[Lunar-commits] <moonbase> mesa-lib: build fixes

[Zbigniew Luszpinski]

commit 291bee5f08d8c8107d2d25ad2ee4dc85bcd700d2
Author: Zbigniew Luszpinski <zbiggy at lunar-linux.org>
Date:   Sat May 5 19:11:31 2012 +0200

    mesa-lib: build fixes
---
 xorg7/mesa-lib/BUILD     |   13 +++++++++++--
 xorg7/mesa-lib/CONFIGURE |    2 +-
 xorg7/mesa-lib/DEPENDS   |    1 +
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/xorg7/mesa-lib/BUILD b/xorg7/mesa-lib/BUILD
index b5f88db..5b861b6 100644
--- a/xorg7/mesa-lib/BUILD
+++ b/xorg7/mesa-lib/BUILD
@@ -1,5 +1,10 @@
 (
 
+ # Mesa Gallium mklib breaks build when linker flags are set
+ if [[ $GALLIUM == y ]]; then
+ bad_flags linker
+ fi  &&
+
  # Do not look for old libva
  sedit 's/libva = 0.31.1/libva = 0.32.0/' configure &&
  patch_it $SOURCE2 1 &&
@@ -10,7 +15,7 @@
   # Detect VMware VGA virtual 3D card and add driver for it
   VGA=`lspci | grep 'VGA.*VMware.*SVGA.*'`
   if [[ -n $VGA  ]]; then
-     SUPPORTED_GALLIUM+="svga"
+     GALLIUMDRIVER+=" svga"
   fi  &&
 
   if [[ -n $MESADRIVER ]] ; then
@@ -38,7 +43,11 @@
   else OPTS+=" --disable-gallium-llvm "
   fi  &&
 
-  if [[ $GALLIUMDRIVER == *r[36]00* ]]; then lin -c llvm
+  if ! module_installed llvm && [[ $GALLIUMDRIVER == *r[36]00* ]] || [[ $GALLIUMDRIVER == "" ]]; then
+  message "$PROBLEM_COLOR You have selected all GPU drivers or Radeon,"
+  message "but llvm module is NOT installed."
+  message "Install llvm module or do not choose all or Radeon drivers $DEFAULT_COLOR"
+  exit 1
   else sedit 's/^GALLIUM_DRIVERS_DEFAULT=.*/GALLIUM_DRIVERS_DEFAULT="swrast"/' configure
   fi  &&
 
diff --git a/xorg7/mesa-lib/CONFIGURE b/xorg7/mesa-lib/CONFIGURE
index c3eb97b..406f530 100644
--- a/xorg7/mesa-lib/CONFIGURE
+++ b/xorg7/mesa-lib/CONFIGURE
@@ -1,7 +1,7 @@
 # swrast is always included, in BUILD
 # nouveau is removed from the list because it fails to build in mesa 7.10.2
 SUPPORTED_DRIVERS="i915 i965 nouveau r200 radeon"
-SUPPORTED_GALLIUM="i915 nouveau nv50 nvc0 nvfx r300 r600 svga"
+SUPPORTED_GALLIUM="i915 nouveau r300 r600 svga"
 make_drivers_checklist() {
 
   # For each locale, extract name, title and charmap information
diff --git a/xorg7/mesa-lib/DEPENDS b/xorg7/mesa-lib/DEPENDS
index 254a8ac..821c792 100644
--- a/xorg7/mesa-lib/DEPENDS
+++ b/xorg7/mesa-lib/DEPENDS
@@ -12,3 +12,4 @@ depends libXxf86vm
 optional_depends "libvdpau"         ""  ""  "vdpau hw acceleration using any gallium supported 3D GPU"
 optional_depends "libva"         ""  ""  "libVA hw acceleration using any gallium supported 3D GPU"
 optional_depends "libXvMC"         ""  ""  "XvMC hw acceleration using any gallium supported 3D GPU"
+optional_depends "llvm"         ""  ""  "llvm IS REQUIRED when you have ATI/AMD Radeon or FireGL"