gentoo auto-resync : 03:10:2024 - 04:43:49

6 files changed, 139 insertions, 2 deletions

diff --git a/x11-base/Manifest.gz b/x11-base/Manifest.gz
index d98d71f9e7d9..8e3733b94da6 100644
--- a/x11-base/Manifest.gz
+++ b/x11-base/Manifest.gz
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index 6a6df212bda4..f6a3a5044ea7 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -4,6 +4,6 @@ AUX xorg-server-21.1.10-c99.patch 1508 BLAKE2B 7c4080924f5f5a8d4be2addae218bbc66
 AUX xorg-server-21.1.10-fix-c99-32bit.patch 2821 BLAKE2B c0fb85a4b7aef3b025b054ce525ffd8e8eb3a4cef3b249a764d328fd3c83336ab50d278f13214691b71b4644bd5604094ca3d5d26341f69625b55fa1c424e12c SHA512 21880bd7f6a8008b1f44e815e6bfc83976153f8639de7d004b82adc647c9e9715d2ba9d4dcb8ad2e16f4b9b80441fe7acae1cc10091fc00b7ba7dc761d167958
 AUX xorg-sets.conf 199 BLAKE2B e9414694f372d3f2a65bee903522094a60e261ddcd0c49a1d85a2ee804f3edbb5c605ed2d0b44839a91e98957f05ea88da87530f5f36b2db249e09ee56ee2975 SHA512 910fe28f20909243044f079ff35136942b8790f4f28ac42ffc64a76b7f03cd22057087fa5e4e01192080b52c0d89000ea96d5a807c6f11f680d3f43312c5be41
 DIST xorg-server-21.1.13.tar.xz 4963952 BLAKE2B f6b05439e54b9709ce7a5b5f3702053ebc586ac8f8976bb6de9955ab34eac7201e027e1076584cf5b6d8c2639703e3a908b9e38f5dc52d4897aac8650f462502 SHA512 a55fbeeed227c12c67f166f2c06a7f4f8d78feeea04c6e73509dbc723185fd0772349aa23f7c44cf0828ac0a0e2f9e4b26cffb220e6dfa7186d60f88b25ccaf1
-EBUILD xorg-server-21.1.13-r1.ebuild 4684 BLAKE2B 7ef655bc3a426f5413dba617087539a611f48dee4825ccf55469f1c47c562782deb85eea650a2dfd4ab259dd49c9d86212aa1135a9d0922c5c70b807e7bd5d34 SHA512 9380e8124b1f965257fb4a7849b6e1801d3b8b3c0b260f7100ad84f7f2a535fe463812f57a3761d3a52129d766df4abde6d61edef2cf0e0d83f8db78d0587f0b
-EBUILD xorg-server-9999.ebuild 4466 BLAKE2B c3b5fae8737b817d126e7444fedadd20e66265c090ac0a7d6f72fe6502cddf39d7b6fa985fe3d34991ba0c60d9b49ace2f34da7c005437403a56b4d979127c11 SHA512 6f5a1b7844832d7abd74cedc20d4d5d3cfb6c949387c909235a52158f222f66d3e219f3ec548d0cea301cc35142ede66a3c35b732d3a2d0558cf4c3eb92b293d
+EBUILD xorg-server-21.1.13-r1.ebuild 4718 BLAKE2B 76bd34d2d9d22ffb81cd1a8c555f003e04f358e4214e12a5aed933f3084814276a14d2323f608ae138203a17f663f53d2132bc1d40b530bdba55d59473df2fab SHA512 351cf17ae0d4b4412be19e40a80988f4749e50aad3deee15171bffe3c99f7228b4379d5f35b8309187e260c10824adf53f881fd828cef1cf0d94b97529dffbe5
+EBUILD xorg-server-9999.ebuild 4500 BLAKE2B be7c232f09a90f1316da8024521aba26fd6bf18ee50735b5aaa614cc206575dcf6689574da899b38bcff6e11e6391ed8017fc504901beddfe904492d3c92fd27 SHA512 b89748b18bb62f38558d55ff5b59ef9d0641200ee4bf6a26989d0272104b265981edef1a01f58cf02d64f281c3fbd6720c8922c32c97b64c759e9c6e0e1d7164
 MISC metadata.xml 881 BLAKE2B e5b0384c9cc45cf1e12a3010abf31232e4a726c11aa46b7303cc22b582e31d6ece1dbed35aacee265ca5a54433a6821d964059709307e4d4e51bb5a22b74b31d SHA512 72d6c8a97e474464e222d8d0be1a5d16c123683bf1415a142204b26361fdefdfbf1b3493d7b33cb637c03a808d5068c10d18adeb7de2a4fd5ecfcd4fa40f2f90
