diff options
| -rw-r--r-- | .SRCINFO | 16 | ||||
| -rw-r--r-- | 0001-systemd-logind-do-not-rely-on-directed-signals.patch | 55 | ||||
| -rw-r--r-- | PKGBUILD | 25 | ||||
| -rw-r--r-- | v2-Xorg.wrap-activate-libdrm-based-detection-for-KMS-drivers.patch | 12 | ||||
| -rw-r--r-- | xserver-glamor-Disable-debugging-messages-other-than-GL-API-errors.patch | 14 |
5 files changed, 10 insertions, 112 deletions
@@ -1,6 +1,6 @@ pkgbase = xorg-server-dev - pkgver = 1.18.0 - pkgrel = 4 + pkgver = 1.18.1 + pkgrel = 1 url = http://xorg.freedesktop.org arch = i686 arch = x86_64 @@ -52,20 +52,14 @@ pkgbase = xorg-server-dev makedepends = dri3proto makedepends = libxshmfence makedepends = libunwind - source = http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-1.18.0.tar.bz2 - source = http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-1.18.0.tar.bz2.sig + source = http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-1.18.1.tar.bz2 + source = http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-1.18.1.tar.bz2.sig source = xvfb-run source = xvfb-run.1 - source = 0001-systemd-logind-do-not-rely-on-directed-signals.patch - source = v2-Xorg.wrap-activate-libdrm-based-detection-for-KMS-drivers.patch - source = xserver-glamor-Disable-debugging-messages-other-than-GL-API-errors.patch - sha256sums = 195670819695d9cedd8dde95fbe069be0d0f488a77797a2d409f9f702daf312e + sha256sums = 85ec56dbeb89a951295cdf4f39bf38e515f900d35e06d4a8081b114d1520789d sha256sums = SKIP sha256sums = ff0156309470fc1d378fd2e104338020a884295e285972cc88e250e031cc35b9 sha256sums = 2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776 - sha256sums = 3d7edab3a54d647e7d924b29d29f91b50212f308fcb1853a5aacd3181f58276c - sha256sums = c8addd0dc6d91797e82c51b539317efa271cd7997609e026c7c8e3884c5f601c - sha256sums = 1fe0c2c13bc3643a9a236bc45910e1e68d7b9cbe128204bcc1821752ed266e95 pkgname = xorg-server-dev pkgdesc = Xorg X server - Bleeding edge version diff --git a/0001-systemd-logind-do-not-rely-on-directed-signals.patch b/0001-systemd-logind-do-not-rely-on-directed-signals.patch deleted file mode 100644 index 9daadf6f6336..000000000000 --- a/0001-systemd-logind-do-not-rely-on-directed-signals.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 780a69aff0ff57ef813179a2f09556eaf488cdfc Mon Sep 17 00:00:00 2001 -From: David Herrmann <dh.herrmann@gmail.com> -Date: Mon, 22 Jun 2015 21:13:05 +0200 -Subject: systemd-logind: do not rely on directed signals - -Right now, Xorg does not install DBus matches for "PauseDevice" / -"ResumeDevice". Therefore, it should usually not receive those DBus -signals from logind. It is just a coincidence that systemd-logind sends -those signals in a directed manner right now. Therefore, dbus-daemon -bypasses the broadcast matches. - -However, this is not ABI and Xorg should not rely on this. systemd-logind -is free to send those signals as broadcasts, in which case Xorg will -freeze the VT. Fix this by always installing those matches. - -Cc: Hans de Goede <hdegoede@redhat.com> -Cc: Keith Packard <keithp@keithp.com> -Reported-by: Jan Alexander Steffens <jan.steffens@gmail.com> -Signed-off-by: David Herrmann <dh.herrmann@gmail.com> -Reviewed-by: Hans de Goede <hdegoede@redhat.com> -Tested-by: Hans de Goede <hdegoede@redhat.com> -Signed-off-by: Hans de Goede <hdegoede@redhat.com> - -diff --git a/hw/xfree86/os-support/linux/systemd-logind.c b/hw/xfree86/os-support/linux/systemd-logind.c -index 69e2f67..2612d9e 100644 ---- a/hw/xfree86/os-support/linux/systemd-logind.c -+++ b/hw/xfree86/os-support/linux/systemd-logind.c -@@ -507,6 +507,24 @@ connect_hook(DBusConnection *connection, void *data) - goto cleanup; - } - -+ dbus_bus_add_match(connection, -+ "type='signal',sender='org.freedesktop.login1',interface='org.freedesktop.login1.Session',member='PauseDevice'", -+ &error); -+ if (dbus_error_is_set(&error)) { -+ LogMessage(X_ERROR, "systemd-logind: could not add match: %s\n", -+ error.message); -+ goto cleanup; -+ } -+ -+ dbus_bus_add_match(connection, -+ "type='signal',sender='org.freedesktop.login1',interface='org.freedesktop.login1.Session',member='ResumeDevice'", -+ &error); -+ if (dbus_error_is_set(&error)) { -+ LogMessage(X_ERROR, "systemd-logind: could not add match: %s\n", -+ error.message); -+ goto cleanup; -+ } -+ - /* - * HdG: This is not useful with systemd <= 208 since the signal only - * contains invalidated property names there, rather than property, val --- -cgit v0.10.2 - @@ -3,8 +3,8 @@ _pkgbase=xorg-server pkgname=('xorg-server-dev' 'xorg-server-xephyr-dev' 'xorg-server-xdmx-dev' 'xorg-server-xvfb-dev' 'xorg-server-xnest-dev' 'xorg-server-xwayland-dev' 'xorg-server-common-dev' 'xorg-server-devel-dev') -pkgver=1.18.0 # http://lists.x.org/archives/xorg-announce/2015-November/002654.html -pkgrel=4 +pkgver=1.18.1 # https://lists.x.org/archives/xorg-announce/2016-February/002674.html +pkgrel=1 arch=('i686' 'x86_64') license=('custom') groups=('xorg') @@ -18,33 +18,18 @@ makedepends=('pixman' 'libx11' 'mesa' 'libgl' 'xf86driproto' 'xcmiscproto' 'xtra 'libxshmfence' 'libunwind') source=(${url}/releases/individual/xserver/${_pkgbase}-${pkgver}.tar.bz2{,.sig} xvfb-run - xvfb-run.1 - 0001-systemd-logind-do-not-rely-on-directed-signals.patch - v2-Xorg.wrap-activate-libdrm-based-detection-for-KMS-drivers.patch - xserver-glamor-Disable-debugging-messages-other-than-GL-API-errors.patch) + xvfb-run.1) validpgpkeys=('7B27A3F1A6E18CD9588B4AE8310180050905E40C' 'C383B778255613DFDB409D91DB221A6900000011' 'DD38563A8A8224537D1F90E45B8A2D50A0ECD0D3') -sha256sums=('195670819695d9cedd8dde95fbe069be0d0f488a77797a2d409f9f702daf312e' +sha256sums=('85ec56dbeb89a951295cdf4f39bf38e515f900d35e06d4a8081b114d1520789d' 'SKIP' 'ff0156309470fc1d378fd2e104338020a884295e285972cc88e250e031cc35b9' - '2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776' - '3d7edab3a54d647e7d924b29d29f91b50212f308fcb1853a5aacd3181f58276c' - 'c8addd0dc6d91797e82c51b539317efa271cd7997609e026c7c8e3884c5f601c' - '1fe0c2c13bc3643a9a236bc45910e1e68d7b9cbe128204bcc1821752ed266e95') + '2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776') prepare() { cd "${_pkgbase}-${pkgver}" - msg2 "fix VT switching with kdbus; from upstream" - patch -Np1 -i ../0001-systemd-logind-do-not-rely-on-directed-signals.patch - - msg2 "fix xorg only working with root FS#47061" - patch -Np1 -i ../v2-Xorg.wrap-activate-libdrm-based-detection-for-KMS-drivers.patch - - msg2 "disable debugging glamor messages in xorg log file" - patch -Np1 -i ../xserver-glamor-Disable-debugging-messages-other-than-GL-API-errors.patch - msg2 "Starting autoreconf..." autoreconf -fvi } diff --git a/v2-Xorg.wrap-activate-libdrm-based-detection-for-KMS-drivers.patch b/v2-Xorg.wrap-activate-libdrm-based-detection-for-KMS-drivers.patch deleted file mode 100644 index 220c5bb55f70..000000000000 --- a/v2-Xorg.wrap-activate-libdrm-based-detection-for-KMS-drivers.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/hw/xfree86/xorg-wrapper.c b/hw/xfree86/xorg-wrapper.c -index 4c37cfc..d930962 100644 ---- a/hw/xfree86/xorg-wrapper.c -+++ b/hw/xfree86/xorg-wrapper.c -@@ -24,6 +24,7 @@ - */ - - #include "dix-config.h" -+#include "xorg-config.h" - - #include <errno.h> - #include <fcntl.h> diff --git a/xserver-glamor-Disable-debugging-messages-other-than-GL-API-errors.patch b/xserver-glamor-Disable-debugging-messages-other-than-GL-API-errors.patch deleted file mode 100644 index 41a67c74b33f..000000000000 --- a/xserver-glamor-Disable-debugging-messages-other-than-GL-API-errors.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/glamor/glamor.c b/glamor/glamor.c -index 116d10c..81aba2d 100644 ---- a/glamor/glamor.c -+++ b/glamor/glamor.c -@@ -393,6 +393,9 @@ glamor_setup_debug_output(ScreenPtr screen) - return; - - glEnable(GL_DEBUG_OUTPUT_SYNCHRONOUS); -+ /* Disable debugging messages other than GL API errors */ -+ glDebugMessageControl(GL_DONT_CARE, GL_DONT_CARE, GL_DONT_CARE, 0, NULL, -+ GL_FALSE); - glDebugMessageControl(GL_DEBUG_SOURCE_API, - GL_DEBUG_TYPE_ERROR, - GL_DONT_CARE, |