Source Mage code commit list

[Eric Sandall <scm AT sourcemage.org>]

GIT changes to master grimoire by Eric Sandall <sandalle AT sourcemage.org>:

 graphics-libs/mesalib/DEPENDS                    |    4 ++++
 graphics-libs/mesalib/DETAILS                    |    4 ++--
 graphics-libs/mesalib/HISTORY                    |    9 +++++++++
 graphics-libs/mesalib/MesaLib-7.11.1.tar.bz2.sig |binary
 graphics-libs/mesalib/PRE_BUILD                  |    8 +++++---
 graphics-libs/mesalib/PRE_SUB_DEPENDS            |    2 +-
 graphics-libs/mesalib/REPAIR^all^PRE_SUB_DEPENDS |    2 +-
 graphics-libs/mesalib/SUB_DEPENDS                |   10 +++++-----
 8 files changed, 27 insertions(+), 12 deletions(-)

New commits:
commit d3dd4d35ddf314fbe3f11987211e80cc21429248
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

    mesalib: MESALIB_VER -> MESALIB_BRANCH
    Also, "git" -> "scm" for MESALIB_BRANCH selection

commit f398ace23b0370ab5c56d890aa5019f2fab80700
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

    mesalib: Latest development is 7.11.1
    Spell "development" correctly (and match PREPARE)
    llvm is required to build at least r300 Gallium drivers in 7.11
    No X11R6 mentioned in Makefiles and no Makefile.template
    for dri driver for 7.11.

diff --git a/graphics-libs/mesalib/DEPENDS b/graphics-libs/mesalib/DEPENDS
index cfd8091..50ec31d 100755
--- a/graphics-libs/mesalib/DEPENDS
+++ b/graphics-libs/mesalib/DEPENDS
@@ -49,4 +49,8 @@ fi &&
 
 if [[ $MESALIB_BRANCH == "scm" ]]; then
   depends  git
+fi &&
+
+if [[ "$MESALIB_BRANCH" == "development" && "$MESALIB_GALLIUM" != "none" ]]; 
then
+  depends llvm
 fi
diff --git a/graphics-libs/mesalib/DETAILS b/graphics-libs/mesalib/DETAILS
index 862b4f1..a2b1c2e 100755
--- a/graphics-libs/mesalib/DETAILS
+++ b/graphics-libs/mesalib/DETAILS
@@ -11,8 +11,8 @@ case "$MESALIB_BRANCH" in
   feature)
          VERSION=7.10.3
   ;;
-  developement)
-         VERSION=7.10.3
+  development)
+         VERSION=7.11.1
   ;;
   scm)
     if [[ "$MESALIB_AUTOUPDATE" == "y" ]]; then
diff --git a/graphics-libs/mesalib/HISTORY b/graphics-libs/mesalib/HISTORY
index 86ab54d..fd6b3a7 100644
--- a/graphics-libs/mesalib/HISTORY
+++ b/graphics-libs/mesalib/HISTORY
@@ -1,3 +1,12 @@
+2011-11-21 Eric Sandall <sandalle AT sourcemage.org>
+       * DETAILS: Latest development is 7.11.1
+         Spell "development" correctly (and match PREPARE)
+       * DEPENDS: llvm is required to build at least r300 Gallium drivers in 
7.11
+       * PRE_BUILD: No X11R6 mentioned in Makefiles and no Makefile.template
+         for dri driver for 7.11.
+       * PRE_BUILD, PRE_SUB_DEPENDS, SUB_DEPENDS: MESALIB_VER -> 
MESALIB_BRANCH
+         Also, "git" -> "scm" for MESALIB_BRANCH selection
+
 2011-09-27 Ismael Luceno <ismael AT sourcemage.org>
        * CONFIGURE: Fix broken case statement
 
diff --git a/graphics-libs/mesalib/MesaLib-7.11.1.tar.bz2.sig 
b/graphics-libs/mesalib/MesaLib-7.11.1.tar.bz2.sig
new file mode 100644
index 0000000..2916753
Binary files /dev/null and b/graphics-libs/mesalib/MesaLib-7.11.1.tar.bz2.sig 
differ
diff --git a/graphics-libs/mesalib/PRE_BUILD b/graphics-libs/mesalib/PRE_BUILD
index 43c0330..93c1def 100755
--- a/graphics-libs/mesalib/PRE_BUILD
+++ b/graphics-libs/mesalib/PRE_BUILD
@@ -24,12 +24,14 @@ do
 done &&
 cd ${SOURCE_DIRECTORY}/docs                                  &&
 sedit "s:/X11R6::g" install.html                             &&
