Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Andraž Levstik (4699913c5ca4f6120c5a30d78f97b5391b1bde6a)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Andraž Levstik <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Andraž Levstik (4699913c5ca4f6120c5a30d78f97b5391b1bde6a)
  • Date: Wed, 19 Nov 2008 01:15:21 -0600

GIT changes to master grimoire by Andraž Levstik <ruskie AT codemages.net>:

graphics-libs/mesalib/BUILD | 3 -
graphics-libs/mesalib/CONFIGURE | 77
++++++++++++----------------------
graphics-libs/mesalib/HISTORY | 6 ++
graphics-libs/mesalib/PRE_SUB_DEPENDS | 2
graphics-libs/mesalib/SUB_DEPENDS | 63 +++++++++++++--------------
5 files changed, 67 insertions(+), 84 deletions(-)

New commits:
commit 02fb0fc63100d3f40c6eef16330b933359fb3afb
Author: Andraž Levstik <ruskie AT codemages.net>
Commit: Andraž Levstik <ruskie AT codemages.net>

mesalib: update sub_depends for auto* build, added driver selection,
added swrast dri module

diff --git a/graphics-libs/mesalib/BUILD b/graphics-libs/mesalib/BUILD
index 8a4108d..8cb1c61 100755
--- a/graphics-libs/mesalib/BUILD
+++ b/graphics-libs/mesalib/BUILD
@@ -1,4 +1,5 @@
local MESALIB_DRIVERS_CONF="${MESALIB_DRIVERS//\ /,}" &&
-OPTS="--with-dri-drivers=$MESALIB_DRIVERS_CONF \
+OPTS="--with-driver=$MESALIB_BUILD \
+ --with-dri-drivers=$MESALIB_DRIVERS_CONF \
$OPTS" &&
default_build
diff --git a/graphics-libs/mesalib/CONFIGURE b/graphics-libs/mesalib/CONFIGURE
index e4df854..3c1e0d5 100755
--- a/graphics-libs/mesalib/CONFIGURE
+++ b/graphics-libs/mesalib/CONFIGURE
@@ -1,57 +1,31 @@
list_remove MESALIB_DRIVERS nouveau || true
list_remove MESALIB_DRIVERS i915tex || true
+# ordering is important
+MESALIB_BUILD=${MESALIB_BUILD/linux-dri/dri}
+MESALIB_BUILD=${MESALIB_BUILD/linux-dri-x86-64/dri}
+MESALIB_BUILD=${MESALIB_BUILD/linux-dri-x86/dri}
+MESALIB_BUILD=${MESALIB_BUILD/linux-dri-ppc/dri}
+MESALIB_BUILD=${MESALIB_BUILD/linux-ppc/xlib}
+MESALIB_BUILD=${MESALIB_BUILD/linux-x86-64/xlib}
+MESALIB_BUILD=${MESALIB_BUILD/linux-x86/xlib}
+MESALIB_BUILD=${MESALIB_BUILD/linux-fbdev/xlib}
+MESALIB_BUILD=${MESALIB_BUILD/linux-directfb/xlib}
+MESALIB_BUILD=${MESALIB_BUILD/linux-glide/xlib}
+MESALIB_BUILD=${MESALIB_BUILD/linux-sparc5/xlib}
+MESALIB_BUILD=${MESALIB_BUILD/linux-sparc/xlib}
+MESALIB_BUILD=${MESALIB_BUILD/linux-ultrasparc/xlib}
+MESALIB_BUILD=${MESALIB_BUILD/linux/xlib}

. $GRIMOIRE/config_query_multi.function &&
-if [[ "${SMGL_COMPAT_ARCHS[1]}" == "sparc" ]]
-then
config_query_list MESALIB_BUILD \
- "Select build type(use dri type for 3D acceleration?" \
- linux-sparc \
- linux-sparc5 \
- linux-ultrasparc \
- linux-directfb \
- linux-fbdev \
- linux-glide
-elif [[ "${SMGL_COMPAT_ARCHS[1]}" == "ppc" ]]
-then
-config_query_list MESALIB_BUILD \
- "Select build type(use dri type for 3D acceleration?" \
- linux-ppc \
- linux-dri-ppc \
- linux-dri \
- linux-directfb \
- linux-fbdev \
- linux-glide
-elif [[ "${SMGL_COMPAT_ARCHS[1]}" == "x86_64" ]]
-then
-config_query_list MESALIB_BUILD \
- "Select build type(use dri type for 3D acceleration?" \
- linux-x86-64 \
- linux-dri-x86-64 \
- linux-dri \
- linux-directfb \
- linux-fbdev \
- linux-glide
-elif [[ "${SMGL_COMPAT_ARCHS[1]}" == "ia32" ]]
-then
-config_query_list MESALIB_BUILD \
- "Select build type(use dri type for 3D acceleration?" \
- linux-x86 \
- linux-dri-x86 \
- linux-dri \
- linux-directfb \
- linux-fbdev \
- linux-glide
-else
-config_query_list MESALIB_BUILD \
- "Select build type(use dri type for 3D acceleration?" \
- linux \
- linux-dri
-fi &&
-if grep -q dri <<< "$MESALIB_BUILD"
-then
+ "Select build type?" \
+ xlib \
+ dri \
+ osmesa &&
+if [[ $MESALIB_BUILD == dri ]]; then
config_query_multi MESALIB_DRIVERS \
"What drivers would you like to build?" \
+ swrast \
all \
i810 \
i915 \
@@ -71,7 +45,12 @@ config_query_multi MESALIB_DRIVERS
\
ffb &&
if list_find "$MESALIB_DRIVERS" all
then
- MESALIB_DRIVERS="i810 i915 i965 mach64 mga r128 r200 r300 radeon s3v
savage sis tdfx trident unichrome ffb"
+ MESALIB_DRIVERS="i810 i915 i965 mach64 mga r128 r200 r300 radeon s3v
savage sis tdfx trident unichrome ffb swrast"
fi
-fi
+fi &&

