Wed Apr 13 04:53:33 UTC 2011

1 files changed, 16 insertions, 12 deletions

diff --git a/testing/mesa/PKGBUILD b/testing/mesa/PKGBUILD
index 5b4bd68c4..6ffa54f19 100644
--- a/testing/mesa/PKGBUILD
+++ b/testing/mesa/PKGBUILD
@@ -1,28 +1,28 @@
-# $Id: PKGBUILD 119075 2011-04-10 20:11:41Z ibiru $
+# $Id: PKGBUILD 119610 2011-04-12 16:23:12Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgbase=mesa
 pkgname=('mesa' 'libgl' 'libgles' 'libegl' 'ati-dri' 'intel-dri' 'unichrome-dri' 'mach64-dri' 'mga-dri' 'r128-dri' 'savage-dri' 'sis-dri' 'tdfx-dri' 'nouveau-dri')
 
-#_git=true
-_git=false
+_git=true
+#_git=false
 
 if [ "${_git}" = "true" ]; then
-    pkgver=7.10.0.git20110215
+    pkgver=7.10.99.git20110412
   else
     pkgver=7.10.2
 fi
-pkgrel=2
+pkgrel=1
 arch=('i686' 'x86_64')
-makedepends=('glproto>=1.4.12' 'pkgconfig' 'libdrm>=2.4.23' 'libxxf86vm>=1.1.0' 'libxdamage>=1.1.3' 'expat>=2.0.1' 'libx11>=1.3.5' 'libxt>=1.0.8' 
+makedepends=('glproto>=1.4.12' 'pkgconfig' 'libdrm>=2.4.25' 'libxxf86vm>=1.1.1' 'libxdamage>=1.1.3' 'expat>=2.0.1' 'libx11>=1.4.3' 'libxt>=1.1.1' 
              'gcc-libs>=4.5' 'dri2proto=2.3' 'python2' 'libxml2' 'imake')
 url="http://mesa3d.sourceforge.net"
 license=('custom')
 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')
+	# mesa git shot from 7.11 branch - see for state: http://cgit.freedesktop.org/mesa/mesa/commit/?id=f05751aa2af1a8ec83c2d110385aab1b7e735238
+	source=(${source[@]} 'ftp://ftp.archlinux.org/other/mesa/mesa-f05751aa2af1a8ec83c2d110385aab1b7e735238.tar.bz2')
   else
 	source=(${source[@]} "ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2"
 )
@@ -30,7 +30,7 @@ fi
 md5sums=('5c65a0fe315dd347e09b1f2826a1df5a'
          '3ec78f340f9387abd7a37b195e764cbf'
          '67c87b77cc2236b52a3b47dad3fbb5d4'
-         'f5de82852f1243f42cc004039e10b771')
+         '56d8862d1155f7e8054f9aa7f93ebebc')
 
 build() {
 if [ "${_git}" = "true" ]; then
@@ -40,10 +40,12 @@ if [ "${_git}" = "true" ]; then
     cd "${srcdir}/Mesa-${pkgver}" 
 fi
 
+if [ "${_git}" != "true" ]; then
 #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"
+fi
 
 if [ "${_git}" = "true" ]; then
     ./autogen.sh --prefix=/usr \
@@ -83,7 +85,7 @@ fi
 }
 
 package_libgl() {
-  depends=('libdrm>=2.4.22' 'libxxf86vm>=1.1.0' 'libxdamage>=1.1.3' 'expat>=2.0.1')
+  depends=('libdrm>=2.4.25' 'libxxf86vm>=1.1.1' 'libxdamage>=1.1.3' 'expat>=2.0.1')
   pkgdesc="Mesa 3-D graphics library and DRI software rasterizer"
 
 if [ "${_git}" = "true" ]; then
@@ -145,7 +147,6 @@ if [ "${_git}" = "true" ]; then
     cd "${srcdir}/Mesa-${pkgver}" 
 fi
   install -m755 -d "${pkgdir}/usr/lib"
-  install -m755 -d "${pkgdir}/usr/lib/egl"
   install -m755 -d "${pkgdir}/usr/lib/pkgconfig"
   install -m755 -d "${pkgdir}/usr/include"
   install -m755 -d "${pkgdir}/usr/include/"
@@ -155,7 +156,10 @@ fi
   install -m755 -d "${pkgdir}/usr/share/doc"
   install -m755 -d "${pkgdir}/usr/share/doc/libegl"
   bin/minstall lib/libEGL.so* "${pkgdir}/usr/lib/"
+if [ "${_git}" != "true" ]; then
+  install -m755 -d "${pkgdir}/usr/lib/egl"
   bin/minstall lib/egl/* "${pkgdir}/usr/lib/egl/"
+fi
   bin/minstall src/egl/main/egl.pc "${pkgdir}/usr/lib/pkgconfig/"
   bin/minstall include/EGL/* "${pkgdir}/usr/include/EGL/"
   bin/minstall include/KHR/khrplatform.h "${pkgdir}/usr/include/KHR/"
@@ -165,7 +169,7 @@ fi
   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')
+  depends=('libgl' 'libx11>=1.4.3' 'libxt>=1.1.1' 'gcc-libs>=4.5' 'dri2proto=2.3' 'libdrm>=2.4.25' 'glproto>=1.4.12')
   optdepends=('opengl-man-pages: for the OpenGL API man pages')
   pkgdesc="Mesa 3-D graphics libraries and include files"