upgpkg: xorg-server 1.18.3-2

3 files changed, 57 insertions, 3 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f38ac9983247..5583255e0ff1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Wed Apr  6 15:04:49 UTC 2016
+# Thu Jun  9 17:30:01 UTC 2016
 pkgbase = xorg-server-bug865
 	pkgver = 1.18.3
-	pkgrel = 1
+	pkgrel = 2
 	url = http://xorg.freedesktop.org
 	arch = i686
 	arch = x86_64
@@ -59,11 +59,13 @@ pkgbase = xorg-server-bug865
 	source = http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-1.18.3.tar.bz2.sig
 	source = xvfb-run
 	source = xvfb-run.1
+	source = call-eglBindAPI-after-eglInitialize.patch
 	source = freedesktop-bug-865.patch
 	sha256sums = ea739c22517cdbe2b5f7c0a5fd05fe8a10ac0629003e71c0c7862f4bb60142cd
 	sha256sums = SKIP
 	sha256sums = ff0156309470fc1d378fd2e104338020a884295e285972cc88e250e031cc35b9
 	sha256sums = 2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776
+	sha256sums = 45fdc2a1241d458756c41a93c01846e04cc75f3c75f81f48b61533d08280918d
 	sha256sums = dad4bbadda03db2fe7046c43d838afd5e41f98c821fdac0908f0f20493caa660
 
 pkgname = xorg-server-bug865
diff --git a/PKGBUILD b/PKGBUILD
index 722064612254..515dc1358d7e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 pkgbase=xorg-server-bug865
 pkgname=xorg-server-bug865
 pkgver=1.18.3
-pkgrel=1 # build first with 0.1 and then rebuild it after xf86-input-evdev rebuild
+pkgrel=2 # build first with 0.1 and then rebuild it after xf86-input-evdev rebuild
 arch=('i686' 'x86_64')
 license=('custom')
 groups=('xorg')
@@ -20,6 +20,7 @@ makedepends=('pixman' 'libx11' 'mesa' 'mesa-libgl' 'xf86driproto' 'xcmiscproto'
 source=(${url}/releases/individual/xserver/xorg-server-${pkgver}.tar.bz2{,.sig}
         xvfb-run
         xvfb-run.1
+        call-eglBindAPI-after-eglInitialize.patch
         freedesktop-bug-865.patch)
 validpgpkeys=('7B27A3F1A6E18CD9588B4AE8310180050905E40C'
               'C383B778255613DFDB409D91DB221A6900000011'
@@ -28,11 +29,14 @@ sha256sums=('ea739c22517cdbe2b5f7c0a5fd05fe8a10ac0629003e71c0c7862f4bb60142cd'
             'SKIP'
             'ff0156309470fc1d378fd2e104338020a884295e285972cc88e250e031cc35b9'
             '2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776'
+            '45fdc2a1241d458756c41a93c01846e04cc75f3c75f81f48b61533d08280918d'
             'dad4bbadda03db2fe7046c43d838afd5e41f98c821fdac0908f0f20493caa660')
 
 prepare() {
   cd "xorg-server-${pkgver}"
 
+  patch -Np1 -i ../call-eglBindAPI-after-eglInitialize.patch
+
   # The patch for freedesktop bug 865
   patch -Np1 -i "${srcdir}/freedesktop-bug-865.patch"
 
diff --git a/call-eglBindAPI-after-eglInitialize.patch b/call-eglBindAPI-after-eglInitialize.patch
new file mode 100644
index 000000000000..09773a2200f2
--- /dev/null
+++ b/call-eglBindAPI-after-eglInitialize.patch
@@ -0,0 +1,48 @@
+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);
+