Synced with testing

PKGBUILD

@@ -9,7 +9,7 @@ _git=true
 #_git=false
 
 if [ "${_git}" = "true" ]; then
-    pkgver=7.10.99.git20110616
+    pkgver=7.10.99.git20110706
   else
     pkgver=7.10.3
 fi
@@ -21,9 +21,9 @@ makedepends=('glproto>=1.4.12' 'pkgconfig' 'lib32-libdrm>=2.4.25' 'lib32-libxxf8
 url="http://mesa3d.sourceforge.net"
 license=('custom')
 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=('ftp://ftp.archlinux.org/other/mesa/mesa-fc8c4a3a7b92a1134cd3a9312063abba9e14b0fe.tar.bz2')
-  md5sums=('f9cf11f9fd8f5d2092536fc48fad922f')
+  # mesa git shot from 7.11 branch - see for state: http://cgit.freedesktop.org/mesa/mesa/commit/?h=7.11&id=1ae00c5960af83bea9545a18a1754bad83d5cbd0
+  source=('ftp://ftp.archlinux.org/other/mesa/mesa-1ae00c5960af83bea9545a18a1754bad83d5cbd0.tar.bz2')
+  md5sums=('6d655a2573037838844019275dce66af')
 else
   source=("ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.zip" nouveau-fix-header.patch)
   md5sums=('614d063ecd170940d9ae7b355d365d59' '67c87b77cc2236b52a3b47dad3fbb5d4')
@@ -52,16 +52,12 @@ build() {
   if [ "${_git}" = "true" ]; then
     ./autogen.sh --prefix=/usr \
     --with-dri-driverdir=/usr/lib32/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 \
@@ -71,7 +67,6 @@ build() {
     --enable-32-bit \
     --libdir=/usr/lib32
     #  --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
     ./configure --prefix=/usr \
@@ -154,7 +149,7 @@ package_lib32-libegl() {
 
   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