gentoo auto-resync : 02:01:2024 - 08:48:32

5 files changed, 171 insertions, 3 deletions

diff --git a/x11-base/Manifest.gz b/x11-base/Manifest.gz
index cf047527869f..706cce9b3220 100644
--- a/x11-base/Manifest.gz
+++ b/x11-base/Manifest.gz
diff --git a/x11-base/xwayland/Manifest b/x11-base/xwayland/Manifest
index d1c897a55130..c5fe58fdc8df 100644
--- a/x11-base/xwayland/Manifest
+++ b/x11-base/xwayland/Manifest
@@ -1,8 +1,10 @@
+AUX xwayland-23.2.3-systemd-automagic.patch 2208 BLAKE2B abb9fa8f1e615d63bea84c9683d858ae182835d51eefe047af9c6ad126cd710bd7733a0dca0e2e3c158e098f75ee3d270f5c580cd2cee91c32f12c2e310015a2 SHA512 c4f379614b9772371c13febb78b32f932f405a20d82286f65bfb25cff3d4837de8b136208ab26c6d47753287a8f34e736ab168a67c20b9570508d16f0168dadb
 AUX xwayland-drop-redundantly-installed-files.patch 664 BLAKE2B 95773c2287be7f985f5156eebb4e01be236b3f8a2b217c31ea4d7c2f7ad826716ff8ac7951c5ee7963a057a5afe71040ddf1ca72151fb90923364cabfefc34c2 SHA512 35e329763122726eca8dd7014ee1c0321a4b23f32441a180fd4dfa2fd91b508b71a57270cc335460ca84a1483dc7c6d7cec56f55a2506aecbb73c14e4705d252
 AUX xwayland-drop-redundantly-installed-files_v2.patch 745 BLAKE2B eb9a61b2746c7b694bde5ed946ecb818f1933edcaaff45a491667cb2ebca81343c40fc3f5caf544e9e15bc41e3bd0777086fc9c0b48aa98d7aceb152dabbc168 SHA512 a4eab1cf0a31cd049ad83f7402746eca8948fcccdf162e4b216efd203fba8eca9ccc5594d483abc5591322f65a8fb937057c08caaec040b350b790fddcb21d24
 DIST xwayland-23.2.2.tar.xz 1298400 BLAKE2B a73d6595db3ee1f55b2d04fce652378f3a277fbff2ecdb0b0da25fe7618a8a70b337cedc2fd18044f52a597171c31f4da87147491366dcbac4f048e985e13446 SHA512 f5b319fdace7d7c078544730ecd26afeb63b1a0c779fb097455147945df85af32d9e91501ebdb70209d48e8a3ead3b23be31e9d5118358ac17e699abb4b6ac07
 DIST xwayland-23.2.3.tar.xz 1298840 BLAKE2B 65a0517fdee19f9144f8e661e17227d838dff0b040f383cf940623492919574d60c032d7ba84f13f35c8a259ca4783ffc3519cc35768946b5b2014e25d4ec93e SHA512 37198aa2f06313a0cb2add51cc78f81b26a42f2c9d55a0d3eecf958777107ea5560961c128f2d0af055f7460ba10fadb1b9050251c2c50f2251b40ab517e79cd
 EBUILD xwayland-23.2.2.ebuild 2370 BLAKE2B 4a1eb486ea329551dd8bdd92538d609425c6012d4db362032341426b4197fa8362c5c97b7da656ecfddd2da37adf4b25eb734bb96e39db2d326a222555208db3 SHA512 8c5c4ebcd76f31065473c36f04975122d5dcff20df244d7771ccdffb54ca81d6f8686a48c10abf7171982d49000ab03792b4a6eeb4f7d4d348bf3dbc15a33222
+EBUILD xwayland-23.2.3-r1.ebuild 2460 BLAKE2B 3246499e93cd7c55a147a3c618fb288896e30e55425c09c571b6d2e7f360b39a8cb79d5ce7d1b5ebb3c54163b089238c99328db9fb4c6c61e8bd413b8993c171 SHA512 20b83d49b4b6d73d0c2f95718771d87e3bac68a1493a2bd5eb97fc9d715adc6687267aa58a94000a2c5ae63413573694c76240b5f550ff99f90a5164519f4288
 EBUILD xwayland-23.2.3.ebuild 2338 BLAKE2B e6e85c544cb18dcf69d0a8ede0ec4e5f1a5f8a71d5156d9d7993299dbf300154019a4288e82720ce5befbbe73632769b193d5d734495f5fe59f42c79d18df7e9 SHA512 6318ead85ae377978c03ce6f025e3c07060c793e189c417324487fc0f7c3805664493324a5d113053c57dfcf818626bc7e1016dc6aeb10e60733eb7a922b2a40
