PERFORCE change 80420 by Andraž "ruskie" Levstik for review

Perforce Review Daemon p4review at smee.org
Fri Jun 9 08:55:01 EDT 2006


Change 80420 by andraž_levstik at omega.mages.ath.cx on 2006/06/09 13:53:19

	Enhanced the spell

Affected files ...

... //sgl/grimoires/devel/audio-players/xmms2/BUILD#7 edit
... //sgl/grimoires/devel/audio-players/xmms2/CONFIGURE#1 add
... //sgl/grimoires/devel/audio-players/xmms2/DEPENDS#6 edit
... //sgl/grimoires/devel/audio-players/xmms2/DETAILS#18 edit
... //sgl/grimoires/devel/audio-players/xmms2/HISTORY#22 edit
... //sgl/grimoires/devel/audio-players/xmms2/INSTALL#6 edit
... //sgl/grimoires/devel/audio-players/xmms2/PREPARE#3 edit
... //sgl/grimoires/devel/audio-players/xmms2/PRE_BUILD#2 edit
... //sgl/grimoires/devel/audio-players/xmms2/ices.patch#2 delete

Differences ...

==== //sgl/grimoires/devel/audio-players/xmms2/BUILD#7 (xtext) ====

@@ -1,2 +1,3 @@
-scons PREFIX=/usr CCFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" EXCLUDE="$OPTS" &&
-scons PREFIX=/usr CCFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" EXCLUDE="$OPTS"
+cd  $SOURCE_DIRECTORY/xmms*                                                                    &&
+scons MANDIR=/usr/share/man PREFIX=/usr CCFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" EXCLUDE="$OPTS" &&
+scons MANDIR=/usr/share/man PREFIX=/usr CCFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" EXCLUDE="$OPTS"

==== //sgl/grimoires/devel/audio-players/xmms2/DEPENDS#6 (xtext) ====

@@ -1,32 +1,37 @@
 depends  scons
-depends  libmad
 depends  sqlite
 depends  glib2
 
 #Transport plugins
-optional_depends curl "nothing" "curl" "For http transport plugin."
+optional_depends curl "" "curl" "For http transport plugin."
+optional_depends libmms "" "mms" "For mms transport plugin."
+optional_depends samba "" "samba" "For samba transport plugin."
 
 #Decoder plugins
-optional_depends libvorbis "nothing" "vorbis" "For ogg/vorbis decoder plugin."
-optional_depends libmodplug "nothing" "modplug" "For mod/s3m/etc... decoder plugin."
-optional_depends libmpcdec "nothing" "musepack" "For musepack(mpc) decoder plugin."
-optional_depends flac "nothing" "flac" "For flac decoder plugin."
-optional_depends sidplay-libs "nothing" "sid" "For sid decoder plugin."
-optional_depends speex "nothing" "speex" "For speex decoder plugin."
-optional_depends faad2 "nothing" "faad" "For AAC/MP4 decoder plugin."
+optional_depends libmad "" "mad" "For mp3 decoder plugin."
+optional_depends libvorbis "" "vorbis" "For ogg/vorbis decoder plugin."
+optional_depends libmodplug "" "modplug" "For mod/s3m/etc... decoder plugin."
+optional_depends libmpcdec "" "musepack" "For musepack(mpc) decoder plugin."
+optional_depends flac "" "flac" "For flac decoder plugin."
+optional_depends sidplay-libs "" "sid" "For sid decoder plugin."
+optional_depends speex "" "speex" "For speex decoder plugin."
+optional_depends faad2 "" "faad" "For AAC/MP4 decoder plugin."
+optional_depends ffmpeg "" "wma" "For WMA decoder plugin."
 
 #Clients
-optional_depends sdl_ttf "nothing" "sdl-vis" "For visuialization client support(sdl-vis)."
+optional_depends sdl_ttf "" "sdl-vis" "For visuialization client support(sdl-vis)."
+optional_depends gamin "" "medialib-updater" "For medialib-updater support."
 
 #Output plugins
-optional_depends alsa-lib "nothing" "alsa" "For alsa output plugin."
-optional_depends jack "nothing" "jack" "For jack output plugin."
+optional_depends alsa-lib "" "alsa" "For alsa output plugin."
+optional_depends jack "" "jack" "For jack output plugin."
 
 #Effect plugins
