Skip to Content.
Sympa Menu

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

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 (81c5c0b1bebb90a2adc087789b1e600ab901f725)
  • Date: Wed, 3 Feb 2010 05:25:15 -0600

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

graphics-libs/mesalib/DETAILS | 17 +++++++++++++++++
graphics-libs/mesalib/HISTORY | 3 +++
graphics-libs/mesalib/PREPARE | 16 ++++++++++++++++
utils/qemu/BUILD | 2 +-
utils/qemu/DEPENDS | 6 +++---
utils/qemu/DETAILS | 12 ++++++++----
utils/qemu/HISTORY | 5 +++++
utils/qemu/PREPARE | 4 ++--
8 files changed, 55 insertions(+), 10 deletions(-)

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

mesalib: added a default version

commit fe68b59a7695f7c56a32be4ab2139b5321dcff47
Author: Vasil Yonkov <spirtbrat AT sourcemage.org>
Commit: Vasil Yonkov <spirtbrat AT sourcemage.org>

qemu: added a default version

commit 870c662675bc61b1be100f096dac1af093ea5c7e
Author: Vasil Yonkov <spirtbrat AT sourcemage.org>
Commit: Vasil Yonkov <spirtbrat AT sourcemage.org>

qemu: made QEMU_VER referring to a branch, not to a concrete version

diff --git a/graphics-libs/mesalib/DETAILS b/graphics-libs/mesalib/DETAILS
index f24fa33..bc862d9 100755
--- a/graphics-libs/mesalib/DETAILS
+++ b/graphics-libs/mesalib/DETAILS
@@ -1,4 +1,21 @@
SPELL=mesalib
+
+###
+# MESALIB_GIT => MESALIB_VER
+
+if [[ $MESALIB_GIT == "y" ]]; then
+ MESALIB_VER="git"
+fi
+
+if [[ $MESALIB_GIT == "n" ]]; then
+ MESALIB_VER="stable"
+fi
+###
+
+if [[ -z $MESALIB_VER ]]; then
+ MESALIB_VER="stable"
+fi
+
case $MESALIB_VER in
stable)
VERSION=7.5.2
diff --git a/graphics-libs/mesalib/HISTORY b/graphics-libs/mesalib/HISTORY
index d4ae0f4..f081328 100644
--- a/graphics-libs/mesalib/HISTORY
+++ b/graphics-libs/mesalib/HISTORY
@@ -1,3 +1,6 @@
+2010-02-03 Vasil Yonkov <spirtbrat AT sourcemage.org>
+ * DETAILS, PREPARE: added a default version
+
2010-01-23 Vasil Yonkov <spirtbrat AT sourcemage.org>
* CONFIGURE, DEPENDS, DETAILS, PREPARE, PRE_BUILD,
SUB_DEPENDS: added test and developement branches
diff --git a/graphics-libs/mesalib/PREPARE b/graphics-libs/mesalib/PREPARE
index 63bfce4..b795d3f 100755
--- a/graphics-libs/mesalib/PREPARE
+++ b/graphics-libs/mesalib/PREPARE
@@ -1,3 +1,19 @@
+###
+# MESALIB_GIT => MESALIB_VER
+
+if [[ $MESALIB_GIT == "y" ]]; then
+ persistent_add MESALIB_VER &&
+ MESALIB_VER="git" &&
+ persistent_remove MESALIB_GIT
+fi
+
+if [ $MESALIB_GIT == "n" ]]; then
+ persistent_add MESALIB_VER &&
+ MESALIB_VER="stable" &&
+ persistent_remove MESALIB_GIT
+fi
+###
+
config_query_list MESALIB_VER "Which version would you like to build?" \
stable \
feature \
diff --git a/utils/qemu/BUILD b/utils/qemu/BUILD
index 91c29cd..e75f7b2 100755
--- a/utils/qemu/BUILD
+++ b/utils/qemu/BUILD
@@ -1,6 +1,6 @@
message "Target list: $QEMU_ARCHS" &&