-cd ${SOURCE_DIRECTORY}/src/mesa/drivers/dri                  &&
-sedit "s:/X11R6::g" Makefile.template                        &&
+if [[ "$MESALIB_BRANCH" != "development" ]]; then
+  cd ${SOURCE_DIRECTORY}/src/mesa/drivers/dri  &&
+  sedit "s:/X11R6::g" Makefile.template
+fi  &&
 cd ${SOURCE_DIRECTORY}/src/glw                               &&
 sedit "s:/X11R6::g" Makefile                                 &&
 
-if [[ $MESALIB_VER == "git" ]]; then
+if [[ "$MESALIB_BRANCH" == "scm" ]]; then
   cd "$SOURCE_DIRECTORY"                                     &&
   patch -p0 < "${SCRIPT_DIRECTORY}/autogen.patch"            &&
   ./autogen.sh
diff --git a/graphics-libs/mesalib/PRE_SUB_DEPENDS 
b/graphics-libs/mesalib/PRE_SUB_DEPENDS
index 5408815..e3cccf7 100755
--- a/graphics-libs/mesalib/PRE_SUB_DEPENDS
+++ b/graphics-libs/mesalib/PRE_SUB_DEPENDS
@@ -1,5 +1,5 @@
 case $THIS_SUB_DEPENDS in
-  NONSTABLE) [[ "$MESALIB_VER" != "stable" ]] && return 0 ;;
+  NONSTABLE) [[ "$MESALIB_BRANCH" != "stable" ]] && return 0 ;;
   DRI) [[ $MESALIB_BUILD == dri ]] && return 0 ;;
 esac
 return 1
diff --git a/graphics-libs/mesalib/REPAIR^all^PRE_SUB_DEPENDS 
b/graphics-libs/mesalib/REPAIR^all^PRE_SUB_DEPENDS
index 5408815..e3cccf7 100755
--- a/graphics-libs/mesalib/REPAIR^all^PRE_SUB_DEPENDS
+++ b/graphics-libs/mesalib/REPAIR^all^PRE_SUB_DEPENDS
@@ -1,5 +1,5 @@
 case $THIS_SUB_DEPENDS in
-  NONSTABLE) [[ "$MESALIB_VER" != "stable" ]] && return 0 ;;
+  NONSTABLE) [[ "$MESALIB_BRANCH" != "stable" ]] && return 0 ;;
   DRI) [[ $MESALIB_BUILD == dri ]] && return 0 ;;
 esac
 return 1
diff --git a/graphics-libs/mesalib/SUB_DEPENDS 
b/graphics-libs/mesalib/SUB_DEPENDS
index cb287af..b4a77c0 100755
--- a/graphics-libs/mesalib/SUB_DEPENDS
+++ b/graphics-libs/mesalib/SUB_DEPENDS
@@ -1,8 +1,8 @@
 case $THIS_SUB_DEPENDS in
   NONSTABLE)
-    if [[ "$MESALIB_VER" == "stable" ]]; then
-      MESALIB_VER="feature" &&
-      persistent_add MESALIB_VER &&
+    if [[ "$MESALIB_BRANCH" == "stable" ]]; then
+      MESALIB_BRANCH="feature" &&
+      persistent_add MESALIB_BRANCH &&
       message "${MESSAGE_COLOR}Non-stable branch of 
${SPELL_COLOR}mesalib${DEFAULT_COLOR}" \
               "${MESSAGE_COLOR}requested, upgrading to 
${SPELL_COLOR}feature${DEFAULT_COLOR}" \
               "${MESSAGE_COLOR}branch."
@@ -20,9 +20,9 @@ case $THIS_SUB_DEPENDS in
 
     . $GRIMOIRE/config_query_multi.function                              &&
    if [[ $MESALIB_BUILD == dri ]]; then
-      if  [[  "$MESALIB_VER"  ==  "stable"  ]];  then
+      if  [[  "$MESALIB_BRANCH"  ==  "stable"  ]];  then
          AVAILABLE_DRIVERS="i810 i915 i965 mach64 mga r128 r200 r300 r600 
radeon s3v savage sis tdfx trident unichrome ffb swrast"
-      elif  [[  "$MESALIB_VER"  ==  "feature"  ]];  then
+      elif  [[  "$MESALIB_BRANCH"  ==  "feature"  ]];  then
          AVAILABLE_DRIVERS="i810 i915 i965 mach64 mga r128 r200 r300 r600 
radeon s3v savage sis tdfx trident unichrome ffb swrast"
       else
          AVAILABLE_DRIVERS="i810 i915 i965 mach64 mga nouveau r128 r200 r300 
r600 radeon s3v savage sis tdfx trident unichrome ffb swrast"