summaryrefslogtreecommitdiff
path: root/x11-base
diff options
context:
space:
mode:
Diffstat (limited to 'x11-base')
-rw-r--r--x11-base/xwayland/Manifest2
-rw-r--r--x11-base/xwayland/xwayland-22.1.0-r100.ebuild (renamed from x11-base/xwayland/xwayland-21.1.4-r100.ebuild)45
2 files changed, 28 insertions, 19 deletions
diff --git a/x11-base/xwayland/Manifest b/x11-base/xwayland/Manifest
index 41832ac4..5a521cba 100644
--- a/x11-base/xwayland/Manifest
+++ b/x11-base/xwayland/Manifest
@@ -1 +1 @@
-DIST xwayland-21.1.4.tar.xz 1261712 BLAKE2B 698886d450f340c4a275f583d27382a5ee22c09255d907bbe2babc6794da1827bd5bf3e575b9da77ff3b3c5c4cd3e30cc10b89d14e0f6365d2a71f8ade61e410 SHA512 54e18565b4c2514534501ddcc76058d6911cf0c2185cddf5c54833d317f51ba8eb8934bd9be269518ece05f3bc8cda81600b25871c61437c923eba916eccc525
+DIST xwayland-22.1.0.tar.xz 1271896 BLAKE2B bd090032a31a2872d3e1095ca2f73d8945eb9f29801ea5164b867132c98e4195eb84adc404048b294e148181b38b9172453e276f78a1a9575889fbc77c31d740 SHA512 01306d2127e9d02e457d86208d6fb285379ed8fab2837febe56aaee4b236bc052ad65ca8ec35555b983d15f0d8dd01d20526a17b40225d2a4b91c53202ec10b5
diff --git a/x11-base/xwayland/xwayland-21.1.4-r100.ebuild b/x11-base/xwayland/xwayland-22.1.0-r100.ebuild
index 4064d322..7787a178 100644
--- a/x11-base/xwayland/xwayland-21.1.4-r100.ebuild
+++ b/x11-base/xwayland/xwayland-22.1.0-r100.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2021-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -9,37 +9,41 @@ 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="unwind xcsecurity selinux"
+IUSE="selinux unwind xcsecurity"
LICENSE="MIT"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-DEPEND="
- >=x11-libs/pixman-0.27.2
+COMMON_DEPEND="
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
+ >=dev-libs/wayland-1.5.0
+ >=dev-libs/wayland-protocols-1.22
+ 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/libxshmfence-1.1
+ >=x11-libs/libdrm-2.4.89
>=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/libxcvt
+ >=x11-libs/libXdmcp-1.0.2
+ >=x11-libs/libXfont2-2.0.1
x11-libs/libxkbfile
- >=x11-libs/xtrans-1.3.5
- x11-base/xorg-proto
+ >=x11-libs/libxshmfence-1.1
+ >=x11-libs/pixman-0.27.2
>=x11-misc/xkeyboard-config-2.4.1-r3
-"
+ unwind? ( sys-libs/libunwind )
+ amd64? ( gui-libs/egl-wayland )
+"
+DEPEND="
+ ${COMMON_DEPEND}
+ x11-base/xorg-proto
+ >=x11-libs/xtrans-1.3.5
+"
RDEPEND="
- ${DEPEND}
+ ${COMMON_DEPEND}
x11-apps/xkbcomp
!<=x11-base/xorg-server-1.20.11
selinux? ( sec-policy/selinux-xserver )
@@ -60,10 +64,12 @@ src_configure() {
$(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
@@ -72,6 +78,9 @@ src_configure() {
-Dxvfb=true
-Dxv=true
-Dxwayland-path="${EPREFIX}"/usr/bin
+ -Ddocs=false
+ -Ddevel-docs=false
+ -Ddocs-pdf=false
)
if use amd64; then