summaryrefslogtreecommitdiff
path: root/x11-base
diff options
context:
space:
mode:
Diffstat (limited to 'x11-base')
-rw-r--r--x11-base/Manifest.gzbin1554 -> 1553 bytes
-rw-r--r--x11-base/xcb-proto/Manifest2
-rw-r--r--x11-base/xcb-proto/xcb-proto-1.17.0.ebuild2
-rw-r--r--x11-base/xorg-proto/Manifest2
-rw-r--r--x11-base/xorg-proto/xorg-proto-2024.1.ebuild2
-rw-r--r--x11-base/xorg-server/Manifest3
-rw-r--r--x11-base/xorg-server/files/xorg-server-21.1.10-fix-c99-32bit.patch54
-rw-r--r--x11-base/xorg-server/xorg-server-21.1.13-r1.ebuild (renamed from x11-base/xorg-server/xorg-server-21.1.13.ebuild)2
-rw-r--r--x11-base/xwayland/Manifest7
-rw-r--r--x11-base/xwayland/files/xwayland-drop-redundantly-installed-files_v2.patch27
-rw-r--r--x11-base/xwayland/xwayland-23.2.7.ebuild113
-rw-r--r--x11-base/xwayland/xwayland-24.1.0.ebuild133
-rw-r--r--x11-base/xwayland/xwayland-9999.ebuild42
13 files changed, 345 insertions, 44 deletions
diff --git a/x11-base/Manifest.gz b/x11-base/Manifest.gz
index e9868dd4cd4f..a97fe84117e8 100644
--- a/x11-base/Manifest.gz
+++ b/x11-base/Manifest.gz
Binary files differ
diff --git a/x11-base/xcb-proto/Manifest b/x11-base/xcb-proto/Manifest
index ae01d3db15ae..2ae3c8491337 100644
--- a/x11-base/xcb-proto/Manifest
+++ b/x11-base/xcb-proto/Manifest
@@ -1,5 +1,5 @@
DIST xcb-proto-1.16.0.tar.xz 151612 BLAKE2B 1c59ae4c71e697bd4f0298f6e0ea5235fc47baa9cf584e079258f1da8be538d1b67dc45f1325d82495247d0f8020d0244ca334de3794b410a1feaceabd6b285e SHA512 54906f379a7aa2cbbfbbe54764c02dbf522ca8f6c54e07d4faae471aac3aee25d0359be38c808c8da887de228aed745582a78b2f56714b023bca8f3513b24972
DIST xcb-proto-1.17.0.tar.xz 151748 BLAKE2B 0f46d040062fca4f6b598bdb7ab7a254b9aefce198812af82fd2112e06e88277e3c9e0a3bab161930b56688e71e1848bb859d4f33588f9496fe7399f9758b9a7 SHA512 34c3795e5a48a66d89b72ee1777fb0bede489d5ec07018e6c9ef3c13bdd60b0358fc2c04a1f0ed0acb5b681aeeb92033db579036e4f5edd967fe56714c03acdf
EBUILD xcb-proto-1.16.0.ebuild 1148 BLAKE2B 3eea55f25b87c04b88192fd06fe6ca76fe01897210490476abba3c56e005ebeb4333c1fde9f1e4ec7ec154325857b908ae55432f8139a1e5c8b21b1b74b3ae28 SHA512 6b42a2cac6580e766218d0b4e28751f098f0c4a86c676d1f265386ad2f533c2126f0e10ed2a77030a8eb556898157ca3c2fe2d0dfa86cdbc2911eb341568871a
-EBUILD xcb-proto-1.17.0.ebuild 1158 BLAKE2B c42ed8c5d96f7445dc6cac63cc00d2964316da904c383c2f0aaae2f7b6a5e0df122188e7eb93047df74f252715069dd25ce88926a39cdbd1daf32851f672e62a SHA512 e8b8564a1e5b440206acf6aa83f4f1a8d4cecb289cf85eeabd05fb46d089c1d7aeb8d76c56be1830a542d5348b207676699a2d0d9544eb6dfaf8214bf8672c4a
+EBUILD xcb-proto-1.17.0.ebuild 1152 BLAKE2B d82d717ba0688f0d160172ae845340f1052c85186bd01a07a448767e57e04e4ec27afe8a0b6fcbc4e8585abca3fbc27fdee24bcd2b94fe21055a22af8af09dee SHA512 13c86423e36345df63d41bf8d44a86e068ad08a9c818ccfdfef92b614043e543fde50fd90e552ad50e06964c2b4a5a987aa4964de02d7f81edb5abfd367c0a88
MISC metadata.xml 341 BLAKE2B 96e3b6613178261ab586ecc15cb98a7de1f752c081744d02ce3b9976a07e22056ff5c564b418839486d106964daa7327bb3d4d57b469593ac1b4968fbfc3bf67 SHA512 1374a7a6fb6254afa291f3ed7fbc0ff5aa1e478ad2b6df17dcf6969cfcce7681eeb2fb82caa6cbcab5109d2ffd128d3d18819013855a2a338bde5dd93992b6f1
diff --git a/x11-base/xcb-proto/xcb-proto-1.17.0.ebuild b/x11-base/xcb-proto/xcb-proto-1.17.0.ebuild
index a7af99861180..0443622b228d 100644
--- a/x11-base/xcb-proto/xcb-proto-1.17.0.ebuild
+++ b/x11-base/xcb-proto/xcb-proto-1.17.0.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="X C-language Bindings protocol headers"
HOMEPAGE="https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/proto/xcbproto"
EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/proto/xcbproto.git"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
# DEPEND=""
diff --git a/x11-base/xorg-proto/Manifest b/x11-base/xorg-proto/Manifest
index 42f99ddfd5fd..ad14ab852c03 100644
--- a/x11-base/xorg-proto/Manifest
+++ b/x11-base/xorg-proto/Manifest
@@ -1,6 +1,6 @@
DIST xorgproto-2023.2.tar.xz 759040 BLAKE2B ff255b91770ad11cdcc48d12815317285d8d16d28011a86166f3e07af18b30fdf35c2eb7b6537504eb4c0e9ca65b3116493422b6faebe04ee80e6aee92387675 SHA512 af0a8c8094fc6a490a886a8c048175762b6334798f2e48b6f6e19a7bb39ddbef05fa1237c4e9d9f1d870d24f5ca7a7c463044c41ceebd108f8ab0816677a582d
DIST xorgproto-2024.1.tar.xz 760500 BLAKE2B a3850f8594e8b4240f731dce696c3ab8310c3b2419117dea3141a093a690d9bc16652e64eb5516073145309c65327bd14be2eaa8843c04de25c8eff6c46d3c1d SHA512 63955cb604ff831575af2193548857c1b99e52d00206ea9421ce99e145094bcd907388c4574bc32174a01cbe2c940b0377bf75ae7d2c0f953157dc9c32e5a07f
EBUILD xorg-proto-2023.2.ebuild 1159 BLAKE2B 97ea5322f2ee61de021c80fbb65867ba29b0fd0fd171630ae8438710367175846c56da1fab6c4e14a4076b710502c208cd3244ea9cdd0090a98b4193389b36e2 SHA512 e9fcae335f5205f8e1c684d24b692247d4a7526fee0c14c566943b86f0c27ab5fd65411dc31dcbb8e5ad41a376e6947f29d1119d63348da22cada2b0028542b3
-EBUILD xorg-proto-2024.1.ebuild 1145 BLAKE2B 8e66800c0e654246d9af2b9bdb2bbc71dd1310b14c2153e461b68cdea2a022091653d7d35ae47ec147a0bdef0388d6f118f3359bc7979cced7ad958102dfd772 SHA512 de791942ae322533eeb129b9337413b7eef52dc33ef4acb61b6e9a9ae839c13744680c5228de2206e56a17811a7850f7a8385c1ce3295f8f9351ae039e10af10
+EBUILD xorg-proto-2024.1.ebuild 1144 BLAKE2B 937be4781df204bc36a3247caae60552e885cb5f456e4f0dd57b23166a5c3fc6abea6d7391559994e48ed0798dc45d6a062734effca066888d9c100a4f9a2e36 SHA512 ea777035b7a486fac0aea9f6ebdbc67475e1060a2f24ec83d6855236e03802e4bee2d4f03f0e49d2e8c0a4bfb04844c3bb3bbf85c8726692503a24f19c915aa9
EBUILD xorg-proto-9999.ebuild 1152 BLAKE2B ce0a6edbb34f340c94cf0a210fe7231e555e8f2d579d8c79746286e18ff79f4edcce30dc7b0a16a6e2e279f1fc1eb26032a4ca3a5fd89954beebfa7c9090a901 SHA512 8fd883a9eebb9f84c09c93473fb3ba42964bbc4f592a8993bdc25ea98984c54917fb8031db377cf1915555c9012d46eb2bf222f66b316ae07aa42f5b33b38180
MISC metadata.xml 342 BLAKE2B 86fa6d992d56d65a60c04ece61c97dcdd3cb0807dd7d895d907d83fe78427df05b15b5924d7b96a38164003e11a7de78470829c72238acfa35473d2f536b5363 SHA512 03783fc18d1dc17283ec540947907d98ecae2c6cb4350701d1976350aa39e1784d91e698fbb0d672d9be50c53ad9aa8e3d0e14ddc24d495654768709d8675826
diff --git a/x11-base/xorg-proto/xorg-proto-2024.1.ebuild b/x11-base/xorg-proto/xorg-proto-2024.1.ebuild
index 0b1990f5e14c..9a50fc259d58 100644
--- a/x11-base/xorg-proto/xorg-proto-2024.1.ebuild
+++ b/x11-base/xorg-proto/xorg-proto-2024.1.ebuild
@@ -18,7 +18,7 @@ inherit ${GIT_ECLASS} meson python-any-r1
DESCRIPTION="X.Org combined protocol headers"
HOMEPAGE="https://gitlab.freedesktop.org/xorg/proto/xorgproto"
if [[ ${PV} != 9999* ]]; then
- KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
SRC_URI="https://xorg.freedesktop.org/archive/individual/proto/${MY_P}.tar.xz"
S="${WORKDIR}/${MY_P}"
fi
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index 97e9bc405c64..6fce6a0fe4cf 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -1,8 +1,9 @@
AUX xorg-server-1.12-unloadsubmodule.patch 1373 BLAKE2B 4c6017bcdc53964ecc796e1beaf8a8714a85f1cfe65032df3e9ea23378b4d2db0057ea7a75ab00e8d5d89ae0d63c766dce05350446f69ffe69bb668d06e2e68b SHA512 a6a8ebbb1005f2ea9cfdfc928209a23fe213caab31a889c3290f14bcae0a9afd40176330e2e56cb5ff986d522505e7fb98fa0c71187f403e2afd33c9c919780e
AUX xorg-server-1.18-support-multiple-Files-sections.patch 1902 BLAKE2B 69ba852b425d652ebb83d116cabbf92d1530d2c616910ddbb96fb574cdad8d3f1ce2b4fcf9fb16aa2950b40a0723c9d00465d8e6d72299f1ea181a257d014c80 SHA512 5cd0a4ce9c2efef7abc84df805a3c6da33bd64fdb16c3aa2fa61da4f805605a3d12cab0f452d3bc217b6e5d5d5bea29c9f3bf262e46347a074770ebd75ddf5b5
AUX xorg-server-21.1.10-c99.patch 1508 BLAKE2B 7c4080924f5f5a8d4be2addae218bbc66e7532798bcd9bd5c43498afb09adfeb1d2238a0157add2e4f9ad49d5f00a80c1acb41001b08ccb509dd2da614276da6 SHA512 d5e5c33834966599df376d0ad3a425f4b56dc4dcc2ca549731dfcc1acfb3e20cf30644586daf590be90357e03d323f7d7d9e2efa8dff6a748a2ce0e1249b6bd3
+AUX xorg-server-21.1.10-fix-c99-32bit.patch 2821 BLAKE2B c0fb85a4b7aef3b025b054ce525ffd8e8eb3a4cef3b249a764d328fd3c83336ab50d278f13214691b71b4644bd5604094ca3d5d26341f69625b55fa1c424e12c SHA512 21880bd7f6a8008b1f44e815e6bfc83976153f8639de7d004b82adc647c9e9715d2ba9d4dcb8ad2e16f4b9b80441fe7acae1cc10091fc00b7ba7dc761d167958
AUX xorg-sets.conf 199 BLAKE2B e9414694f372d3f2a65bee903522094a60e261ddcd0c49a1d85a2ee804f3edbb5c605ed2d0b44839a91e98957f05ea88da87530f5f36b2db249e09ee56ee2975 SHA512 910fe28f20909243044f079ff35136942b8790f4f28ac42ffc64a76b7f03cd22057087fa5e4e01192080b52c0d89000ea96d5a807c6f11f680d3f43312c5be41
DIST xorg-server-21.1.13.tar.xz 4963952 BLAKE2B f6b05439e54b9709ce7a5b5f3702053ebc586ac8f8976bb6de9955ab34eac7201e027e1076584cf5b6d8c2639703e3a908b9e38f5dc52d4897aac8650f462502 SHA512 a55fbeeed227c12c67f166f2c06a7f4f8d78feeea04c6e73509dbc723185fd0772349aa23f7c44cf0828ac0a0e2f9e4b26cffb220e6dfa7186d60f88b25ccaf1
-EBUILD xorg-server-21.1.13.ebuild 4597 BLAKE2B 64f058ab6c0c2c37fdea3db9e1a7ec986294b4097ce6cfaffa34e55fe990c752885f5f361bc45699db649f6f533cb7784cef1e26a4730f7010220ebccaac52ee SHA512 32b6b238c87a75bbc77a7d7a7e3591189a903be9e9a27f8d2a20389ea3e02caeb253b5d00bfe7740268b4d656c662997b4f9c8016f63b526f7c8ffd63c236fb0
+EBUILD xorg-server-21.1.13-r1.ebuild 4690 BLAKE2B 95b4ed10aa4909d74f38f36b6701a73815da0d0152a742bb2ad05a56c6c0cd2b9a3087d5329b41f62e6813d7601b69054de5b7084621d734c922f839de85631b SHA512 40b388f1a08e6d2ac299af817dfd6e7485ff222ef3131769f0be05829da5bd9f564611bb44872f07ee2255a5386a9e115e632730c1a6ce2e48a0807855b957f6
EBUILD xorg-server-9999.ebuild 4493 BLAKE2B cad2953ec28afb82bb24cf3adf5d6e4249b88eb860637fc124f16f3a672937d5ae28501849ef38567d2dac22486a85d90f34f261b681f37395e569eab4eb1f24 SHA512 a46b38a7047d4c4a00d41090bffb586bab2dd5fdadd9693bcd27b420909f340da740d5d1d25e964142e0398ea2415934d098d9c7a341da7a6d838de0cc63b15c
MISC metadata.xml 881 BLAKE2B e5b0384c9cc45cf1e12a3010abf31232e4a726c11aa46b7303cc22b582e31d6ece1dbed35aacee265ca5a54433a6821d964059709307e4d4e51bb5a22b74b31d SHA512 72d6c8a97e474464e222d8d0be1a5d16c123683bf1415a142204b26361fdefdfbf1b3493d7b33cb637c03a808d5068c10d18adeb7de2a4fd5ecfcd4fa40f2f90
diff --git a/x11-base/xorg-server/files/xorg-server-21.1.10-fix-c99-32bit.patch b/x11-base/xorg-server/files/xorg-server-21.1.10-fix-c99-32bit.patch
new file mode 100644
index 000000000000..40afef18cead
--- /dev/null
+++ b/x11-base/xorg-server/files/xorg-server-21.1.10-fix-c99-32bit.patch
@@ -0,0 +1,54 @@
+https://bugs.gentoo.org/925876
+https://gitlab.freedesktop.org/xorg/xserver/-/commit/e89edec497bac581ca9b614fb00c25365580f045
+
+From e89edec497bac581ca9b614fb00c25365580f045 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jos=C3=A9=20Exp=C3=B3sito?= <jexposit@redhat.com>
+Date: Fri, 19 Jan 2024 13:05:51 +0100
+Subject: [PATCH] ephyr: Fix incompatible pointer type build error
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Fix a compilation error on 32 bits architectures with gcc 14:
+
+ ephyr_glamor_xv.c: In function ‘ephyr_glamor_xv_init’:
+ ephyr_glamor_xv.c:154:31: error: assignment to ‘SetPortAttributeFuncPtr’ {aka ‘int (*)(struct _KdScreenInfo *, long unsigned int, int, void *)’} from incompatible pointer type ‘int (*)(KdScreenInfo *, Atom, INT32, void *)’ {aka ‘int (*)(struct _KdScreenInfo *, long unsigned int, long int, void *)’} [-Wincompatible-pointer-types]
+ 154 | adaptor->SetPortAttribute = ephyr_glamor_xv_set_port_attribute;
+ | ^
+ ephyr_glamor_xv.c:155:31: error: assignment to ‘GetPortAttributeFuncPtr’ {aka ‘int (*)(struct _KdScreenInfo *, long unsigned int, int *, void *)’} from incompatible pointer type ‘int (*)(KdScreenInfo *, Atom, INT32 *, void *)’ {aka ‘int (*)(struct _KdScreenInfo *, long unsigned int, long int *, void *)’} [-Wincompatible-pointer-types]
+ 155 | adaptor->GetPortAttribute = ephyr_glamor_xv_get_port_attribute;
+ | ^
+
+Build error logs:
+https://koji.fedoraproject.org/koji/taskinfo?taskID=111964273
+
+Signed-off-by: José Expósito <jexposit@redhat.com>
+---
+ hw/kdrive/ephyr/ephyr_glamor_xv.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/hw/kdrive/ephyr/ephyr_glamor_xv.c b/hw/kdrive/ephyr/ephyr_glamor_xv.c
+index 4dd15cf41..b5eae48c8 100644
+--- a/hw/kdrive/ephyr/ephyr_glamor_xv.c
++++ b/hw/kdrive/ephyr/ephyr_glamor_xv.c
+@@ -50,16 +50,16 @@ ephyr_glamor_xv_stop_video(KdScreenInfo *screen, void *data, Bool cleanup)
+
+ static int
+ ephyr_glamor_xv_set_port_attribute(KdScreenInfo *screen,
+- Atom attribute, INT32 value, void *data)
++ Atom attribute, int value, void *data)
+ {
+- return glamor_xv_set_port_attribute(data, attribute, value);
++ return glamor_xv_set_port_attribute(data, attribute, (INT32)value);
+ }
+
+ static int
+ ephyr_glamor_xv_get_port_attribute(KdScreenInfo *screen,
+- Atom attribute, INT32 *value, void *data)
++ Atom attribute, int *value, void *data)
+ {
+- return glamor_xv_get_port_attribute(data, attribute, value);
++ return glamor_xv_get_port_attribute(data, attribute, (INT32 *)value);
+ }
+
+ static void
diff --git a/x11-base/xorg-server/xorg-server-21.1.13.ebuild b/x11-base/xorg-server/xorg-server-21.1.13-r1.ebuild
index aac526f8a150..e32da90e92a2 100644
--- a/x11-base/xorg-server/xorg-server-21.1.13.ebuild
+++ b/x11-base/xorg-server/xorg-server-21.1.13-r1.ebuild
@@ -104,6 +104,8 @@ PATCHES=(
"${FILESDIR}"/${PN}-1.18-support-multiple-Files-sections.patch
# pending upstream backport, bug #885763
"${FILESDIR}"/${PN}-21.1.10-c99.patch
+ # backport of upstream commit, bug #925876
+ "${FILESDIR}"/${PN}-21.1.10-fix-c99-32bit.patch
)
src_configure() {
diff --git a/x11-base/xwayland/Manifest b/x11-base/xwayland/Manifest
index bed69f5f1340..4b5b4868585d 100644
--- a/x11-base/xwayland/Manifest
+++ b/x11-base/xwayland/Manifest
@@ -1,8 +1,11 @@
AUX xwayland-23.2.3-systemd-automagic.patch 2208 BLAKE2B abb9fa8f1e615d63bea84c9683d858ae182835d51eefe047af9c6ad126cd710bd7733a0dca0e2e3c158e098f75ee3d270f5c580cd2cee91c32f12c2e310015a2 SHA512 c4f379614b9772371c13febb78b32f932f405a20d82286f65bfb25cff3d4837de8b136208ab26c6d47753287a8f34e736ab168a67c20b9570508d16f0168dadb
AUX xwayland-23.3.6-test-Skip-Xwayland-test-early-if-PIGLIT_DIR-XTEST_DI.patch 1170 BLAKE2B 709a801bb4752e996fb2f4f31faff3fa1e451fda26058b18250d9ef85cfbd6f7071b08523ece50899e55a7a2f87d460854ce4a3fb90b7169a486e0e9d0f91df9 SHA512 7d3a1eecdb23d8d5815565c120fac538d4c17fda8353ac486b9fd764a22f242ce4eee23884cbad7910ce29938d2f6da15a7d6dbcf58997e90e00b679b902a0a4
AUX xwayland-drop-redundantly-installed-files.patch 664 BLAKE2B 95773c2287be7f985f5156eebb4e01be236b3f8a2b217c31ea4d7c2f7ad826716ff8ac7951c5ee7963a057a5afe71040ddf1ca72151fb90923364cabfefc34c2 SHA512 35e329763122726eca8dd7014ee1c0321a4b23f32441a180fd4dfa2fd91b508b71a57270cc335460ca84a1483dc7c6d7cec56f55a2506aecbb73c14e4705d252
-AUX xwayland-drop-redundantly-installed-files_v2.patch 881 BLAKE2B bf2b22420c1bcda7967cae62189d2f2205d4cf5da7b01eaf392cd6dc1ad42068af85ee7a0717c42603f93262fa37deeec83346154e157854e1395be889a4505a SHA512 7d760c1e11cb70c9b20a4ae4be43f6a89c6376b792e9bb1d1b01a693df0d2c5d931d31f5ce5b81789c151cc033a10436c61144787c7dd8a15ea4543e2c19ca8a
DIST xwayland-23.2.6.tar.xz 1300092 BLAKE2B 5b10984a2c2fba87ce1101b70c26070100e743239dc705716c4b7e1318e192ad1da5e4933516f87ab0405b98eb1cc093081d4a1e4754f5dc8947a546a6f89072 SHA512 9e3c2253af335a559d0f890fa8f9bc381beca6531e0842d739ac15cbca008b3d07c0eefafd03611b04917c626861a7871a83657afa2a298994f4b162f714fc49
+DIST xwayland-23.2.7.tar.xz 1295016 BLAKE2B 9c8b5490eb4c468f0ee7c4e267ee9f3f9eba04bd9535a0a06a461fe0f3c7c8708d19deb8473ba4eacb446b9207637555a379bd768f8459c1ebe10cfed59010d1 SHA512 d78bd1ffed5a8149c55b453a464e46d2d658169bb814a96b8b75119349ba5506bb9d5c131c3ff28d94b4a27db894963b8f039b89843a0164d4463d7015d74c1b
+DIST xwayland-24.1.0.tar.xz 1301180 BLAKE2B d20f91fa6c1d404cafb69a7e1cf843458be084a5e0d4feb5266e6bc78a6ee0445aeb178e97c569eb17d13a8a3cc566ac664afcec02e1b56c92f9ea0b95be85b5 SHA512 7592609ad112652cb870761f938f280802d7d3b4bbc82acc7bf741a763d862aa97bbbd7f78250c63a961d76be73fb55555832045514092d89e406839564f0003
EBUILD xwayland-23.2.6.ebuild 2541 BLAKE2B edc4b12da17dec0c1977091244e16ffe3f3703d887057d0793729a8b74449be1004fe15fb9f07773ecf831598976da63479e85632ea87867708ab9da607852fc SHA512 2a677167a631ea1661995c2f0cb8042a37da180cb31f3d9e02706728cede83ef888374316ba622f6e8491bd0252a7a55d9d2aaaec748dbc7b79f48f5317bcc9e
-EBUILD xwayland-9999.ebuild 2298 BLAKE2B b5f34180d5798cd226e56220a4908441ac8e768727c740d4a3988345b163ec84ecb6ab10438745313d7b29589b826cdafbae915571ff5c6536407612ef0a4d3e SHA512 c3496c6ffb575591e3fa87de31894f0c7ac431d02d476ac13a32737223fe09c9ed6086364ec932e4db32b128ea7567943abcb9749b833e99807000e0548bd3f0
+EBUILD xwayland-23.2.7.ebuild 2547 BLAKE2B 440d071818eabf42dd83e5945feb9c9dc66cb74bc07085750f0ecb412da832a3dcaab905b1262bdb4dec4611e23ddb36ceba6e5fbde02d40687736fd70548fd9 SHA512 3d33a1082675ad9e27c8a428510c0b28e4f535f1b73c28cd39e6b206a0afefc2825c2a5a292e47cb52a67b47b9766c1ad16b844cfb4e30820ea905cccf0d5f7f
+EBUILD xwayland-24.1.0.ebuild 2717 BLAKE2B 5d7a071d31160db68cad4d3d77bf9470d72b759a05827db7e3f46c3a76ca4198f510793ccd03c3ffa42ca8ad19b749f1cc90ab77a5c2e8fb5e757ccd09faaa5d SHA512 f68ff61e0d9c4f7cd2fb943ddb3959144fbd6d20486735b45bc5433ce8f33eca94a26af4b6f61b915eb8a4f34ef4898a08efb1a3552d9f1ada2fbde117ea5ca5
+EBUILD xwayland-9999.ebuild 2717 BLAKE2B 5d7a071d31160db68cad4d3d77bf9470d72b759a05827db7e3f46c3a76ca4198f510793ccd03c3ffa42ca8ad19b749f1cc90ab77a5c2e8fb5e757ccd09faaa5d SHA512 f68ff61e0d9c4f7cd2fb943ddb3959144fbd6d20486735b45bc5433ce8f33eca94a26af4b6f61b915eb8a4f34ef4898a08efb1a3552d9f1ada2fbde117ea5ca5
MISC metadata.xml 627 BLAKE2B 1d39badd8534a02eb9785acbfa9efa97823c134696d41397d1db294fa774da9b4f184e027dada1b718cff3d651c9b436a4812458abef1d70af4d7749963d822a SHA512 9d02c7a263144ecfa9aac594867efee3622823b264fc3305e11c4b396156f0c43b071804f6f0ae9850b67b09ae887d270a722b9c4c4482e5ea962eedb915ee79
diff --git a/x11-base/xwayland/files/xwayland-drop-redundantly-installed-files_v2.patch b/x11-base/xwayland/files/xwayland-drop-redundantly-installed-files_v2.patch
deleted file mode 100644
index 11c9bed1e235..000000000000
--- a/x11-base/xwayland/files/xwayland-drop-redundantly-installed-files_v2.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff --git a/dix/meson.build b/dix/meson.build
-index fbbcf8646..15ca7d3b0 100644
---- a/dix/meson.build
-+++ b/dix/meson.build
-@@ -57,8 +57,3 @@ libxserver_main = static_library('libxserver_main',
- include_directories: inc,
- dependencies: common_dep,
- )
--
--install_data(
-- 'protocol.txt',
-- install_dir: serverconfigdir,
--)
-diff --git a/man/meson.build b/man/meson.build
-index 2961469c5..1183d741d 100644
---- a/man/meson.build
-+++ b/man/meson.build
-@@ -28,9 +28,3 @@ manpage_config.set('modulepath', module_dir)
- # manpage_config.set('suid_wrapper_dir', join_paths(get_option('prefix'), libexecdir))
- manpage_config.set('suid_wrapper_dir', join_paths(get_option('prefix'), 'libexec'))
- manpage_config.set('default_font_path', default_font_path)
--
--install_man(configure_file(
-- input: 'Xserver.man',
-- output: 'Xserver.1',
-- configuration: manpage_config,
--))
diff --git a/x11-base/xwayland/xwayland-23.2.7.ebuild b/x11-base/xwayland/xwayland-23.2.7.ebuild
new file mode 100644
index 000000000000..ebe16be06541
--- /dev/null
+++ b/x11-base/xwayland/xwayland-23.2.7.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"
+
+LICENSE="MIT"
+SLOT="0"
+
+IUSE="libei selinux systemd video_cards_nvidia unwind xcsecurity"
+
+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-2023.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}"/${PN}-drop-redundantly-installed-files.patch
+ "${FILESDIR}"/${PN}-23.2.3-systemd-automagic.patch
+ "${FILESDIR}"/${PN}-23.3.6-test-Skip-Xwayland-test-early-if-PIGLIT_DIR-XTEST_DI.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
+}
diff --git a/x11-base/xwayland/xwayland-24.1.0.ebuild b/x11-base/xwayland/xwayland-24.1.0.ebuild
new file mode 100644
index 000000000000..3b5d437dd588
--- /dev/null
+++ b/x11-base/xwayland/xwayland-24.1.0.ebuild
@@ -0,0 +1,133 @@
+# 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"
+
+LICENSE="MIT"
+SLOT="0"
+
+IUSE="libei selinux systemd test unwind xcsecurity"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+ dev-libs/libbsd
+ dev-libs/openssl:=
+ >=dev-libs/wayland-1.21.0
+ >=dev-libs/wayland-protocols-1.34
+ 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.116
+ >=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 )
+"
+DEPEND="
+ ${COMMON_DEPEND}
+ >=x11-base/xorg-proto-2024.1
+ >=x11-libs/xtrans-1.3.5
+ test? (
+ x11-misc/rendercheck
+ x11-libs/libX11
+ )
+"
+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
+"
+
+src_prepare() {
+ default
+
+ if ! use test; then
+ sed -i -e "s/dependency('x11')/disabler()/" meson.build || die
+ fi
+}
+
+src_configure() {
+ local emesonargs=(
+ $(meson_use selinux xselinux)
+ $(meson_use systemd systemd_notify)
+ $(meson_use unwind libunwind)
+ $(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
+ -Dxdmcp=true
+ -Dxinerama=true
+ -Dxvfb=true
+ -Dxv=true
+ -Dxwayland-path="${EPREFIX}"/usr/bin
+ -Dlibdecor=false
+ -Ddocs=false
+ -Ddevel-docs=false
+ -Ddocs-pdf=false
+ )
+
+ if [[ ${PV} == "9999" ]]; then
+ emesonargs+=(
+ -Dxorg=false
+ -Dxnest=false
+ -Dxvfb=false
+ -Dxwayland=true
+ )
+ fi
+
+ 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
+
+ # Remove files installed by x11-base/xorg-xserver
+ rm \
+ "${ED}"/usr/share/man/man1/Xserver.1 \
+ "${ED}"/usr/$(get_libdir)/xorg/protocol.txt \
+ || die
+}
diff --git a/x11-base/xwayland/xwayland-9999.ebuild b/x11-base/xwayland/xwayland-9999.ebuild
index 4c325088c840..3b5d437dd588 100644
--- a/x11-base/xwayland/xwayland-9999.ebuild
+++ b/x11-base/xwayland/xwayland-9999.ebuild
@@ -19,18 +19,19 @@ HOMEPAGE="https://wayland.freedesktop.org/xserver.html"
LICENSE="MIT"
SLOT="0"
-IUSE="libei selinux unwind xcsecurity"
+IUSE="libei selinux systemd test unwind xcsecurity"
+RESTRICT="!test? ( test )"
COMMON_DEPEND="
dev-libs/libbsd
dev-libs/openssl:=
>=dev-libs/wayland-1.21.0
- >=dev-libs/wayland-protocols-1.30
+ >=dev-libs/wayland-protocols-1.34
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/libdrm-2.4.116
>=x11-libs/libXau-1.0.4
x11-libs/libxcvt
>=x11-libs/libXdmcp-1.0.2
@@ -41,12 +42,17 @@ COMMON_DEPEND="
>=x11-misc/xkeyboard-config-2.4.1-r3
libei? ( dev-libs/libei )
+ systemd? ( sys-apps/systemd )
unwind? ( sys-libs/libunwind )
"
DEPEND="
${COMMON_DEPEND}
>=x11-base/xorg-proto-2024.1
>=x11-libs/xtrans-1.3.5
+ test? (
+ x11-misc/rendercheck
+ x11-libs/libX11
+ )
"
RDEPEND="
${COMMON_DEPEND}
@@ -60,13 +66,18 @@ BDEPEND="
dev-util/wayland-scanner
"
-PATCHES=(
- "${FILESDIR}"/xwayland-drop-redundantly-installed-files_v2.patch
-)
+src_prepare() {
+ default
+
+ if ! use test; then
+ sed -i -e "s/dependency('x11')/disabler()/" meson.build || die
+ fi
+}
src_configure() {
local emesonargs=(
$(meson_use selinux xselinux)
+ $(meson_use systemd systemd_notify)
$(meson_use unwind libunwind)
$(meson_use xcsecurity)
-Ddpms=true
@@ -89,12 +100,17 @@ src_configure() {
-Ddocs=false
-Ddevel-docs=false
-Ddocs-pdf=false
- -Dxorg=false
- -Dxnest=false
- -Dxvfb=false
- -Dxwayland=true
)
+ if [[ ${PV} == "9999" ]]; then
+ emesonargs+=(
+ -Dxorg=false
+ -Dxnest=false
+ -Dxvfb=false
+ -Dxwayland=true
+ )
+ fi
+
if use libei; then
emesonargs+=( -Dxwayland_ei=portal )
else
@@ -108,4 +124,10 @@ src_install() {
dosym ../bin/Xwayland /usr/libexec/Xwayland
meson_src_install
+
+ # Remove files installed by x11-base/xorg-xserver
+ rm \
+ "${ED}"/usr/share/man/man1/Xserver.1 \
+ "${ED}"/usr/$(get_libdir)/xorg/protocol.txt \
+ || die
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-03 16:04:23 +0000