gentoo auto-resync : 13:08:2024 - 11:06:03

3 files changed, 135 insertions, 0 deletions

diff --git a/x11-base/Manifest.gz b/x11-base/Manifest.gz
index 0313e44bcea9..e81ef27b21da 100644
--- a/x11-base/Manifest.gz
+++ b/x11-base/Manifest.gz
diff --git a/x11-base/xwayland/Manifest b/x11-base/xwayland/Manifest
index 9da28bd5448e..4516000273b6 100644
--- a/x11-base/xwayland/Manifest
+++ b/x11-base/xwayland/Manifest
@@ -4,8 +4,10 @@ AUX xwayland-drop-redundantly-installed-files.patch 664 BLAKE2B 95773c2287be7f98
 DIST xwayland-23.2.6.tar.xz 1300092 BLAKE2B 5b10984a2c2fba87ce1101b70c26070100e743239dc705716c4b7e1318e192ad1da5e4933516f87ab0405b98eb1cc093081d4a1e4754f5dc8947a546a6f89072 SHA512 9e3c2253af335a559d0f890fa8f9bc381beca6531e0842d739ac15cbca008b3d07c0eefafd03611b04917c626861a7871a83657afa2a298994f4b162f714fc49
 DIST xwayland-24.1.0.tar.xz 1301180 BLAKE2B d20f91fa6c1d404cafb69a7e1cf843458be084a5e0d4feb5266e6bc78a6ee0445aeb178e97c569eb17d13a8a3cc566ac664afcec02e1b56c92f9ea0b95be85b5 SHA512 7592609ad112652cb870761f938f280802d7d3b4bbc82acc7bf741a763d862aa97bbbd7f78250c63a961d76be73fb55555832045514092d89e406839564f0003
 DIST xwayland-24.1.1.tar.xz 1301652 BLAKE2B 0b25776d7b6910b5a122d5ab917506ce933c87b6f0abf908649461f013463001161d1fa5fcaa499c56cfce57f035ad95fd49e28bb3e84ce159eaaad74b5b2799 SHA512 e44f47adab3830846360fd05fdc06d9016832133c662f2e4b0763b98de0c9b48dbfce7d757ffea5538b5fabb68170e5d1057acc1b9a086e396b147deaa750998
+DIST xwayland-24.1.2.tar.xz 1302068 BLAKE2B 761cc7da4e73da8120d5006ba085808e2c383fa991e29d3948c610671a11fee16295584d59409417ebb216fc8ae23de26d69eda7e453725067229672911ae85e SHA512 2788f6954c999c29be54d5b1e6e2c81327de9fbefae140f7cd322c1ff21f76fdd17cb74cf8243035ea850bfa4573d2013ab895426790b7959cceb7120ba9531c
 EBUILD xwayland-23.2.6.ebuild 2541 BLAKE2B edc4b12da17dec0c1977091244e16ffe3f3703d887057d0793729a8b74449be1004fe15fb9f07773ecf831598976da63479e85632ea87867708ab9da607852fc SHA512 2a677167a631ea1661995c2f0cb8042a37da180cb31f3d9e02706728cede83ef888374316ba622f6e8491bd0252a7a55d9d2aaaec748dbc7b79f48f5317bcc9e
 EBUILD xwayland-24.1.0.ebuild 2717 BLAKE2B 5d7a071d31160db68cad4d3d77bf9470d72b759a05827db7e3f46c3a76ca4198f510793ccd03c3ffa42ca8ad19b749f1cc90ab77a5c2e8fb5e757ccd09faaa5d SHA512 f68ff61e0d9c4f7cd2fb943ddb3959144fbd6d20486735b45bc5433ce8f33eca94a26af4b6f61b915eb8a4f34ef4898a08efb1a3552d9f1ada2fbde117ea5ca5
 EBUILD xwayland-24.1.1.ebuild 2717 BLAKE2B 5d7a071d31160db68cad4d3d77bf9470d72b759a05827db7e3f46c3a76ca4198f510793ccd03c3ffa42ca8ad19b749f1cc90ab77a5c2e8fb5e757ccd09faaa5d SHA512 f68ff61e0d9c4f7cd2fb943ddb3959144fbd6d20486735b45bc5433ce8f33eca94a26af4b6f61b915eb8a4f34ef4898a08efb1a3552d9f1ada2fbde117ea5ca5
