From 06c7c4c5ef2c808f288b2a8cd63548a322d66754 Mon Sep 17 00:00:00 2001
From: root <root@rshg047.dnsready.net>
Date: Mon, 11 Apr 2011 04:43:21 +0000
Subject: Mon Apr 11 04:43:21 UTC 2011

---
 testing/mesa/PKGBUILD | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

(limited to 'testing/mesa/PKGBUILD')

diff --git a/testing/mesa/PKGBUILD b/testing/mesa/PKGBUILD
index 26997608b..5b4bd68c4 100644
--- a/testing/mesa/PKGBUILD
+++ b/testing/mesa/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 117470 2011-04-03 17:24:19Z ibiru $
+# $Id: PKGBUILD 119075 2011-04-10 20:11:41Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
@@ -11,7 +11,7 @@ _git=false
 if [ "${_git}" = "true" ]; then
     pkgver=7.10.0.git20110215
   else
-    pkgver=7.10.1
+    pkgver=7.10.2
 fi
 pkgrel=2
 arch=('i686' 'x86_64')
@@ -19,17 +19,18 @@ makedepends=('glproto>=1.4.12' 'pkgconfig' 'libdrm>=2.4.23' 'libxxf86vm>=1.1.0'
              'gcc-libs>=4.5' 'dri2proto=2.3' 'python2' 'libxml2' 'imake')
 url="http://mesa3d.sourceforge.net"
 license=('custom')
-source=(LICENSE)
+source=(LICENSE gnome-shell-shader-fix.patch nouveau-fix-header.patch)
 if [ "${_git}" = "true" ]; then
 	# mesa git shot from 7.10 branch - see for state: http://cgit.freedesktop.org/mesa/mesa/commit/?h=7.10&id=cc1636b6db85604510f97f8a37d7fd0ecf453866
 	source=(${source[@]} 'ftp://ftp.archlinux.org/other/mesa/mesa-cc1636b6db85604510f97f8a37d7fd0ecf453866.tar.bz2')
   else
 	source=(${source[@]} "ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2"
-                gnome-shell-shader-fix.patch)
+)
 fi
 md5sums=('5c65a0fe315dd347e09b1f2826a1df5a'
-         'efe8da4d80c2a5d32a800770b8ce5dfa'
-         '3ec78f340f9387abd7a37b195e764cbf')
+         '3ec78f340f9387abd7a37b195e764cbf'
+         '67c87b77cc2236b52a3b47dad3fbb5d4'
+         'f5de82852f1243f42cc004039e10b771')
 
 build() {
 if [ "${_git}" = "true" ]; then
@@ -42,6 +43,7 @@ fi
 #backport from master to fix gnome-shell shader
 #https://bugs.freedesktop.org/show_bug.cgi?id=35714
 patch -Np1 -i "${srcdir}/gnome-shell-shader-fix.patch"
+patch -Np1 -i "${srcdir}/nouveau-fix-header.patch"
 
 if [ "${_git}" = "true" ]; then
     ./autogen.sh --prefix=/usr \
@@ -105,7 +107,7 @@ fi
   ln -s libglx.xorg "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so"
 
   install -m755 -d "${pkgdir}/usr/share/licenses/libgl"
-  install -m755 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libgl/"
+  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libgl/"
 }
 
 package_libgles() {
@@ -130,7 +132,7 @@ fi
   bin/minstall include/GLES2/* "${pkgdir}/usr/include/GLES2/"
 
   install -m755 -d "${pkgdir}/usr/share/licenses/libgles"
-  install -m755 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libgles/"
+  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libgles/"
 }
 
 package_libegl() {
@@ -160,7 +162,7 @@ fi
   bin/minstall docs/egl.html "${pkgdir}/usr/share/doc/libegl/"
 
   install -m755 -d "${pkgdir}/usr/share/licenses/libegl"
-  install -m755 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libegl/"
+  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libegl/"
 }
 package_mesa() {
   depends=('libgl' 'libx11>=1.3.5' 'libxt>=1.0.8' 'gcc-libs>=4.5' 'dri2proto=2.3' 'libdrm>=2.4.22' 'glproto>=1.4.12')
@@ -187,7 +189,7 @@ fi
   rm -rf ${pkgdir}/usr/include/{GLES,GLES2,EGL,KHR}
 
   install -m755 -d "${pkgdir}/usr/share/licenses/mesa"
-  install -m755 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa/"
+  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa/"
 }
 
 package_ati-dri() {
-- 
cgit v1.2.3-54-g00ecf