-optional_depends libshout "nothing" "ices" "For ices client plugin"
+optional_depends libshout "" "ices icymetaint" "Icecast effect plugin"
 
 #Language bindings
-optional_depends pyrex "nothing" "python" "For python bindings."
-optional_depends ruby "nothing" "ruby" "For ruby bindings."
-optional_depends JAVA "nothing" "java" "For java bindings."
-optional_depends ecore "nothing" "xmmsclient-ecore" "For ecore bindings."
+optional_depends pyrex "" "python" "For python bindings."
+optional_depends ruby "" "ruby" "For ruby bindings."
+optional_depends JAVA "" "java" "For java bindings."
+optional_depends ecore "" "xmmsclient-ecore" "For ecore bindings."
+optional_depends boost "" "xmmsclient++" "For ecore bindings."

==== //sgl/grimoires/devel/audio-players/xmms2/DETAILS#18 (xtext) ====

@@ -1,11 +1,11 @@
            SPELL=xmms2
 if [[ "$XMMS2_SNAPSHOT" == "y" ]]
 then
-         VERSION=cae0d4328c6405e36ff0c82b60b58c8daa8efe3e
-          SOURCE=${SPELL}-devel.git-snapshot-${VERSION}.tar.bz2
-SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-devel.git-snapshot-${VERSION}
+         VERSION=HEAD
+          SOURCE=${SPELL}-${XMMS2_TREE}.git-snapshot-${VERSION}.tar.bz2
+SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
    SOURCE_URL[0]=http://git.xmms.se/snapshot.cgi/${SOURCE}
-     SOURCE_HASH=sha512:e3a2692041e784f76e53109ebe413d52c1ca2f5b9207379e0802c4b7b907fcf286120556d97528c9de799f767b2ff2efe662d534d1bb969bedbe748483dbf0ec
+   SOURCE_IGNORE=volatile
 else
          VERSION=0.2DrDolittle
           SOURCE=${SPELL}-${VERSION}.tar.bz2

==== //sgl/grimoires/devel/audio-players/xmms2/HISTORY#22 (text) ====

@@ -1,3 +1,12 @@
+2006-06-09 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
+	* DETAILS: modified to provide multiple trees
+	* INSTALL: modified to provide multiple trees
+	* BUILD: modified to provide multiple trees
+	* PRE_BUILD: modified to provide multiple trees, removed ices patch
+	* PREPARE: modified to provide multiple trees
+	* CONFIGURE: added some more options
+	* ices.patch: removed
+
 2006-02-28 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
 	* DETAILS: updated release to DrDolittle and snapshot as well
 	* DEPENDS: added libshout and JAVA

==== //sgl/grimoires/devel/audio-players/xmms2/INSTALL#6 (xtext) ====

@@ -1,1 +1,2 @@
-scons PREFIX=/usr CCFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" EXCLUDE="$OPTS" /usr
+cd  $SOURCE_DIRECTORY/xmms*  &&
+scons MANDIR=/usr/share/man PREFIX=/usr CCFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" EXCLUDE="$OPTS" /usr

==== //sgl/grimoires/devel/audio-players/xmms2/PREPARE#3 (xtext) ====

@@ -1,1 +1,6 @@
-config_query  XMMS2_SNAPSHOT  "Do you want to build a snapshot version?"  y
+config_query  XMMS2_SNAPSHOT  "Do you want to build a snapshot version?"  y  &&
+if [[ $XMMS2_SNAPSHOT == "y" ]]
+        then
+config_query_list  XMMS2_TREE  "Which tree do you want to use:" \
+                   stable devel anders eleusis jlt juhovh nano theefer tilman tru
+fi

==== //sgl/grimoires/devel/audio-players/xmms2/PRE_BUILD#2 (xtext) ====

@@ -1,3 +1,4 @@
-default_pre_build     &&
-cd $SOURCE_DIRECTORY  &&
-patch -p1 < $SCRIPT_DIRECTORY/ices.patch
+mk_source_dir $SOURCE_DIRECTORY  &&
+cd $SOURCE_DIRECTORY             &&
+unpack_file                      &&
+cd xmms*



More information about the SM-Commit mailing list