upgpkg: xorg-server1.12 1.12.4-6

Fix error with catalyst driver

3 files changed, 44 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 65773ae071e8..f7d644607c10 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,8 @@
+# Generated by mksrcinfo v8
+# Wed Dec 16 14:25:09 UTC 2015
 pkgbase = xorg-server1.12
 	pkgver = 1.12.4
-	pkgrel = 5
+	pkgrel = 6
 	url = http://xorg.freedesktop.org
 	arch = i686
 	arch = x86_64
@@ -50,6 +52,7 @@ pkgbase = xorg-server1.12
 	source = xvfb-run.1
 	source = 10-quirks.conf
 	source = 0001-sdksyms.sh-Make-sdksyms.sh-work-with-gcc5.patch
+	source = bad-impl.patch
 	sha256sums = 8ac07c35306ba3fb3c0972722dd4e919303039eca1d40ac7862560e0b2c94cf7
 	sha256sums = f1e94a4284672f93d47d51ac5fd19731058761a5ab9de471b5fdfa226ab62b56
 	sha256sums = d027776fac1f7675b0a9ee817502290b1c45f9c09b0f0a6bb058c35f92361e84
@@ -57,6 +60,7 @@ pkgbase = xorg-server1.12
 	sha256sums = 2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776
 	sha256sums = 94612f5c0d34a3b7152915c2e285c7b462e9d8e38d3539bd551a339498eac166
 	sha256sums = b4a4fbddebfa614d1a97e77dde98748682ee331fbf7be394480050670d6203aa
+	sha256sums = b7dbca90cd80ed987441a835998af5006f4d08cdb403a290440604086e7d2260
 
 pkgname = xorg-server1.12
 	pkgdesc = Xorg X server
diff --git a/PKGBUILD b/PKGBUILD
index 60bf77e00d6b..bdc8bf4b163c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@ pkgbase=xorg-server1.12
 _pkgbase=xorg-server
 pkgname=('xorg-server1.12' 'xorg-server1.12-xephyr' 'xorg-server1.12-xdmx' 'xorg-server1.12-xvfb' 'xorg-server1.12-xnest' 'xorg-server1.12-common' 'xorg-server1.12-devel')
 pkgver=1.12.4
-pkgrel=5
+pkgrel=6
 arch=('i686' 'x86_64')
 license=('custom')
 url="http://xorg.freedesktop.org"
@@ -21,14 +21,16 @@ source=(${url}/releases/individual/xserver/${_pkgbase}-${pkgver}.tar.bz2
         xvfb-run
         xvfb-run.1
         10-quirks.conf
-        0001-sdksyms.sh-Make-sdksyms.sh-work-with-gcc5.patch)
+        0001-sdksyms.sh-Make-sdksyms.sh-work-with-gcc5.patch
+	bad-impl.patch)
 sha256sums=('8ac07c35306ba3fb3c0972722dd4e919303039eca1d40ac7862560e0b2c94cf7'
             'f1e94a4284672f93d47d51ac5fd19731058761a5ab9de471b5fdfa226ab62b56'
             'd027776fac1f7675b0a9ee817502290b1c45f9c09b0f0a6bb058c35f92361e84'
             'ff0156309470fc1d378fd2e104338020a884295e285972cc88e250e031cc35b9'
             '2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776'
             '94612f5c0d34a3b7152915c2e285c7b462e9d8e38d3539bd551a339498eac166'
-            'b4a4fbddebfa614d1a97e77dde98748682ee331fbf7be394480050670d6203aa')
+            'b4a4fbddebfa614d1a97e77dde98748682ee331fbf7be394480050670d6203aa'
+            'b7dbca90cd80ed987441a835998af5006f4d08cdb403a290440604086e7d2260')
 
 build() {
   cd "${srcdir}/${_pkgbase}-${pkgver}"
@@ -42,6 +44,9 @@ build() {
   # fix FS#45245, merged upstream
   patch -Np1 -i ../0001-sdksyms.sh-Make-sdksyms.sh-work-with-gcc5.patch
 
+  # Fix error with catalyst driver
+  patch -Np1 -i "${srcdir}/bad-impl.patch"
+
   autoreconf -fi
   ./configure --prefix=/usr \
       --enable-ipv6 \
diff --git a/bad-impl.patch b/bad-impl.patch
new file mode 100644
index 000000000000..57a865893645
--- /dev/null
+++ b/bad-impl.patch
@@ -0,0 +1,31 @@
+--- xorg-server.orig/Xi/xiselectev.c	2012-05-17 19:09:01.000000000 +0200
++++ xorg-server/Xi/xiselectev.c	2012-12-18 10:29:38.804469850 +0100
+@@ -175,17 +175,24 @@
+                 if (inputMasks)
+                     iclient = inputMasks->inputClients;
+                 for (; iclient; iclient = iclient->next) {
+-                    DeviceIntPtr dummy;
++                    DeviceIntPtr devTest;
++                    DeviceIntRec dummyTest;
+ 
+                     if (CLIENT_ID(iclient->resource) == client->index)
+                         continue;
+ 
+-                    dixLookupDevice(&dummy, evmask->deviceid, serverClient,
++                    if (evmask->deviceid == XIAllDevices ||
++                        evmask->deviceid == XIAllMasterDevices) {
++                        dummyTest.id = evmask->deviceid;
++                        devTest = &dummyTest;
++                    }
++                    else
++                        dixLookupDevice(&devTest, evmask->deviceid, serverClient,
+                                     DixReadAccess);
+-                    if (!dummy)
++                    if (!devTest)
+                         return BadImplementation;       /* this shouldn't happen */
+ 
+-                    if (xi2mask_isset(iclient->xi2mask, dummy, XI_TouchBegin))
++                    if (xi2mask_isset(iclient->xi2mask, devTest, XI_TouchBegin))
+                         return BadAccess;
+                 }
+             }