summaryrefslogtreecommitdiff
path: root/x11-base
diff options
context:
space:
mode:
Diffstat (limited to 'x11-base')
-rw-r--r--x11-base/Manifest.gzbin1560 -> 1554 bytes
-rw-r--r--x11-base/xwayland/Manifest6
-rw-r--r--x11-base/xwayland/metadata.xml1
-rw-r--r--x11-base/xwayland/xwayland-23.2.1.ebuild110
-rw-r--r--x11-base/xwayland/xwayland-9999.ebuild12
5 files changed, 125 insertions, 4 deletions
diff --git a/x11-base/Manifest.gz b/x11-base/Manifest.gz
index 2c51dcb89a1a..19e2b0c9221f 100644
--- a/x11-base/Manifest.gz
+++ b/x11-base/Manifest.gz
Binary files differ
diff --git a/x11-base/xwayland/Manifest b/x11-base/xwayland/Manifest
index 4bc11192f56d..e4fa2d369575 100644
--- a/x11-base/xwayland/Manifest
+++ b/x11-base/xwayland/Manifest
@@ -2,7 +2,9 @@ AUX xwayland-drop-redundantly-installed-files.patch 664 BLAKE2B 95773c2287be7f98
AUX xwayland-drop-redundantly-installed-files_v2.patch 745 BLAKE2B eb9a61b2746c7b694bde5ed946ecb818f1933edcaaff45a491667cb2ebca81343c40fc3f5caf544e9e15bc41e3bd0777086fc9c0b48aa98d7aceb152dabbc168 SHA512 a4eab1cf0a31cd049ad83f7402746eca8948fcccdf162e4b216efd203fba8eca9ccc5594d483abc5591322f65a8fb937057c08caaec040b350b790fddcb21d24
DIST xwayland-23.1.2.tar.xz 1287396 BLAKE2B 56e213ea9d8cfa0ab316fb0a09d623427b7fa6effc6feb2b1d4364ee494b54d82e1863fbba86f824b09bf07b0b83fe5e85595f5cd00fdfa38fd72923922c2ea4 SHA512 796939106e8c986f2e8d6a1ff27f3a51cda0718825c3a6da678573de95a61bcc9fac484a34c6f8f762f7078f5289aa35c393725ea0b0f7e5d153352ab01a48f5
DIST xwayland-23.2.0.tar.xz 1298020 BLAKE2B 7b4d1b74c8c8d537395dfb277ff012b2761c5e6dc2d5ed20ec0f8b7da35c04d000a20efaff9ea9d2097b5b7ab1df7778162ec23f4623d0a63e38a4253a7bfa06 SHA512 3b490839026da4d34136d50050397d87e205d4fdb9c3cc9896eb2980bf90f3c951e7ce5271d7f7379c56a376d36f9e1fe1242211b64e680b715dd065ea58532d
+DIST xwayland-23.2.1.tar.xz 1298128 BLAKE2B d871c83c1b5975f1cbd1ae2ee5ab693a277d992c1cd66d40b2b7159a49827e9208321ac7465f5706e2e85ac0c438548cc871a2f34e3391388317bd08aef161de SHA512 8ea3061a175c9163166c69569a81dbee2cad605d140dd25d9b61219db555e775811ebe9716c38b6fa6c591299b7c1dfcd5248e797e341ee4cea49b998be89657
EBUILD xwayland-23.1.2.ebuild 2179 BLAKE2B 228f4234a40c45b54699176b0165902e968021e75b284bae5afff110a3e7eb4437cd8ef651d5a98d4e47226ba87e49186118eb18a412a68906f28c25f80b60fa SHA512 2d5b47ea010a3cad00e89d914a76004bd14c001e5cdaa324ef1438a47951da51c6aab34dce8eb46dcdbbcb6f08ea1acd799c3d5cfb052d5f112e24be0c620d5a
EBUILD xwayland-23.2.0.ebuild 2207 BLAKE2B 5943f7bd4c3505a5296f918b85b5fcb7b1b912f312865b2152b3bf150d2d21bf432710281a009640a87e560eb453e0c3fdc50352b162baf7e83d44554eb4e35a SHA512 6db644c52f9f715dc8ffca1a6c734e44856fc28e800a8a7d83fd2c2847487579f6ecab5093fce70108b8ee5c4da3afbd69f349ff9f96d5e382971c376279c9fb
-EBUILD xwayland-9999.ebuild 2274 BLAKE2B 2a2e88861bcfb5d1ffeb057b6f9f4479e5f513a05b8ac47e68e23896e7fd46b3983bf710849e11ffec74afeb903b1ffcf209dd16f98e2f427e7a2eb5c6a4aafe SHA512 85654958010e8eb0431338862b7e40cf8436c222578dbc5b72c5b522c7dbc9362f69474704604b2c4615636a2f3cee43e851d5117de54a9689dcf726a1f2632c
-MISC metadata.xml 543 BLAKE2B 6d9eaf03b02d3db1a546ca6443bc0e4964be085031c18ba0b5e58e615ef48090f181894fc9aec4abe358a8b59131423135b3bb25f0fe3a3cbb628e8d0f52c273 SHA512 075a7e2f5b39b537472c2ce242d9c7dde98be8230c6b48ec4a4115bd740011d1792a9d8188b44326276c91b7ddb56f01d1e548199786885b0f766854eab047b6
+EBUILD xwayland-23.2.1.ebuild 2376 BLAKE2B dc483c3a7ed102a16ab669c70a7840accac2b0f6b757cea0ebb0ff36afec56e01ad4a1e967c8ef5588841b792ef805d8930f37e4705e664f50377329ee1cca7e SHA512 073af289523b7e6345fb787c1827ba87084e1201012af8b927240b460540cc129d4edafaef9b742986716a3cba039f2a4d216c27779b87632d8bdea19c6dc506
+EBUILD xwayland-9999.ebuild 2443 BLAKE2B ee5fa283c6cbfeee7f7d33f4ed67679da6906fc20844174d85bcf9fdc6cbefa93c6bcbd7540eac3b496c0eefd8ae90879a8159515b23fd7eff2769a6c5a261b6 SHA512 85e045ff59e981b6d0369f729684b90e6ce06b1b6f1e729fb94993fc1579474d466820d3fca2c0570937ef5af343ca065e54ae78e6d2a94a98acf2585ae5b329
+MISC metadata.xml 627 BLAKE2B 1d39badd8534a02eb9785acbfa9efa97823c134696d41397d1db294fa774da9b4f184e027dada1b718cff3d651c9b436a4812458abef1d70af4d7749963d822a SHA512 9d02c7a263144ecfa9aac594867efee3622823b264fc3305e11c4b396156f0c43b071804f6f0ae9850b67b09ae887d270a722b9c4c4482e5ea962eedb915ee79
diff --git a/x11-base/xwayland/metadata.xml b/x11-base/xwayland/metadata.xml
index 2df659c4c950..1c6df10259d6 100644
--- a/x11-base/xwayland/metadata.xml
+++ b/x11-base/xwayland/metadata.xml
@@ -8,6 +8,7 @@
<use>
<flag name="unwind">Enable libunwind usage for backtraces</flag>
<flag name="xcsecurity">Build Security extension</flag>
+ <flag name="libei">Enable emulated input using <pkg>dev-libs/libei</pkg></flag>
</use>
<upstream>
<remote-id type="cpe">cpe:/a:x.org:xorg-server</remote-id>
diff --git a/x11-base/xwayland/xwayland-23.2.1.ebuild b/x11-base/xwayland/xwayland-23.2.1.ebuild
new file mode 100644
index 000000000000..56309b0f665b
--- /dev/null
+++ b/x11-base/xwayland/xwayland-23.2.1.ebuild
@@ -0,0 +1,110 @@
+# Copyright 2021-2023 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"
+
+IUSE="libei selinux video_cards_nvidia unwind xcsecurity"
+
+LICENSE="MIT"
+SLOT="0"
+
+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 )
+ unwind? ( sys-libs/libunwind )
+ video_cards_nvidia? ( gui-libs/egl-wayland )
+"
+DEPEND="
+ ${COMMON_DEPEND}
+ >=x11-base/xorg-proto-2022.2
+ >=x11-libs/xtrans-1.3.5
+"
+RDEPEND="
+ ${COMMON_DEPEND}
+ x11-apps/xkbcomp
+ !<=x11-base/xorg-server-1.20.11
+
+ libei? ( >=sys-apps/xdg-desktop-portal-1.18.0 )
+ selinux? ( sec-policy/selinux-xserver )
+"
+BDEPEND="
+ sys-devel/flex
+ dev-util/wayland-scanner
+"
+
+PATCHES=(
+ "${FILESDIR}"/xwayland-drop-redundantly-installed-files.patch
+)
+
+src_configure() {
+ local emesonargs=(
+ $(meson_use selinux xselinux)
+ $(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
+}
diff --git a/x11-base/xwayland/xwayland-9999.ebuild b/x11-base/xwayland/xwayland-9999.ebuild
index 738f4ae7b687..23efd8ee8752 100644
--- a/x11-base/xwayland/xwayland-9999.ebuild
+++ b/x11-base/xwayland/xwayland-9999.ebuild
@@ -16,7 +16,7 @@ fi
DESCRIPTION="Standalone X server running under Wayland"
HOMEPAGE="https://wayland.freedesktop.org/xserver.html"
-IUSE="selinux video_cards_nvidia unwind xcsecurity"
+IUSE="libei selinux video_cards_nvidia unwind xcsecurity"
LICENSE="MIT"
SLOT="0"
@@ -40,6 +40,7 @@ COMMON_DEPEND="
>=x11-libs/pixman-0.27.2
>=x11-misc/xkeyboard-config-2.4.1-r3
+ libei? ( dev-libs/libei )
unwind? ( sys-libs/libunwind )
video_cards_nvidia? ( gui-libs/egl-wayland )
"
@@ -52,6 +53,8 @@ RDEPEND="
${COMMON_DEPEND}
x11-apps/xkbcomp
!<=x11-base/xorg-server-1.20.11
+
+ libei? ( >=sys-apps/xdg-desktop-portal-1.18.0 )
selinux? ( sec-policy/selinux-xserver )
"
BDEPEND="
@@ -82,7 +85,6 @@ src_configure() {
-Dxace=true
-Dxdmcp=true
-Dxinerama=true
- -Dxwayland_ei=false
-Dxvfb=true
-Dxv=true
-Dxwayland-path="${EPREFIX}"/usr/bin
@@ -96,6 +98,12 @@ src_configure() {
-Dxwayland=true
)
+ if use libei; then
+ emesonargs+=( -Dxwayland_ei=portal )
+ else
+ emesonargs+=( -Dxwayland_ei=false )
+ fi
+
meson_src_configure
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-02 00:20:21 +0000