mesa-demos-libre-8.1.0-2: fix building with mesa-10.2 (FS#40435 => https://bugs.archlinux.org/task/40435)

3 files changed, 114 insertions, 13 deletions

diff --git a/libre/mesa-demos-libre/PKGBUILD b/libre/mesa-demos-libre/PKGBUILD
index 2838b51b9..15c7e11b9 100644
--- a/libre/mesa-demos-libre/PKGBUILD
+++ b/libre/mesa-demos-libre/PKGBUILD
@@ -1,39 +1,46 @@
-# $Id: PKGBUILD 178740 2013-02-26 16:15:13Z andyrtr $
+# $Id: PKGBUILD 213124 2014-05-19 12:03:07Z lcarlier $
 # Maintainer (Arch): Jan de Groot <jgc@archlinux.org>
 # Maintainer (Arch): Andreas Radke <andyrtr@archlinux.org>
 # Maintainer: André Silva <emulatorman@parabola.nu>
 
 pkgname='mesa-demos-libre'
 pkgver=8.1.0
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64' 'mips64el')
 pkgdesc="Mesa demos and tools, without nonfree demos"
 url="http://mesa3d.sourceforge.net"
 license=('custom')
-depends=('libgl' 'glew')
 provides=("mesa-demos=$pkgver")
 replaces=('mesa-demos')
 conflicts=('mesa-demos')
-mksource=("ftp://ftp.freedesktop.org/pub/mesa/demos/${pkgver}/mesa-demos-${pkgver}.tar.bz2"
-          'mesa-demos-libre.patch')
+depends=('libgl' 'glew')
+mksource=("ftp://ftp.freedesktop.org/pub/mesa/demos/${pkgver}/mesa-demos-${pkgver}.tar.bz2")
 source=("https://repo.parabolagnulinux.org/other/mesa-demos-libre/mesa-demos-libre-${pkgver}.tar.bz2"
-        'LICENSE')
-mksha256sums=('9703fa0646b32a1e68d2abf5628f936f77bf97c69ffcaac90de380820a87a828'
-              '476f58fc62e9074936643b0d61165c5160a6d5aed082e60c10b39d219f56913f')
-sha256sums=('d2678138f7ff4a684a6d851f1086fd7baf4ee321ef65531063b072632c2c504b'
+        'LICENSE'
+        'drawtex-resolve-glDrawTexfOES-extension-function.patch'
+        'libre.patch')
+mksha256sums=('9703fa0646b32a1e68d2abf5628f936f77bf97c69ffcaac90de380820a87a828')
+sha256sums=('b0b966cc08c4fd787cf0542118e07e2fe1f1bcc3752ff7676ebb1b4f2a1b86c8'
+            '7fdc119cf53c8ca65396ea73f6d10af641ba41ea1dd2bd44a824726e01c8b3f2'
+            '963b3e45b2eccafea50fdab4f2fac17bd308f4c15522c00d4787b50ebb25423a'
             '476f58fc62e9074936643b0d61165c5160a6d5aed082e60c10b39d219f56913f')
 
 mksource() {
   cd "${srcdir}/mesa-demos-${pkgver}"
-
-  # Remove nonfree demos (pointblast and spriteblast)
+  # remove nonfree demos (pointblast and spriteblast)
   rm -v src/demos/{pointblast,spriteblast}.c
-  patch -Np1 -i "${srcdir}/mesa-demos-libre.patch"
 }
 
-build() {
+prepare() {
   cd "${srcdir}/mesa-demos-${pkgver}"
+  # merged upstream
+  patch -Np1 -i ../drawtex-resolve-glDrawTexfOES-extension-function.patch
+  # remove nonfree demos references (pointblast and spriteblast)
+  patch -Np1 -i ../libre.patch
+}
 
+build() {
+  cd "${srcdir}/mesa-demos-${pkgver}"
   ./configure --prefix=/usr
   make
 }
diff --git a/libre/mesa-demos-libre/drawtex-resolve-glDrawTexfOES-extension-function.patch b/libre/mesa-demos-libre/drawtex-resolve-glDrawTexfOES-extension-function.patch
new file mode 100644
index 000000000..d803b3eec
--- /dev/null
+++ b/libre/mesa-demos-libre/drawtex-resolve-glDrawTexfOES-extension-function.patch
@@ -0,0 +1,94 @@
+From 9c326a34e088971a3c11b2e5289cd1a8e4d439df Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Tapani=20P=C3=A4lli?= <tapani.palli@intel.com>
+Date: Wed, 30 Apr 2014 14:05:11 +0300
+Subject: [PATCH] drawtex: resolve glDrawTexfOES extension function
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=78101
+Signed-off-by: Tapani Pälli <tapani.palli@intel.com>
+Reviewed-by: Brian Paul <brianp@vmware.com>
+Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
+---
+ src/egl/opengles1/drawtex.c | 10 +++++++++-
+ 1 file changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/src/egl/opengles1/drawtex.c b/src/egl/opengles1/drawtex.c
+index 524f931..1ba8ac7 100644
+--- a/src/egl/opengles1/drawtex.c
++++ b/src/egl/opengles1/drawtex.c
+@@ -25,13 +25,14 @@ static GLfloat width = 200, height = 200;
+ static GLboolean animate = GL_FALSE;
+ static int win;
+ 
++static PFNGLDRAWTEXFOESPROC glDrawTexfOES_func = NULL;
+ 
+ static void
+ draw(void)
+ {
+    glClear(GL_COLOR_BUFFER_BIT);
+ 
+-   glDrawTexfOES(view_posx, view_posy, 0.0, width, height);
++   glDrawTexfOES_func(view_posx, view_posy, 0.0, width, height);
+ }
+ 
+ 
+@@ -128,6 +129,13 @@ init(void)
+       exit(1);
+    }
+ 
++   glDrawTexfOES_func = eglGetProcAddress("glDrawTexfOES");
++
++   if (!glDrawTexfOES_func) {
++      fprintf(stderr, "Sorry, failed to resolve glDrawTexfOES function\n");
++      exit(1);
++   }
++
+    glClearColor(0.4, 0.4, 0.4, 0.0);
+ 
+    make_smile_texture();
+-- 
+1.9.2
+
+From 6ad8820c457845300806a2f9469599460ca96af9 Mon Sep 17 00:00:00 2001
+From: Stefan Dirsch <sndirsch@suse.de>
+Date: Thu, 8 May 2014 11:48:44 +0200
+Subject: [PATCH] drawtex: fixed compiler warnings related to use of
+ eglGetProcAddress
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Add proper <EGL/egl.h> include and cast in order to fix compiler
+warnings related to the use of eglGetProcAddress.
+
+Reviewed-By: Tapani Pälli <tapani.palli@intel.com>
+---
+ src/egl/opengles1/drawtex.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/egl/opengles1/drawtex.c b/src/egl/opengles1/drawtex.c
+index 1ba8ac7..dc1de13 100644
+--- a/src/egl/opengles1/drawtex.c
++++ b/src/egl/opengles1/drawtex.c
+@@ -16,6 +16,7 @@
+ #include <string.h>
+ #include <GLES/gl.h>
+ #include <GLES/glext.h>
++#include <EGL/egl.h>
+ 
+ #include "eglut.h"
+ 
+@@ -129,7 +130,7 @@ init(void)
+       exit(1);
+    }
+ 
+-   glDrawTexfOES_func = eglGetProcAddress("glDrawTexfOES");
++   glDrawTexfOES_func = (PFNGLDRAWTEXFOESPROC) eglGetProcAddress("glDrawTexfOES");
+ 
+    if (!glDrawTexfOES_func) {
+       fprintf(stderr, "Sorry, failed to resolve glDrawTexfOES function\n");
+-- 
+1.9.2
+
diff --git a/libre/mesa-demos-libre/mesa-demos-libre.patch b/libre/mesa-demos-libre/libre.patch
index d630f373c..d630f373c 100644
--- a/libre/mesa-demos-libre/mesa-demos-libre.patch
+++ b/libre/mesa-demos-libre/libre.patch