[Lunar-commits] <moonbase> mesa-lib: fixed some bugs & cleanup

Michael 'v4hn' Goerner v4hn at lunar-linux.org
Sat Jun 23 00:20:49 CEST 2012


commit 5b13f751def7267182a977330db34c2e3894ac77
Author: Michael 'v4hn' Goerner <v4hn at lunar-linux.org>
Date:   Fri Jun 22 16:36:20 2012 +0200

    mesa-lib: fixed some bugs & cleanup
---
 xorg7/mesa-lib/BUILD     |   13 +++++--------
 xorg7/mesa-lib/CONFIGURE |    2 --
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/xorg7/mesa-lib/BUILD b/xorg7/mesa-lib/BUILD
index a77b8b9..3a5305e 100644
--- a/xorg7/mesa-lib/BUILD
+++ b/xorg7/mesa-lib/BUILD
@@ -6,24 +6,21 @@
   fi  &&
 
   # Do not look for old libva
-  sedit 's/libva = 0.31.1/libva = 0.32.0/' configure &&
+  sedit 's/libva = 0.31.1/libva = 0.33.0/' configure &&
   patch_it $SOURCE2 1 &&
 
-  OPTS+=" --with-dri-drivers=$(echo $MESADRIVER | sed s/\ /,/g)"
+  OPTS+=" --with-dri-drivers=$(echo $MESADRIVER | sed s/\ /,/g)" &&
 
-  OPTS+=" --with-gallium-drivers=$(echo $GALLIUMDRIVER | sed s/\ /,/g)"
+  OPTS+=" --with-gallium-drivers=$(echo $GALLIUMDRIVER | sed s/\ /,/g)" &&
 
   if [[ $GALLIUM == y ]] && [[ $EGL == y ]]; then
     OPTS+=" --enable-gallium-egl"
-  fi
+  fi &&
 
   if module_installed xorg-server; then
     OPTS+=" --with-x --enable-xorg"
   fi  &&
 
-  ./configure --prefix=/usr $OPTS &&
-  make all  &&
-  prepare_install  &&
-  make install
+  default_build
 
 ) > $C_FIFO 2>&1
diff --git a/xorg7/mesa-lib/CONFIGURE b/xorg7/mesa-lib/CONFIGURE
index 127a6b0..acacf10 100644
--- a/xorg7/mesa-lib/CONFIGURE
+++ b/xorg7/mesa-lib/CONFIGURE
@@ -49,7 +49,6 @@ select_gallium_drivers() {
 }
 
 if ! grep -q "MESADRIVER=" $MODULE_CONFIG; then
-  unpack_localedata
   MESADRIVER=`select_drivers`
   set_module_config MESADRIVER "$MESADRIVER"
 fi
@@ -61,7 +60,6 @@ GALLIUM=`get_module_config GALLIUM`
 
 if [[ $GALLIUM == y ]] ; then
   if ! grep -q "GALLIUMDRIVER=" $MODULE_CONFIG; then
-    unpack_localedata
     GALLIUMDRIVER=`select_gallium_drivers`
     set_module_config GALLIUMDRIVER "$GALLIUMDRIVER"
   fi


More information about the Lunar-commits mailing list