sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Vasil Yonkov (d9deb7c66ce4cc13720b3e387f66148a9a59ffd4)

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 (d9deb7c66ce4cc13720b3e387f66148a9a59ffd4)
Date: Sat, 23 Jan 2010 12:29:13 -0600

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

graphics-libs/mesalib/CONFIGURE | 6 ++--
graphics-libs/mesalib/DEPENDS | 2 -
graphics-libs/mesalib/DETAILS | 29
+++++++++++++++++-------
graphics-libs/mesalib/HISTORY | 4 +++
graphics-libs/mesalib/MesaLib-7.5.2.tar.bz2.sig |binary
graphics-libs/mesalib/MesaLib-7.6.1.tar.bz2.sig |binary
graphics-libs/mesalib/MesaLib-7.7.tar.bz2.sig |binary
graphics-libs/mesalib/PREPARE | 12 ++++++---
graphics-libs/mesalib/PRE_BUILD | 9 ++++---
graphics-libs/mesalib/SUB_DEPENDS | 6 ++--
10 files changed, 45 insertions(+), 23 deletions(-)

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

mesalib: added test and developement branches

diff --git a/graphics-libs/mesalib/CONFIGURE b/graphics-libs/mesalib/CONFIGURE
index 437ef72..6466fbb 100755
--- a/graphics-libs/mesalib/CONFIGURE
+++ b/graphics-libs/mesalib/CONFIGURE
@@ -33,10 +33,10 @@ 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
+ 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 r128 r200 r300 r600 radeon
s3v savage sis tdfx trident unichrome ffb swrast"
fi
config_query_multi MESALIB_DRIVERS \
"What drivers would you like to build?" \
diff --git a/graphics-libs/mesalib/DEPENDS b/graphics-libs/mesalib/DEPENDS
index eb898e7..a43eb33 100755
--- a/graphics-libs/mesalib/DEPENDS
+++ b/graphics-libs/mesalib/DEPENDS
@@ -30,6 +30,6 @@ if spell_ok libdrm && [[ $(installed_version libdrm|sed
's:\.::g') -lt 243 ]]; t
fi &&

-if [[ $MESALIB_GIT == y ]]; then
+if [[ $MESALIB_VER == "git" ]]; then
depends git
fi
diff --git a/graphics-libs/mesalib/DETAILS b/graphics-libs/mesalib/DETAILS
index dc92df7..f24fa33 100755
--- a/graphics-libs/mesalib/DETAILS
+++ b/graphics-libs/mesalib/DETAILS
@@ -1,23 +1,36 @@
SPELL=mesalib
-if [[ "$MESALIB_GIT" == "y" ]]; then
- if [[ "$MESALIB_GIT_AUTOUPDATE" == "y" ]]; then
+case $MESALIB_VER in
+ stable)
+ VERSION=7.5.2
+ ;;
+ feature)
+ VERSION=7.6.1
+ ;;
+developement)
+ VERSION=7.7
+ ;;
+ git)
+ if [[ "$MESALIB_GIT_AUTOUPDATE" == "y" ]]; then
VERSION=$(date +%Y%m%d)
- else
+ else
VERSION=git
- fi
+ fi
+ ;;
+esac
+
+if [[ "$MESALIB_VER" == "git" ]]; then
SOURCE=$SPELL-git.tar.bz2
-SOURCE_DIRECTORY=${BUILD_DIRECTORY}/mesalib-git
FORCE_DOWNLOAD="on"
SOURCE_URL[0]=git://anongit.freedesktop.org/git/mesa/mesa:mesalib-git
+SOURCE_DIRECTORY=${BUILD_DIRECTORY}/mesalib-git
SOURCE_IGNORE=volatile
else
- VERSION=7.5.2
-
SOURCE_HASH=sha512:74e916bbcaa2c633a648b457657e81a633169149668cbeb54887940e81ddc3ed273348d772190cae74eee12bc0b2d13fbd6a093762918ccfafb8fb282d37799c
SOURCE=MesaLib-${VERSION}.tar.bz2
SOURCE_URL[0]=ftp://ftp.freedesktop.org/pub/mesa/$VERSION/$SOURCE
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/Mesa-${VERSION}
-# SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
+ SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
fi
+
LICENSE[0]=GPL
WEB_SITE=http://www.mesa3d.org/
KEYWORDS="graphics libs"
diff --git a/graphics-libs/mesalib/HISTORY b/graphics-libs/mesalib/HISTORY
index 6970ad9..d4ae0f4 100644
--- a/graphics-libs/mesalib/HISTORY
+++ b/graphics-libs/mesalib/HISTORY
@@ -1,3 +1,7 @@
+2010-01-23 Vasil Yonkov <spirtbrat AT sourcemage.org>
+ * CONFIGURE, DEPENDS, DETAILS, PREPARE, PRE_BUILD,
+ SUB_DEPENDS: added test and developement branches
+
2010-01-02 Robert Figura <template AT sourcemage.org>
* DETAILS: version 7.5.2

