From 3d989e7ce40c6396d89ff81f043f7a8058c07930 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado <emulatorman@parabola.nu>
Date: Wed, 21 May 2014 07:41:22 -0300
Subject: mesa-demos-libre-8.1.0-2: fix building with mesa-10.2 (FS#40435 =>
 https://bugs.archlinux.org/task/40435)

---
 libre/mesa-demos-libre/PKGBUILD | 33 ++++++++++++++++++++-------------
 1 file changed, 20 insertions(+), 13 deletions(-)

(limited to 'libre/mesa-demos-libre/PKGBUILD')

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
 }
-- 
cgit v1.2.3