Skip to Content.
Sympa Menu

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

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 (afb9c5d492d1285e477b07fb9d4455594816c6d5)
  • Date: Mon, 19 Nov 2007 14:02:20 -0600

GIT changes to master grimoire by Andraž Levstik <ruskie AT mages.ath.cx>:

audio-players/gxmms2/DETAILS | 19 +++++++++++--------
audio-players/gxmms2/HISTORY | 5 +++++
audio-players/gxmms2/PREPARE | 9 ++++++++-
audio-players/gxmms2/PRE_BUILD | 2 +-
audio-players/xmms2/BUILD | 2 +-
audio-players/xmms2/DETAILS | 1 +
audio-players/xmms2/HISTORY | 6 ++++++
audio-players/xmms2/PRE_BUILD | 2 ++
audio-players/xmms2/UP_TRIGGERS | 9 +++++++++
9 files changed, 44 insertions(+), 11 deletions(-)

New commits:
commit 42861d695cb92245cd51ae876ed16f639a43df4f
Author: Andraž Levstik <ruskie AT mages.ath.cx>
Commit: Andraž Levstik <ruskie AT mages.ath.cx>

xmms2: added UP_TRIGGERS

commit 8bba91b21afb7c34cffd850160a9a808e79fda6d
Author: Andraž Levstik <ruskie AT mages.ath.cx>
Commit: Andraž Levstik <ruskie AT mages.ath.cx>

audio-players/gxmms2: version update

commit 931ac673806e244ca3751b38290c21285278e4a4
Author: Andraž Levstik <ruskie AT mages.ath.cx>
Commit: Andraž Levstik <ruskie AT mages.ath.cx>

xmms2: minor but important bugfix

diff --git a/audio-players/gxmms2/DETAILS b/audio-players/gxmms2/DETAILS
index d66424a..609d814 100755
--- a/audio-players/gxmms2/DETAILS
+++ b/audio-players/gxmms2/DETAILS
@@ -1,22 +1,25 @@
SPELL=gxmms2
-if [[ "$GXMMS_GIT" = "n" ]] ; then
- VERSION=0.6.5
- SOURCE=$SPELL-$VERSION.tar.gz
- SOURCE_URL[0]=http://wejp.k.vu/projects/xmms2/$SOURCE
-
SOURCE_HASH=sha512:a2dad6c4dc51c749ea3b680c74b42034fa29993c4edeb32f8959f802956829b7426e93bdfa9dc99ef8d7bee043504cd66474e940596e5064b28bd0ac06bf7f6b
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-else
+if [[ "$GXMMS_SCM" == "y" ]] ; then
+if [[ "$GXMMS2_SCM_AUTOUPDATE" == "y" ]] ; then
VERSION="$(date +%Y%m%d)"
+else
+ VERSION=scm
+fi
SOURCE=${SPELL}.git-snapshot-HEAD.tar.bz2
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}

SOURCE_URL[0]=http://git.xmms.se/snapshot.cgi/gxmms2.git-snapshot-HEAD.tar.bz2
FORCE_DOWNLOAD=ON
SOURCE_IGNORE=volatile
+else
+ VERSION=0.7.0
+ SOURCE=$SPELL-$VERSION.tar.gz
+ SOURCE_URL[0]=http://wejp.k.vu/projects/xmms2/$SOURCE
+
SOURCE_HASH=sha512:76d963670c36ebb06453b3a3373fc6ab260de92f0ca9c1262c331cef00ce20e054bda93599f8e3c6d095e443863b5383d2cb8bbacfaa41496a2a65d5706da7df
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
fi
WEB_SITE=http://wejp.k.vu/projects/xmms2/
LICENSE[0]=GPL
ENTERED=20060114
- PATCHLEVEL=1
KEYWORDS="xmms players audio"
SHORT="gxmms2 is a GTK2 based XMMS2 client, written in C."
cat << EOF
diff --git a/audio-players/gxmms2/HISTORY b/audio-players/gxmms2/HISTORY
index 265dfe6..9a3172e 100644
--- a/audio-players/gxmms2/HISTORY
+++ b/audio-players/gxmms2/HISTORY
@@ -1,3 +1,8 @@
+2007-11-18 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DETAILS: updated spell to 0.7.0, fallback is always release
+ * PRE_BUILD: minor cleanup
+ * PREPARE: use SCM agnostic vars
+
2007-08-15 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
* PRE_BUILD: fixup the previous version
* DETAILS: fixup the previous version
diff --git a/audio-players/gxmms2/PREPARE b/audio-players/gxmms2/PREPARE
index d763b3f..4b4998c 100755
--- a/audio-players/gxmms2/PREPARE
+++ b/audio-players/gxmms2/PREPARE
@@ -1 +1,8 @@
-config_query GXMMS_GIT "Build the git version (needed for the recent xmms2
update)" n
+config_query GXMMS2_SCM "Do you want SCM version" "${GXMMS2_GIT:-n}" &&
+if [[ "${GXMMS2_SCM}" == "y" ]]
+then
+ config_query GXMMS2_SCM_AUTOUPDATE \
+ "Automaticaly update the spell on sorcery queue/system-update?" \
+ "n"
+fi
+
diff --git a/audio-players/gxmms2/PRE_BUILD b/audio-players/gxmms2/PRE_BUILD
index c44526e..c1bf504 100755
--- a/audio-players/gxmms2/PRE_BUILD
+++ b/audio-players/gxmms2/PRE_BUILD
@@ -1,6 +1,6 @@
mk_source_dir $SOURCE_DIRECTORY &&
cd $SOURCE_DIRECTORY &&
unpack_file &&
-cd gxmms2.* &&
+cd gxmms2* &&
sedit "s:^PREFIX=.*:PREFIX=/usr:g" Makefile
sedit "s:^CFLAGS=.*:CFLAGS=-Wall \$(GTK_CFLAGS) \$(XMMS2_CFLAGS) -I.
$CFLAGS:g" Makefile
diff --git a/audio-players/xmms2/BUILD b/audio-players/xmms2/BUILD
index cd5be35..cc9a571 100755
--- a/audio-players/xmms2/BUILD
+++ b/audio-players/xmms2/BUILD
@@ -1,5 +1,5 @@
cd xmms2* &&
-OPTS="$XMMS2_OPTS --with-mandir=${INSTALL_ROOT}/usr/share/man"
+OPTS="$XMMS2_OPTS --with-mandir=${INSTALL_ROOT}/usr/share/man $OPTS"
if ! list_find "$XMMS2_OPTS" "--without-xmms2d=1" ; then
#OPTS="$XMMS2_OPTS --with-mandir=${INSTALL_ROOT}/usr/share/man
--without-plugins=diskwrite,html,id3v2,equalizer,null,m3u,cue,nulstripper,pls,icymetaint,ices,lastfm,lastfmeta,curl,vocoder,daap,file,asx,rss,xml,xspf,cdda,mms,samba,mad,vorbis,modplug,musepack,flac,sid,speex,faad,alsa,jack,mp4,oss,ao,wave,avformat,replaygain,gnomevfs,avcodec
$OPTS"
#else
diff --git a/audio-players/xmms2/DETAILS b/audio-players/xmms2/DETAILS
index c7d2893..6b0283d 100755
--- a/audio-players/xmms2/DETAILS
+++ b/audio-players/xmms2/DETAILS
@@ -19,6 +19,7 @@ else
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
SOURCE_URL[0]=${SOURCEFORGE_URL}/${SPELL}/${SOURCE}

