New commits:
commit d124022eb1b115b55455edbdbdf6dba078501eea
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>
mesalib: Update Gallium3D drivers for development/scm branch
No more radeon, i965 Gallium3D drivers in development/scm
Add r300 and r600 Gallium3D drivers in development/scm branch
Gallium3D drivers in development/scm branch use
--with-gallium-drivers=... (like --with-dri-drivers=...)
except for llvm, which retains --enable-gallium-llvm
diff --git a/graphics-libs/mesalib/BUILD b/graphics-libs/mesalib/BUILD
index d8468a1..4be58de 100755
--- a/graphics-libs/mesalib/BUILD
+++ b/graphics-libs/mesalib/BUILD
@@ -1,22 +1,38 @@
local MESALIB_DRIVERS_CONF="${MESALIB_DRIVERS//\ /,}" &&
- config_query_multi MESALIB_GALLIUM \
- "What Gallium3D drivers would you like to build?" \
- none llvm svga i915 i965 radeon nouveau swrast
+ if [[ "x${MESALIB_BRANCH}" == "xdevelopment" ||
+ "x${MESALIB_BRANCH}" == "xscm" ]]; then
+ if list_find "radeon" MESALIB_GALLIUM; then
+ MESALIB_GALLIUM="r300 r600"
+ fi &&
+ list_remove MESALIB_GALLIUM "i965" &&
+ list_remove MESALIB_GALLIUM "radeon" &&
+ config_query_multi MESALIB_GALLIUM \
+ "What Gallium3D drivers would you like to build?" \
+ none llvm svga i915 r300 r600 nouveau swrast
+ else
+ config_query_multi MESALIB_GALLIUM \
+ "What Gallium3D drivers would you like to build?" \
+ none llvm svga i915 i965 radeon nouveau swrast
+ fi
fi &&
if [[ $MESALIB_BUILD == xlib ]]; then MESALIB_DRIVERS="swrast"
diff --git a/graphics-libs/mesalib/HISTORY b/graphics-libs/mesalib/HISTORY
index 4afe623..6064ed8 100644
--- a/graphics-libs/mesalib/HISTORY
+++ b/graphics-libs/mesalib/HISTORY
@@ -1,3 +1,10 @@
+2013-01-11 Eric Sandall <sandalle AT sourcemage.org>
+ * CONFIGURE: No more radeon, i965 Gallium3D drivers in development/scm
+ Add r300 and r600 Gallium3D drivers in development/scm branch
+ * BUILD: Gallium3D drivers in development/scm branch use
+ --with-gallium-drivers=... (like --with-dri-drivers=...) except for
+ llvm, which retains --enable-gallium-llvm
+
2013-01-10 Eric Sandall <sandalle AT sourcemage.org>
* DEPENDS: Fix scm dependency typo ";&" -> ";;"
[SM-Commit] GIT changes to devel-xorg-modular grimoire by Eric Sandall (d124022eb1b115b55455edbdbdf6dba078501eea),
Eric Sandall, 01/11/2013