-if [[ $QEMU_VER == "0.10.6" ]] || [[ $QEMU_VER == "0.11.1" ]]; then
+if [[ $QEMU_VER == "0.10" ]] || [[ $QEMU_VER == "0.11" ]]; then
if [[ ! $OPTS =~ "--disable-kqemu" ]]; then
#
# Disable PIC if building soft MMU targets
diff --git a/utils/qemu/DEPENDS b/utils/qemu/DEPENDS
index c8a41be..d1d3754 100755
--- a/utils/qemu/DEPENDS
+++ b/utils/qemu/DEPENDS
@@ -1,5 +1,5 @@
case $QEMU_VER in
- 0.10.6)
+ 0.10)
optional_depends sdl \
"" \
"--disable-gfx-check" \
@@ -25,7 +25,7 @@ case $QEMU_VER in
"--disable-vnc-tls" \
"to enable TLS encryption for VNC server"
;;
- 0.11.1)
+ 0.11)
optional_depends sdl \
"" \
"--disable-sdl" \
@@ -61,7 +61,7 @@ case $QEMU_VER in
"--disable-vnc-sasl" \
"to enable SASL encryption for VNC server"
;;
- 0.12.2)
+ 0.12)
optional_depends sdl \
"--enable-sdl" \
"--disable-sdl" \
diff --git a/utils/qemu/DETAILS b/utils/qemu/DETAILS
index bfa8e02..4544bae 100755
--- a/utils/qemu/DETAILS
+++ b/utils/qemu/DETAILS
@@ -1,13 +1,17 @@
SPELL=qemu

+if [[ -z $QEMU_VER ]]; then
+ QEMU_VER="0.10"
+fi
+
case $QEMU_VER in
- 0.10.6)
+ 0.10)
VERSION=0.10.6
;;
- 0.11.1)
+ 0.11)
VERSION=0.11.1
;;
- 0.12.2)
+ 0.12)
VERSION=0.12.2
;;
esac
@@ -16,7 +20,7 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=http://savannah.inetbridge.net/$SPELL/$SOURCE
SOURCE_URL[1]=http://download.savannah.gnu.org/releases/$SPELL/$SOURCE

-if [[ $QEMU_VER == "0.10.6" ]]; then
+if [[ $QEMU_VER == "0.10" ]]; then
SOURCE2=$SOURCE.sig
SOURCE2_URL[0]=$SOURCE_URL.sig
SOURCE2_URL[1]=${SOURCE_URL[1]}.sig
diff --git a/utils/qemu/HISTORY b/utils/qemu/HISTORY
index 1d85989..f92c8ec 100644
--- a/utils/qemu/HISTORY
+++ b/utils/qemu/HISTORY
@@ -1,3 +1,8 @@
+2010-02-03 Vasil Yonkov <spirtbrat AT sourcemage.org>
+ * BUILD, DEPENDS, DETAILS, PREPARE: made QEMU_VER referring to
+ a branch, not to a concrete version
+ * DETAILS: added a default version
+
2010-01-20 Vasil Yonkov <spirtbrat AT sourcemage.org>
* DETAILS, DEPENDS, PREPARE: added versions 0.11.1 and 0.12.2
* BUILD: the build fails only when kqemu support is enabled
diff --git a/utils/qemu/PREPARE b/utils/qemu/PREPARE
index 150110d..267aa0c 100755
--- a/utils/qemu/PREPARE
+++ b/utils/qemu/PREPARE
@@ -1,2 +1,2 @@
-config_query_list QEMU_VER "Which version would you like to build?" \
- 0.10.6 0.11.1 0.12.2
+config_query_list QEMU_VER "Which branch to build?" \
+ 0.10 0.11 0.12



  • [SM-Commit] GIT changes to master grimoire by Vasil Yonkov (81c5c0b1bebb90a2adc087789b1e600ab901f725), Vasil Yonkov, 02/03/2010

Archive powered by MHonArc 2.6.24.

Top of Page