From nobody Mon Nov 21 11:23:42 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4NG4lM1BWBz4hlMh; Mon, 21 Nov 2022 11:23:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4NG4lM0gtCz3tvh; Mon, 21 Nov 2022 11:23:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669029823; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mfIGGf0fnI3CtIATRUQg9ujSVAhXLgD6EhA+m7WNK24=; b=N6zzATxd4y5/7amHqtCCMY4XTWsTPJ2oz2oxqoYhxboMCbKrUdkc1uP4cDgpT/peOnKmCt dCeb8ADH6fDkV0qdBJ3/If3dsZAqPuB6MY9zldo5HUZ8G+Qo2FS9XEBk7MAqrmt7DyUfM+ rt05II9rHE8KZ6255awZ0SS1DND0cc9P1xzc5AI4jAK7g/9Z6dRv+wGeVYwU2eLxExlupg c9VopLWh4xE8iUvV43blkTPT13ULUB8VUwCGULPIn8yjrwKaGgUa39g9VQefGw3bn+Rsqs WksrNLJeoNsb5s9zUsWrofAyKy+igIzOrlYo+fuLzyN9rNavYkWO0G1eZxj7fg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669029823; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mfIGGf0fnI3CtIATRUQg9ujSVAhXLgD6EhA+m7WNK24=; b=V/wPTTI4exUbQtWmhurNFJAJbPE5zMqz776btjiYLskEH4VapZz8fnHrgzOzxvkQOUcecD l9h7qZN3ognjN6PlwLnrmcl3qw9qjQh/8+T0F5LsK5MdpbY/bQmXKtOcCbiJ5XCUu6GtMg bAsTdTpmwxakDPilYVUB1ZyOPOibIFHK+NPCQz7rdj+bbu+xVv5iXcGgzmurZ33wWXPu5A FdbbB/On8tcfCbi7nslXUrXsDY+zpaSm/hNiJz/soirPv9yxhH9cGA0PHZHmKDGG9kLgSi Ew33PVK4Fx88mLSd+UlQ7vDaABW9CZ3zjqnxsPe971Gc5sX3uwjtum3lzMZrsw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1669029823; a=rsa-sha256; cv=none; b=sOKqJutS+yXwW6t6PV3D0H3a2SHjbmZjlmrCuMePV0tEzLKYo7sU4q264O47w9D6/YH1i2 LFuZ3hzFi83qNOxUy507kHo2MPpqj3M3xTlj4RbWPtpe/qy+exxkq8YCFMY8ZjcnQrehDR EEuI8xFPPf9xoH4Sgamn3xFLtuKApFoL9g/ktd6fyABDXmqEF+jws7tmCU549Y4hrUsOxX xZ0bVvLZYR0v7gHitXaghRwCBsgTx6VeamB4pTPm2J4VXP1OycoqTjL+FtEednhoT+v126 hVscygbjMGglIagDH0hoIF56lVRevfJrBzKRDjv9RP2RRmQ7zj/pmlgkVb/lKA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4NG4lL6sQ7z125r; Mon, 21 Nov 2022 11:23:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2ALBNglW070843; Mon, 21 Nov 2022 11:23:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2ALBNgPJ070842; Mon, 21 Nov 2022 11:23:42 GMT (envelope-from git) Date: Mon, 21 Nov 2022 11:23:42 GMT Message-Id: <202211211123.2ALBNgPJ070842@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: a347cfee7327 - main - x11-wm/sway: unbreak WLR_BACKENDS != drm after 3eb7d7b7f6a0 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a347cfee7327523b2a42ccc20b445c59658cf64a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=a347cfee7327523b2a42ccc20b445c59658cf64a commit a347cfee7327523b2a42ccc20b445c59658cf64a Author: Jan Beich AuthorDate: 2022-11-21 11:13:34 +0000 Commit: Jan Beich CommitDate: 2022-11-21 11:22:54 +0000 x11-wm/sway: unbreak WLR_BACKENDS != drm after 3eb7d7b7f6a0 $ echo 'exec swaymsg -t get_outputs' >/tmp/sway.conf $ WLR_BACKENDS=headless sway -c /tmp/sway.conf 00:00:00.067 [wlr] [types/wlr_drm_lease_v1.c:716] No DRM backend supplied, failed to create wlr_drm_lease_v1_manager 00:00:00.000 [common/ipc-client.c:87] Unable to receive IPC response Segmentation fault (lldb) bt * thread #1, name = 'sway', stop reason = signal SIGSEGV: invalid address (fault address: 0x0) * frame #0: 0x000000082b381e84 libc.so.7`strlen + 84 frame #1: 0x0000000822cc530d libjson-c.so.5`json_object_new_string(s=0x0000000000000000) at json_object.c:1276:36 frame #2: 0x0000000000234de9 sway`ipc_json_describe_output(output=0x0000000871982200, object=0x00000008755e63b0) at ipc-json.c:255:4 frame #3: 0x000000000023441f sway`ipc_json_describe_node(node=0x0000000871982200) at ipc-json.c:707:3 frame #4: 0x0000000000239d07 sway`ipc_client_handle_command(client=0x000000084e3a1380, payload_length=0, payload_type=IPC_GET_OUTPUTS) at ipc-server.c:672:31 frame #5: 0x00000000002397fa sway`ipc_client_handle_readable(client_fd=27, mask=1, data=0x000000084e3a1380) at ipc-server.c:267:3 frame #6: 0x00000008271b88c7 libwayland-server.so.0`wl_event_source_fd_dispatch(source=0x000000084e3a16c0, ep=0x0000000820f4e360) at event-loop.c:112:9 frame #7: 0x00000008271b9fd4 libwayland-server.so.0`wl_event_loop_dispatch(loop=0x000000084e344320, timeout=-1) at event-loop.c:1027:4 frame #8: 0x00000008271b5c6f libwayland-server.so.0`wl_display_run(display=0x000000084e35e000) at wayland-server.c:1431:3 frame #9: 0x000000000023e205 sway`server_run(server=0x00000000002a3070) at server.c:310:2 frame #10: 0x000000000023cd84 sway`main(argc=3, argv=0x0000000820f4e608) at main.c:431:2 frame #11: 0x000000000022ca10 sway`_start(ap=, cleanup=) at crt1_c.c:75:7 (lldb) f 2 frame #2: 0x0000000000234de9 sway`ipc_json_describe_output(output=0x0000000871982200, object=0x00000008755e63b0) at ipc-json.c:255:4 252 json_object_new_string( 253 ipc_json_orientation_description(L_NONE))); 254 json_object_object_add(object, "make", -> 255 json_object_new_string(wlr_output->make)); 256 json_object_object_add(object, "model", 257 json_object_new_string(wlr_output->model)); 258 json_object_object_add(object, "serial", (lldb) p *wlr_output (wlr_output) $0 = { [...] make = 0x0000000000000000 model = 0x0000000000000000 serial = 0x0000000000000000 [...] PR: 267853 Reported by: lbartoletti Regressed by: https://gitlab.freedesktop.org/wlroots/wlroots/-/commit/be86145322e6 --- x11-wm/sway/Makefile | 4 +++- x11-wm/sway/distinfo | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/x11-wm/sway/Makefile b/x11-wm/sway/Makefile index 1666396dce0e..e2e9c308d14a 100644 --- a/x11-wm/sway/Makefile +++ b/x11-wm/sway/Makefile @@ -1,6 +1,6 @@ PORTNAME= sway DISTVERSION= 1.7 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-wm wayland PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ @@ -22,6 +22,8 @@ PATCHFILES+= 440d0bc22d57.patch:-p1 # wlroots 0.16 PATCHFILES+= 6c4c0387a24b.patch:-p1 # wlroots 0.16 PATCHFILES+= acdb48a59c26.patch:-p1 # wlroots 0.16 PATCHFILES+= 3f600565e4dd.patch:-p1 # wlroots 0.16 +PATCHFILES+= f0d57da315ec.patch:-p1 # wlroots 0.16 +PATCHFILES+= d0b9bf94a5c6.patch:-p1 # wlroots 0.16 PATCHFILES+= 26a0e97634dc.patch:-p1 # wlroots 0.16 PATCHFILES+= 1c69d0e72fe8.patch:-p1 # wlroots 0.16 PATCHFILES+= 94dbc6a92a03.patch:-p1 # wlroots 0.16 diff --git a/x11-wm/sway/distinfo b/x11-wm/sway/distinfo index eff23b339df4..a15a027a0727 100644 --- a/x11-wm/sway/distinfo +++ b/x11-wm/sway/distinfo @@ -37,6 +37,10 @@ SHA256 (acdb48a59c26.patch) = a1bcb9cfe917d0b4fe44785a2ac833b223e0e17517f9b8e29f SIZE (acdb48a59c26.patch) = 2848 SHA256 (3f600565e4dd.patch) = 326ca734e8eef7fc2f23ef63f5ec7c693e17c159b8c71ca0e3d17d99f17538e6 SIZE (3f600565e4dd.patch) = 1355 +SHA256 (f0d57da315ec.patch) = 24ebd3eca91e551365331c67c56b5ed855c96855052c9f862281b806869cca2f +SIZE (f0d57da315ec.patch) = 4552 +SHA256 (d0b9bf94a5c6.patch) = 17a0704b661fba5b09d7a5c1d5f554d61bf32a566a1780d8cfb2056748494f54 +SIZE (d0b9bf94a5c6.patch) = 1979 SHA256 (26a0e97634dc.patch) = 92660c130ec41158383438afe32f32244ef2506d6f6d306a1ba64c2ac1cda4e5 SIZE (26a0e97634dc.patch) = 2175 SHA256 (1c69d0e72fe8.patch) = df8f1ed38b3570eefaa9a3ea0a8e1d66e3234e2f09e70b1930c903dc56a5a033