summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--metadata/md5-cache/x11-base/xwayland-21.1.1-r10014
-rw-r--r--metadata/md5-cache/x11-base/xwayland-21.1.2-r10014
-rw-r--r--metadata/pkg_desc_index2
-rw-r--r--x11-base/xwayland/Manifest2
-rw-r--r--x11-base/xwayland/xwayland-21.1.2-r100.ebuild (renamed from x11-base/xwayland/xwayland-21.1.1-r100.ebuild)4
5 files changed, 19 insertions, 17 deletions
diff --git a/metadata/md5-cache/x11-base/xwayland-21.1.1-r100 b/metadata/md5-cache/x11-base/xwayland-21.1.1-r100
deleted file mode 100644
index 39fd8ad2..00000000
--- a/metadata/md5-cache/x11-base/xwayland-21.1.1-r100
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/flex dev-util/wayland-scanner >=dev-util/meson-0.56.0 >=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 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libdrm-2.4.89 >=media-libs/libepoxy-1.5.4[X,egl(+)] >=media-libs/mesa-18[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
-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 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libdrm-2.4.89 >=media-libs/libepoxy-1.5.4[X,egl(+)] >=media-libs/mesa-18[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-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.1.tar.xz
-_eclasses_=eapi8-dosym cd7d420bb5be5ee079f27239ce76b8f5 meson 5bc3f1b890f90cc00cf1d1dddc10233e multilib 97566c1a256d07b00848aa767e38a352 multiprocessing 61c959fc55c15c00bbb1079d6a71370b ninja-utils a4dab848a4490e8e48cf0baab3e61bc2 python-utils-r1 2f5967e7ced9abfa71ff7b0ea8d61b3a toolchain-funcs 9ea1c67b6f8315fdc2568abb674519aa
-_md5_=7638f34151ce32efa6cf3084a6f413c1
diff --git a/metadata/md5-cache/x11-base/xwayland-21.1.2-r100 b/metadata/md5-cache/x11-base/xwayland-21.1.2-r100
new file mode 100644
index 00000000..1e760862
--- /dev/null
+++ b/metadata/md5-cache/x11-base/xwayland-21.1.2-r100
@@ -0,0 +1,14 @@
+BDEPEND=sys-devel/flex dev-util/wayland-scanner >=dev-util/meson-0.56.0 >=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 video_cards_nvidia? ( 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-18[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
+IUSE=rpc unwind ipv6 xcsecurity selinux video_cards_nvidia
+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 video_cards_nvidia? ( 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-18[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-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.tar.xz
+_eclasses_=eapi8-dosym cd7d420bb5be5ee079f27239ce76b8f5 meson 5bc3f1b890f90cc00cf1d1dddc10233e multilib 97566c1a256d07b00848aa767e38a352 multiprocessing 61c959fc55c15c00bbb1079d6a71370b ninja-utils a4dab848a4490e8e48cf0baab3e61bc2 python-utils-r1 2f5967e7ced9abfa71ff7b0ea8d61b3a toolchain-funcs 9ea1c67b6f8315fdc2568abb674519aa
+_md5_=cb89a25ea69c575b644a5485896e034c
diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index
index 864de6be..38b48e6f 100644
--- a/metadata/pkg_desc_index
+++ b/metadata/pkg_desc_index
@@ -85,7 +85,7 @@ virtual/rust 100: Virtual for Rust language compiler
virtual/tmpfiles 0-r100: Virtual to select between different tmpfiles.d handlers
x11-base/xorg-drivers 1.20-r100: Meta package containing deps on all xorg drivers (dummy package)
x11-base/xorg-server 1.20.12-r100: X.Org X servers
-x11-base/xwayland 21.1.1-r100: Standalone X server running under Wayland
+x11-base/xwayland 21.1.2-r100: Standalone X server running under Wayland
x11-drivers/nvidia-drivers 460.84: NVIDIA Accelerated Graphics Driver
x11-drivers/nvidia-drivers-legacy 390.143: NVIDIA Accelerated Graphics Driver
x11-libs/gtk+ 2.24.32-r314 3.24.20-r314: Gimp ToolKit +
diff --git a/x11-base/xwayland/Manifest b/x11-base/xwayland/Manifest
index 2f2adffe..98418607 100644
--- a/x11-base/xwayland/Manifest
+++ b/x11-base/xwayland/Manifest
@@ -1 +1 @@
-DIST xwayland-21.1.1.tar.xz 1257776 BLAKE2B 181aca3d3fad3759eb726c6f6141912d588a85bae214f9d395450b6945ee845d28c7a8580e6aaa5f3538d06083312391d24267e6b239bfc533526a1bd7a56f0a SHA512 0cb03d796af183f9fde14c30ef45d94ef466ac4ba3d85dda34e74f91dd94bb75d0c8a867ecb7bda7ea61d98c70a4f73bc98c5a205ea5f69a0e222cd780d263d8
+DIST xwayland-21.1.2.tar.xz 1258732 BLAKE2B 1a797e4dedee4f47ada968d4a06c89da2fac64bbfa587e84f01d5b0aa7da23402b70369a274a672470e6d8df0645fd117d129d1f2049b25394d825a9eed3e451 SHA512 3bd595a563cbc44b49a00c85adabdbcddf02fd55c6500ed2711557c156f10cd273af93f7b232865141ad27392a85583e40268bcedad183ad9eeefba457cef6c6
diff --git a/x11-base/xwayland/xwayland-21.1.1-r100.ebuild b/x11-base/xwayland/xwayland-21.1.2-r100.ebuild
index aa71522c..cbe10fc6 100644
--- a/x11-base/xwayland/xwayland-21.1.1-r100.ebuild
+++ b/x11-base/xwayland/xwayland-21.1.2-r100.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Standalone X server running under Wayland"
HOMEPAGE="https://wayland.freedesktop.org/xserver.html"
SRC_URI="https://xorg.freedesktop.org/archive/individual/xserver/${P}.tar.xz"
-IUSE="rpc unwind ipv6 xcsecurity selinux"
+IUSE="rpc unwind ipv6 xcsecurity selinux video_cards_nvidia"
LICENSE="MIT"
SLOT="0"
@@ -21,6 +21,7 @@ DEPEND="
>=x11-libs/libXfont2-2.0.1
dev-libs/openssl:=
dev-libs/wayland
+ video_cards_nvidia? ( gui-libs/egl-wayland )
>=x11-libs/libXdmcp-1.0.2
>=x11-libs/libdrm-2.4.89
>=media-libs/libepoxy-1.5.4[X,egl(+)]
@@ -59,6 +60,7 @@ src_configure() {
$(meson_use ipv6)
$(meson_use xcsecurity)
$(meson_use selinux xselinux)
+ $(meson_use video_cards_nvidia xwayland_eglstream)
-Dsha1=libcrypto
-Ddpms=true
-Ddri3=true