SOURCE_HASH=sha512:82b4b3f8615b87b41674a6782d319470b43fcbab83c31826a5db902bd6c9ef8d7a50dbe78686436953b921a7e9a7d670f1da7bab96501ab239ec13cc3992e925
+ PATCHLEVEL=1
fi
WEB_SITE=http://wiki.xmms2.xmms.se/index.php/Main_Page
ENTERED=20040527
diff --git a/audio-players/xmms2/HISTORY b/audio-players/xmms2/HISTORY
index 18c9e83..209c495 100644
--- a/audio-players/xmms2/HISTORY
+++ b/audio-players/xmms2/HISTORY
@@ -1,3 +1,9 @@
+2007-11-19 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * BUILD: gah stupid me forgot to append $OPTS
+ * PRE_BUILD: trick sorcery into providing configure --help option
+ * DETAILS: patchlevel++
+ * UP_TRIGGERS: added, forgot to do it earlier
+
2007-11-15 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
* DETAILS: version update 0.4DrKosmos
* CONFIGURE: new options
diff --git a/audio-players/xmms2/PRE_BUILD b/audio-players/xmms2/PRE_BUILD
index 42a72d9..2037a9a 100755
--- a/audio-players/xmms2/PRE_BUILD
+++ b/audio-players/xmms2/PRE_BUILD
@@ -2,6 +2,8 @@ mk_source_dir $SOURCE_DIRECTORY &&
cd $SOURCE_DIRECTORY &&
unpack_file &&
cd xmms* &&
+echo -e "#!/bin/sh\ncd xmms*\n./waf configure --help" > ../configure &&
+chmod +x ../configure &&
sedit "230s:.*: conf.env[\"CCFLAGS\"] =
Utils.to_list(conf.env[\"CFLAGS\"]):" wscript
sedit "231s:.*: conf.env[\"CXXFLAGS\"] =
Utils.to_list(conf.env[\"CXXFLAGS\"]):" wscript
sedit "247s:.*: conf.env[\"CCFLAGS\"] =
Utils.to_list(conf.env[\"CFLAGS\"]):" wscript
diff --git a/audio-players/xmms2/UP_TRIGGERS b/audio-players/xmms2/UP_TRIGGERS
new file mode 100755
index 0000000..ef0b47e
--- /dev/null
+++ b/audio-players/xmms2/UP_TRIGGERS
@@ -0,0 +1,9 @@
+# this makes ABI changes automatically cast those that depend on xmms2 via
an up_trigger
+
+local OLD_SPELL_VERSION=""
+spell_ok $SPELL && OLD_SPELL_VERSION="$(installed_version $SPELL)"
+if [ "${VERSION/[a-z]*/}" != "${OLD_SPELL_VERSION/[a-z]*/}" ]; then
+ for each in $(show_up_depends $SPELL 1); do
+ up_trigger $each check_self
+ done
+fi



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

Archive powered by MHonArc 2.6.24.

Top of Page