x11-base/xwayland : revision bump

4 files changed, 23 insertions, 18 deletions

diff --git a/metadata/md5-cache/x11-base/xwayland-21.1.2.901-r10 b/metadata/md5-cache/x11-base/xwayland-21.1.2.901-r10
deleted file mode 100644
index 28cdb116..00000000
--- a/metadata/md5-cache/x11-base/xwayland-21.1.2.901-r10
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/flex dev-util/wayland-scanner >=dev-util/meson-0.58.2-r1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install test
-DEPEND=>=x11-libs/pixman-0.27.2 dev-libs/libbsd >=x11-libs/libXfont2-2.0.1 dev-libs/openssl:= dev-libs/wayland gui-libs/egl-wayland >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libdrm-2.4.89 >=media-libs/libepoxy-1.5.4[X,egl(+)] >=media-libs/mesa-21.1[X(+),egl(+),gbm(+)] >=x11-libs/libxshmfence-1.1 rpc? ( net-libs/libtirpc ) >=x11-libs/libXau-1.0.4 media-libs/libglvnd[X] unwind? ( sys-libs/libunwind ) >=dev-libs/wayland-protocols-1.18 media-fonts/font-util x11-libs/libxkbfile >=x11-libs/xtrans-1.3.5 x11-base/xorg-proto >=x11-misc/xkeyboard-config-2.4.1-r3
-DESCRIPTION=Standalone X server running under Wayland
-EAPI=7
-HOMEPAGE=https://wayland.freedesktop.org/xserver.html
-INHERIT=meson
-IUSE=rpc unwind ipv6 xcsecurity selinux
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=>=x11-libs/pixman-0.27.2 dev-libs/libbsd >=x11-libs/libXfont2-2.0.1 dev-libs/openssl:= dev-libs/wayland gui-libs/egl-wayland >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libdrm-2.4.89 >=media-libs/libepoxy-1.5.4[X,egl(+)] >=media-libs/mesa-21.1[X(+),egl(+),gbm(+)] >=x11-libs/libxshmfence-1.1 rpc? ( net-libs/libtirpc ) >=x11-libs/libXau-1.0.4 media-libs/libglvnd[X] unwind? ( sys-libs/libunwind ) >=dev-libs/wayland-protocols-1.18 media-fonts/font-util x11-libs/libxkbfile >=x11-libs/xtrans-1.3.5 x11-base/xorg-proto >=x11-misc/xkeyboard-config-2.4.1-r3 x11-apps/xkbcomp !<=x11-base/xorg-server-1.20.12 selinux? ( sec-policy/selinux-xserver )
-SLOT=0
-SRC_URI=https://xorg.freedesktop.org/archive/individual/xserver/xwayland-21.1.2.901.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=2e850e64b85738638f705a121b5e319f
diff --git a/metadata/md5-cache/x11-base/xwayland-21.1.2.901-r11 b/metadata/md5-cache/x11-base/xwayland-21.1.2.901-r11
new file mode 100644
index 00000000..a429cbf5
--- /dev/null
+++ b/metadata/md5-cache/x11-base/xwayland-21.1.2.901-r11
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/flex dev-util/wayland-scanner >=dev-util/meson-0.58.2-r1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install test
+DEPEND=>=x11-libs/pixman-0.27.2 dev-libs/libbsd >=x11-libs/libXfont2-2.0.1 dev-libs/openssl:= dev-libs/wayland amd64? ( gui-libs/egl-wayland ) >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libdrm-2.4.89 >=media-libs/libepoxy-1.5.4[X,egl(+)] >=media-libs/mesa-21.1[X(+),egl(+),gbm(+)] >=x11-libs/libxshmfence-1.1 rpc? ( net-libs/libtirpc ) >=x11-libs/libXau-1.0.4 media-libs/libglvnd[X] unwind? ( sys-libs/libunwind ) >=dev-libs/wayland-protocols-1.18 media-fonts/font-util x11-libs/libxkbfile >=x11-libs/xtrans-1.3.5 x11-base/xorg-proto >=x11-misc/xkeyboard-config-2.4.1-r3
+DESCRIPTION=Standalone X server running under Wayland
+EAPI=7
+HOMEPAGE=https://wayland.freedesktop.org/xserver.html
+INHERIT=meson
+IUSE=rpc unwind ipv6 xcsecurity selinux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=>=x11-libs/pixman-0.27.2 dev-libs/libbsd >=x11-libs/libXfont2-2.0.1 dev-libs/openssl:= dev-libs/wayland amd64? ( gui-libs/egl-wayland ) >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libdrm-2.4.89 >=media-libs/libepoxy-1.5.4[X,egl(+)] >=media-libs/mesa-21.1[X(+),egl(+),gbm(+)] >=x11-libs/libxshmfence-1.1 rpc? ( net-libs/libtirpc ) >=x11-libs/libXau-1.0.4 media-libs/libglvnd[X] unwind? ( sys-libs/libunwind ) >=dev-libs/wayland-protocols-1.18 media-fonts/font-util x11-libs/libxkbfile >=x11-libs/xtrans-1.3.5 x11-base/xorg-proto >=x11-misc/xkeyboard-config-2.4.1-r3 x11-apps/xkbcomp !<=x11-base/xorg-server-1.20.12 selinux? ( sec-policy/selinux-xserver )
+SLOT=0
+SRC_URI=https://xorg.freedesktop.org/archive/individual/xserver/xwayland-21.1.2.901.tar.xz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=236d21bc8b1aec21bf52f760a1181e14
diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index
index f341c0b0..923244ac 100644
--- a/metadata/pkg_desc_index
+++ b/metadata/pkg_desc_index
@@ -85,7 +85,7 @@ virtual/tmpfiles 0-r100: Virtual to select between different tmpfiles.d handlers
 virtual/udev 1000: Virtual to select between different udev daemon providers
 x11-base/xorg-drivers 1.20-r100: Meta package containing deps on all xorg drivers (dummy package)
 x11-base/xorg-server 1.20.13-r100: X.Org X servers
