summaryrefslogtreecommitdiff
path: root/x11-base/xwayland
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2024-02-27 23:40:34 +0000
committerV3n3RiX <venerix@koprulu.sector>2024-02-27 23:40:34 +0000
commitfdd31f37b982d2c1b6d73b85f99718b13031be36 (patch)
treeb53698971171aec857ab0822be99fc89cac616c6 /x11-base/xwayland
parent5cf235d5f7f308ba0183f7fa588514966b692114 (diff)
gentoo auto-resync : 27:02:2024 - 23:40:33
Diffstat (limited to 'x11-base/xwayland')
-rw-r--r--x11-base/xwayland/Manifest2
-rw-r--r--x11-base/xwayland/files/xwayland-23.2.4-c99.patch72
-rw-r--r--x11-base/xwayland/xwayland-23.2.4-r1.ebuild113
3 files changed, 187 insertions, 0 deletions
diff --git a/x11-base/xwayland/Manifest b/x11-base/xwayland/Manifest
index 950a08df33d1..0b33c2f2b064 100644
--- a/x11-base/xwayland/Manifest
+++ b/x11-base/xwayland/Manifest
@@ -1,7 +1,9 @@
AUX xwayland-23.2.3-systemd-automagic.patch 2208 BLAKE2B abb9fa8f1e615d63bea84c9683d858ae182835d51eefe047af9c6ad126cd710bd7733a0dca0e2e3c158e098f75ee3d270f5c580cd2cee91c32f12c2e310015a2 SHA512 c4f379614b9772371c13febb78b32f932f405a20d82286f65bfb25cff3d4837de8b136208ab26c6d47753287a8f34e736ab168a67c20b9570508d16f0168dadb
+AUX xwayland-23.2.4-c99.patch 4608 BLAKE2B f7b897ebe48de9c3ce22dce3b8864eecbfc1471840e819ddb052350c12091d5c7ab962597e5018638ddf7b9bb09dfabcb31f997cf6ce06e5e09b531d7e6faa38 SHA512 6a8ce0aec44cb9b274ba9ba80c8ee6545d1d4cc44f70f57e927b9f5c2d28e97109976e0f90972aa7001fbc9aacfc06ce0c1497fa1697f98a591da216a9503153
AUX xwayland-drop-redundantly-installed-files.patch 664 BLAKE2B 95773c2287be7f985f5156eebb4e01be236b3f8a2b217c31ea4d7c2f7ad826716ff8ac7951c5ee7963a057a5afe71040ddf1ca72151fb90923364cabfefc34c2 SHA512 35e329763122726eca8dd7014ee1c0321a4b23f32441a180fd4dfa2fd91b508b71a57270cc335460ca84a1483dc7c6d7cec56f55a2506aecbb73c14e4705d252
AUX xwayland-drop-redundantly-installed-files_v2.patch 745 BLAKE2B eb9a61b2746c7b694bde5ed946ecb818f1933edcaaff45a491667cb2ebca81343c40fc3f5caf544e9e15bc41e3bd0777086fc9c0b48aa98d7aceb152dabbc168 SHA512 a4eab1cf0a31cd049ad83f7402746eca8948fcccdf162e4b216efd203fba8eca9ccc5594d483abc5591322f65a8fb937057c08caaec040b350b790fddcb21d24
DIST xwayland-23.2.4.tar.xz 1299748 BLAKE2B 5427ff1f8b95b25c79df74eef18e2aeb7eecafa7d522e720e1072603108516cbaa57652e6439426d18d90320b67ec0764978450c76c6ce759d49fedfc6aedf65 SHA512 ac3ff208cbef5bbe4637c335cfda226489c93b0a3768f2f4fb0201c588485ede38262fbce77ef1425b3d2a0be61b6580df53341c7b95e6072c8b6371ad29d187
+EBUILD xwayland-23.2.4-r1.ebuild 2507 BLAKE2B 08d8f7cf243e6d7c74770f2115a67d25dfeb945f778aaeb6db18d1e5841243d43006073099e86e99b00cf0529aaa1def23eedc3fd869f23eb8033f110b715e29 SHA512 9e93fcd804f8a51106c63a016d21be25241b46220d23ab94e653d612c5731c16186ca57077d8d6cf0237d8d06f5b583628c3d2519c537c06cfc712d315dcc200
EBUILD xwayland-23.2.4.ebuild 2460 BLAKE2B 6f2f739493ea332813745c8ec7fd701fdb1424ed92bc4cb40df6514e77452be56521d338fde5dc8643966a8f40b52847a182b7eb24da6099c0ea686c915da62d SHA512 5bd80924be0710fcac6e71b27fbfce71c01f509a7a925f307d7f7980b9e6c3f4c3804c48dffefd056c125d9e1bd2a3d790d86ecbc9780caf663d22650236d0bb
EBUILD xwayland-9999.ebuild 2416 BLAKE2B 26d83d501ed780215928ce0f86c9ced213893004a3af6ff95d938b40729a761856fa704398b33e4565b74b25552a077121e33d4153c3371b4dce7a8f36af2cbe SHA512 8dc1bd6e4330547d59b79c04d97e84303c4d9983766d63654958b2f729b19c72ac95a901c5134e200728c95012bb9f5fa827c5e46d392899356c2aba14ec904b
MISC metadata.xml 627 BLAKE2B 1d39badd8534a02eb9785acbfa9efa97823c134696d41397d1db294fa774da9b4f184e027dada1b718cff3d651c9b436a4812458abef1d70af4d7749963d822a SHA512 9d02c7a263144ecfa9aac594867efee3622823b264fc3305e11c4b396156f0c43b071804f6f0ae9850b67b09ae887d270a722b9c4c4482e5ea962eedb915ee79
diff --git a/x11-base/xwayland/files/xwayland-23.2.4-c99.patch b/x11-base/xwayland/files/xwayland-23.2.4-c99.patch
new file mode 100644
index 000000000000..21131ea317e4
--- /dev/null
+++ b/x11-base/xwayland/files/xwayland-23.2.4-c99.patch
@@ -0,0 +1,72 @@
+https://gitlab.freedesktop.org/xorg/xserver/-/commit/f0a187f55d76139225c11ce92ab69816d46db55c
+
+From f0a187f55d76139225c11ce92ab69816d46db55c Mon Sep 17 00:00:00 2001
+From: Florian Weimer <fweimer@redhat.com>
+Date: Mon, 29 Jan 2024 10:31:36 +0100
+Subject: [PATCH] xwayland: Use correct pointer types on i386
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+And other 32-bit architectures, where uint32_t and CARD32 are
+not the same type. Otherwise the build will fail with GCC 14
+with errors like:
+
+../hw/xwayland/xwayland-glamor.c: In function ‘xwl_glamor_get_formats’:
+../hw/xwayland/xwayland-glamor.c:291:43: error: passing argument 3 of ‘xwl_get_formats_for_device’ from incompatible pointer type [-Wincompatible-pointer-types]
+ 291 | num_formats, formats);
+ | ^~~~~~~~~~~
+ | |
+ | CARD32 * {aka long unsigned int *}
+../hw/xwayland/xwayland-glamor.c:238:38: note: expected ‘uint32_t *’ {aka ‘unsigned int *’} but argument is of type ‘CARD32 *’ {aka ‘long unsigned int *’}
+ 238 | uint32_t *num_formats, uint32_t **formats)
+ | ~~~~~~~~~~^~~~~~~~~~~
+../hw/xwayland/xwayland-glamor.c:291:56: error: passing argument 4 of ‘xwl_get_formats_for_device’ from incompatible pointer type [-Wincompatible-pointer-types]
+ 291 | num_formats, formats);
+ | ^~~~~~~
+ | |
+ | CARD32 ** {aka long unsigned int **}
+../hw/xwayland/xwayland-glamor.c:238:62: note: expected ‘uint32_t **’ {aka ‘unsigned int **’} but argument is of type ‘CARD32 **’ {aka ‘long unsigned int **’}
+ 238 | uint32_t *num_formats, uint32_t **formats)
+ | ~~~~~~~~~~~^~~~~~~
+../hw/xwayland/xwayland-glamor.c:295:28: error: passing argument 3 of ‘xwl_get_formats’ from incompatible pointer type [-Wincompatible-pointer-types]
+ 295 | num_formats, formats);
+ | ^~~~~~~~~~~
+ | |
+ | CARD32 * {aka long unsigned int *}
+../hw/xwayland/xwayland-glamor.c:217:26: note: expected ‘uint32_t *’ {aka ‘unsigned int *’} but argument is of type ‘CARD32 *’ {aka ‘long unsigned int *’}
+ 217 | uint32_t *num_formats, uint32_t **formats)
+ | ~~~~~~~~~~^~~~~~~~~~~
+../hw/xwayland/xwayland-glamor.c:295:41: error: passing argument 4 of ‘xwl_get_formats’ from incompatible pointer type [-Wincompatible-pointer-types]
+ 295 | num_formats, formats);
+ | ^~~~~~~
+ | |
+ | CARD32 ** {aka long unsigned int **}
+../hw/xwayland/xwayland-glamor.c:217:50: note: expected ‘uint32_t **’ {aka ‘unsigned int **’} but argument is of type ‘CARD32 **’ {aka ‘long unsigned int **’}
+ 217 | uint32_t *num_formats, uint32_t **formats)
+ | ~~~~~~~~~~~^~~~~~~
+--- a/hw/xwayland/xwayland-glamor.c
++++ b/hw/xwayland/xwayland-glamor.c
+@@ -212,7 +212,7 @@ xwl_screen_get_main_dev(struct xwl_screen *xwl_screen)
+
+ static Bool
+ xwl_get_formats(struct xwl_format *format_array, int format_array_len,
+- uint32_t *num_formats, uint32_t **formats)
++ CARD32 *num_formats, CARD32 **formats)
+ {
+ *num_formats = 0;
+ *formats = NULL;
+@@ -233,9 +233,9 @@ xwl_get_formats(struct xwl_format *format_array, int format_array_len,
+
+ static Bool
+ xwl_get_formats_for_device(struct xwl_dmabuf_feedback *xwl_feedback, drmDevice *device,
+- uint32_t *num_formats, uint32_t **formats)
++ CARD32 *num_formats, CARD32 **formats)
+ {
+- uint32_t *ret = NULL;
++ CARD32 *ret = NULL;
+ uint32_t count = 0;
+
+ /* go through all matching sets of tranches for the window's device */
+--
+GitLab
diff --git a/x11-base/xwayland/xwayland-23.2.4-r1.ebuild b/x11-base/xwayland/xwayland-23.2.4-r1.ebuild
new file mode 100644
index 000000000000..2a4fe1f5c0f8
--- /dev/null
+++ b/x11-base/xwayland/xwayland-23.2.4-r1.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"
+
+IUSE="libei selinux systemd 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 )
+ systemd? ( sys-apps/systemd )
+ 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
+
+ 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
+}