Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Vasil Yonkov (49712fa7e56fde69fe78da8cd51633a967590222)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vasil Yonkov <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Vasil Yonkov (49712fa7e56fde69fe78da8cd51633a967590222)
  • Date: Tue, 5 Oct 2010 13:54:22 -0500

GIT changes to master grimoire by Vasil Yonkov <spirtbrat AT sourcemage.org>:

dev/null |binary
graphics-libs/mesalib/BUILD | 15 +++-
graphics-libs/mesalib/CONFIGURE | 75
++++++++++++++++++------
graphics-libs/mesalib/DEPENDS | 19 +++++-
graphics-libs/mesalib/DETAILS | 4 -
graphics-libs/mesalib/HISTORY | 9 ++
graphics-libs/mesalib/MesaLib-7.6.1.tar.bz2.sig |binary
graphics-libs/mesalib/MesaLib-7.7.1.tar.bz2.sig | 0
graphics-libs/mesalib/MesaLib-7.8.2.tar.bz2.sig | 0
graphics-libs/mesalib/MesaLib-7.9.tar.bz2.sig |binary
10 files changed, 98 insertions(+), 24 deletions(-)

New commits:
commit 9138f1563c877b4a181be67c4c2e81f8b3e8d1b8
Author: Vasil Yonkov <spirtbrat AT sourcemage.org>
Commit: Vasil Yonkov <spirtbrat AT sourcemage.org>

mesalib: feature => 7.6.2, developement => 7.9;
updated gallium options, added MESALIB_OPTS;
updated gallium and dri drivers options; added missing options;
made libxt dependency optional; optionaly depends on talloc;
added conditional sub_depends on libdrm

diff --git a/graphics-libs/mesalib/BUILD b/graphics-libs/mesalib/BUILD
index 6bffb44..c56a12e 100755
--- a/graphics-libs/mesalib/BUILD
+++ b/graphics-libs/mesalib/BUILD
@@ -1,13 +1,20 @@
local MESALIB_DRIVERS_CONF="${MESALIB_DRIVERS//\ /,}" &&

case $MESALIB_GALLIUM in
- none) OPTS="${OPTS} --disable-gallium" ;;
- intel) OPTS="${OPTS} --enable-gallium-intel" ;;
- radeon) OPTS="${OPTS} --enable-gallium-radeon --disable-gallium-intel" ;;
+ 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" ;;
+ r600) OPTS="${OPTS} --enable-gallium-r600" ;;
nouveau) OPTS="${OPTS} --enable-gallium-nouveau --disable-gallium-intel" ;;
- all) OPTS="${OPTS} --enable-gallium-intel --enable-gallium-radeon
--enable-gallium-nouveau" ;;
+ swrast) OPTS="${OPTS} --enable-gallium-swrast" ;;
+ none) OPTS="${OPTS} --disable-gallium" ;;
esac &&
+
OPTS="--with-driver=$MESALIB_BUILD \
--with-dri-drivers=$MESALIB_DRIVERS_CONF \
+ $MESALIB_OPTS \
$OPTS" &&
default_build
diff --git a/graphics-libs/mesalib/CONFIGURE b/graphics-libs/mesalib/CONFIGURE
index 9059a41..decd7d4 100755
--- a/graphics-libs/mesalib/CONFIGURE
+++ b/graphics-libs/mesalib/CONFIGURE
@@ -31,29 +31,70 @@ config_query_list MESALIB_BUILD
\
xlib \
dri \
osmesa &&
+
if [[ $MESALIB_BUILD == dri ]]; then
- if [[ "$MESALIB_VER" == "stable" ]]; then
- AVAILABLE_DRIVERS="i810 i915 i965 mach64 mga r128 r200 r300 radeon s3v
savage sis tdfx trident unichrome ffb swrast"
- elif [[ "$MESALIB_VER" == "feature" ]]; then
- AVAILABLE_DRIVERS="i810 i915 i965 mach64 mga r128 r200 r300 r600 radeon
s3v savage sis tdfx trident unichrome ffb swrast"
+ if [[ "$MESALIB_VER" == "stable" ]]; then
+ AVAILABLE_DRIVERS="i810 i915 i965 mach64 mga r128 r200 r300 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"
- fi
+ AVAILABLE_DRIVERS="i915 i965 mach64 mga r128 r200 r300 r600 radeon
savage \
+ tdfx unichrome swrast"
+ fi &&
+
config_query_multi MESALIB_DRIVERS \
"What drivers would you like to build?" \
- $AVAILABLE_DRIVERS &&
- if list_find "$MESALIB_DRIVERS" all
- then
- MESALIB_DRIVERS="$AVAILABLE_DRIVERS"
+ all $AVAILABLE_DRIVERS
+
+ if list_find "$MESALIB_DRIVERS" all; then
+ MESALIB_DRIVERS="$AVAILABLE_DRIVERS"
fi
-fi &&

