From 7d13548d48c1e98b9c12201685fd6fef5e9388db Mon Sep 17 00:00:00 2001
From: root <root@rshg047.dnsready.net>
Date: Fri, 15 Apr 2011 04:55:43 +0000
Subject: Fri Apr 15 04:55:43 UTC 2011

---
 multilib/lib32-mesa/PKGBUILD | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

(limited to 'multilib/lib32-mesa/PKGBUILD')

diff --git a/multilib/lib32-mesa/PKGBUILD b/multilib/lib32-mesa/PKGBUILD
index d6e047987..489fd3703 100644
--- a/multilib/lib32-mesa/PKGBUILD
+++ b/multilib/lib32-mesa/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 41096 2011-03-03 18:58:55Z lcarlier $
+# $Id: PKGBUILD 44674 2011-04-10 20:53:16Z lcarlier $
 # Contributor: Jan de Groot <jgc@archlinux.org>
 # Contributor: Andreas Radke <andyrtr@archlinux.org>
 
@@ -12,13 +12,13 @@ _git=false
 if [ "${_git}" = "true" ]; then
     pkgver=7.10.0.git20110215
   else
-    pkgver=7.10.1
+    pkgver=7.10.2
 fi
 
-pkgrel=1
+pkgrel=2
 arch=(x86_64)
 makedepends=('glproto>=1.4.12' 'pkgconfig' 'lib32-libdrm>=2.4.23' 'lib32-libxxf86vm>=1.1.0' 'lib32-libxdamage>=1.1.3' 'lib32-expat>=2.0.1' 'lib32-libx11>=1.3.5' 'lib32-libxt>=1.0.8' 
-'lib32-gcc-libs>=4.5' 'dri2proto=2.3' 'lib32-talloc' 'python2' 'libxml2' 'gcc-multilib' imake 'lib32-udev')
+'lib32-gcc-libs>=4.5' 'dri2proto=2.3' 'python2' 'libxml2' 'gcc-multilib' imake 'lib32-udev')
 url="http://mesa3d.sourceforge.net"
 license=('custom')
 if [ "${_git}" = "true" ]; then
@@ -26,8 +26,8 @@ if [ "${_git}" = "true" ]; then
   source=('ftp://ftp.archlinux.org/other/mesa/mesa-cc1636b6db85604510f97f8a37d7fd0ecf453866.tar.bz2')
   md5sums=('f0d9daab4aaaacfd3b756dcb23b268af')
 else
-  source=("ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2")
-  md5sums=('efe8da4d80c2a5d32a800770b8ce5dfa')
+  source=("ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2" nouveau-fix-header.patch)
+  md5sums=('f5de82852f1243f42cc004039e10b771' '67c87b77cc2236b52a3b47dad3fbb5d4')
 fi
 
 build() {
@@ -42,11 +42,7 @@ build() {
     cd "${srcdir}/Mesa-${pkgver}" 
   fi
 
-  # python2 build fixes
-  sed -i -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \
-         -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" $(find $srcdir -name '*.py')
-  sed -i -e "s|PYTHON2 = python|PYTHON2 = python2|" configs/{default,autoconf.in}
-  sed -i -e "s|python|python2|" src/gallium/auxiliary/Makefile
+  patch -Np1 -i "${srcdir}/nouveau-fix-header.patch"
 
   if [ "${_git}" = "true" ]; then
     ./autogen.sh --prefix=/usr \
-- 
cgit v1.2.3-54-g00ecf