diff --git a/graphics-libs/mesalib/MesaLib-7.5.2.tar.bz2.sig
b/graphics-libs/mesalib/MesaLib-7.5.2.tar.bz2.sig
new file mode 100644
index 0000000..a4e40dd
Binary files /dev/null and b/graphics-libs/mesalib/MesaLib-7.5.2.tar.bz2.sig
differ
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..350ef50
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.tar.bz2.sig
b/graphics-libs/mesalib/MesaLib-7.7.tar.bz2.sig
new file mode 100644
index 0000000..23e9c22
Binary files /dev/null and b/graphics-libs/mesalib/MesaLib-7.7.tar.bz2.sig
differ
diff --git a/graphics-libs/mesalib/PREPARE b/graphics-libs/mesalib/PREPARE
index a6539bb..63bfce4 100755
--- a/graphics-libs/mesalib/PREPARE
+++ b/graphics-libs/mesalib/PREPARE
@@ -1,6 +1,10 @@
-config_query MESALIB_GIT "Check out the latest development code?" n &&
+config_query_list MESALIB_VER "Which version would you like to build?" \
+ stable \
+ feature \
+ developement \
+ git &&

-if [[ "$MESALIB_GIT" == "y" ]]; then
- config_query MESALIB_GIT_AUTOUPDATE \
- "Queue for update on every system update?" n
+if [[ "$MESALIB_VER" == "git" ]]; then
+ config_query MESALIB_GIT_AUTOUPDATE \
+ "Queue for update on every system update?" n
fi
diff --git a/graphics-libs/mesalib/PRE_BUILD b/graphics-libs/mesalib/PRE_BUILD
index 0c29c2c..d5e90ac 100755
--- a/graphics-libs/mesalib/PRE_BUILD
+++ b/graphics-libs/mesalib/PRE_BUILD
@@ -1,9 +1,10 @@
default_pre_build &&
cd ${SOURCE_DIRECTORY} &&
-if [[ "$MESALIB_GIT" == "y" ]]; then
- patch -p1 < $SPELL_DIRECTORY/gl_select-scm.patch
-else
+if [[ "$MESALIB_VER" == "stable" ]]; then
patch -p1 < $SPELL_DIRECTORY/gl_select.patch
+else
+ patch -p1 < $SPELL_DIRECTORY/gl_select-scm.patch
+
fi &&
cd ${SOURCE_DIRECTORY}/configs &&
sedit "s:/usr/local:/usr:g" default &&
@@ -34,7 +35,7 @@ sedit "s:/X11R6::g" dri_glx.c
&&
cd ${SOURCE_DIRECTORY}/src/glw &&
sedit "s:/X11R6::g" Makefile &&

-if [[ $MESALIB_GIT == y ]]; then
+if [[ $MESALIB_VER == "git" ]]; then
cd "$SOURCE_DIRECTORY" &&
sedit "/.*configure.*/d" autogen.sh &&
./autogen.sh
diff --git a/graphics-libs/mesalib/SUB_DEPENDS
b/graphics-libs/mesalib/SUB_DEPENDS
index 8b1f39f..14ed565 100755
--- a/graphics-libs/mesalib/SUB_DEPENDS
+++ b/graphics-libs/mesalib/SUB_DEPENDS
@@ -11,10 +11,10 @@ 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
+ 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 r128 r200 r300 r600
radeon s3v savage sis tdfx trident unichrome ffb swrast"
fi
config_query_multi MESALIB_DRIVERS \
"What drivers would you like to build?" \

[SM-Commit] GIT changes to master grimoire by Vasil Yonkov (d9deb7c66ce4cc13720b3e387f66148a9a59ffd4), Vasil Yonkov, 01/23/2010
- Re: [SM-Commit] GIT changes to master grimoire by Vasil Yonkov (d9deb7c66ce4cc13720b3e387f66148a9a59ffd4), Eric Sandall, 01/24/2010
  - Re: [SM-Commit] GIT changes to master grimoire by Vasil Yonkov (d9deb7c66ce4cc13720b3e387f66148a9a59ffd4), Vasil Yonkov, 01/24/2010
    - Re: [SM-Commit] GIT changes to master grimoire by Vasil Yonkov (d9deb7c66ce4cc13720b3e387f66148a9a59ffd4), Eric Sandall, 01/24/2010
      - Re: [SM-Commit] GIT changes to master grimoire by Vasil Yonkov (d9deb7c66ce4cc13720b3e387f66148a9a59ffd4), Arwed von Merkatz, 01/25/2010