diff --git a/x11-base/xorg-server/xorg-server-21.1.13-r1.ebuild b/x11-base/xorg-server/xorg-server-21.1.13-r1.ebuild
index 0923dc31158f..16599d733bf8 100644
--- a/x11-base/xorg-server/xorg-server-21.1.13-r1.ebuild
+++ b/x11-base/xorg-server/xorg-server-21.1.13-r1.ebuild
@@ -111,6 +111,7 @@ PATCHES=(
 src_configure() {
 	# bug #835653
 	use x86 && replace-flags -Os -O2
+	use x86 && replace-flags -Oz -O2
 
 	# localstatedir is used for the log location; we need to override the default
 	#	from ebuild.sh
diff --git a/x11-base/xorg-server/xorg-server-9999.ebuild b/x11-base/xorg-server/xorg-server-9999.ebuild
index 73e76552fc7b..fbaefca8e5ce 100644
--- a/x11-base/xorg-server/xorg-server-9999.ebuild
+++ b/x11-base/xorg-server/xorg-server-9999.ebuild
@@ -104,6 +104,7 @@ PATCHES=(
 src_configure() {
 	# bug #835653
 	use x86 && replace-flags -Os -O2
+	use x86 && replace-flags -Oz -O2
 
 	use debug && EMESON_BUILDTYPE=debug
 
diff --git a/x11-base/xwayland/Manifest b/x11-base/xwayland/Manifest
index 7dce0b7cabd7..643252579f3a 100644
--- a/x11-base/xwayland/Manifest
+++ b/x11-base/xwayland/Manifest
@@ -1,4 +1,6 @@
 DIST xwayland-24.1.2.tar.xz 1302068 BLAKE2B 761cc7da4e73da8120d5006ba085808e2c383fa991e29d3948c610671a11fee16295584d59409417ebb216fc8ae23de26d69eda7e453725067229672911ae85e SHA512 2788f6954c999c29be54d5b1e6e2c81327de9fbefae140f7cd322c1ff21f76fdd17cb74cf8243035ea850bfa4573d2013ab895426790b7959cceb7120ba9531c
+DIST xwayland-24.1.3.tar.xz 1302164 BLAKE2B 53968bc0eb1ab6ab1d04d195730bbd0961428acfb0178dc592c04bc9bfc3a07cb5ba399377fd1aaaed1153de59d2d35b8b78582a8f7e151912998c3a3cfc6dce SHA512 7e0e11b07408f41a81bafa7bc519d02ed9bdc36e11be16abe255a7d779d04824af23d79323f1602119b046c545cdd43ea91b93e23feb0ffe411aa6989b462c1d
 EBUILD xwayland-24.1.2.ebuild 2699 BLAKE2B 9b23fe1ba2a9efc518296c1dca0b97392cd0dd55b9208383cef6af5e8845c1c599c1280a32ffdb504c3ea6f018b261a047b336b3869f50d7354421057375a21d SHA512 cfc26ae1f34a7069465b232c1f290a302a92612438347b42f4d26ad1cb41efa692b2f0311790941488943fbdbc4ca221b2e85f02255bba63101c95d42a608f63
+EBUILD xwayland-24.1.3.ebuild 2705 BLAKE2B f54170097fdc08c8647412456e57c67caca7d7ac6232316db9c63a4691276b7815dff21a96f3ca1427ccda89adce8fc0b38e0c5d570406a8a0f056e74f025e15 SHA512 d652055dc89bc82c902e8a8f2763d9087998ea8a64f68120e36ce643ab520757a7ec86f870e14685e4dab25469b0f5df612853f2b460ee37b403703501e2aa81
 EBUILD xwayland-9999.ebuild 2684 BLAKE2B f60153f9a0659ee758f8b77bf2b8956625a0ff86d54bcdd93447ab8c321e2babb84f0f260627105977e43d90ce75a7764580a357a77aea59bc810a4087b9b5b6 SHA512 81e17d04515359bd43209a8cf5b887a6de48c002aacb5a51cfb832ee37ec7af94935e486386854d99d018d5359ee658ad43aeb794d6cff893c8987363b9acf82
 MISC metadata.xml 627 BLAKE2B 1d39badd8534a02eb9785acbfa9efa97823c134696d41397d1db294fa774da9b4f184e027dada1b718cff3d651c9b436a4812458abef1d70af4d7749963d822a SHA512 9d02c7a263144ecfa9aac594867efee3622823b264fc3305e11c4b396156f0c43b071804f6f0ae9850b67b09ae887d270a722b9c4c4482e5ea962eedb915ee79
diff --git a/x11-base/xwayland/xwayland-24.1.3.ebuild b/x11-base/xwayland/xwayland-24.1.3.ebuild
new file mode 100644
index 000000000000..9eecb443ea90
--- /dev/null
+++ b/x11-base/xwayland/xwayland-24.1.3.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 ~loong ~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
+}