From cb2d4b340dbcd53b5e1ff8fc77d135f77eb2295c Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Tue, 17 May 2011 20:36:03 +0200
Subject: [PATCH] Mesa: prepare for llvm builds, cosmetics

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/graphics/Mesa/build | 43 +++++++++++++++++++++++-------------
 1 file changed, 28 insertions(+), 15 deletions(-)

diff --git a/packages/graphics/Mesa/build b/packages/graphics/Mesa/build
index f58bb9047c..4da2e2644f 100755
--- a/packages/graphics/Mesa/build
+++ b/packages/graphics/Mesa/build
@@ -36,29 +36,42 @@ MESA_CONFIG=" --disable-gallium --disable-gallium-nouveau --disable-gallium-i915
 MESA_CONFIG="$MESA_CONFIG --disable-gallium-radeon --disable-gallium-r300 --disable-gallium-r600"
 MESA_CONFIG="$MESA_CONFIG --disable-gallium-svga --disable-gallium-swrast"
 
+if [ "$LLVM_SUPPORT" = "yes" ]; then
+  export LLVM_CONFIG="$SYSROOT_PREFIX/usr/bin/llvm-config"
+  MESA_CONFIG="$MESA_CONFIG --enable-gallium --enable-gallium-llvm"
+fi
+
 for drv in $GRAPHIC_DRIVERS; do
-  [ "$drv" = i915 ] && \
-    MESA_CONFIG=`echo $MESA_CONFIG | sed -e 's/disable-gallium-i915/disable-gallium-i915/'`
-
-  [ "$drv" = i965 ] && \
-    MESA_CONFIG=`echo $MESA_CONFIG | sed -e 's/disable-gallium-i965/disable-gallium-i965/'`
-
-  [ "$drv" = r300 -o "$drv" = radeon ] && \
-    MESA_CONFIG=`echo $MESA_CONFIG | sed -e 's/disable-gallium-radeon/enable-gallium-radeon/'` && \
-    MESA_CONFIG=`echo $MESA_CONFIG | sed -e 's/disable-gallium-r300/enable-gallium-r300/'` && \
+  if [ "$drv" = i915 ]; then
+    MESA_CONFIG=`echo $MESA_CONFIG | sed -e 's/disable-gallium-i915/enable-gallium-i915/'`
     MESA_CONFIG="$MESA_CONFIG --with-state-trackers=dri,glx --enable-gallium"
+  fi
 
-  [ "$drv" = r600 ] && \
-    MESA_CONFIG=`echo $MESA_CONFIG | sed -e 's/disable-gallium-r600/enable-gallium-r600/'` && \
+  if [ "$drv" = i965 ]; then
+    MESA_CONFIG=`echo $MESA_CONFIG | sed -e 's/disable-gallium-i965/enable-gallium-i965/'`
     MESA_CONFIG="$MESA_CONFIG --with-state-trackers=dri,glx --enable-gallium"
+  fi
 
-  [ "$drv" = nouveau ] && \
-    MESA_CONFIG=`echo $MESA_CONFIG | sed -e 's/disable-gallium-nouveau/enable-gallium-nouveau/'` && \
+  if [ "$drv" = r300 -o "$drv" = radeon ]; then
+    MESA_CONFIG=`echo $MESA_CONFIG | sed -e 's/disable-gallium-radeon/enable-gallium-radeon/'`
+    MESA_CONFIG=`echo $MESA_CONFIG | sed -e 's/disable-gallium-r300/enable-gallium-r300/'`
     MESA_CONFIG="$MESA_CONFIG --with-state-trackers=dri,glx --enable-gallium"
+  fi
 
-  [ "$drv" = vmware ] && \
-    MESA_CONFIG=`echo $MESA_CONFIG | sed -e 's/disable-gallium-svga/enable-gallium-svga/'` && \
+  if [ "$drv" = r600 ]; then
+    MESA_CONFIG=`echo $MESA_CONFIG | sed -e 's/disable-gallium-r600/enable-gallium-r600/'`
     MESA_CONFIG="$MESA_CONFIG --with-state-trackers=dri,glx --enable-gallium"
+  fi
+
+  if [ "$drv" = nouveau ]; then
+    MESA_CONFIG=`echo $MESA_CONFIG | sed -e 's/disable-gallium-nouveau/enable-gallium-nouveau/'`
+    MESA_CONFIG="$MESA_CONFIG --with-state-trackers=dri,glx --enable-gallium"
+  fi
+
+  if [ "$drv" = vmware ]; then
+    MESA_CONFIG=`echo $MESA_CONFIG | sed -e 's/disable-gallium-svga/enable-gallium-svga/'`
+    MESA_CONFIG="$MESA_CONFIG --with-state-trackers=dri,glx --enable-gallium"
+  fi
 done
 
 cd $PKG_BUILD