+if [[ $MESALIB_BUILD == xlib ]]; then
+config_query_multi MESALIB_DRIVERS \
+ "What drivers would you like to build?" \
+ swrast
+fi
diff --git a/graphics-libs/mesalib/HISTORY b/graphics-libs/mesalib/HISTORY
index f081598..7ece52e 100644
--- a/graphics-libs/mesalib/HISTORY
+++ b/graphics-libs/mesalib/HISTORY
@@ -1,3 +1,9 @@
+2008-11-14 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * BUILD: updated build type so that swrast can be built
+ * SUB_DEPENDS: updated sub depends to work with the auto* build
+ * PRE_SUB_DEPENDS: updated sub depends to work with the auto* build
+ * CONFIGURE: updated build type so that swrast can be built
+
2008-10-14 Vlad Glagolev <stealth AT sourcemage.org>
* DEPENDS: added missing dep (#14775); cleaned up

diff --git a/graphics-libs/mesalib/PRE_SUB_DEPENDS
b/graphics-libs/mesalib/PRE_SUB_DEPENDS
index 117b22c..bf78a14 100755
--- a/graphics-libs/mesalib/PRE_SUB_DEPENDS
+++ b/graphics-libs/mesalib/PRE_SUB_DEPENDS
@@ -1,4 +1,4 @@
case $THIS_SUB_DEPENDS in
- DRI) grep -q dri <<< "$MESALIB_BUILD" && 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 20b80f6..dc613c1 100755
--- a/graphics-libs/mesalib/SUB_DEPENDS
+++ b/graphics-libs/mesalib/SUB_DEPENDS
@@ -1,44 +1,41 @@
case $THIS_SUB_DEPENDS in
DRI)
- case ${SMGL_COMPAT_ARCHS[1]} in
- ia32) MESALIB_BUILD=linux-dri-x86 ;;
- x86_64) MESALIB_BUILD=linux-dri-x86-64 ;;
- ppc) MESALIB_BUILD=linux-dri-ppc ;;
- *) MESALIB_BUILD=linux-dri ;;
- esac &&
-
+ MESALIB_BUILD=dri &&
persistent_add MESALIB_BUILD &&

message "${MESSAGE_COLOR}DRI support requested, forcing build type" \
"$MESALIB_BUILD for architecture\n${SMGL_COMPAT_ARCHS[1]}." \
"$DEFAULT_COLOR" &&
+ list_remove MESALIB_DRIVERS nouveau || true
+ list_remove MESALIB_DRIVERS i915tex || true

- config_query_multi MESALIB_DRIVERS \
- "Which drivers would you like to build?" \
- all \
- i810 \
- i915tex \
- i915 \
- i965 \
- mach64 \
- mga \
- nouveau \
- r128 \
- r200 \
- r300 \
- radeon \
- s3v \
- savage \
- sis \
- tdfx \
- trident \
- unichrome \
- ffb &&
-
- if list_find "$MESALIB_DRIVERS" all; then
- MESALIB_DRIVERS="i810 i915tex i915 i965 mach64 mga nouveau r128 r200
r300 radeon s3v \
- savage sis tdfx trident unichrome ffb"
- fi ;;
+ . $GRIMOIRE/config_query_multi.function &&
+ if [[ $MESALIB_BUILD == dri ]]; then
+ config_query_multi MESALIB_DRIVERS \
+ "What drivers would you like to build?" \
+ swrast \
+ all \
+ i810 \
+ i915 \
+ i965 \
+ mach64 \
+ mga \
+ r128 \
+ r200 \
+ r300 \
+ radeon \
+ s3v \
+ savage \
+ sis \
+ tdfx \
+ trident \
+ unichrome \
+ ffb &&
+ if list_find "$MESALIB_DRIVERS" all
+ then
+ MESALIB_DRIVERS="i810 i915 i965 mach64 mga r128 r200 r300 radeon s3v
savage sis tdfx trident unichrome ffb swrast"
+ fi
+ fi ;;

*) echo "Unknown sub_depends!"; return 1 ;;
esac



  • [SM-Commit] GIT changes to master grimoire by Andraž Levstik (4699913c5ca4f6120c5a30d78f97b5391b1bde6a), Andraž Levstik, 11/19/2008

Archive powered by MHonArc 2.6.24.

Top of Page