sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to devel-xorg-modular grimoire by Arjan Bouter (478e412429df55c4c07c01be3d397e100d01a650)

From: Arjan Bouter <scm AT sourcemage.org>
To: sm-commit AT lists.ibiblio.org
Subject: [SM-Commit] GIT changes to devel-xorg-modular grimoire by Arjan Bouter (478e412429df55c4c07c01be3d397e100d01a650)
Date: Sat, 25 Jul 2009 13:40:21 -0500

GIT changes to devel-xorg-modular grimoire by Arjan Bouter
<abouter AT sourcemage.org>:

graphics-libs/mesalib/CONFIGURE | 27 +++++++--------------------
graphics-libs/mesalib/HISTORY | 2 +-
graphics-libs/mesalib/SUB_DEPENDS | 27 +++++++--------------------
3 files changed, 15 insertions(+), 41 deletions(-)

New commits:
commit 478e412429df55c4c07c01be3d397e100d01a650
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

mesalib: r600 is only in the scm version

diff --git a/graphics-libs/mesalib/CONFIGURE b/graphics-libs/mesalib/CONFIGURE
index a4acf6e..41266a7 100755
--- a/graphics-libs/mesalib/CONFIGURE
+++ b/graphics-libs/mesalib/CONFIGURE
@@ -33,30 +33,17 @@ config_query_list MESALIB_BUILD
\
dri \
osmesa &&
if [[ $MESALIB_BUILD == dri ]]; then
+ if [[ "$MESALIB_GIT" == "y" ]]; 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 r128 r200 r300 radeon s3v
savage sis tdfx trident unichrome ffb swrast"
+ fi
config_query_multi MESALIB_DRIVERS \
"What drivers would you like to build?" \
- swrast \
- all \
- i810 \
- i915 \
- i965 \
- mach64 \
- mga \
- r128 \
- r200 \
- r300 \
- r600 \
- radeon \
- s3v \
- savage \
- sis \
- tdfx \
- trident \
- unichrome \
- ffb &&
+ $AVAILABLE_DRIVERS &&
if list_find "$MESALIB_DRIVERS" all
then
- MESALIB_DRIVERS="i810 i915 i965 mach64 mga r128 r200 r300 r600 radeon s3v
savage sis tdfx trident unichrome ffb swrast"
+ MESALIB_DRIVERS="$AVAILABLE_DRIVERS"
fi
fi &&

diff --git a/graphics-libs/mesalib/HISTORY b/graphics-libs/mesalib/HISTORY
index 9a3d49b..32b6182 100644
--- a/graphics-libs/mesalib/HISTORY
+++ b/graphics-libs/mesalib/HISTORY
@@ -1,5 +1,5 @@
2009-07-25 Arjan Bouter <abouter AT sourcemage.org>
- * CONFIGURE, SUB_DEPENDS: added r600
+ * CONFIGURE, SUB_DEPENDS: added r600 for scm version
* PROVIDES: provides GLUT

2009-07-17 Eric Sandall <sandalle AT sourcemage.org>
diff --git a/graphics-libs/mesalib/SUB_DEPENDS
b/graphics-libs/mesalib/SUB_DEPENDS
index 354bdf0..8b1f39f 100755
--- a/graphics-libs/mesalib/SUB_DEPENDS
+++ b/graphics-libs/mesalib/SUB_DEPENDS
@@ -11,30 +11,17 @@ case $THIS_SUB_DEPENDS in

. $GRIMOIRE/config_query_multi.function &&
if [[ $MESALIB_BUILD == dri ]]; then
+ if [[ "$MESALIB_GIT" == "y" ]]; 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 r128 r200 r300 radeon
s3v savage sis tdfx trident unichrome ffb swrast"
+ fi
config_query_multi MESALIB_DRIVERS \
"What drivers would you like to build?" \
- swrast \
- all \
- i810 \
- i915 \
- i965 \
- mach64 \
- mga \
- r128 \
- r200 \
- r300 \
- r600 \
- radeon \
- s3v \
- savage \
- sis \
- tdfx \
- trident \
- unichrome \
- ffb &&
+ $AVAILABLE_DRIVERS &&
if list_find "$MESALIB_DRIVERS" all
then
- MESALIB_DRIVERS="i810 i915 i965 mach64 mga r128 r200 r300 r600 radeon
s3v savage sis tdfx trident unichrome ffb swrast"
+ MESALIB_DRIVERS="$AVAILABLE_DRIVERS"
fi
fi ;;

[SM-Commit] GIT changes to devel-xorg-modular grimoire by Arjan Bouter (478e412429df55c4c07c01be3d397e100d01a650), Arjan Bouter, 07/25/2009