summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--metadata/md5-cache/x11-base/xorg-server-21.1.3-r100 (renamed from metadata/md5-cache/x11-base/xorg-server-21.1.2-r100)6
-rw-r--r--metadata/pkg_desc_index2
-rw-r--r--x11-base/xorg-server/Manifest2
-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-21.1.3-r100.ebuild (renamed from x11-base/xorg-server/xorg-server-21.1.2-r100.ebuild)1
5 files changed, 5 insertions, 154 deletions
diff --git a/metadata/md5-cache/x11-base/xorg-server-21.1.2-r100 b/metadata/md5-cache/x11-base/xorg-server-21.1.3-r100
index 0ca656a4..df8d91af 100644
--- a/metadata/md5-cache/x11-base/xorg-server-21.1.2-r100
+++ b/metadata/md5-cache/x11-base/xorg-server-21.1.3-r100
@@ -12,7 +12,7 @@ PDEPEND=xorg? ( >=x11-base/xorg-drivers-21.1 )
RDEPEND=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] ) !systemd? ( gui-libs/display-manager-init ) selinux? ( sec-policy/selinux-xserver ) xorg? ( >=x11-apps/xinit-1.3.3-r1 )
REQUIRED_USE=!minimal? ( || ( xephyr xnest xorg xvfb ) ) elogind? ( udev ) ?? ( elogind systemd )
RESTRICT=!test? ( test )
-SLOT=0/21.1.2
-SRC_URI=https://www.x.org/releases/individual/xserver/xorg-server-21.1.2.tar.xz
+SLOT=0/21.1.3
+SRC_URI=https://www.x.org/releases/individual/xserver/xorg-server-21.1.3.tar.xz
_eclasses_=autotools c9df06c186913b43eb211100ef5fe2cf eapi8-dosym cd7d420bb5be5ee079f27239ce76b8f5 edos2unix 33e347e171066657f91f8b0c72ec8773 eutils dab5d8ec471d025b79c9e6906bcf3bff flag-o-matic d5e1306543bc457213f68bb18f830d14 gnuconfig 262062cef0ba4f22b397193da514a350 libtool 241a8f577b9781a42a7421e53448a44e meson 9f3e84959ae1d60e19bc91f212774dcc multilib 4b66d835ec72e021e359bb81eacfe988 multiprocessing 61c959fc55c15c00bbb1079d6a71370b ninja-utils a4dab848a4490e8e48cf0baab3e61bc2 python-utils-r1 a8b7938ade305f087865de7e52d079b5 strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8 wrapper 4251d4c84c25f59094fd557e0063a974 xorg-3 4c1d5c48b38c2a0457352b812ac916a8
-_md5_=7efbc525843e429da089319e18c03b61
+_md5_=0fb12c81d90163b153eb26189e54d6e7
diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index
index 3b67e29f..18aa886d 100644
--- a/metadata/pkg_desc_index
+++ b/metadata/pkg_desc_index
@@ -85,7 +85,7 @@ virtual/rust 100: Virtual for Rust language compiler
virtual/tmpfiles 0-r100: Virtual to select between different tmpfiles.d handlers
virtual/udev 1000: Virtual to select between different udev daemon providers
x11-base/xorg-drivers 21.1-r100: Meta package containing deps on all xorg drivers (dummy package)
-x11-base/xorg-server 21.1.2-r100: X.Org X servers
+x11-base/xorg-server 21.1.3-r100: X.Org X servers
x11-base/xwayland 21.1.4-r100: Standalone X server running under Wayland
x11-drivers/nvidia-drivers 470.94: NVIDIA Accelerated Graphics Driver
x11-drivers/nvidia-drivers-legacy 390.147: NVIDIA Accelerated Graphics Driver
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index 67e6b1a4..1d987c68 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -1 +1 @@
-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
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 1d16e132..00000000
--- 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-21.1.2-r100.ebuild b/x11-base/xorg-server/xorg-server-21.1.3-r100.ebuild
index 8c49bc02..71b9d8d0 100644
--- a/x11-base/xorg-server/xorg-server-21.1.2-r100.ebuild
+++ b/x11-base/xorg-server/xorg-server-21.1.3-r100.ebuild
@@ -89,7 +89,6 @@ REQUIRED_USE="!minimal? (
?? ( elogind systemd )"
UPSTREAMED_PATCHES=(
- "${FILESDIR}"/${P}-fix-resume-logind.patch
)
PATCHES=(
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-02 14:53:40 +0000