[Lunar-commits] <moonbase> mesa-lib bump to 7.1 + ncurses based selector for drivers

[Samuel Verstraete]

commit 58919909da6edd2a53772414cc8c66dc11dd0a9a
Author: Samuel Verstraete <elangelo at lunar-linux.org>
Date:   Tue Sep 9 14:11:52 2008 +0200

    mesa-lib bump to 7.1 + ncurses based selector for drivers
---
 xorg7/mesa-lib/BUILD     |   45 ++++++++++++++++++++++++++++---------------
 xorg7/mesa-lib/CONFIGURE |   47 ++++++++++++++++++++++++++++++++++++++++++++++
 xorg7/mesa-lib/CONFLICTS |    7 +-----
 xorg7/mesa-lib/DEPENDS   |    1 +
 xorg7/mesa-lib/DETAILS   |   10 ++++----
 5 files changed, 83 insertions(+), 27 deletions(-)

diff --git a/xorg7/mesa-lib/BUILD b/xorg7/mesa-lib/BUILD
index a2e9bcc..f124c6a 100644
--- a/xorg7/mesa-lib/BUILD
+++ b/xorg7/mesa-lib/BUILD
@@ -1,25 +1,38 @@
 (
+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 &&
-  make -C progs/xdemos PROGS='glxinfo glxgears' &&
+
+
+#  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 &&
+  ./configure --prefix=/usr $OPTS && 
+  #make -C progs/xdemos PROGS='glxinfo glxgears' &&
 
   prepare_install &&
 
-  make install                                                &&
-  install -v -m644 include/GLView.h /usr/include/        &&
-  install -v -m755 progs/xdemos/glxinfo progs/xdemos/glxgears /usr/bin
+  make && 
+
+ 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
new file mode 100644
index 0000000..8866664
--- /dev/null
+++ b/xorg7/mesa-lib/CONFIGURE
@@ -0,0 +1,47 @@
+SUPPORTED_DRIVERS="i810 i915 i965 mach64 mga r128 r200 r300 radeon s3v savage sis swrast tdfx trident unichrome"
+
+make_drivers_checklist() {
+  
+  # Execute the modified supported locales file to get a list of 
+  # supported variables in the $SUPPORTED_LOCALES variable
+#  . $SUPPORTED_DRIVERS &&
+  
+  # For each locale, extract name, title and charmap information
+  for driver in $SUPPORTED_DRIVERS; do
+      title=$driver
+
+    echo "\"$driver\" \"$title\" \"off\" "
+  done
+}
+
+select_drivers() {
+  BACKTITLE="MesaLib Configuration"
+      TITLE="Driver Selection"
+       HELP=""
+  make_drivers_checklist | xargs \
+  dialog --backtitle "$BACKTITLE" \
+         --title     "$TITLE"     \
+         --stdout                 \
+         --separate-output        \
+         --checklist "$HELP"      \
+         0 0 0
+}
+
+if ! grep -q CONFIGURED $MODULE_CONFIG; then
+  if grep -q "MESADRIVER=" $MODULE_CONFIG; then
+    message "Selecting drivers is optional"
+  fi
+
+  if query "Would you like to select drivers? (if not selected, all locales will be installed)" y; then
+    unpack_localedata
+
+    MESADRIVER=`select_drivers`
+    TEMP=`grep -v "MESADRIVER="             $MODULE_CONFIG`
+    echo "$TEMP"                             > $MODULE_CONFIG
+    echo "MESADRIVER=\"$MESADRIVER\"" >> $MODULE_CONFIG
+
+  fi
+
+  echo "OPTS=\"\$OPTS $OPTS\"" >> $MODULE_CONFIG
+  echo "CONFIGURED=y"          >> $MODULE_CONFIG
+fi
diff --git a/xorg7/mesa-lib/CONFLICTS b/xorg7/mesa-lib/CONFLICTS
index 1e48749..771346b 100644
--- a/xorg7/mesa-lib/CONFLICTS
+++ b/xorg7/mesa-lib/CONFLICTS
@@ -1,7 +1,2 @@
 conflicts XOrg6       &&
-conflicts XOrg-test   &&
-conflicts NVIDIA      &&
-conflicts NVIDIA-old  &&
-conflicts mesa-glu    &&
-conflicts glut        &&
-conflicts freeglut
+conflicts XOrg-test
diff --git a/xorg7/mesa-lib/DEPENDS b/xorg7/mesa-lib/DEPENDS
index 054cb73..42477c4 100644
--- a/xorg7/mesa-lib/DEPENDS
+++ b/xorg7/mesa-lib/DEPENDS
@@ -6,3 +6,4 @@ depends libXi
 depends libXext
 depends libXfixes
 depends libXdamage
+depends dri2proto
diff --git a/xorg7/mesa-lib/DETAILS b/xorg7/mesa-lib/DETAILS
index 6bb9f5c..5e28070 100644
--- a/xorg7/mesa-lib/DETAILS
+++ b/xorg7/mesa-lib/DETAILS
@@ -1,5 +1,5 @@
            MODULE=mesa-lib
-          VERSION=7.0.4
+          VERSION=7.1
            SOURCE=MesaLib-$VERSION.tar.bz2
           SOURCE2=MesaDemos-$VERSION.tar.bz2
           SOURCE3=MesaGLUT-$VERSION.tar.bz2
@@ -7,12 +7,12 @@
        SOURCE_URL=$SFORGE_URL/mesa3d/
       SOURCE2_URL=$SFORGE_URL/mesa3d/
       SOURCE3_URL=$SFORGE_URL/mesa3d/
-       SOURCE_VFY=sha1:7e2ecbe89d245510d2681d04e959aee6adc205c5
-      SOURCE2_VFY=sha1:1adb2010d6d3103bd57c08f228e2bbed38178e14
-      SOURCE3_VFY=sha1:488a9e39f5ec4ad6b7fa84dd9bc91844337462d5
+       SOURCE_VFY=sha1:0b946a8a4334ca22baf3e0fe583f88187e9d74fa
+      SOURCE2_VFY=sha1:f0dd15c5da8fea9921d78f2e9133b70cf2a1ca7a
+      SOURCE3_VFY=sha1:69d6d3fa64832c5ced0bd434131624542872f247
          WEB_SITE=http://www.mesa3d.org
           ENTERED=20060215
-          UPDATED=20080818
+          UPDATED=20080909
             PSAFE="no"
             SHORT="Mesa 3D library"