-EBUILD xwayland-9999.ebuild 2410 BLAKE2B cc096cb2a9ca3cb7988cb070d36d20f2c18e87a672888c07854ada44eca2546ae4df46c3a05739f6b2388fad087af2b85ab3a70a619c4852576ac71bb4d6e349 SHA512 d4c3eef5dc9e4296ca6cd88908c904d866aba3e7317017e071f194fffd793b9758e4215c62ba5bb0a3a581a222ddfef83c2583cb7f5a4ae32e8e08dc85998083
+EBUILD xwayland-9999.ebuild 2472 BLAKE2B 6c9a9c6c676eda9635ce0b7ed104359da359745bda16866c9c0166f74ea26e573252d53b8b8c24118e652dd17e0f6aa04517a7944932977f7ed0e18ed1df99cf SHA512 f92ddb5cef72cb96eb9830ecf524bbf53affe237fcc524c90c6bcb80a79c124f87ef443d6227921b6abfe03f4db9cb0822dd976c4ed21129a0c27cd51960f22f
 MISC metadata.xml 627 BLAKE2B 1d39badd8534a02eb9785acbfa9efa97823c134696d41397d1db294fa774da9b4f184e027dada1b718cff3d651c9b436a4812458abef1d70af4d7749963d822a SHA512 9d02c7a263144ecfa9aac594867efee3622823b264fc3305e11c4b396156f0c43b071804f6f0ae9850b67b09ae887d270a722b9c4c4482e5ea962eedb915ee79
