Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to devel-xorg-modular grimoire by Eric Sandall (d124022eb1b115b55455edbdbdf6dba078501eea)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to devel-xorg-modular grimoire by Eric Sandall (d124022eb1b115b55455edbdbdf6dba078501eea)
  • Date: Fri, 11 Jan 2013 18:28:19 -0600

GIT changes to devel-xorg-modular grimoire by Eric Sandall
<sandalle AT sourcemage.org>:

graphics-libs/mesalib/BUILD | 48
++++++++++++++++++++++++++--------------
graphics-libs/mesalib/CONFIGURE | 18 ++++++++++++---
graphics-libs/mesalib/HISTORY | 7 +++++
3 files changed, 54 insertions(+), 19 deletions(-)

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//\ /,}" &&

-case $MESALIB_GALLIUM in
- llvm) OPTS="${OPTS} --enable-gallium-llvm" ;;
- svga) OPTS="${OPTS} --enable-gallium-svga" ;;
- intel) OPTS="${OPTS} --enable-gallium-intel" ;;
- i915) OPTS="${OPTS} --enable-gallium-i915" ;;
- i965) OPTS="${OPTS} --enable-gallium-i965" ;;
- radeon) OPTS="${OPTS} --enable-gallium-radeon --disable-gallium-intel"
- LDFLAGS="${LDFLAGS/-s/}" ;;
- r600) OPTS="${OPTS} --enable-gallium-r600" ;;
- nouveau) OPTS="${OPTS} --enable-gallium-nouveau --disable-gallium-intel" ;;
- swrast) OPTS="${OPTS} --enable-gallium-swrast" ;;
- none) OPTS="${OPTS} --disable-gallium" ;;
-esac &&
+if [[ "x${MESALIB_BRANCH}" == "xdevelopment" ||
+ "x${MESALIB_BRANCH}" == "xscm" ]]; then
+ case $MESALIB_GALLIUM in
+ llvm) OPTS="${OPTS} --enable-gallium-llvm" ;;
+ i915) MESALIB_GALLIUM_CONF="$MESALIB_GALLIUM_CONF,i915" ;;
+ nouveau) MESALIB_GALLIUM_CONF="$MESALIB_GALLIUM_CONF,nouveau" ;;
+ r300) MESALIB_GALLIUM_CONF="$MESALIB_GALLIUM_CONF,r300" ;;
+ r600) MESALIB_GALLIUM_CONF="$MESALIB_GALLIUM_CONF,r600" ;;
+ svga) MESALIB_GALLIUM_CONF="$MESALIB_GALLIUM_CONF,svga" ;;
+ swrast) MESALIB_GALLIUM_CONF="$MESALIB_GALLIUM_CONF,swrast" ;;
+ esac &&

-OPTS="--with-driver=$MESALIB_BUILD \
- --with-dri-drivers=$MESALIB_DRIVERS_CONF \
- $MESALIB_OPTS \
+ OPTS="--with-gallium-drivers=$MESALIB_GALLIUM_CONF \
+ $OPTS"
+else
+ case $MESALIB_GALLIUM in
+ llvm) OPTS="${OPTS} --enable-gallium-llvm" ;;
+ svga) OPTS="${OPTS} --enable-gallium-svga" ;;
+ intel) OPTS="${OPTS} --enable-gallium-intel" ;;
+ i915) OPTS="${OPTS} --enable-gallium-i915" ;;
+ i965) OPTS="${OPTS} --enable-gallium-i965" ;;
+ radeon) OPTS="${OPTS} --enable-gallium-radeon --disable-gallium-intel"
+ LDFLAGS="${LDFLAGS/-s/}" ;;
+ r600) OPTS="${OPTS} --enable-gallium-r600" ;;
+ nouveau) OPTS="${OPTS} --enable-gallium-nouveau --disable-gallium-intel"
;;
+ swrast) OPTS="${OPTS} --enable-gallium-swrast" ;;
+ none) OPTS="${OPTS} --disable-gallium" ;;
+ esac
+fi &&
+
+OPTS="--with-driver=$MESALIB_BUILD \
+ --with-dri-drivers=$MESALIB_DRIVERS_CONF \
--with-egl-platforms=${MESA_EGL//\ /,} \
+ $MESALIB_OPTS \
$OPTS" &&
default_build
diff --git a/graphics-libs/mesalib/CONFIGURE b/graphics-libs/mesalib/CONFIGURE
index 5060517..74fbf77 100755
--- a/graphics-libs/mesalib/CONFIGURE
+++ b/graphics-libs/mesalib/CONFIGURE
@@ -43,9 +43,21 @@ if [[ $MESALIB_BUILD == dri ]]; then
MESALIB_DRIVERS="$AVAILABLE_DRIVERS"
fi &&

- 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

Archive powered by MHonArc 2.6.24.

Top of Page