[arch-commits] Commit in mesa/trunk (PKGBUILD)

[andyrtr at archlinux.org]

    Date: Wednesday, July 6, 2011 @ 12:35:35
  Author: andyrtr
Revision: 130489

upgpkg: mesa 7.10.99.git20110706-1
update snapshot, switch to 7.11 branch, fix configure options to fit the new way

Modified:
  mesa/trunk/PKGBUILD

----------+
 PKGBUILD |   20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-07-06 16:27:01 UTC (rev 130488)
+++ PKGBUILD	2011-07-06 16:35:35 UTC (rev 130489)
@@ -9,11 +9,11 @@
 #_git=false
 
 if [ "${_git}" = "true" ]; then
-    pkgver=7.10.99.git20110616
+    pkgver=7.10.99.git20110706
   else
     pkgver=7.10.3
 fi
-pkgrel=2
+pkgrel=1
 arch=('i686' 'x86_64')
 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' 'llvm')
@@ -21,8 +21,8 @@
 license=('custom')
 source=(LICENSE gnome-shell-shader-fix.patch nouveau-fix-header.patch)
 if [ "${_git}" = "true" ]; then
-	# mesa git shot from mastee (will become 7.11) branch - see for state: http://cgit.freedesktop.org/mesa/mesa/commit/?id=fc8c4a3a7b92a1134cd3a9312063abba9e14b0fe
-	source=(${source[@]} 'ftp://ftp.archlinux.org/other/mesa/mesa-fc8c4a3a7b92a1134cd3a9312063abba9e14b0fe.tar.bz2')
+	# mesa git shot from 7.11 branch - see for state: http://cgit.freedesktop.org/mesa/mesa/commit/?h=7.11&id=1ae00c5960af83bea9545a18a1754bad83d5cbd0
+	source=(${source[@]} 'ftp://ftp.archlinux.org/other/mesa/mesa-1ae00c5960af83bea9545a18a1754bad83d5cbd0.tar.bz2')
   else
 	source=(${source[@]} "ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.zip"
 )
@@ -30,7 +30,7 @@
 md5sums=('5c65a0fe315dd347e09b1f2826a1df5a'
          '3ec78f340f9387abd7a37b195e764cbf'
          '67c87b77cc2236b52a3b47dad3fbb5d4'
-         'f9cf11f9fd8f5d2092536fc48fad922f')
+         '6d655a2573037838844019275dce66af')
 
 build() {
 if [ "${_git}" = "true" ]; then
@@ -50,16 +50,12 @@
 if [ "${_git}" = "true" ]; then
     ./autogen.sh --prefix=/usr \
     --with-dri-driverdir=/usr/lib/xorg/modules/dri \
-    --enable-gallium-r300 \
-    --enable-gallium-r600 \
-    --enable-gallium-nouveau \
+    --with-gallium-drivers=r300,r600,nouveau,swrast \
     --enable-gallium-llvm \
     --enable-gallium-egl \
-    --enable-gallium-swrast \
     --enable-glx-tls \
     --with-driver=dri \
     --enable-xcb \
-    --with-state-trackers=dri,glx,egl \
     --disable-glut \
     --enable-gles1 \
     --enable-gles2 \
@@ -68,8 +64,6 @@
     --enable-shared-dricore
     
     #    --enable-gallium-svga \
-
-    #--enable-shared-dricore - link DRI modules with shared core DRI routines[default=disabled]  http://bugs.gentoo.org/show_bug.cgi?id=357177
     #--enable-shared-glapi EXPERIMENTAL. Enable shared glapi for OpenGL[default=no]
     
   else
@@ -155,7 +149,7 @@
 
 if [ "${_git}" = "true" ]; then
     cd ${srcdir}/mesa-*  
-    make -C src/gallium/targets/egl DESTDIR="${pkgdir}" install
+    make -C src/gallium/targets/egl-static DESTDIR="${pkgdir}" install
   else
     cd "${srcdir}/Mesa-${pkgver}" 
 fi