[gentoo-commits] repo/gentoo:master commit in: media-libs/libva-intel-media-driver/, x11-base/xwayland/

[gentoo-commits] repo/gentoo:master commit in: media-libs/libva-intel-media-driver/, x11-base/xwayland/

[Matt Turner]

commit:     7febe476aa2414645a436d1483a2e4dac2ff8f6b
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Wed Apr  3 19:56:04 2024 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Wed Apr  3 20:33:26 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7febe476

x11-base/xwayland: Version bump to 23.2.5

Bug: https://bugs.gentoo.org/927716
Bug: https://bugs.gentoo.org/928531
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 .../libva-intel-media-driver-24.2.0.ebuild         |   4 +-
 x11-base/xwayland/Manifest                         |   1 +
 x11-base/xwayland/xwayland-23.2.5.ebuild           | 113 +++++++++++++++++++++
 3 files changed, 116 insertions(+), 2 deletions(-)

diff --git a/media-libs/libva-intel-media-driver/libva-intel-media-driver-24.2.0.ebuild b/media-libs/libva-intel-media-driver/libva-intel-media-driver-24.2.0.ebuild
index c39052ca1e08..91b4623797d9 100644
--- a/media-libs/libva-intel-media-driver/libva-intel-media-driver-24.2.0.ebuild
+++ b/media-libs/libva-intel-media-driver/libva-intel-media-driver-24.2.0.ebuild
@@ -29,8 +29,8 @@ IUSE="+redistributable test X"
 
 RESTRICT="!test? ( test )"
 
-DEPEND=">=media-libs/gmmlib-22.3.14:=[${MULTILIB_USEDEP}]
-	>=media-libs/libva-2.20.0[X?,${MULTILIB_USEDEP}]
+DEPEND=">=media-libs/gmmlib-22.3.18:=[${MULTILIB_USEDEP}]
+	>=media-libs/libva-2.21.0[X?,${MULTILIB_USEDEP}]
 "
 RDEPEND="${DEPEND}"
 

diff --git a/x11-base/xwayland/Manifest b/x11-base/xwayland/Manifest
index e4ff8a0fd3cd..81eab49fc5bb 100644
--- a/x11-base/xwayland/Manifest
+++ b/x11-base/xwayland/Manifest
@@ -1 +1,2 @@
 DIST xwayland-23.2.4.tar.xz 1299748 BLAKE2B 5427ff1f8b95b25c79df74eef18e2aeb7eecafa7d522e720e1072603108516cbaa57652e6439426d18d90320b67ec0764978450c76c6ce759d49fedfc6aedf65 SHA512 ac3ff208cbef5bbe4637c335cfda226489c93b0a3768f2f4fb0201c588485ede38262fbce77ef1425b3d2a0be61b6580df53341c7b95e6072c8b6371ad29d187
+DIST xwayland-23.2.5.tar.xz 1299988 BLAKE2B d0f4ff06c5eef3c4863aae53496dbd02e89fb186b06001c81f5a7e261fe5a7eefd8a327a9489a5eaed34c91ac68e02664256d948cca6c4efad116580ec9340f6 SHA512 8cf90d51db7c4c7e8191b5919e6529fe577bc735bb1d00fbc0139cb67ef95d30eb56c2026f3b2f639745c6a621b33bbd60f9ebabdd12175148dd192393ce1169

diff --git a/x11-base/xwayland/xwayland-23.2.5.ebuild b/x11-base/xwayland/xwayland-23.2.5.ebuild
new file mode 100644
index 000000000000..c41f16ee5928
--- /dev/null
+++ b/x11-base/xwayland/xwayland-23.2.5.ebuild
@@ -0,0 +1,113 @@
+# 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 video_cards_nvidia unwind xcsecurity"
+
+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-2023.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="
+	app-alternatives/lex
+	dev-util/wayland-scanner
+"
+
+PATCHES=(
+	"${FILESDIR}"/xwayland-drop-redundantly-installed-files.patch
+	"${FILESDIR}"/xwayland-23.2.3-systemd-automagic.patch
+	"${FILESDIR}"/xwayland-23.2.4-c99.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
+}