upgpkg: xorg-server-nosystemd-1.18.4-1

4 files changed, 11 insertions, 108 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ef8557940c12..c876eeba4b22 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Sun Jul 17 21:26:26 UTC 2016
+# Wed Jul 20 23:49:34 UTC 2016
 pkgbase = xorg-server-nosystemd
-	pkgver = 1.18.3
-	pkgrel = 3
+	pkgver = 1.18.4
+	pkgrel = 1
 	url = http://xorg.freedesktop.org
 	arch = i686
 	arch = x86_64
@@ -55,18 +55,14 @@ pkgbase = xorg-server-nosystemd
 	makedepends = dri3proto
 	makedepends = libxshmfence
 	makedepends = libunwind
-	source = http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-1.18.3.tar.bz2
-	source = http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-1.18.3.tar.bz2.sig
+	source = http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-1.18.4.tar.bz2
+	source = http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-1.18.4.tar.bz2.sig
 	source = xvfb-run
 	source = xvfb-run.1
-	source = call-eglBindAPI-after-eglInitialize.patch
-	source = xserver-dix-Work-around-non-premultiplied-ARGB-cursor-data.patch
-	sha256sums = ea739c22517cdbe2b5f7c0a5fd05fe8a10ac0629003e71c0c7862f4bb60142cd
+	sha256sums = 278459b2c31d61a15655d95a72fb79930c480a6bb8cf9226e48a07df8b1d31c8
 	sha256sums = SKIP
 	sha256sums = ff0156309470fc1d378fd2e104338020a884295e285972cc88e250e031cc35b9
 	sha256sums = 2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776
-	sha256sums = 45fdc2a1241d458756c41a93c01846e04cc75f3c75f81f48b61533d08280918d
-	sha256sums = ecb0b1f73342e8c3de1563efcc812ac0235e2994d0343b392c1f51920510aa18
 
 pkgname = xorg-server-nosystemd
 	pkgdesc = Xorg X server
diff --git a/PKGBUILD b/PKGBUILD
index cada17908d7b..63c186dcbb18 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,8 +7,8 @@ pkgbase=xorg-server-nosystemd
 pkgname=('xorg-server-nosystemd' 'xorg-server-xephyr-nosystemd' 'xorg-server-xdmx-nosystemd' 'xorg-server-xvfb-nosystemd'
 		 'xorg-server-xnest-nosystemd' 'xorg-server-xwayland-nosystemd' 'xorg-server-common-nosystemd' 'xorg-server-devel-nosystemd')
 _pkgbase=xorg-server
-pkgver=1.18.3
-pkgrel=3
+pkgver=1.18.4
+pkgrel=1
 arch=('i686' 'x86_64')
 license=('custom')
 groups=('xorg')
@@ -22,26 +22,15 @@ makedepends=('pixman' 'libx11' 'mesa-nosystemd' 'mesa-libgl-nosystemd' 'xf86drip
              'libxshmfence' 'libunwind')
 source=(${url}/releases/individual/xserver/${_pkgbase}-${pkgver}.tar.bz2{,.sig}
         xvfb-run
-        xvfb-run.1
-        call-eglBindAPI-after-eglInitialize.patch
-        xserver-dix-Work-around-non-premultiplied-ARGB-cursor-data.patch)
+        xvfb-run.1)
 validpgpkeys=('7B27A3F1A6E18CD9588B4AE8310180050905E40C'
               'C383B778255613DFDB409D91DB221A6900000011'
               'DD38563A8A8224537D1F90E45B8A2D50A0ECD0D3')
-sha256sums=('ea739c22517cdbe2b5f7c0a5fd05fe8a10ac0629003e71c0c7862f4bb60142cd'
+sha256sums=('278459b2c31d61a15655d95a72fb79930c480a6bb8cf9226e48a07df8b1d31c8'
             'SKIP'
             'ff0156309470fc1d378fd2e104338020a884295e285972cc88e250e031cc35b9'
-            '2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776'
-            '45fdc2a1241d458756c41a93c01846e04cc75f3c75f81f48b61533d08280918d'
-            'ecb0b1f73342e8c3de1563efcc812ac0235e2994d0343b392c1f51920510aa18')
+            '2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776')
 