-if [[ $MESALIB_BUILD == xlib ]]; then
-config_query_multi MESALIB_DRIVERS \
- "What drivers would you like to build?" \
- swrast
-fi &&
+if [[ "$MESALIB_VER" == "stable" ]] || \
+ [[ "$MESALIB_VER" == "feature" ]]; then

config_query_multi MESALIB_GALLIUM \
"What Gallium3D drivers woulld you like to build?" \
- none intel radeon nouveau all
+ none intel radeon nouveau
+
+else
+config_query_multi MESALIB_GALLIUM \
+ "What Gallium3D drivers woulld you like to build?" \
+ none llvm svga i915 i965 radeon r600 nouveau swrast
+
+fi
+fi &&
+
+if [[ $MESALIB_BUILD == xlib ]]; then MESALIB_DRIVERS="swrast"
+fi &&
+
+config_query_option MESALIB_OPTS "enable TLS support in GLX" n \
+ "--enable-glx-tls" "--disable-glx-tls" &&
+
+config_query_option MESALIB_OPTS "enable EGL library?" y \
+ "--enable-egl" "--disable-egl" &&
+
+config_query_option MESALIB_OPTS "enable OpenGL Utility library?" y \
+ "--enable-glu" "--disable-glu" &&
+
+config_query_option MESALIB_OPTS "enable Xt/Motif widget library?" y \
+ "--enable-glw" "--disable-glw" &&
+
+# config_query_option MESALIB_OPTS "enable GLUT library" y \
+# "--enable-glut" "--disable-glut"
+
+if [[ "$MESALIB_VER" == "developement" ]] || \
+ [[ "$MESALIB_VER" == "git" ]]; then
+
+config_query_option MESALIB_OPTS "enable support for OpenGL ES 1.x API?" n \
+ "--enable-gles1" "--disable-gles1" &&
+
+config_query_option MESALIB_OPTS "enable support for OpenGL ES 2.x API?" n \
+ "--enable-gles2" "--disable-gles2" &&
+
+if ( list_find "--enable-gles1" $MESALIB_OPTS ) || \
+ ( list_find "--enable-gles2" $MESALIB_OPTS ); then
+
+config_query_option MESALIB_OPTS "build separate OpenGL ES only libraries?"
n \
+ "--enable-gles-overlay" "--disable-gles-overlay"
+fi
+fi
diff --git a/graphics-libs/mesalib/DEPENDS b/graphics-libs/mesalib/DEPENDS
index 88ad890..e4ca679 100755
--- a/graphics-libs/mesalib/DEPENDS
+++ b/graphics-libs/mesalib/DEPENDS
@@ -10,11 +10,14 @@ depends libxdamage &&
depends libx11 &&
depends libxext &&
depends libxxf86vm &&
-depends libxt &&
depends libxau &&
depends libxfixes &&
depends glproto &&

+if list_find "--enable-glw" $MESALIB_OPTS; then
+ depends libxt
+fi &&
+
optional_depends libxcb \
'--enable-xcb' \
'--disable-xcb' \
@@ -28,6 +31,20 @@ if spell_ok libdrm && [[ $(installed_version libdrm|sed
's:\.::g') -lt 243 ]]; t
force_depends libdrm
fi &&