-x11-base/xwayland 21.1.2.901-r10: Standalone X server running under Wayland
+x11-base/xwayland 21.1.2.901-r11: Standalone X server running under Wayland
 x11-drivers/nvidia-drivers 470.63.01: NVIDIA Accelerated Graphics Driver
 x11-drivers/nvidia-drivers-legacy 390.144-r3: NVIDIA Accelerated Graphics Driver
 x11-libs/gtk+ 2.24.33-r10 3.24.29-r10: Gimp ToolKit +
diff --git a/x11-base/xwayland/xwayland-21.1.2.901-r10.ebuild b/x11-base/xwayland/xwayland-21.1.2.901-r11.ebuild
index 8d646a89..32bf45ef 100644
--- a/x11-base/xwayland/xwayland-21.1.2.901-r10.ebuild
+++ b/x11-base/xwayland/xwayland-21.1.2.901-r11.ebuild
@@ -21,7 +21,7 @@ DEPEND="
 	>=x11-libs/libXfont2-2.0.1
 	dev-libs/openssl:=
 	dev-libs/wayland
-	gui-libs/egl-wayland
+	amd64? ( gui-libs/egl-wayland )
 	>=x11-libs/libXdmcp-1.0.2
 	>=x11-libs/libdrm-2.4.89
 	>=media-libs/libepoxy-1.5.4[X,egl(+)]
@@ -72,11 +72,16 @@ src_configure() {
 		-Dxinerama=true
 		-Dxv=true
 		-Dxvfb=true
-		-Dxwayland_eglstream=true
 		-Dxwayland-path="${EPREFIX}"/usr/bin
 		-Ddtrace=false
 	)
 
+	if use amd64; then
+		local emesonargs+=(
+		-Dxwayland_eglstream=true
+	)
+	fi
+
 	meson_src_configure
 }