-prepare() {
-  cd "${_pkgbase}-${pkgver}"
-
-  patch -Np1 -i ../call-eglBindAPI-after-eglInitialize.patch
-  # fix broken cursor in games with mesa drivers
-  patch -Np1 -i ../xserver-dix-Work-around-non-premultiplied-ARGB-cursor-data.patch
-}
 
 build() {
   cd "${_pkgbase}-${pkgver}"
diff --git a/call-eglBindAPI-after-eglInitialize.patch b/call-eglBindAPI-after-eglInitialize.patch
deleted file mode 100644
index 09773a2200f2..000000000000
--- a/call-eglBindAPI-after-eglInitialize.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff --git a/glamor/glamor_egl.c b/glamor/glamor_egl.c
-index 4bcd3ce..16a20a7 100644
---- a/glamor/glamor_egl.c
-+++ b/glamor/glamor_egl.c
-@@ -770,11 +770,6 @@ glamor_egl_init(ScrnInfoPtr scrn, int fd)
- 
-     glamor_egl->has_gem = glamor_egl_check_has_gem(fd);
- 
--#ifndef GLAMOR_GLES2
--    eglBindAPI(EGL_OPENGL_API);
--#else
--    eglBindAPI(EGL_OPENGL_ES_API);
--#endif
-     if (!eglInitialize
-         (glamor_egl->display, &glamor_egl->major, &glamor_egl->minor)) {
-         xf86DrvMsg(scrn->scrnIndex, X_ERROR, "eglInitialize() failed\n");
-@@ -782,6 +777,12 @@ glamor_egl_init(ScrnInfoPtr scrn, int fd)
-         goto error;
-     }
- 
-+#ifndef GLAMOR_GLES2
-+    eglBindAPI(EGL_OPENGL_API);
-+#else
-+    eglBindAPI(EGL_OPENGL_ES_API);
-+#endif
-+
-     version = eglQueryString(glamor_egl->display, EGL_VERSION);
-     xf86Msg(X_INFO, "%s: EGL version %s:\n", glamor_name, version);
- 
-diff --git a/hw/xwayland/xwayland-glamor.c b/hw/xwayland/xwayland-glamor.c
-index ad66cf6..73ccd71 100644
---- a/hw/xwayland/xwayland-glamor.c
-+++ b/hw/xwayland/xwayland-glamor.c
-@@ -298,12 +298,13 @@ xwl_drm_init_egl(struct xwl_screen *xwl_screen)
-         return;
-     }
- 
--    eglBindAPI(EGL_OPENGL_API);
-     if (!eglInitialize(xwl_screen->egl_display, &major, &minor)) {
-         ErrorF("eglInitialize() failed\n");
-         return;
-     }
- 
-+    eglBindAPI(EGL_OPENGL_API);
-+
-     version = eglQueryString(xwl_screen->egl_display, EGL_VERSION);
-     ErrorF("glamor: EGL version %s:\n", version);
- 
diff --git a/xserver-dix-Work-around-non-premultiplied-ARGB-cursor-data.patch b/xserver-dix-Work-around-non-premultiplied-ARGB-cursor-data.patch
deleted file mode 100644
index 68d03673d806..000000000000
--- a/xserver-dix-Work-around-non-premultiplied-ARGB-cursor-data.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff --git a/dix/cursor.c b/dix/cursor.c
-index e459456..25d6767 100644
---- a/dix/cursor.c
-+++ b/dix/cursor.c
-@@ -288,6 +288,29 @@ AllocARGBCursor(unsigned char *psrcbits, unsigned char *pmaskbits,
-         goto error;
- 
-     *ppCurs = pCurs;
-+
-+    if (argb) {
-+        size_t i, size = bits->width * bits->height;
-+
-+        for (i = 0; i < size; i++) {
-+            if ((argb[i] & 0xff000000) == 0 && (argb[i] & 0xffffff) != 0) {
-+                /* ARGB data doesn't seem pre-multiplied, fix it */
-+                for (i = 0; i < size; i++) {
-+                    CARD32 a, ar, ag, ab;
-+
-+                    a = argb[i] >> 24;
-+                    ar = a * ((argb[i] >> 16) & 0xff) / 0xff;
-+                    ag = a * ((argb[i] >> 8) & 0xff) / 0xff;
-+                    ab = a * (argb[i] & 0xff) / 0xff;
-+
-+                    argb[i] = a << 24 | ar << 16 | ag << 8 | ab;
-+                }
-+
-+                break;
-+            }
-+        }
-+    }
-+
-     return Success;
- 
-  error: