From e04c31c8e8531ac41e0b476fd28155a4531164b1 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Tue, 10 May 2011 09:17:07 +0200
Subject: [PATCH] Mesa: update alternative version to Mesa-7.11-git6807438

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 config/options               | 2 +-
 packages/graphics/Mesa/build | 8 +++++++-
 packages/graphics/Mesa/meta  | 2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/config/options b/config/options
index e79b189752..c778e89c9f 100644
--- a/config/options
+++ b/config/options
@@ -87,7 +87,7 @@ get_graphicdrivers() {
     [ "$drv" = "r300" ] && MESA_DRIVERS="$MESA_DRIVERS,r300"
     [ "$drv" = "r600" ] && MESA_DRIVERS="$MESA_DRIVERS,r600"
     [ "$drv" = "radeon" ] && MESA_DRIVERS="$MESA_DRIVERS,radeon"
-    [ "$drv" = "nouveau" ] && MESA_DRIVERS="$MESA_DRIVERS,nouveau"
+#    [ "$drv" = "nouveau" ] && MESA_DRIVERS="$MESA_DRIVERS,nouveau"
     [ "$drv" = "omapfb" ] && MESA_DRIVERS="$MESA_DRIVERS,swrast"
 
     if [ "$drv" = "i915" -o "$drv" = "i965" ]; then
diff --git a/packages/graphics/Mesa/build b/packages/graphics/Mesa/build
index 200e6a8d44..3a06003a7c 100755
--- a/packages/graphics/Mesa/build
+++ b/packages/graphics/Mesa/build
@@ -24,6 +24,8 @@
 
 get_graphicdrivers
 
+export PYTHONVERBOSE=1
+
 # dont use gold linker because of compiling issues
   strip_gold
   strip_linker_plugin
@@ -33,7 +35,8 @@ get_graphicdrivers
   LDFLAGS=""
 
 MESA_CONFIG=" --disable-gallium --disable-gallium-nouveau --disable-gallium-i915 --disable-gallium-i965"
-MESA_CONFIG="$MESA_CONFIG --disable-gallium-radeon --disable-gallium-r600 --disable-gallium-svga --disable-gallium-swrast"
+MESA_CONFIG="$MESA_CONFIG --disable-gallium-radeon --disable-gallium-r300 --disable-gallium-r600"
+MESA_CONFIG="$MESA_CONFIG --disable-gallium-svga --disable-gallium-swrast"
 
 for drv in $GRAPHIC_DRIVERS; do
   [ "$drv" = i915 ] && \
@@ -45,6 +48,9 @@ for drv in $GRAPHIC_DRIVERS; do
   [ "$drv" = radeon ] && \
     MESA_CONFIG=`echo $MESA_CONFIG | sed -e 's/disable-gallium-radeon/disable-gallium-radeon/'`
 
+  [ "$drv" = r300 ] && \
+    MESA_CONFIG=`echo $MESA_CONFIG | sed -e 's/disable-gallium-r300/disable-gallium-r300/'`
+
   [ "$drv" = r600 ] && \
     MESA_CONFIG=`echo $MESA_CONFIG | sed -e 's/disable-gallium-r600/disable-gallium-r600/'`
 
diff --git a/packages/graphics/Mesa/meta b/packages/graphics/Mesa/meta
index 21bb5ef10d..530e875656 100644
--- a/packages/graphics/Mesa/meta
+++ b/packages/graphics/Mesa/meta
@@ -36,6 +36,6 @@ PKG_IS_ADDON="no"
 PKG_AUTORECONF="yes"
 
 if [ "$MESA_MASTER" = "yes" ]; then
-  PKG_VERSION="6067a2a"
+  PKG_VERSION="7.11-git6807438"
   PKG_URL="$OPENELEC_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2"
 fi