diff --git a/x11-base/xwayland/files/xwayland-23.2.3-systemd-automagic.patch b/x11-base/xwayland/files/xwayland-23.2.3-systemd-automagic.patch
new file mode 100644
index 000000000000..9af034c46fd5
--- /dev/null
+++ b/x11-base/xwayland/files/xwayland-23.2.3-systemd-automagic.patch
@@ -0,0 +1,52 @@
+https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1230
+
+From 010f6e751e86207a7e88f3504191bcae2d77b458 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Sun, 31 Dec 2023 23:37:19 +0000
+Subject: [PATCH] meson: add option for systemd
+
+Without this, systemd will be used if installed on the system automagically,
+which is a problem if the built e.g. Xwayland is going to be used on a non-systemd
+machine.
+
+Bug: https://bugs.gentoo.org/908254
+Signed-off-by: Sam James <sam@gentoo.org>
+
+diff --git a/include/meson.build b/include/meson.build
+index e6e3d553f..ddc18407e 100644
+--- a/include/meson.build
++++ b/include/meson.build
+@@ -91,7 +91,7 @@ endif
+ 
+ conf_data.set('HAVE_LIBBSD', libbsd_dep.found() ? '1' : false)
+ # Note: this symbol is used by libXtrans.
+-conf_data.set('HAVE_SYSTEMD_DAEMON', libsystemd_daemon_dep.found() ? '1' : false)
++conf_data.set('HAVE_SYSTEMD_DAEMON', build_systemd ? '1' : false)
+ conf_data.set('HAVE_XSHMFENCE', xshmfence_dep.found() ? '1' : false)
+ conf_data.set('WITH_LIBDRM', libdrm_required ? '1' : false)
+ conf_data.set('GLAMOR_HAS_EGL_QUERY_DMABUF',
+diff --git a/meson.build b/meson.build
+index 60164d73b..de984760c 100644
+--- a/meson.build
++++ b/meson.build
+@@ -99,6 +99,7 @@ xkbcomp_dep = dependency('xkbcomp', required: false)
+ xkbfile_dep = dependency('xkbfile')
+ xfont2_dep = dependency('xfont2', version: '>= 2.0')
+ 
++build_systemd = get_option('systemd') == 'true'
+ # libsystemd-daemon was moved into libsystemd in version 209
+ libsystemd_daemon_dep = dependency('libsystemd', version: '>= 209', required: false)
+ if not libsystemd_daemon_dep.found()
+diff --git a/meson_options.txt b/meson_options.txt
+index af094df70..62c539fbd 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -47,6 +47,8 @@ option('listen_unix', type: 'boolean', value: true,
+ option('listen_local', type: 'boolean', value: true,
+        description: 'Listen on local by default')
+ 
++option('systemd', type: 'combo', choices: ['true', 'false', 'auto'], value: 'auto',
++       description: 'Enable systemd-notify support')
+ option('dpms', type: 'boolean', value: true,
+        description: 'Xorg DPMS extension')
+ option('xf86bigfont', type: 'boolean', value: false,
diff --git a/x11-base/xwayland/xwayland-23.2.3-r1.ebuild b/x11-base/xwayland/xwayland-23.2.3-r1.ebuild
new file mode 100644
index 000000000000..7cf66e28583c
--- /dev/null
+++ b/x11-base/xwayland/xwayland-23.2.3-r1.ebuild
@@ -0,0 +1,112 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/xserver.git"
+	inherit git-r3
+else
+	SRC_URI="https://xorg.freedesktop.org/archive/individual/xserver/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+DESCRIPTION="Standalone X server running under Wayland"
+HOMEPAGE="https://wayland.freedesktop.org/xserver.html"
+
+IUSE="libei selinux systemd video_cards_nvidia unwind xcsecurity"
+
+LICENSE="MIT"
+SLOT="0"
+
+COMMON_DEPEND="
+	dev-libs/libbsd
+	dev-libs/openssl:=
+	>=dev-libs/wayland-1.21.0
+	>=dev-libs/wayland-protocols-1.30
+	media-fonts/font-util
+	>=media-libs/libepoxy-1.5.4[X,egl(+)]
+	media-libs/libglvnd[X]
+	>=media-libs/mesa-21.1[X(+),egl(+),gbm(+)]
+	>=x11-libs/libdrm-2.4.109
+	>=x11-libs/libXau-1.0.4
+	x11-libs/libxcvt
+	>=x11-libs/libXdmcp-1.0.2
+	>=x11-libs/libXfont2-2.0.1
+	x11-libs/libxkbfile
+	>=x11-libs/libxshmfence-1.1
+	>=x11-libs/pixman-0.27.2
+	>=x11-misc/xkeyboard-config-2.4.1-r3
+
+	libei? ( dev-libs/libei )
+	systemd? ( sys-apps/systemd )
+	unwind? ( sys-libs/libunwind )
+	video_cards_nvidia? ( gui-libs/egl-wayland )
+"
+DEPEND="
+	${COMMON_DEPEND}
+	>=x11-base/xorg-proto-2022.2
+	>=x11-libs/xtrans-1.3.5
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	x11-apps/xkbcomp
+
+	libei? ( >=sys-apps/xdg-desktop-portal-1.18.0 )
+	selinux? ( sec-policy/selinux-xserver )
+"
+BDEPEND="
+	sys-devel/flex
+	dev-util/wayland-scanner
+"
+
+PATCHES=(
+	"${FILESDIR}"/xwayland-drop-redundantly-installed-files.patch
+	"${FILESDIR}"/xwayland-23.2.3-systemd-automagic.patch
+)
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use selinux xselinux)
+		$(meson_use systemd)
+		$(meson_use unwind libunwind)
+		$(meson_use xcsecurity)
+		$(meson_use video_cards_nvidia xwayland_eglstream)
+		-Ddpms=true
+		-Ddri3=true
+		-Ddrm=true
+		-Ddtrace=false
+		-Dglamor=true
+		-Dglx=true
+		-Dipv6=true
+		-Dsecure-rpc=false
+		-Dscreensaver=true
+		-Dsha1=libcrypto
+		-Dxace=true
+		-Dxdmcp=true
+		-Dxinerama=true
+		-Dxvfb=true
+		-Dxv=true
+		-Dxwayland-path="${EPREFIX}"/usr/bin
+		-Dlibdecor=false
+		-Ddocs=false
+		-Ddevel-docs=false
+		-Ddocs-pdf=false
+	)
+
+	if use libei; then
+		emesonargs+=( -Dxwayland_ei=portal )
+	else
+		emesonargs+=( -Dxwayland_ei=false )
+	fi
+
+	meson_src_configure
+}
+
+src_install() {
+	dosym ../bin/Xwayland /usr/libexec/Xwayland
+
+	meson_src_install
+}
diff --git a/x11-base/xwayland/xwayland-9999.ebuild b/x11-base/xwayland/xwayland-9999.ebuild
index 915fd9a08bb3..6d2b4301bc42 100644
--- a/x11-base/xwayland/xwayland-9999.ebuild
+++ b/x11-base/xwayland/xwayland-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 Gentoo Authors
+# Copyright 2021-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -16,7 +16,7 @@ fi
 DESCRIPTION="Standalone X server running under Wayland"
 HOMEPAGE="https://wayland.freedesktop.org/xserver.html"
 
-IUSE="libei selinux video_cards_nvidia unwind xcsecurity"
+IUSE="libei selinux systemd video_cards_nvidia unwind xcsecurity"
 
 LICENSE="MIT"
 SLOT="0"
@@ -41,6 +41,7 @@ COMMON_DEPEND="
 	>=x11-misc/xkeyboard-config-2.4.1-r3
 
 	libei? ( dev-libs/libei )
+	systemd? ( sys-apps/systemd )
 	unwind? ( sys-libs/libunwind )
 	video_cards_nvidia? ( gui-libs/egl-wayland )
 "
@@ -68,6 +69,7 @@ PATCHES=(
 src_configure() {
 	local emesonargs=(
 		$(meson_use selinux xselinux)
+		$(meson_use systemd)
 		$(meson_use unwind libunwind)
 		$(meson_use xcsecurity)
 		$(meson_use video_cards_nvidia xwayland_eglstream)