+if ( list_find "i915" $MESALIB_DRIVERS ) || \
+ ( list_find "i965" $MESALIB_DRIVERS ); then
+ sub_depends libdrm INTEL
+fi &&
+
+if ( list_find "r200" $MESALIB_DRIVERS ) || \
+ ( list_find "r300" $MESALIB_DRIVERS ) || \
+ ( list_find "r600" $MESALIB_DRIVERS ); then
+ sub_depends libdrm RADEON
+fi &&
+
+if [[ $MESALIB_VER == "developement" ]]; then
+ depends talloc
+fi &&

if [[ $MESALIB_VER == "git" ]]; then
depends git &&
diff --git a/graphics-libs/mesalib/DETAILS b/graphics-libs/mesalib/DETAILS
index 562cb53..f79f3e7 100755
--- a/graphics-libs/mesalib/DETAILS
+++ b/graphics-libs/mesalib/DETAILS
@@ -21,10 +21,10 @@ case $MESALIB_VER in
VERSION=7.5.2
;;
feature)
- VERSION=7.7.1
+ VERSION=7.6.1
;;
developement)
- VERSION=7.8.2
+ VERSION=7.9
;;
git)
if [[ "$MESALIB_GIT_AUTOUPDATE" == "y" ]]; then
diff --git a/graphics-libs/mesalib/HISTORY b/graphics-libs/mesalib/HISTORY
index 88bfe06..ce5a424 100644
--- a/graphics-libs/mesalib/HISTORY
+++ b/graphics-libs/mesalib/HISTORY
@@ -1,3 +1,12 @@
+2010-10-05 Vasil Yonkov <spirtbrat AT sourcemage.org>
+ * DETAILS: feature => 7.6.2, developement => 7.9;
+ updated MESALIB_VER=developement to 7.9
+ updated MESALIB_VER=feature to 7.6.1
+ BUILD: updated gallium options, added MESALIB_OPTS;
+ CONFIGURE: updated gallium and dri drivers options; added missing
options;
+ DEPENDS: made libxt optional; added conditional sub_depends on
libdrm;
+ added talloc
+
2010-09-14 Pol Vinogradov <vin.public AT gmail.com>
* PRE_BUILD: removed link creation for git branch

diff --git a/graphics-libs/mesalib/MesaLib-7.6.1.tar.bz2.sig
b/graphics-libs/mesalib/MesaLib-7.6.1.tar.bz2.sig
new file mode 100644
index 0000000..ff46b02
Binary files /dev/null and b/graphics-libs/mesalib/MesaLib-7.6.1.tar.bz2.sig
differ
diff --git a/graphics-libs/mesalib/MesaLib-7.7.1.tar.bz2.sig
b/graphics-libs/mesalib/MesaLib-7.7.1.tar.bz2.sig
deleted file mode 100644
index 37e6fc7..0000000
Binary files a/graphics-libs/mesalib/MesaLib-7.7.1.tar.bz2.sig and /dev/null
differ
diff --git a/graphics-libs/mesalib/MesaLib-7.8.2.tar.bz2.sig
b/graphics-libs/mesalib/MesaLib-7.8.2.tar.bz2.sig
deleted file mode 100644
index a7118aa..0000000
Binary files a/graphics-libs/mesalib/MesaLib-7.8.2.tar.bz2.sig and /dev/null
differ
diff --git a/graphics-libs/mesalib/MesaLib-7.9.tar.bz2.sig
b/graphics-libs/mesalib/MesaLib-7.9.tar.bz2.sig
new file mode 100644
index 0000000..69f9746
Binary files /dev/null and b/graphics-libs/mesalib/MesaLib-7.9.tar.bz2.sig
differ



  • [SM-Commit] GIT changes to master grimoire by Vasil Yonkov (49712fa7e56fde69fe78da8cd51633a967590222), Vasil Yonkov, 10/05/2010

Archive powered by MHonArc 2.6.24.

Top of Page