[Lunar-commits] <moonbase> mesa-lib: Allow gallium to be entirely disabled.

[Auke Kok]

commit 0f6a0b7e56d83bb7c787bc062b11c3f8c045faca
Author: Auke Kok <sofar at foo-projects.org>
Date:   Tue Jun 14 00:28:39 2011 +0200

    mesa-lib: Allow gallium to be entirely disabled.
    
    Gallium completely break HD video content rendering on G33 (965) because
    on this chipset gallium only allows 1024 bit wide textures, but HD content
    needs 1920 (2048). The old rendering code handled 2048 wide textures, so
    for some people this is required.
---
 xorg7/mesa-lib/BUILD     |   40 +++++++++++++++++++++-------------------
 xorg7/mesa-lib/CONFIGURE |    1 +
 2 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/xorg7/mesa-lib/BUILD b/xorg7/mesa-lib/BUILD
index fc841ee..323e24f 100644
--- a/xorg7/mesa-lib/BUILD
+++ b/xorg7/mesa-lib/BUILD
@@ -10,25 +10,27 @@
     # Ensure that swrast is included, as a fall-back
     OPTS+=" --with-dri-drivers=swrast,"
     OPTS+=$(echo $MESADRIVER | sed s/\ /,/g)
-    OPTS+=" --enable-gallium-swrast --enable-gallium-llvm "
-    if [[ $MESADRIVER == *i915* ]]; then
-      OPTS+=" --enable-gallium-i915 "
-    fi
-    if [[ $MESADRIVER == *i965* ]]; then
-      OPTS+=" --enable-gallium-i965 "
-    fi
-# Nouveau breaks build in mesa 7.10.2
-#    if [[ $MESADRIVER == *nouveau* ]]; then
-#      OPTS+=" --enable-gallium-nouveau "
-#    fi
-    if [[ $MESADRIVER == *radeon* ]]; then
-      OPTS+=" --enable-gallium-radeon "
-    fi
-    if [[ $MESADRIVER == *r600* ]]; then
-      OPTS+=" --enable-gallium-r600 "
-    fi
-    if [[ $VGA == *VMware* ]]; then
-      OPTS+=" --enable-gallium-svga "
+    if [[ $GALLIUM == y ]]; then
+      OPTS+=" --enable-gallium-swrast --enable-gallium-llvm "
+      if [[ $MESADRIVER == *i915* ]]; then
+        OPTS+=" --enable-gallium-i915 "
+      fi
+      if [[ $MESADRIVER == *i965* ]]; then
+        OPTS+=" --enable-gallium-i965 "
+      fi
+      # Nouveau breaks build in mesa 7.10.2
+      if [[ $MESADRIVER == *nouveau* ]]; then
+        OPTS+=" --enable-gallium-nouveau "
+      fi
+      if [[ $MESADRIVER == *radeon* ]]; then
+        OPTS+=" --enable-gallium-radeon "
+      fi
+      if [[ $MESADRIVER == *r600* ]]; then
+        OPTS+=" --enable-gallium-r600 "
+      fi
+      if [[ $VGA == *VMware* ]]; then
+        OPTS+=" --enable-gallium-svga "
+      fi
     fi
   fi  &&
 
diff --git a/xorg7/mesa-lib/CONFIGURE b/xorg7/mesa-lib/CONFIGURE
index b8f7d2f..271cf23 100644
--- a/xorg7/mesa-lib/CONFIGURE
+++ b/xorg7/mesa-lib/CONFIGURE
@@ -45,4 +45,5 @@ if ! grep -q CONFIGURED $MODULE_CONFIG; then
 fi
 
 # Default is y, so xorg-server can be compiled with it disabled or enabled
+mquery GALLIUM "Enable Gallium renderer? (can break functionality on some chipsets)" y "" ""
 mquery ENABLE_GLX_TLS "Enable glx-tls? (${PROBLEM_COLOR}lin xorg-server also${DEFAULT_COLOR})" y "--enable-glx-tls" "--disable-glx-tls"