summaryrefslogtreecommitdiff
path: root/x11-base
diff options
context:
space:
mode:
Diffstat (limited to 'x11-base')
-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
3 files changed, 1 insertions, 150 deletions
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-10 10:57:51 +0000