upgpkg: xorg-server 1.19.2-1

3 files changed, 12 insertions, 181 deletions

diff --git a/.SRCINFO b/.SRCINFO
index fa1b1e1cb47d..42ee09d20592 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Thu Feb 23 10:01:05 UTC 2017
+# Sun Mar  5 09:02:17 UTC 2017
 pkgbase = xorg-server-bug865
-	pkgver = 1.19.1
-	pkgrel = 5
+	pkgver = 1.19.2
+	pkgrel = 1
 	url = http://xorg.freedesktop.org
 	arch = i686
 	arch = x86_64
@@ -57,16 +57,14 @@ pkgbase = xorg-server-bug865
 	makedepends = libunwind
 	makedepends = systemd
 	makedepends = wayland-protocols
-	source = https://xorg.freedesktop.org/releases/individual/xserver/xorg-server-1.19.1.tar.bz2
-	source = https://xorg.freedesktop.org/releases/individual/xserver/xorg-server-1.19.1.tar.bz2.sig
-	source = bug99358.patch
+	source = https://xorg.freedesktop.org/releases/individual/xserver/xorg-server-1.19.2.tar.bz2
+	source = https://xorg.freedesktop.org/releases/individual/xserver/xorg-server-1.19.2.tar.bz2.sig
 	source = nvidia-add-modulepath-support.patch
 	source = xvfb-run
 	source = xvfb-run.1
 	source = freedesktop-bug-865.patch
-	sha256sums = 79ae2cf39d3f6c4a91201d8dad549d1d774b3420073c5a70d390040aa965a7fb
+	sha256sums = 4f8ab9f4a1a885fe7550080555381b34b82858582559e8e3c4da96e3a85884bb
 	sha256sums = SKIP
-	sha256sums = f46a9d1a5ac43c5359fbd8c57b6e64b0bd313116b5cb638527bfe3701e6c3904
 	sha256sums = 914a8d775b708f836ae3f0eeca553da3872727a2e4262190f4d5c01241cb14e8
 	sha256sums = ff0156309470fc1d378fd2e104338020a884295e285972cc88e250e031cc35b9
 	sha256sums = 2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776
@@ -90,7 +88,7 @@ pkgname = xorg-server-bug865
 	provides = X-ABI-XINPUT_VERSION=24.1
 	provides = X-ABI-EXTENSION_VERSION=10.0
 	provides = x-server
-	provides = xorg-server=1.19.1
+	provides = xorg-server=1.19.2
 	conflicts = nvidia-utils<=331.20
 	conflicts = glamor-egl
 	conflicts = xf86-video-modesetting
diff --git a/PKGBUILD b/PKGBUILD
index 033572527b7e..8ecb0b0061c4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,8 +4,8 @@
 
 pkgbase=xorg-server-bug865
 pkgname=xorg-server-bug865
-pkgver=1.19.1
-pkgrel=5
+pkgver=1.19.2
+pkgrel=1
 arch=('i686' 'x86_64')
 license=('custom')
 groups=('xorg')
