[Lunar-commits] <moonbase> MesaLib: module clean up + install glxgears and glxinfo

[Samuel Verstraete]

commit 263d9ac4dd54a38a84f42b2988781ce468df4bba
Author: Samuel Verstraete <elangelo at lunar-linux.org>
Date:   Tue Oct 14 17:54:20 2008 +0200

    MesaLib: module clean up + install glxgears and glxinfo
---
 xorg7/mesa-lib/BUILD     |   34 +++++-----------------------------
 xorg7/mesa-lib/CONFIGURE |    2 +-
 xorg7/mesa-lib/PRE_BUILD |    6 +++---
 3 files changed, 9 insertions(+), 33 deletions(-)

diff --git a/xorg7/mesa-lib/BUILD b/xorg7/mesa-lib/BUILD
index f124c6a..58a78dd 100644
--- a/xorg7/mesa-lib/BUILD
+++ b/xorg7/mesa-lib/BUILD
@@ -1,38 +1,14 @@
 (
-OPTS+="--with-dri-drivers="
-#for driver in $MESADRIVER; do
-#  echo $driver;
-#  OPTS+="$driver,";
-#done
-OPTS+=$(echo $MESADRIVER | sed s/\ /,/g)
-
-
-
-
-
-#  sedit 's,/usr/X11R6/lib/modules,/usr/lib,' configs/default &&
-#  sedit 's,/usr/X11R6,/usr,g' configs/linux* configs/default &&
-#  sedit 's,lib64,lib,g' configs/linux* configs/default &&
-#  sedit 's,usr/local,usr,g' configs/linux* configs/default &&
-#  sedit 's,lib/modules,lib,g' src/glx/x11/dri_glx.c &&
-#  sedit 's,[-]g,,g' configs/default configs/linux-dri-x86 configs/linux-dri-x86-64 configs/linux-dri &&
-
-#  case `arch` in
-#    x86_64) CONF=linux-dri-x86-64 ;;
-#    i?86)   CONF=linux-dri ;;
-#    *)      exit 1 ;;
-#  esac &&
-
-#  make $CONF &&
+  OPTS+="--with-dri-drivers="
+  OPTS+=$(echo $MESADRIVER | sed s/\ /,/g)
   ./configure --prefix=/usr $OPTS && 
-  #make -C progs/xdemos PROGS='glxinfo glxgears' &&
 
   prepare_install &&
 
   make && 
 
- make install                                                
-  #install -v -m644 include/GLView.h /usr/include/        &&
-  #install -v -m755 progs/xdemos/glxinfo progs/xdemos/glxgears /usr/bin
+  make install                                                
+  install -v -m644 include/GLView.h /usr/include/        &&
+  install -v -m755 progs/xdemos/glxinfo progs/xdemos/glxgears /usr/bin
 
 ) > $C_FIFO 2>&1
diff --git a/xorg7/mesa-lib/CONFIGURE b/xorg7/mesa-lib/CONFIGURE
index 8866664..2d1a6ad 100644
--- a/xorg7/mesa-lib/CONFIGURE
+++ b/xorg7/mesa-lib/CONFIGURE
@@ -4,7 +4,7 @@ make_drivers_checklist() {
   
   # Execute the modified supported locales file to get a list of 
   # supported variables in the $SUPPORTED_LOCALES variable
-#  . $SUPPORTED_DRIVERS &&
+  # . $SUPPORTED_DRIVERS &&
   
   # For each locale, extract name, title and charmap information
   for driver in $SUPPORTED_DRIVERS; do
diff --git a/xorg7/mesa-lib/PRE_BUILD b/xorg7/mesa-lib/PRE_BUILD
index f145805..1d87ee4 100644
--- a/xorg7/mesa-lib/PRE_BUILD
+++ b/xorg7/mesa-lib/PRE_BUILD
@@ -1,5 +1,5 @@
 default_pre_build        &&
-cd $BUILD_DIRECTORY        &&
-unpack $SOURCE2                &&
-unpack $SOURCE3                &&
+cd $BUILD_DIRECTORY      &&
+unpack $SOURCE2          &&
+unpack $SOURCE3          &&
 cd $SOURCE_DIRECTORY