+EBUILD xwayland-24.1.2.ebuild 2717 BLAKE2B 5d7a071d31160db68cad4d3d77bf9470d72b759a05827db7e3f46c3a76ca4198f510793ccd03c3ffa42ca8ad19b749f1cc90ab77a5c2e8fb5e757ccd09faaa5d SHA512 f68ff61e0d9c4f7cd2fb943ddb3959144fbd6d20486735b45bc5433ce8f33eca94a26af4b6f61b915eb8a4f34ef4898a08efb1a3552d9f1ada2fbde117ea5ca5
 EBUILD xwayland-9999.ebuild 2696 BLAKE2B 6fa7327b7c58db3b0bba07df7fa78834d0faf840058d785ec6bb3f3a8c5cd3e997bf67b9331d36d7fc1abb866a011aa833314ec8777087be25ae4b82c2d91d9e SHA512 dbe891acf1560537dd3e9fe8333f7e430efffdda1f1eb5367fbcbc9ff48c902c6cc2d51f9d315e5e3194148c4e0c73ded61fbbac3f58afb4b4b404effc4726de
 MISC metadata.xml 627 BLAKE2B 1d39badd8534a02eb9785acbfa9efa97823c134696d41397d1db294fa774da9b4f184e027dada1b718cff3d651c9b436a4812458abef1d70af4d7749963d822a SHA512 9d02c7a263144ecfa9aac594867efee3622823b264fc3305e11c4b396156f0c43b071804f6f0ae9850b67b09ae887d270a722b9c4c4482e5ea962eedb915ee79
diff --git a/x11-base/xwayland/xwayland-24.1.2.ebuild b/x11-base/xwayland/xwayland-24.1.2.ebuild
new file mode 100644
index 000000000000..3b5d437dd588
--- /dev/null
+++ b/x11-base/xwayland/xwayland-24.1.2.ebuild
@@ -0,0 +1,133 @@
+# 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"
+
+LICENSE="MIT"
+SLOT="0"
+
+IUSE="libei selinux systemd test unwind xcsecurity"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	dev-libs/libbsd
+	dev-libs/openssl:=
+	>=dev-libs/wayland-1.21.0
+	>=dev-libs/wayland-protocols-1.34
+	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.116
+	>=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 )
+"
+DEPEND="
+	${COMMON_DEPEND}
+	>=x11-base/xorg-proto-2024.1
+	>=x11-libs/xtrans-1.3.5
+	test? (
+		x11-misc/rendercheck
+		x11-libs/libX11
+	)
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	x11-apps/xkbcomp
+
+	libei? ( >=sys-apps/xdg-desktop-portal-1.18.0 )
+	selinux? ( sec-policy/selinux-xserver )
+"
+BDEPEND="
+	app-alternatives/lex
+	dev-util/wayland-scanner
+"
+
+src_prepare() {
+	default
+
+	if ! use test; then
+		sed -i -e "s/dependency('x11')/disabler()/" meson.build || die
+	fi
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use selinux xselinux)
+		$(meson_use systemd systemd_notify)
+		$(meson_use unwind libunwind)
+		$(meson_use xcsecurity)
+		-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 [[ ${PV} == "9999" ]]; then
+		emesonargs+=(
+			-Dxorg=false
+			-Dxnest=false
+			-Dxvfb=false
+			-Dxwayland=true
+		)
+	fi
+
+	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
+
+	# Remove files installed by x11-base/xorg-xserver
+	rm \
+		"${ED}"/usr/share/man/man1/Xserver.1 \
+		"${ED}"/usr/$(get_libdir)/xorg/protocol.txt \
+		|| die
+}