@@ -18,7 +18,6 @@ makedepends=('pixman' 'libx11' 'mesa' 'mesa-libgl' 'xf86driproto' 'xcmiscproto'
              'xcb-util' 'xcb-util-image' 'xcb-util-renderutil' 'xcb-util-wm' 'xcb-util-keysyms' 'dri3proto'
              'libxshmfence' 'libunwind' 'systemd' 'wayland-protocols')
 source=(https://xorg.freedesktop.org/releases/individual/xserver/xorg-server-${pkgver}.tar.bz2{,.sig}
-        bug99358.patch
         nvidia-add-modulepath-support.patch
         xvfb-run
         xvfb-run.1
@@ -26,9 +25,8 @@ source=(https://xorg.freedesktop.org/releases/individual/xserver/xorg-server-${p
 validpgpkeys=('7B27A3F1A6E18CD9588B4AE8310180050905E40C'
               'C383B778255613DFDB409D91DB221A6900000011'
               'DD38563A8A8224537D1F90E45B8A2D50A0ECD0D3')
-sha256sums=('79ae2cf39d3f6c4a91201d8dad549d1d774b3420073c5a70d390040aa965a7fb'
+sha256sums=('4f8ab9f4a1a885fe7550080555381b34b82858582559e8e3c4da96e3a85884bb'
             'SKIP'
-            'f46a9d1a5ac43c5359fbd8c57b6e64b0bd313116b5cb638527bfe3701e6c3904'
             '914a8d775b708f836ae3f0eeca553da3872727a2e4262190f4d5c01241cb14e8'
             'ff0156309470fc1d378fd2e104338020a884295e285972cc88e250e031cc35b9'
             '2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776'
@@ -40,13 +38,10 @@ prepare() {
   # merged upstream in trunk
   patch -Np1 -i ../nvidia-add-modulepath-support.patch
 
-  # https://bugs.freedesktop.org/show_bug.cgi?id=99358
-  # https://bugs.archlinux.org/task/52808
-  patch -Np1 -i ../bug99358.patch
-
   # The patch for freedesktop bug 865
   patch -Np1 -i "${srcdir}/freedesktop-bug-865.patch"
 
+  autoreconf -vfi
 }
 
 build() {
@@ -103,7 +98,7 @@ package_xorg-server-bug865() {
            libpciaccess libdrm libxshmfence) # FS#52949
   # see xorg-server-*/hw/xfree86/common/xf86Module.h for ABI versions - we provide major numbers that drivers can depend on
   # and /usr/lib/pkgconfig/xorg-server.pc in xorg-server-devel pkg
-  provides=('X-ABI-VIDEODRV_VERSION=23' 'X-ABI-XINPUT_VERSION=24.1' 'X-ABI-EXTENSION_VERSION=10.0' 'x-server' 'xorg-server=1.19.1')
+  provides=('X-ABI-VIDEODRV_VERSION=23' 'X-ABI-XINPUT_VERSION=24.1' 'X-ABI-EXTENSION_VERSION=10.0' 'x-server' 'xorg-server=1.19.2')
   conflicts=('nvidia-utils<=331.20' 'glamor-egl' 'xf86-video-modesetting' 'xorg-server')
   replaces=('glamor-egl' 'xf86-video-modesetting')
   install=xorg-server.install
diff --git a/bug99358.patch b/bug99358.patch
deleted file mode 100644
index 7feb762ba1bd..000000000000
--- a/bug99358.patch
+++ /dev/null
@@ -1,162 +0,0 @@
-From 7198a6d4e74f684cb383b3e0f70dd2bae405e6e7 Mon Sep 17 00:00:00 2001
-From: Chris Wilson <chris@chris-wilson.co.uk>
-Date: Mon, 16 Jan 2017 22:17:36 +0000
-Subject: xfree86: Take the input lock for xf86RecolorCursor
-
-xf86RecolorCursor() may be called directly from XRecolorCursor as well
-as from xf86ScreenSetCursor(). In the latter case, the input lock is
-already held, but not for the former and so we need to add a wrapper
-function that acquires the input lock before performing
-xf86RecolorCursor()
-
-References: https://bugs.freedesktop.org/show_bug.cgi?id=99358
-
-diff --git a/hw/xfree86/ramdac/xf86HWCurs.c b/hw/xfree86/ramdac/xf86HWCurs.c
-index 4481320..55d5861 100644
---- a/hw/xfree86/ramdac/xf86HWCurs.c
-+++ b/hw/xfree86/ramdac/xf86HWCurs.c
-@@ -22,6 +22,9 @@
- 
- #include "servermd.h"
- 
-+static void
-+xf86RecolorCursor_locked(xf86CursorScreenPtr ScreenPriv, CursorPtr pCurs);
-+
- static CARD32
- xf86ReverseBitOrder(CARD32 v)
- {
-@@ -204,7 +207,7 @@ xf86ScreenSetCursor(ScreenPtr pScreen, CursorPtr pCurs, int x, int y)
-         if (!xf86DriverLoadCursorImage (infoPtr, bits))
-             return FALSE;
- 
--    xf86RecolorCursor(pScreen, pCurs, 1);
-+    xf86RecolorCursor_locked (ScreenPriv, pCurs);
- 
-     (*infoPtr->SetCursorPosition) (infoPtr->pScrn, x, y);
- 
-@@ -312,12 +315,9 @@ xf86MoveCursor(ScreenPtr pScreen, int x, int y)
-     input_unlock();
- }
- 
--void
--xf86RecolorCursor(ScreenPtr pScreen, CursorPtr pCurs, Bool displayed)
-+static void
-+xf86RecolorCursor_locked(xf86CursorScreenPtr ScreenPriv, CursorPtr pCurs)
- {
--    xf86CursorScreenPtr ScreenPriv =
--        (xf86CursorScreenPtr) dixLookupPrivate(&pScreen->devPrivates,
--                                               xf86CursorScreenKey);
-     xf86CursorInfoPtr infoPtr = ScreenPriv->CursorInfoPtr;
- 
-     /* recoloring isn't applicable to ARGB cursors and drivers
-@@ -357,6 +357,18 @@ xf86RecolorCursor(ScreenPtr pScreen, CursorPtr pCurs, Bool displayed)
-     }
- }
- 
-+void
-+xf86RecolorCursor(ScreenPtr pScreen, CursorPtr pCurs, Bool displayed)
-+{
-+    xf86CursorScreenPtr ScreenPriv =
-+        (xf86CursorScreenPtr) dixLookupPrivate(&pScreen->devPrivates,
-+                                               xf86CursorScreenKey);
-+
-+    input_lock();
-+    xf86RecolorCursor_locked (ScreenPriv, pCurs);
-+    input_unlock();
-+}
-+
- /* These functions assume that MaxWidth is a multiple of 32 */
- static unsigned char *
- RealizeCursorInterleave0(xf86CursorInfoPtr infoPtr, CursorPtr pCurs)
--- 
-cgit v0.10.2
-
-From cfddd919cce4178baba07959e5e862d02e166522 Mon Sep 17 00:00:00 2001
-From: Chris Wilson <chris@chris-wilson.co.uk>
-Date: Mon, 16 Jan 2017 22:36:34 +0000
-Subject: xfree86: Take input lock for xf86TransparentCursor
-
-
-diff --git a/hw/xfree86/ramdac/xf86HWCurs.c b/hw/xfree86/ramdac/xf86HWCurs.c
-index 55d5861..26dc7e5 100644
---- a/hw/xfree86/ramdac/xf86HWCurs.c
-+++ b/hw/xfree86/ramdac/xf86HWCurs.c
-@@ -261,6 +261,8 @@ xf86SetTransparentCursor(ScreenPtr pScreen)
-                                                xf86CursorScreenKey);
-     xf86CursorInfoPtr infoPtr = ScreenPriv->CursorInfoPtr;
- 
-+    input_lock();
-+
-     if (!ScreenPriv->transparentData)
-         ScreenPriv->transparentData =
-             (*infoPtr->RealizeCursor) (infoPtr, NullCursor);
-@@ -273,6 +275,8 @@ xf86SetTransparentCursor(ScreenPtr pScreen)
-                                    ScreenPriv->transparentData);
- 
-     (*infoPtr->ShowCursor) (infoPtr->pScrn);
-+
-+    input_unlock();
- }
- 
- static void
--- 
-cgit v0.10.2
-
-From 3eb964e25243056dd998f52d3b00171b71c89189 Mon Sep 17 00:00:00 2001
-From: Chris Wilson <chris@chris-wilson.co.uk>
-Date: Fri, 20 Jan 2017 09:49:19 +0000
-Subject: xfree86: Take input_lock() for xf86ScreenCheckHWCursor
-
-
-diff --git a/hw/xfree86/ramdac/xf86HWCurs.c b/hw/xfree86/ramdac/xf86HWCurs.c
-index 26dc7e5..7043a9c 100644
---- a/hw/xfree86/ramdac/xf86HWCurs.c
-+++ b/hw/xfree86/ramdac/xf86HWCurs.c
-@@ -139,9 +139,14 @@ Bool
- xf86CheckHWCursor(ScreenPtr pScreen, CursorPtr cursor, xf86CursorInfoPtr infoPtr)
- {
-     ScreenPtr pSlave;
-+    Bool use_hw_cursor = TRUE;
- 
--    if (!xf86ScreenCheckHWCursor(pScreen, cursor, infoPtr))
--        return FALSE;
-+    input_lock();
-+
-+    if (!xf86ScreenCheckHWCursor(pScreen, cursor, infoPtr)) {
-+        use_hw_cursor = FALSE;
-+	goto unlock;
-+    }
- 
-     /* ask each driver consuming a pixmap if it can support HW cursor */
-     xorg_list_for_each_entry(pSlave, &pScreen->slave_list, slave_head) {
-@@ -151,14 +156,22 @@ xf86CheckHWCursor(ScreenPtr pScreen, CursorPtr cursor, xf86CursorInfoPtr infoPtr
-             continue;
- 
-         sPriv = dixLookupPrivate(&pSlave->devPrivates, xf86CursorScreenKey);
--        if (!sPriv) /* NULL if Option "SWCursor", possibly other conditions */
--            return FALSE;
-+        if (!sPriv) { /* NULL if Option "SWCursor", possibly other conditions */
-+            use_hw_cursor = FALSE;
-+	    break;
-+	}
- 
-         /* FALSE if HWCursor not supported by slave */
--        if (!xf86ScreenCheckHWCursor(pSlave, cursor, sPriv->CursorInfoPtr))
--            return FALSE;
-+        if (!xf86ScreenCheckHWCursor(pSlave, cursor, sPriv->CursorInfoPtr)) {
-+            use_hw_cursor = FALSE;
-+	    break;
-+	}
-     }
--    return TRUE;
-+
-+unlock:
-+    input_unlock();
-+
-+    return use_hw_cursor;
- }
- 
- static Bool
--- 
-cgit v0.10.2
-