summaryrefslogtreecommitdiff
path: root/x11-base
diff options
context:
space:
mode:
Diffstat (limited to 'x11-base')
-rw-r--r--x11-base/Manifest.gzbin1391 -> 1390 bytes
-rw-r--r--x11-base/xorg-drivers/Manifest4
-rw-r--r--x11-base/xorg-drivers/xorg-drivers-21.1.ebuild6
-rw-r--r--x11-base/xorg-drivers/xorg-drivers-9999.ebuild8
-rw-r--r--x11-base/xorg-server/Manifest9
-rw-r--r--x11-base/xorg-server/files/xorg-server-21.1.2-fix-resume-logind.patch148
-rw-r--r--x11-base/xorg-server/xorg-server-1.20.14-r1.ebuild (renamed from x11-base/xorg-server/xorg-server-1.20.14.ebuild)9
-rw-r--r--x11-base/xorg-server/xorg-server-21.1.3-r1.ebuild (renamed from x11-base/xorg-server/xorg-server-21.1.2-r4.ebuild)11
-rw-r--r--x11-base/xorg-server/xorg-server-21.1.3.ebuild184
-rw-r--r--x11-base/xorg-server/xorg-server-9999.ebuild8
-rw-r--r--x11-base/xwayland/Manifest2
-rw-r--r--x11-base/xwayland/xwayland-22.1.0.ebuild94
12 files changed, 127 insertions, 356 deletions
diff --git a/x11-base/Manifest.gz b/x11-base/Manifest.gz
index 5e86219c0a20..dc2be7f4d9aa 100644
--- a/x11-base/Manifest.gz
+++ b/x11-base/Manifest.gz
Binary files differ
diff --git a/x11-base/xorg-drivers/Manifest b/x11-base/xorg-drivers/Manifest
index 0cab6a452817..1d8c0095ebe7 100644
--- a/x11-base/xorg-drivers/Manifest
+++ b/x11-base/xorg-drivers/Manifest
@@ -1,4 +1,4 @@
EBUILD xorg-drivers-1.20-r2.ebuild 3663 BLAKE2B 8bea6180884af5bface58cb832be4aedebd3246aa04ac425202611d70ffeb6373a191f92bd626c86161f5e0916b4b094275c824063254c2f0e9765c25ba3ac4b SHA512 8598f1dbc448d42daf1eb738a9ac42701f19777f585529e7af7c9c761eabf0ac19e41af0374297e186e0bf363be409ef13937a12ece193237c160af671cd70dd
-EBUILD xorg-drivers-21.1.ebuild 3669 BLAKE2B 14f1a8df7a284eb4eaa4a9948759db70af43a0478c63b8ced3f023d0f7f649ad9f2e802f752801aa21ce72957e9c5df083dc4c20ce721e8cde4f7e1a35169bde SHA512 b11c2e07300a51101ee16e7e243d22860aa605d955debd08065c47f280c8a3fb4c50f134a7e1b66efc63b670d9c2296ed7387669b7c4ae0a1cd50382bc0254b7
-EBUILD xorg-drivers-9999.ebuild 3689 BLAKE2B 90c471e6925594be628396251f7a5d408fdc0068c0e1285a603b5f3a85e5647b68345e24efd23143a739482db5169f5cf274a443238301d3667c0ded59c1ff32 SHA512 74478e2ae3af50ca9594f92e214a011ac00780649dc45e3b64614193b7b524960fcd7bad42ce8894ba0dd23519d767d1a081b4ebb5ab4de4feae58d51f7ba364
+EBUILD xorg-drivers-21.1.ebuild 3569 BLAKE2B 8b6316625739843b2f4642fd02d2121e5bb908b2bd26d15df62dbaee2d2ae0576e8f8fa29bb1119d84796c676409a4c3bf710fbe362e8f5493e619e239feeee9 SHA512 e69dbc8abdbe318b0cb642a1143038164cd84ccd0625c58d5c3e8d47493ea2114dad8222add1d0408e4ce0a51e4003da8fad11e368a24184b73ab7df3878febd
+EBUILD xorg-drivers-9999.ebuild 3576 BLAKE2B 3a38117aa44a9798eb5788949d155a95be36a37d119e808de5f3f9482cc809f0e1154436cefbcd7815fc5ca7faea1afb4243d2011fae82f16f859c321adad145 SHA512 fc9c11f884a890652d1e23865e60a127aa8598e384b7f4bb25f6351ae9b31f407ff52fb5838a84b78d783cfb64fd7e8dddfb04467dcb8bb10acba303e5cb1d38
MISC metadata.xml 235 BLAKE2B 5ed3cd35ac32a5cdd6ac490bafdbc1cd03fc8c6bdbc8194ba7f4a34151a24c4ade7a80705d92348d6d13a9579d18b19ec40a353bf014dc02f98980bfa03d3574 SHA512 3fe78f6dd92b87b30ed02aef15ed72ec5cb62f4c6568dd9b98dcb2f11a4b9ce93955e34c62112a310b4c4a51f87e0e31e31ae5af140e1054c127d3cd344d7267
diff --git a/x11-base/xorg-drivers/xorg-drivers-21.1.ebuild b/x11-base/xorg-drivers/xorg-drivers-21.1.ebuild
index b86887f122ea..9f3f808e57bf 100644
--- a/x11-base/xorg-drivers/xorg-drivers-21.1.ebuild
+++ b/x11-base/xorg-drivers/xorg-drivers-21.1.ebuild
@@ -11,6 +11,8 @@ LICENSE="metapackage"
SLOT="0"
if [[ ${PV} != 9999 ]]; then
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+else
+ PROPERTIES+=" live"
fi
IUSE_INPUT_DEVICES="
@@ -32,7 +34,6 @@ IUSE_VIDEO_CARDS="
video_cards_geode
video_cards_glint
video_cards_i915
- video_cards_i965
video_cards_intel
video_cards_mga
video_cards_nouveau
@@ -78,8 +79,7 @@ PDEPEND="
video_cards_geode? ( x11-drivers/xf86-video-geode )
video_cards_glint? ( >=x11-drivers/xf86-video-glint-1.2.9 )
video_cards_i915? ( x11-drivers/xf86-video-intel )
- video_cards_i965? ( >=x11-base/xorg-server-${PV}[-minimal] )
- video_cards_intel? ( !video_cards_i965? ( >=x11-drivers/xf86-video-intel-2.99.917_p20180214-r1 ) )
+ video_cards_intel? ( >=x11-base/xorg-server-${PV}[-minimal] )
video_cards_mga? ( >=x11-drivers/xf86-video-mga-1.6.5 )
video_cards_nouveau? ( >=x11-drivers/xf86-video-nouveau-1.0.13 )
video_cards_nv? ( >=x11-drivers/xf86-video-nv-2.1.21 )
diff --git a/x11-base/xorg-drivers/xorg-drivers-9999.ebuild b/x11-base/xorg-drivers/xorg-drivers-9999.ebuild
index 99c7a47b95a4..76e98afb460a 100644
--- a/x11-base/xorg-drivers/xorg-drivers-9999.ebuild
+++ b/x11-base/xorg-drivers/xorg-drivers-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ SRC_URI=""
LICENSE="metapackage"
SLOT="0"
if [[ ${PV} != 9999 ]]; then
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
else
PROPERTIES+=" live"
fi
@@ -34,7 +34,6 @@ IUSE_VIDEO_CARDS="
video_cards_geode
video_cards_glint
video_cards_i915
- video_cards_i965
video_cards_intel
video_cards_mga
video_cards_nouveau
@@ -80,8 +79,7 @@ PDEPEND="
video_cards_geode? ( x11-drivers/xf86-video-geode )
video_cards_glint? ( >=x11-drivers/xf86-video-glint-1.2.9 )
video_cards_i915? ( x11-drivers/xf86-video-intel )
- video_cards_i965? ( >=x11-base/xorg-server-${PV}[-minimal] )
- video_cards_intel? ( !video_cards_i965? ( >=x11-drivers/xf86-video-intel-2.99.917_p20180214-r1 ) )
+ video_cards_intel? ( >=x11-base/xorg-server-${PV}[-minimal] )
video_cards_mga? ( >=x11-drivers/xf86-video-mga-1.6.5 )
video_cards_nouveau? ( >=x11-drivers/xf86-video-nouveau-1.0.13 )
video_cards_nv? ( >=x11-drivers/xf86-video-nv-2.1.21 )
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index c56956dcf014..97809c592279 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -1,12 +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.2-fix-resume-logind.patch 5634 BLAKE2B 15528bd26a26a701b374110f1505cd1ed75872ad6bb74e53a6c897e7edd15a074e3abd3bcca08a31cdc5d368e3fa71915ff970c427563cfb5443167b11fd4bd6 SHA512 39033c81d24ffcdb4e6b7eb5d6bcdb0083a4b6940e1ee5f256bc9f0e917a6dd821304b84b2a8752c4a4597aa72730d1f44a67079527842dd01faeebedead5b63
AUX xorg-sets.conf 199 BLAKE2B e9414694f372d3f2a65bee903522094a60e261ddcd0c49a1d85a2ee804f3edbb5c605ed2d0b44839a91e98957f05ea88da87530f5f36b2db249e09ee56ee2975 SHA512 910fe28f20909243044f079ff35136942b8790f4f28ac42ffc64a76b7f03cd22057087fa5e4e01192080b52c0d89000ea96d5a807c6f11f680d3f43312c5be41
DIST xorg-server-1.20.14.tar.xz 5178288 BLAKE2B e60cbb6f3023639598d518fb53e3df3a2aced8f8950279f3a1642ad0a9545bea756574c4d41383cba966dc76c317859065b2290c8420668547f26f1d6e508da3 SHA512 be3dc32cce7d55d7e38c5f6557027f13f39224c76cc83e5800555d5ce89dbdc3731773a2d186a5b97db9fc8731a2b2dd6e9829af2b01ee2559246d4aef7c4963
-DIST xorg-server-21.1.2.tar.xz 4967784 BLAKE2B 352c8717dbbceb547e84610db3983bcfc83d4d72f02f6658ce6c7faa88821a60b401824e76a02bbce617d6646cd474a21823a4b7b75270512bbfd37957dff18d SHA512 6d7a0d29d5be09f80ed505c4d6ae964795127525a0ab73a4eab4f601788ab3627033143e5aeb4c2565c6683dd3402084d13acab5554606fbd519c4aec0a79def
DIST xorg-server-21.1.3.tar.xz 4955948 BLAKE2B 1907007e4131378ead2b8757e84e8e9403148c9b3cdffc68d7c54faf5ab0efa6b594b635940fce8af4b8334e4a1c67984f59fc2f3642e48b54eb2f2dcc7fd8f5 SHA512 cf5fed023eadda62ae732f8c4d427c272ebe005188341290f3d03147042c103b00cbb94d86a0256da815fb9b9a3da315c21a05ee0c926c1a2ff0c54ab0c0638b
-EBUILD xorg-server-1.20.14.ebuild 5101 BLAKE2B 92557bb8ff4afb0c4d62a2e4a2d42eabd05a6d99cd45f574b91a24d378938133f11cfd6b1a7f69ec60b51a72745d701ccf1f3bc97493ba13f76add6aa3430453 SHA512 c52f33f276b48dddaea825343147f33f0e73f47be6e03aa1e7d12b2fa4d43df6249a480645a78b6c21870499a2545e0e022e9606defb2a2878cd70e699db3427
-EBUILD xorg-server-21.1.2-r4.ebuild 4432 BLAKE2B e03babd0c81e78558d651b9622cdc4d8fc4d302523eb4016a0850a44ab129384fa38cdf353218378583e143b10f159b645f26001e7301e08db1abcec8b745a12 SHA512 559b4414d2583ad62f2dad82a8b46ff03826c19f5ace62c2750a71b61bdf49de4fc74d7ede86de9fd2ed36ec8ce25d5614b8da4425d90e7d125f3afb1fc8b7da
-EBUILD xorg-server-21.1.3.ebuild 4387 BLAKE2B dcaa2de6f1104cec4484e8b01df30a9dedc2f3402595f385a0e98f69cd074a648dd9082fd8e841e0c301fb77a597220ee7d7f21253834ad3329d5400d5d2fe90 SHA512 0be2a301914efa091744eeb6b54a279494b0b77b4eccdef2aa9b2525cc5920199aedd5ec5a796ae404eccc57a6ee9c5c04bb66c319b1bf053bfad2898d45a396
-EBUILD xorg-server-9999.ebuild 4388 BLAKE2B 3e1683034181cb6a58210051792444ec7431fb15fb99b48f56264574e9bcf8bbd4943ce352a91b07d3b3d7645c98a702447522c6de6f518f871117cd3bcddf34 SHA512 7c81fe0f187cfab5a7822bacdcc5dc4182a3ef328e57aa59deb153c0bd7dd8f9d2a1cccd1fd99cfa1d459a23633ff8397f1e5cdde4cf64dedf90c07aaa96666a
+EBUILD xorg-server-1.20.14-r1.ebuild 5195 BLAKE2B 845754526068efc9d3e98256ce1d9a947a1533429416acd94b6025a86d7c4de4737177b8786a3238aee42e3f10314c42a00445dcad29caad6c94253fcfb9a1e0 SHA512 9615fbd48424508cec887368ed589857f80ad2087f63887529b3fa569a781c70aa7e1fa5a7d253c3731ca25db6da2f7cd9c9f9fd65f2eff66378412731dfcdc9
+EBUILD xorg-server-21.1.3-r1.ebuild 4445 BLAKE2B b8c7a20bb4a1d812305e16a4cd83e6ba0893ac447c9c84cfe802f1f2f2b61c307d5482690c59cc5e375b15a53014e89524425da7d59c88cd24731b536a1d5b14 SHA512 42f7029d9f3b5014bbd61369c417cfb97f59b1cc73193f52d3b0ef1453eede6e9bf8db570d8b9a97e16ac447c90bc649b18c14b3c839e740d48ac51ac6aafdd7
+EBUILD xorg-server-9999.ebuild 4447 BLAKE2B f6af18099606c1c774969ac59b9f0f86201fd5f29d6b694fd6f88524958344725a39772f3a3365214abf3018176e0f69aec3019b0e9062c032362f903cb4092a SHA512 095a2054e843431fecbe23a8dd51512718a6d62e349eab43e71dec07927e12a9fa97f7ab7eed81a8cd93088c8b5c5e23e55421b8c9c3d3efd83f97ec3fb71a3f
MISC metadata.xml 896 BLAKE2B cdcbd8758222413b63e88487aa887654f80fac5e245563e99cc8fa9de5af6ab5da3da2ff499230a1e897b3e051a692e62100e8864fc0cfde128365f85d715d08 SHA512 51970dfe9c2ef9a00dd4095246160f344fa9df76defbd4f0c43e07062b36d4c4f027cd77d0de7d7d70a91995f3e898c4537111b0191298e331fe14586a2d8637
diff --git a/x11-base/xorg-server/files/xorg-server-21.1.2-fix-resume-logind.patch b/x11-base/xorg-server/files/xorg-server-21.1.2-fix-resume-logind.patch
deleted file mode 100644
index 1d16e132f62a..000000000000
--- a/x11-base/xorg-server/files/xorg-server-21.1.2-fix-resume-logind.patch
+++ /dev/null
@@ -1,148 +0,0 @@
-Merged upstream into master, this is the backport PR variant.
-
-https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/833
-https://bugs.gentoo.org/829496
-
-From: Jocelyn Falempe <jfalempe@redhat.com>
-Date: Thu, 16 Dec 2021 15:46:43 +0100
-Subject: [PATCH 1/2] xf86/logind: Fix compilation error when built without
- logind/platform bus
-
-This was introduced by commit 8eb1396d
-
-Closes: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1269
-Fixes: da9d012a9 - xf86/logind: Fix drm_drop_master before vt_reldisp
-
-Signed-off-by: Jocelyn Falempe <jfalempe@redhat.com>
-Reviewed-by: Hans de Goede <hdegoede@redhat.com>
---- a/hw/xfree86/common/xf86Events.c
-+++ b/hw/xfree86/common/xf86Events.c
-@@ -383,14 +383,7 @@ xf86VTLeave(void)
- xf86GPUScreens[i]->LeaveVT(xf86GPUScreens[i]);
-
- if (systemd_logind_controls_session()) {
-- for (i = 0; i < xf86_num_platform_devices; i++) {
-- if (xf86_platform_devices[i].flags & XF86_PDEV_SERVER_FD) {
-- int major, minor;
-- major = xf86_platform_odev_attributes(i)->major;
-- minor = xf86_platform_odev_attributes(i)->minor;
-- systemd_logind_drop_master(major, minor);
-- }
-- }
-+ systemd_logind_drop_master();
- }
-
- if (!xf86VTSwitchAway())
---- a/hw/xfree86/os-support/linux/systemd-logind.c
-+++ b/hw/xfree86/os-support/linux/systemd-logind.c
-@@ -308,13 +308,19 @@ cleanup:
- * and ensure the drm_drop_master is done before
- * VT_RELDISP when switching VT
- */
--void systemd_logind_drop_master(int _major, int _minor)
-+void systemd_logind_drop_master(void)
- {
-- struct systemd_logind_info *info = &logind_info;
-- dbus_int32_t major = _major;
-- dbus_int32_t minor = _minor;
-+ int i;
-+ for (i = 0; i < xf86_num_platform_devices; i++) {
-+ if (xf86_platform_devices[i].flags & XF86_PDEV_SERVER_FD) {
-+ dbus_int32_t major, minor;
-+ struct systemd_logind_info *info = &logind_info;
-
-- systemd_logind_ack_pause(info, minor, major);
-+ major = xf86_platform_odev_attributes(i)->major;
-+ minor = xf86_platform_odev_attributes(i)->minor;
-+ systemd_logind_ack_pause(info, minor, major);
-+ }
-+ }
- }
-
- static DBusHandlerResult
---- a/include/systemd-logind.h
-+++ b/include/systemd-logind.h
-@@ -33,7 +33,7 @@ int systemd_logind_take_fd(int major, int minor, const char *path, Bool *paus);
- void systemd_logind_release_fd(int major, int minor, int fd);
- int systemd_logind_controls_session(void);
- void systemd_logind_vtenter(void);
--void systemd_logind_drop_master(int major, int minor);
-+void systemd_logind_drop_master(void);
- #else
- #define systemd_logind_init()
- #define systemd_logind_fini()
-@@ -41,7 +41,7 @@ void systemd_logind_drop_master(int major, int minor);
- #define systemd_logind_release_fd(major, minor, fd) close(fd)
- #define systemd_logind_controls_session() 0
- #define systemd_logind_vtenter()
--#define systemd_logind_drop_master(major, minor)
-+#define systemd_logind_drop_master()
- #endif
-
- #endif
-GitLab
-From 66890ca569291a53ea9cdc6ec19070173e522260 Mon Sep 17 00:00:00 2001
-From: Jocelyn Falempe <jfalempe@redhat.com>
-Date: Fri, 17 Dec 2021 10:18:25 +0100
-Subject: [PATCH 2/2] xf86/logind: fix missing call to vtenter if the platform
- device is not paused
-
-If there is one platform device, which is not paused nor resumed,
-systemd_logind_vtenter() will never get called.
-This break suspend/resume, and switching to VT on system with Nvidia
-proprietary driver.
-This is a regression introduced by f5bd039633fa83
-
-So now call systemd_logind_vtenter() if there are no paused
-platform devices.
-
-Closes: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1271
-Fixes: f5bd0396 - xf86/logind: fix call systemd_logind_vtenter after receiving drm device resume
-
-Signed-off-by: Jocelyn Falempe <jfalempe@redhat.com>
-Tested-by: Olivier Fourdan <ofourdan@redhat.com>
-Reviewed-by: Hans de Goede <hdegoede@redhat.com>
---- a/hw/xfree86/os-support/linux/systemd-logind.c
-+++ b/hw/xfree86/os-support/linux/systemd-logind.c
-@@ -316,6 +316,7 @@ void systemd_logind_drop_master(void)
- dbus_int32_t major, minor;
- struct systemd_logind_info *info = &logind_info;
-
-+ xf86_platform_devices[i].flags |= XF86_PDEV_PAUSED;
- major = xf86_platform_odev_attributes(i)->major;
- minor = xf86_platform_odev_attributes(i)->minor;
- systemd_logind_ack_pause(info, minor, major);
-@@ -323,6 +324,16 @@ void systemd_logind_drop_master(void)
- }
- }
-
-+static Bool are_platform_devices_resumed(void) {
-+ int i;
-+ for (i = 0; i < xf86_num_platform_devices; i++) {
-+ if (xf86_platform_devices[i].flags & XF86_PDEV_PAUSED) {
-+ return FALSE;
-+ }
-+ }
-+ return TRUE;
-+}
-+
- static DBusHandlerResult
- message_filter(DBusConnection * connection, DBusMessage * message, void *data)
- {
-@@ -416,13 +427,11 @@ message_filter(DBusConnection * connection, DBusMessage * message, void *data)
-
- if (pdev) {
- pdev->flags &= ~XF86_PDEV_PAUSED;
-- systemd_logind_vtenter();
- } else
- systemd_logind_set_input_fd_for_all_devs(major, minor, fd,
- info->vt_active);
--
-- /* Always call vtenter(), only if there are only legacy video devs */
-- if (!xf86_num_platform_devices)
-+ /* Call vtenter if all platform devices are resumed, or if there are no platform device */
-+ if (are_platform_devices_resumed())
- systemd_logind_vtenter();
- }
- return DBUS_HANDLER_RESULT_HANDLED;
-GitLab
diff --git a/x11-base/xorg-server/xorg-server-1.20.14.ebuild b/x11-base/xorg-server/xorg-server-1.20.14-r1.ebuild
index 0c0e77d2d5a9..ba7bcec8880c 100644
--- a/x11-base/xorg-server/xorg-server-1.20.14.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.20.14-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -66,8 +66,12 @@ CDEPEND="
>=media-libs/libepoxy-1.5.4[X,egl(+)]
)
udev? ( virtual/libudev:= )
- unwind? ( sys-libs/libunwind )
+ unwind? ( sys-libs/libunwind:= )
>=x11-apps/xinit-1.3.3-r1
+ selinux? (
+ sys-process/audit
+ sys-libs/libselinux:=
+ )
systemd? (
sys-apps/dbus
sys-apps/systemd
@@ -131,6 +135,7 @@ src_configure() {
$(use_enable !minimal glx)
$(use_enable xcsecurity)
$(use_enable xephyr)
+ $(use_enable selinux xselinux)
$(use_enable xnest)
$(use_enable xorg)
$(use_enable xvfb)
diff --git a/x11-base/xorg-server/xorg-server-21.1.2-r4.ebuild b/x11-base/xorg-server/xorg-server-21.1.3-r1.ebuild
index b68bfec9fdd3..6b140fe486f3 100644
--- a/x11-base/xorg-server/xorg-server-21.1.2-r4.ebuild
+++ b/x11-base/xorg-server/xorg-server-21.1.3-r1.ebuild
@@ -11,7 +11,7 @@ EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/xserver.git"
DESCRIPTION="X.Org X servers"
SLOT="0/${PV}"
if [[ ${PV} != 9999* ]]; then
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
fi
IUSE_SERVERS="xephyr xnest xorg xvfb"
@@ -54,8 +54,11 @@ CDEPEND="
>=media-libs/libepoxy-1.5.4[X,egl(+)]
)
udev? ( virtual/libudev:= )
- unwind? ( sys-libs/libunwind )
- selinux? ( sys-libs/libselinux )
+ unwind? ( sys-libs/libunwind:= )
+ selinux? (
+ sys-process/audit
+ sys-libs/libselinux:=
+ )
systemd? (
sys-apps/dbus
sys-apps/systemd
@@ -90,7 +93,6 @@ REQUIRED_USE="!minimal? (
?? ( elogind systemd )"
UPSTREAMED_PATCHES=(
- "${FILESDIR}"/${P}-fix-resume-logind.patch
)
PATCHES=(
@@ -119,6 +121,7 @@ src_configure() {
$(meson_use udev udev_kms)
$(meson_use unwind libunwind)
$(meson_use xcsecurity)
+ $(meson_use selinux xselinux)
$(meson_use xephyr)
$(meson_use xnest)
$(meson_use xorg)
diff --git a/x11-base/xorg-server/xorg-server-21.1.3.ebuild b/x11-base/xorg-server/xorg-server-21.1.3.ebuild
deleted file mode 100644
index b1a569170aa6..000000000000
--- a/x11-base/xorg-server/xorg-server-21.1.3.ebuild
+++ /dev/null
@@ -1,184 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-XORG_TARBALL_SUFFIX="xz"
-XORG_EAUTORECONF="no"
-inherit xorg-3 meson
-EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/xserver.git"
-
-DESCRIPTION="X.Org X servers"
-SLOT="0/${PV}"
-if [[ ${PV} != 9999* ]]; then
- KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-fi
-
-IUSE_SERVERS="xephyr xnest xorg xvfb"
-IUSE="${IUSE_SERVERS} debug +elogind minimal selinux suid systemd test +udev unwind xcsecurity"
-RESTRICT="!test? ( test )"
-
-CDEPEND="
- media-libs/libglvnd[X]
- dev-libs/libbsd
- dev-libs/openssl:0=
- >=x11-apps/iceauth-1.0.2
- >=x11-apps/rgb-1.0.3
- >=x11-apps/xauth-1.0.3
- x11-apps/xkbcomp
- >=x11-libs/libdrm-2.4.89
- >=x11-libs/libpciaccess-0.12.901
- >=x11-libs/libXau-1.0.4
- >=x11-libs/libXdmcp-1.0.2
- >=x11-libs/libXfont2-2.0.1
- >=x11-libs/libxcvt-0.1.0
- >=x11-libs/libxkbfile-1.0.4
- >=x11-libs/libxshmfence-1.1
- >=x11-libs/pixman-0.27.2
- >=x11-misc/xbitmaps-1.0.1
- >=x11-misc/xkeyboard-config-2.4.1-r3
- >=x11-libs/libXext-1.0.5
- x11-libs/libXv
- xephyr? (
- x11-libs/libxcb[xkb]
- x11-libs/xcb-util
- x11-libs/xcb-util-image
- x11-libs/xcb-util-keysyms
- x11-libs/xcb-util-renderutil
- x11-libs/xcb-util-wm
- )
- !minimal? (
- >=x11-libs/libX11-1.1.5
- >=x11-libs/libXext-1.0.5
- >=media-libs/mesa-18[X(+),egl(+),gbm(+)]
- >=media-libs/libepoxy-1.5.4[X,egl(+)]
- )
- udev? ( virtual/libudev:= )
- unwind? ( sys-libs/libunwind )
- selinux? ( sys-libs/libselinux )
- systemd? (
- sys-apps/dbus
- sys-apps/systemd
- )
- elogind? (
- sys-apps/dbus
- sys-auth/elogind[pam]
- sys-auth/pambase[elogind]
- )
- !!x11-drivers/nvidia-drivers[-libglvnd(+)]
-"
-DEPEND="${CDEPEND}
- >=x11-base/xorg-proto-2021.4.99.2
- >=x11-libs/xtrans-1.3.5
- media-fonts/font-util
-"
-RDEPEND="${CDEPEND}
- !systemd? ( gui-libs/display-manager-init )
- selinux? ( sec-policy/selinux-xserver )
- xorg? ( >=x11-apps/xinit-1.3.3-r1 )
-"
-BDEPEND="
- sys-devel/flex
-"
-PDEPEND="
- xorg? ( >=x11-base/xorg-drivers-$(ver_cut 1-2) )"
-
-REQUIRED_USE="!minimal? (
- || ( ${IUSE_SERVERS} )
- )
- elogind? ( udev )
- ?? ( elogind systemd )"
-
-UPSTREAMED_PATCHES=(
-)
-
-PATCHES=(
- "${UPSTREAMED_PATCHES[@]}"
- "${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch
- # needed for new eselect-opengl, bug #541232
- "${FILESDIR}"/${PN}-1.18-support-multiple-Files-sections.patch
-)
-
-src_configure() {
- # localstatedir is used for the log location; we need to override the default
- # from ebuild.sh
- # sysconfdir is used for the xorg.conf location; same applies
-
- local emesonargs=(
- --localstatedir "${EPREFIX}/var"
- --sysconfdir "${EPREFIX}/etc/X11"
- --buildtype $(usex debug debug plain)
- -Db_ndebug=$(usex debug false true)
- $(meson_use !minimal dri1)
- $(meson_use !minimal dri2)
- $(meson_use !minimal dri3)
- $(meson_use !minimal glamor)
- $(meson_use !minimal glx)
- $(meson_use udev)
- $(meson_use udev udev_kms)
- $(meson_use unwind libunwind)
- $(meson_use xcsecurity)
- $(meson_use xephyr)
- $(meson_use xnest)
- $(meson_use xorg)
- $(meson_use xvfb)
- -Ddocs=false
- -Ddrm=true
- -Ddtrace=false
- -Dipv6=true
- -Dhal=false
- -Dlinux_acpi=false
- -Dlinux_apm=false
- -Dsecure-rpc=false
- -Dsha1=libcrypto
- -Dxkb_output_dir="${EPREFIX}/var/lib/xkb"
- )
-
- if [[ ${PV} == 9999 ]] ; then
- # Gone in 21.1.x, but not in master.
- emesonargs+=( -Dxwayland=false )
- fi
-
- if use systemd || use elogind; then
- emesonargs+=(
- -Dsystemd_logind=true
- $(meson_use suid suid_wrapper)
- )
- else
- emesonargs+=(
- -Dsystemd_logind=false
- -Dsuid_wrapper=false
- )
- fi
-
- meson_src_configure
-}
-
-src_install() {
- meson_src_install
-
- # The meson build system does not support install-setuid
- if ! use systemd && ! use elogind; then
- if use suid; then
- chmod u+s "${ED}"/usr/bin/Xorg
- fi
- fi
-
- if ! use xorg; then
- rm -f "${ED}"/usr/share/man/man1/Xserver.1x \
- "${ED}"/usr/$(get_libdir)/xserver/SecurityPolicy \
- "${ED}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \
- "${ED}"/usr/share/man/man1/Xserver.1x || die
- fi
-
- # install the @x11-module-rebuild set for Portage
- insinto /usr/share/portage/config/sets
- newins "${FILESDIR}"/xorg-sets.conf xorg.conf
-}
-
-pkg_postrm() {
- # Get rid of module dir to ensure opengl-update works properly
- if [[ -z ${REPLACED_BY_VERSION} && -e ${EROOT}/usr/$(get_libdir)/xorg/modules ]]; then
- rm -rf "${EROOT}"/usr/$(get_libdir)/xorg/modules
- fi
-}
diff --git a/x11-base/xorg-server/xorg-server-9999.ebuild b/x11-base/xorg-server/xorg-server-9999.ebuild
index 79b9ff4ad7a3..646bf1f1723c 100644
--- a/x11-base/xorg-server/xorg-server-9999.ebuild
+++ b/x11-base/xorg-server/xorg-server-9999.ebuild
@@ -54,8 +54,11 @@ CDEPEND="
>=media-libs/libepoxy-1.5.4[X,egl(+)]
)
udev? ( virtual/libudev:= )
- unwind? ( sys-libs/libunwind )
- selinux? ( sys-libs/libselinux )
+ unwind? ( sys-libs/libunwind:= )
+ selinux? (
+ sys-process/audit
+ sys-libs/libselinux:=
+ )
systemd? (
sys-apps/dbus
sys-apps/systemd
@@ -118,6 +121,7 @@ src_configure() {
$(meson_use udev udev_kms)
$(meson_use unwind libunwind)
$(meson_use xcsecurity)
+ $(meson_use selinux xselinux)
$(meson_use xephyr)
$(meson_use xnest)
$(meson_use xorg)
diff --git a/x11-base/xwayland/Manifest b/x11-base/xwayland/Manifest
index 26262e41961d..2b6c4d500b99 100644
--- a/x11-base/xwayland/Manifest
+++ b/x11-base/xwayland/Manifest
@@ -1,4 +1,6 @@
AUX xwayland-drop-redundantly-installed-files.patch 664 BLAKE2B 95773c2287be7f985f5156eebb4e01be236b3f8a2b217c31ea4d7c2f7ad826716ff8ac7951c5ee7963a057a5afe71040ddf1ca72151fb90923364cabfefc34c2 SHA512 35e329763122726eca8dd7014ee1c0321a4b23f32441a180fd4dfa2fd91b508b71a57270cc335460ca84a1483dc7c6d7cec56f55a2506aecbb73c14e4705d252
DIST xwayland-21.1.4.tar.xz 1261712 BLAKE2B 698886d450f340c4a275f583d27382a5ee22c09255d907bbe2babc6794da1827bd5bf3e575b9da77ff3b3c5c4cd3e30cc10b89d14e0f6365d2a71f8ade61e410 SHA512 54e18565b4c2514534501ddcc76058d6911cf0c2185cddf5c54833d317f51ba8eb8934bd9be269518ece05f3bc8cda81600b25871c61437c923eba916eccc525
+DIST xwayland-22.1.0.tar.xz 1271896 BLAKE2B bd090032a31a2872d3e1095ca2f73d8945eb9f29801ea5164b867132c98e4195eb84adc404048b294e148181b38b9172453e276f78a1a9575889fbc77c31d740 SHA512 01306d2127e9d02e457d86208d6fb285379ed8fab2837febe56aaee4b236bc052ad65ca8ec35555b983d15f0d8dd01d20526a17b40225d2a4b91c53202ec10b5
EBUILD xwayland-21.1.4.ebuild 1882 BLAKE2B e80be42c3262df906848da3db9965a797e6fdb6d493e2441890c63a38bf2674aa2ec97e9baaa1949d3be2aa10512e6962cf7eb03ed457aa00b932dab72200a51 SHA512 88b60dfd55a8c6a14380a4b18a7ee137d59e024366dc760f46945ee51050d08bf6bf6ded3ae71c87c4f600e5f314731647426e40e7e19aeb28532c1189efe334
+EBUILD xwayland-22.1.0.ebuild 2024 BLAKE2B 4a5551dcf5db869b39cbeb046c5f35a8a0ad0c86965a4d1197ebe3e20b11612672e61a327748e8432d4597602115c395666e9dba997bd392c4c709c8a8cff9a2 SHA512 c59271431fe50565c73af573e2f69431f1a0cde04dedc5682a3fd6fa224c6d3ca77a9e02115619a1f6318d4a0c44660d373d4d96a282f643b8a3a9afdde9e7d5
MISC metadata.xml 450 BLAKE2B 9bddecffad64304a7d32a52c921ca817db03bb90315ebdb64710def6dfd5a17362e319de94fe26ccb5def82996917005bc3a77b4f673cf19a4f4be19d6d2ffe8 SHA512 13fef8a30ada7880d900603b361337757f93eaeb1d61d97d1119ab11633c1128926ca61c8249d00fa4fe2756191f5f01c974036c9d7ecee0457c0629d8f0da11
diff --git a/x11-base/xwayland/xwayland-22.1.0.ebuild b/x11-base/xwayland/xwayland-22.1.0.ebuild
new file mode 100644
index 000000000000..54ef1745e2ba
--- /dev/null
+++ b/x11-base/xwayland/xwayland-22.1.0.ebuild
@@ -0,0 +1,94 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson
+
+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="selinux video_cards_nvidia unwind xcsecurity"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+COMMON_DEPEND="
+ dev-libs/libbsd
+ dev-libs/openssl:=
+ >=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/libdrm-2.4.89
+ >=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
+
+ unwind? ( sys-libs/libunwind )
+ video_cards_nvidia? ( gui-libs/egl-wayland )
+"
+DEPEND="
+ ${COMMON_DEPEND}
+ x11-base/xorg-proto
+ >=x11-libs/xtrans-1.3.5
+"
+RDEPEND="
+ ${COMMON_DEPEND}
+ x11-apps/xkbcomp
+ !<=x11-base/xorg-server-1.20.11
+ 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
+ -Ddocs=false
+ -Ddevel-docs=false
+ -Ddocs-pdf=false
+ )
+
+ meson_src_configure
+}
+
+src_install() {
+ dosym ../bin/Xwayland /usr/libexec/Xwayland
+
+ meson_src_install
+}
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-01 22:08:11 +0000