From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5EFD115800A for ; Mon, 7 Aug 2023 20:05:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A0ABE2BC013; Mon, 7 Aug 2023 20:05:51 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 875732BC013 for ; Mon, 7 Aug 2023 20:05:51 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BC574335C92 for ; Mon, 7 Aug 2023 20:05:50 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 01938DC8 for ; Mon, 7 Aug 2023 20:05:49 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1691438726.993790523289c55de0cbd076688df264957ce8f4.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: gui-wm/hyprland/, gui-wm/hyprland/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: gui-wm/hyprland/files/hyprland-0.28.0-no-wlroots-automagic-r1.patch gui-wm/hyprland/files/hyprland-0.28.0-no-wlroots-automagic.patch gui-wm/hyprland/hyprland-0.28.0-r1.ebuild gui-wm/hyprland/hyprland-0.28.0.ebuild X-VCS-Directories: gui-wm/hyprland/ gui-wm/hyprland/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 993790523289c55de0cbd076688df264957ce8f4 X-VCS-Branch: master Date: Mon, 7 Aug 2023 20:05:49 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: dda5ec03-1232-40ae-99f1-db274672a055 X-Archives-Hash: 5b8633124ccb2a30f3d06f7e813f388f commit: 993790523289c55de0cbd076688df264957ce8f4 Author: Alfred Wingate protonmail com> AuthorDate: Mon Aug 7 07:42:55 2023 +0000 Commit: Sam James gentoo org> CommitDate: Mon Aug 7 20:05:26 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99379052 gui-wm/hyprland: enable x11-backend with xwayland, not unconditionally Closes: https://bugs.gentoo.org/911828 Closes: https://bugs.gentoo.org/911871 Signed-off-by: Alfred Wingate protonmail.com> Closes: https://github.com/gentoo/gentoo/pull/32205 Signed-off-by: Sam James gentoo.org> .../hyprland-0.28.0-no-wlroots-automagic-r1.patch | 20 ++++++++++++++++++++ .../files/hyprland-0.28.0-no-wlroots-automagic.patch | 14 -------------- ...rland-0.28.0.ebuild => hyprland-0.28.0-r1.ebuild} | 4 ++-- 3 files changed, 22 insertions(+), 16 deletions(-) diff --git a/gui-wm/hyprland/files/hyprland-0.28.0-no-wlroots-automagic-r1.patch b/gui-wm/hyprland/files/hyprland-0.28.0-no-wlroots-automagic-r1.patch new file mode 100644 index 000000000000..ca37e4e7c16d --- /dev/null +++ b/gui-wm/hyprland/files/hyprland-0.28.0-no-wlroots-automagic-r1.patch @@ -0,0 +1,20 @@ +# Disable automagic, otherwise wlroots will enable features if dependencies are present. +# Enable x11-backend only if xwayland is enabled. +diff --git a/meson.build b/meson.build +index 6a94dee6..08993f8a 100644 +--- a/meson.build ++++ b/meson.build +@@ -39,7 +39,12 @@ add_project_arguments( + ], + language: 'cpp') + +-wlroots = subproject('wlroots', default_options: ['examples=false']) ++if get_option('xwayland').enabled() ++ wlroots = subproject('wlroots', default_options: ['backends=drm,libinput,x11','examples=false','renderers=gles2','xcb-errors=disabled','xwayland=enabled']) ++else ++ wlroots = subproject('wlroots', default_options: ['backends=drm,libinput','examples=false','renderers=gles2','xcb-errors=disabled','xwayland=disabled']) ++endif ++ + have_xwlr = wlroots.get_variable('features').get('xwayland') + xcb_dep = dependency('xcb', required: get_option('xwayland')) + diff --git a/gui-wm/hyprland/files/hyprland-0.28.0-no-wlroots-automagic.patch b/gui-wm/hyprland/files/hyprland-0.28.0-no-wlroots-automagic.patch deleted file mode 100644 index 96b12fe497eb..000000000000 --- a/gui-wm/hyprland/files/hyprland-0.28.0-no-wlroots-automagic.patch +++ /dev/null @@ -1,14 +0,0 @@ -# Disable automagic, otherwise wlroots will enable features if dependencies are present. -diff --git a/meson.build b/meson.build -index 6a94dee6..9608717d 100644 ---- a/meson.build -+++ b/meson.build -@@ -39,7 +39,7 @@ add_project_arguments( - ], - language: 'cpp') - --wlroots = subproject('wlroots', default_options: ['examples=false']) -+wlroots = subproject('wlroots', default_options: ['backends=drm,libinput,x11','examples=false','renderers=gles2','xcb-errors=disabled']) - have_xwlr = wlroots.get_variable('features').get('xwayland') - xcb_dep = dependency('xcb', required: get_option('xwayland')) - diff --git a/gui-wm/hyprland/hyprland-0.28.0.ebuild b/gui-wm/hyprland/hyprland-0.28.0-r1.ebuild similarity index 96% rename from gui-wm/hyprland/hyprland-0.28.0.ebuild rename to gui-wm/hyprland/hyprland-0.28.0-r1.ebuild index 5023065717c7..1da193f4e218 100644 --- a/gui-wm/hyprland/hyprland-0.28.0.ebuild +++ b/gui-wm/hyprland/hyprland-0.28.0-r1.ebuild @@ -18,7 +18,7 @@ IUSE="X legacy-renderer systemd video_cards_nvidia" # bundled wlroots has the following dependency string according to included headers. # wlroots[drm,gles2-renderer,libinput,x11-backend?,X?] -# lets enable x11-backend by default +# enable x11-backend with X and vice versa WLROOTS_RDEPEND=" >=dev-libs/libinput-1.14.0:= dev-libs/libliftoff @@ -103,7 +103,7 @@ src_prepare() { cd "${S}" || die fi - eapply "${FILESDIR}/hyprland-0.28.0-no-wlroots-automagic.patch" + eapply "${FILESDIR}/hyprland-0.28.0-no-wlroots-automagic-r1.patch" default }