mirror/buildroot
1
0
Fork 0
mirror of https://gitlab.com/buildroot.org/buildroot.git synced 2026-09-30 14:01:57 -09:00
Code Issues Packages Projects Releases Wiki Activity

package/x11r7/xserver_xorg-server: bump version to 21.1.3

Browse Source 
Release notes:
https://lists.x.org/archives/xorg-announce/2022-January/003127.html

Removed patch which was applied upstream:
9c66d910ca

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
(cherry picked from commit e3245e3eba)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Bernd Kuhls
2022-05-14 19:55:54 +02:00
committed by Peter Korsgaard
parent 62eed1d06a
commit 0ec971b0d9
3 changed files with 4 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

90
package/x11r7/xserver_xorg-server/0002-Fix-compilation-error-when-built-without-logind-plat.patch
View File

@@ -1,90 +0,0 @@
From 17b6ab4d8cecf55a3784dbefbef9bfcf84ee3b1b Mon Sep 17 00:00:00 2001
From: Jocelyn Falempe <jfalempe@redhat.com>
Date: Thu, 16 Dec 2021 15:46:43 +0100
Subject: [PATCH] Fix compilation error when built without logind/platform bus
This was introduced by commit 8eb1396d
Signed-off-by: Jocelyn Falempe <jfalempe@redhat.com>
[Peter: from https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/827]
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
hw/xfree86/common/xf86Events.c | 9 +--------
hw/xfree86/os-support/linux/systemd-logind.c | 16 +++++++++++-----
include/systemd-logind.h | 4 ++--
3 files changed, 14 insertions(+), 15 deletions(-)
diff --git a/hw/xfree86/common/xf86Events.c b/hw/xfree86/common/xf86Events.c
index 6076efa80..395bbc7b3 100644
--- 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())
diff --git a/hw/xfree86/os-support/linux/systemd-logind.c b/hw/xfree86/os-support/linux/systemd-logind.c
index 35d5cc75b..f6a223a55 100644
--- 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
diff --git a/include/systemd-logind.h b/include/systemd-logind.h
index a8af2b96d..5c04d0130 100644
--- 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
--
2.20.1

6
package/x11r7/xserver_xorg-server/xserver_xorg-server.hash
View File

@@ -1,6 +1,6 @@
# From https://lists.x.org/archives/xorg-announce/2021-December/003125.html # From https://lists.x.org/archives/xorg-announce/2022-January/003127.html
sha256 c20bf46a9fe8e74bf4e75430637e58d49a02d806609dc161462bceb1ef7e8db0 xorg-server-21.1.2.tar.xz sha256 61d6aad5b6b47a116b960bd7f0cba4ee7e6da95d6bb0b127bde75d7d1acdebe5 xorg-server-21.1.3.tar.xz
sha512 6d7a0d29d5be09f80ed505c4d6ae964795127525a0ab73a4eab4f601788ab3627033143e5aeb4c2565c6683dd3402084d13acab5554606fbd519c4aec0a79def xorg-server-21.1.2.tar.xz sha512 cf5fed023eadda62ae732f8c4d427c272ebe005188341290f3d03147042c103b00cbb94d86a0256da815fb9b9a3da315c21a05ee0c926c1a2ff0c54ab0c0638b xorg-server-21.1.3.tar.xz
# Locally calculated # Locally calculated
sha256 4cc0447a22635c7b2f1a93fec4aa94f1970fadeb72a063de006b51cf4963a06f COPYING sha256 4cc0447a22635c7b2f1a93fec4aa94f1970fadeb72a063de006b51cf4963a06f COPYING

2
package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
View File

@@ -4,7 +4,7 @@
# #
################################################################################ ################################################################################
XSERVER_XORG_SERVER_VERSION = 21.1.2 XSERVER_XORG_SERVER_VERSION = 21.1.3
XSERVER_XORG_SERVER_SOURCE = xorg-server-$(XSERVER_XORG_SERVER_VERSION).tar.xz XSERVER_XORG_SERVER_SOURCE = xorg-server-$(XSERVER_XORG_SERVER_VERSION).tar.xz
XSERVER_XORG_SERVER_SITE = https://xorg.freedesktop.org/archive/individual/xserver XSERVER_XORG_SERVER_SITE = https://xorg.freedesktop.org/archive/individual/xserver
XSERVER_XORG_SERVER_LICENSE = MIT XSERVER_XORG_SERVER_LICENSE = MIT