diff options
3 files changed, 3 insertions, 41 deletions
diff --git a/xorg-server-hwcursor-gamma/PKGBUILD b/xorg-server-hwcursor-gamma/PKGBUILD index 8a9068c..adf39b3 100644 --- a/xorg-server-hwcursor-gamma/PKGBUILD +++ b/xorg-server-hwcursor-gamma/PKGBUILD @@ -4,8 +4,8 @@ _pkgname=xorg-server pkgname=xorg-server-hwcursor-gamma -pkgver=1.18.0 -pkgrel=3 # 4 in xorg-server +pkgver=1.18.1 +pkgrel=1 # 1=2 in xorg-server pkgdesc="Xorg X server with patch to apply gamma ramps on hardware cursors" depends=(libepoxy libxdmcp libxfont libpciaccess libdrm pixman libgcrypt libxau xorg-server-common libxshmfence libgl xf86-input-evdev) provides=("xorg-server=${pkgver}" 'X-ABI-VIDEODRV_VERSION=20' 'X-ABI-XINPUT_VERSION=22.1' 'X-ABI-EXTENSION_VERSION=9.0' 'x-server') @@ -24,16 +24,12 @@ makedepends=('pixman' 'libx11' 'mesa' 'mesa-libgl' 'xf86driproto' 'xcmiscproto' source=(${url}/releases/individual/xserver/${_pkgname}-${pkgver}.tar.bz2 xvfb-run xvfb-run.1 - v2-Xorg.wrap-activate-libdrm-based-detection-for-KMS-drivers.patch - xserver-glamor-Disable-debugging-messages-other-than-GL-API-errors.patch 0001-When-an-cursor-is-set-it-is-adjusted-to-use-the.patch 0002-Fix-for-full-and-semi-transparency-under-negative-im.patch 0003-Use-Harms-s-suggest-do-not-use-inline-if.-And-fix-si.patch) -sha256sums=('195670819695d9cedd8dde95fbe069be0d0f488a77797a2d409f9f702daf312e' +sha256sums=('85ec56dbeb89a951295cdf4f39bf38e515f900d35e06d4a8081b114d1520789d' 'ff0156309470fc1d378fd2e104338020a884295e285972cc88e250e031cc35b9' '2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776' - 'c8addd0dc6d91797e82c51b539317efa271cd7997609e026c7c8e3884c5f601c' - '1fe0c2c13bc3643a9a236bc45910e1e68d7b9cbe128204bcc1821752ed266e95' 'bea348631dedd66475d84ac2cfe0840f22a80a642b4680d73fead4749e47f055' 'be9169b937b5d0b44f7f05d7c08aaa5f0c1092e128ce261d9cb350f09dfe1fb0' '0a643ae83e03faee0f4db669a33c5b3c99edbba5c86cde2c83962ae536d31081') @@ -45,14 +41,6 @@ prepare() { patch -Np1 -i ../0001-When-an-cursor-is-set-it-is-adjusted-to-use-the.patch patch -Np1 -i ../0002-Fix-for-full-and-semi-transparency-under-negative-im.patch patch -Np1 -i ../0003-Use-Harms-s-suggest-do-not-use-inline-if.-And-fix-si.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 - - autoreconf -fvi } build() { diff --git a/xorg-server-hwcursor-gamma/v2-Xorg.wrap-activate-libdrm-based-detection-for-KMS-drivers.patch b/xorg-server-hwcursor-gamma/v2-Xorg.wrap-activate-libdrm-based-detection-for-KMS-drivers.patch deleted file mode 100644 index 220c5bb..0000000 --- a/xorg-server-hwcursor-gamma/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/xorg-server-hwcursor-gamma/xserver-glamor-Disable-debugging-messages-other-than-GL-API-errors.patch b/xorg-server-hwcursor-gamma/xserver-glamor-Disable-debugging-messages-other-than-GL-API-errors.patch deleted file mode 100644 index 41a67c7..0000000 --- a/xorg-server-hwcursor-gamma/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, |