Skip to Content.
Sympa Menu

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

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 (9e16d6ecbb428ac2865af80cbe31234a17d48d67)
  • Date: Mon, 21 May 2007 03:16:08 -0500

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

ChangeLog
| 4
FUNCTIONS
| 2
audio-players/xmms2/BUILD
| 33 -
audio-players/xmms2/CONFIGURE
| 175 +++++--
audio-players/xmms2/DEPENDS
| 225 +++++-----
audio-players/xmms2/DETAILS
| 4
audio-players/xmms2/HISTORY
| 14
audio-players/xmms2/INSTALL
| 8
audio-players/xmms2/PRE_BUILD
| 5
audio-players/xmms2/PRE_SUB_DEPENDS
| 18
audio-players/xmms2/REPAIR^5357927979794c14a02dc869a1bd39d0^PRE_SUB_DEPENDS
| 12
audio-players/xmms2/SUB_DEPENDS
| 13
12 files changed, 296 insertions(+), 217 deletions(-)

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

FUNCTIONS: minor fixup in waf_build nothing serious

commit 0fa4ffabc2a75b2d62ec573e687cddc398a64903
Author: Andraž Levstik <ruskie AT mages.ath.cx>
Commit: Andraž Levstik <ruskie AT mages.ath.cx>

xmms2: version update and major rework of the spell(build system changed

diff --git a/ChangeLog b/ChangeLog
index 0062d40..d5f1000 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2007-05-21 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * FUNCTIONS: minor fixup in waf_build
+
2007-05-21 Treeve Jelbert <treeve AT sourcemage.org>
* devel/re2c: new spell,
tool for writing very fast and very flexible scanners
@@ -163,7 +166,6 @@

2007-05-01 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* utils/sunbird: new spell, mozilla sunbird, a calendar and task
planner
-
2007-05-01 Pol Vinogradov <vin.public AT gmail.com>
* doc/rmagick-doc: new spell, documentation for RMagick

diff --git a/FUNCTIONS b/FUNCTIONS
index 12ad13e..933aaf0 100755
--- a/FUNCTIONS
+++ b/FUNCTIONS
@@ -490,7 +490,7 @@ function waf_build(){
--nocache \
--prefix=${INSTALL_ROOT}/usr \
$OPTS &&
-./waf --verbose
+./waf build
}

function waf_install(){
diff --git a/audio-players/xmms2/BUILD b/audio-players/xmms2/BUILD
index 05056a7..10b16c9 100755
--- a/audio-players/xmms2/BUILD
+++ b/audio-players/xmms2/BUILD
@@ -1,26 +1,7 @@
-if list_find "$XMMS2_OPTS1" noruby ; then
- list_remove OPTS ruby
-fi &&
-if list_find "$XMMS2_OPTS1" nopython ; then
- list_remove OPTS python
-fi &&
-if list_find "$XMMS2_OPTS1" noxmmsclient++ ; then
- list_remove OPTS xmmsclient++
-fi &&
-if list_find "$XMMS2_OPTS1" noxmmsclient-ecore ; then
- list_remove OPTS xmmsclient-ecore
-fi &&
-if list_find "$XMMS2_OPTS1" nojava ; then
- list_remove OPTS java
-fi &&
-cd $SOURCE_DIRECTORY/xmms* &&
-scons MANDIR=${INSTALL_ROOT}/usr/share/man \
- PREFIX=${INSTALL_ROOT}/usr \
- CCFLAGS="$CFLAGS" \
- CXXFLAGS="$CXXFLAGS" \
- EXCLUDE="$XMMS2_OPTS $OPTS" &&
-scons MANDIR=${INSTALL_ROOT}/usr/share/man \
- PREFIX=${INSTALL_ROOT}/usr \
- CCFLAGS="$CFLAGS" \
- CXXFLAGS="$CXXFLAGS" \
- EXCLUDE="$XMMS2_OPTS $OPTS"
+cd xmms2* &&
+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
+OPTS="$XMMS2_OPTS --with-mandir=${INSTALL_ROOT}/usr/share/man
--without-plugins=html,cdda,sid,speex $OPTS"
+fi &&
+CCFLAGS=$CFLAGS waf_build
diff --git a/audio-players/xmms2/CONFIGURE b/audio-players/xmms2/CONFIGURE
index 47434d3..c8e3371 100755
--- a/audio-players/xmms2/CONFIGURE
+++ b/audio-players/xmms2/CONFIGURE
@@ -1,63 +1,126 @@
+XMMS2_OPTS="$(echo $XMMS2_OPTS $XMMS2_OPTS1 | tr " " "\n" | grep "\-\-with"
| tr "\n" " ")"
message "NOTE: not all of these options might be relevant to your selected"
&&
message "tree and version but they don't affect anything or in other words"
&&
message "NOTHING WILL BREAK IF IT ISN'T SUPPORTED" &&
config_query_option XMMS2_OPTS \
-"Do you want to build the xmms2 daemon(to play music localy)" y \
- "noxmms" "xmms" &&
-config_query_option XMMS2_OPTS \
-"Do you want to build the client lib for other clients to use RECOMMENDED" y
\
- "nolib" "lib" &&
-if list_find "$XMMS2_OPTS" noxmms ; then
- config_query_option XMMS2_OPTS \
- "Do you want diskwrite plugin" y \
- "nonedw" "diskwrite" &&
- config_query_option XMMS2_OPTS \
- "Do you want html playlist support" y \
- "nohtml" "html" &&
- config_query_option XMMS2_OPTS \
- "Do you want id3 tag support" y \
- "noid3" "id3v2" &&
- config_query_option XMMS2_OPTS \
- "Do you want equalizer support" y \
- "noequalizer" "equalizer" &&
- config_query_option XMMS2_OPTS \
- "Do you want null output support" y \
- "nonull" "null" &&
- config_query_option XMMS2_OPTS \
- "Do you want m3u playlist support" y \
- "nom3u" "m3u" &&
- config_query_option XMMS2_OPTS \
- "Do you want nulstripper support" y \
- "nonulstripper" "nulstripper" &&
- config_query_option XMMS2_OPTS \
- "Do you want pls playlist support" y \
- "nopls" "pls" &&
- config_query_option XMMS2_OPTS \
- "Do you want icecast stream support" y \
- "noicymetaint" "icymetaint" &&
- config_query_option XMMS2_OPTS \
+"Do you want to build the xmms2 daemon(to play music localy)" \
+ y \
+ "--without-xmms2d=0" \
+ "--without-xmms2d=1" &&
+if list_find "$XMMS2_OPTS" "--without-xmms2d=0" ; then
+config_query_option XMMS2_OPTS \
+ "Do you want diskwrite plugin" \
+ y \
+ "--with-plugins=diskwrite" \
+ "--without-plugins=diskwrite" &&
+#config_query_option XMMS2_OPTS \
+# "Do you want html playlist support" \
+# y \
+# "--with-plugins=html" \
+# "--without-plugins=html" &&
+config_query_option XMMS2_OPTS \
+ "Do you want id3 tag support" \
+ y \
+ "--with-plugins=id3v2" \
+ "--without-plugins=id3v2" &&
+config_query_option XMMS2_OPTS \
+ "Do you want equalizer support" \
+ y \
+ "--with-plugins=equalizer" \
+ "--without-plugins=equalizer" &&
+config_query_option XMMS2_OPTS \
+ "Do you want null output support" \
+ y \
+ "--with-plugins=null" \
+ "--without-plugins=null" &&
+config_query_option XMMS2_OPTS \
+ "Do you want m3u playlist support" \
+ y \
+ "--with-plugins=m3u" \
+ "--without-plugins=m3u" &&
+config_query_option XMMS2_OPTS \
+ "Do you want cue playlist support" \
+ y \
+ "--with-plugins=cue" \
+ "--without-plugins=cue" &&
+config_query_option XMMS2_OPTS \
+ "Do you want nulstripper support" \
+ y \
+ "--with-plugins=nulstripper" \
+ "--without-plugins=nulstripper" &&
+config_query_option XMMS2_OPTS \
+ "Do you want pls playlist support" \
+ y \
+ "--with-plugins=pls" \
+ "--without-plugins=pls" &&
+config_query_option XMMS2_OPTS \
+ "Do you want icecast stream support" \
+ y \
+ "--with-plugins=icymetaint,curl" \
+ "--without-plugins=icymetaint,curl" &&
+config_query_option XMMS2_OPTS \
+ "Do you want ices source support" \
+ y \
+ "--with-plugins=ices" \
+ "--without-plugins=ices" &&
+config_query_option XMMS2_OPTS \
"Do you want lastfm stream transport support" \
y \
- "nolastfm nolastfmeta" "lastfm lastfmeta" &&
- config_query_option XMMS2_OPTS \
- "Do you want phase vocoder effect plugin" y \
- "novocoder" "vocoder" &&
- config_query_option XMMS2_OPTS \
- "Do you want daap support" y \
- "nodaap" "daap" &&
- config_query_option XMMS2_OPTS \
-"Do you want file transport support(to access using file://) RECOMMENDED" \
- y "nofile" "file"
-else
- list_add XMMS2_OPTS file pls nulstripper m3u null equalizer id3v2 html
diskwrite
+ "--with-plugins=lastfm,lastfmeta,curl" \
+ "--without-plugins=lastfm,lastfmeta,curl" &&
+config_query_option XMMS2_OPTS \
+ "Do you want phase vocoder effect plugin" \
+ y \
+ "--with-plugins=vocoder" \
+ "--without-plugins=vocoder" &&
+config_query_option XMMS2_OPTS \
+ "Do you want daap support" \
+ y \
+ "--with-plugins=daap" \
+ "--without-plugins=daap" &&
+config_query_option XMMS2_OPTS \
+ "Do you want file transport support(to access using file://)" \
+ y \
+ "--with-plugins=file" \
+ "--without-plugins=file" &&
+config_query_option XMMS2_OPTS \
+ "Do you want asx support" \
+ y \
+ "--with-plugins=asx" \
+ "--without-plugins=asx" &&
+config_query_option XMMS2_OPTS \
+ "Do you want rss support" \
+ y \
+ "--with-plugins=rss" \
+ "--without-plugins=rss" &&
+config_query_option XMMS2_OPTS \
+ "Do you want xml support" \
+ y \
+ "--with-plugins=xml" \
+ "--without-plugins=xml" &&
+config_query_option XMMS2_OPTS \
+ "Do you want xspf support" \
+ y \
+ "--with-plugins=xspf" \
+ "--without-plugins=xspf"
+#config_query_option XMMS2_OPTS \
+# "Do you want CDDA support" \
+# y \
+# "--with-plugins=cdda" \
+# "--without-plugins=cdda"
fi &&
-if list_find "$XMMS2_OPTS" nolib ; then
- config_query_option XMMS2_OPTS \
- "Do you want to build the cli client" y \
- "nocli" "cli" &&
- config_query_option XMMS2_OPTS \
- "Do you want to build the et report tool" y \
- "noet" "et"
-else
- list_add XMMS2_OPTS cli et
-fi
+config_query_option XMMS2_OPTS \
+ "Do you want to build the cli client" \
+ y \
+ "--with-optionals=cli" \
+ "--without-optionals=cli" &&
+config_query_option XMMS2_OPTS \
+ "Do you want to build the xmms2-launcher" \
+ y \
+ "--with-optionals=launcher" \
+ "--without-optionals=launcher" &&
+config_query_option XMMS2_OPTS \
+ "Do you want to build the et report tool" \
+ y \
+ "--with-optionals=et" \
+ "--without-optionals=et"
diff --git a/audio-players/xmms2/DEPENDS b/audio-players/xmms2/DEPENDS
index 7907b94..161ccf6 100755
--- a/audio-players/xmms2/DEPENDS
+++ b/audio-players/xmms2/DEPENDS
@@ -1,124 +1,137 @@
-. $GRIMOIRE/is_depends_enabled.function &&
-depends scons &&
-depends sqlite &&
-depends glib2 &&
+. $GRIMOIRE/is_depends_enabled.function &&
+depends python &&
+depends sqlite &&
+depends glib2 &&

#Transport plugins &&
-if list_find "$XMMS2_OPTS" noxmms ; then
-optional_depends curl \
- "" \
- "curl" \
- "For http transport plugin." &&
-optional_depends libmms \
- "" \
- "mms" \
- "For mms transport plugin." &&
-optional_depends samba \
- "" \
- "samba" \
- "For samba transport plugin." &&
-optional_depends avahi \
- "" \
- "avahi" \
- "For avahi support." &&
+if list_find "$XMMS2_OPTS" "--without-xmms2d=0" ; then
+# if list_find "$XMMS2_OPTS" "--with-plugins=cdda" ; then
+#depends libcdio &&
+#depends cd-discid
+# fi &&
+ if list_find "$XMMS2_OPTS" "--with-plugins=xspf" ||
+ list_find "$XMMS2_OPTS" "--with-plugins=xml" ||
+ list_find "$XMMS2_OPTS" "--with-plugins=rss"
+ then
+depends libxml2
+ fi &&
+optional_depends curl \
+ "--with-plugins=curl" \
+ "--without-plugins=curl" \
+ "For http transport plugin." &&
+optional_depends libmms \
+ "--with-plugins=mms" \
+ "--without-plugins=mms" \
+ "For mms transport plugin." &&
+optional_depends samba \
+ "--with-plugins=samba" \
+ "--without-plugins=samba" \
+ "For samba transport plugin." &&
+optional_depends avahi \
+ "--with-optionals=avahi" \
+ "--without-optionals=avahi" \
+ "For avahi support." &&


#Decoder plugins &&
-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 LIBAVCODEC \
- "" \
- "wma" \
- "For WMA decoder plugin." &&
-
+optional_depends libmad \
+ "--with-plugins=mad" \
+ "--without-plugins=mad" \
+ "For mp3 decoder plugin." &&
+optional_depends libvorbis \
+ "--with-plugins=vorbis" \
+ "--without-plugins=vorbis" \
+ "For ogg/vorbis decoder plugin." &&
+optional_depends libmodplug \
+ "--with-plugins=modplug" \
+ "--without-plugins=modplug" \
+ "For mod/s3m/etc... decoder plugin." &&
+optional_depends libmpcdec \
+ "--with-plugins=musepack" \
+ "--without-plugins=musepack" \
+ "For musepack(mpc) decoder plugin." &&
+optional_depends flac \
+ "--with-plugins=flac" \
+ "--without-plugins=flac" \
+ "For flac decoder plugin." &&
+#optional_depends sidplay-libs \
+# "--with-plugins=sid" \
+# "--without-plugins=sid" \
+# "For sid decoder plugin." &&
+#optional_depends speex \
+# "--with-plugins=speex" \
+# "--without-plugins=speex" \
+# "For speex decoder plugin." &&
+optional_depends faad2 \
+ "--with-plugins=faad" \
+ "--without-plugins=faad" \
+ "For AAC/MP4 decoder plugin." &&
+optional_depends LIBAVCODEC \
+ "--with-plugins=avcodec" \
+ "--without-plugins=avcodec" \
+ "For WMA decoder plugin." &&

#Output plugins &&
-optional_depends alsa-lib \
- "" \
- "alsa" \
- "For alsa output plugin." &&
-optional_depends JACK-DRIVER \
- "" \
- "jack" \
- "For jack output plugin." &&
+optional_depends alsa-lib \
+ "--with-plugins=alsa" \
+ "--without-plugins=alsa" \
+ "For alsa output plugin." &&
+optional_depends JACK-DRIVER \
+ "--with-plugins=jack" \
+ "--without-plugins=jack" \
+ "For jack output plugin." &&

#Effect plugins &&
-optional_depends libshout \
- "" \
- "ices" \
- "Icecs client plugin"
-if list_find "$XMMS2_OPTS" novocoder ; then
-depends libsamplerate &&
+ if list_find "$XMMS2_OPTS" "--with-plugins=ices" ; then
+depends libshout &&
+depends libogg &&
+depends libvorbis
+ fi &&
+ if list_find "$XMMS2_OPTS" "--with-plugins=icymetaint,curl" ; then
+depends curl
+ fi &&
+ if list_find "$XMMS2_OPTS" "--with-plugins=vocoder" ; then
+depends libsamplerate &&
depends fftw
-fi
-if list_find "$XMMS2_OPTS" nolastfm ; then
+ fi &&
+ if list_find "$XMMS2_OPTS" "--with-plugins=lastfm,lastfmmeta,curl" ; then
depends curl
+ fi
fi
-fi &&
-if list_find "$XMMS2_OPTS" nolib ; then
+
#Clients &&
-optional_depends sdl_ttf \
- "" \
- "sdl-vis" \
- "For visuialization client support(sdl-vis)." &&
-optional_depends gamin \
- "" \
- "medialib-updater" \
- "For medialib-updater support." &&
+optional_depends gamin \
+ "--with-optionals=medialib-updater" \
+ "--without-optionals=medialib-updater" \
+ "For medialib-updater support." &&

#Language bindings &&
-optional_depends pyrex \
- "" \
- "python" \
- "For python bindings." &&
-optional_depends ruby \
- "" \
- "ruby" \
- "For ruby bindings." &&
-optional_depends JAVA \
- "" \
- "java" \
- "For java bindings." \
- "z-rejected" &&
-optional_depends ecore \
- "" \
- "xmmsclient-ecore" \
- "For ecore bindings." &&
-optional_depends boost \
- "" \
- "xmmsclient++" \
- "For C++ bindings." &&
+optional_depends pyrex \
+ "--with-optionals=python" \
+ "--without-optionals=python" \
+ "For python bindings." &&
+optional_depends ruby \
+ "--with-optionals=ruby" \
+ "--without-optionals=ruby" \
+ "For ruby bindings." &&
+optional_depends perl \
+ "--with-optionals=perl" \
+ "--without-optionals=perl" \
+ "For perl bindings." &&
+#removed for now it's in x4x
+#optional_depends JAVA \
+# "--with-optionals=java" \
+# "--without-optionals=java" \
+# "For java bindings." \
+# "z-rejected" &&
+optional_depends ecore \
+ "--with-optionals=xmmsclient-ecore" \
+ "--without-optionals=xmmsclient-ecore" \
+ "For ecore bindings." &&
+optional_depends boost \
+ "--with-optionals=xmmsclient++-glib,xmmsclient++" \
+ "--without-optionals=xmmsclient++-glib,xmmsclient++" \
+ "For C++ bindings." &&
if is_depends_enabled $SPELL boost ; then
sub_depends boost SIGNALS
fi
-fi
diff --git a/audio-players/xmms2/DETAILS b/audio-players/xmms2/DETAILS
index b094eb9..931adb8 100755
--- a/audio-players/xmms2/DETAILS
+++ b/audio-players/xmms2/DETAILS
@@ -14,11 +14,11 @@ SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${PKG}
FORCE_DOWNLOAD=ON
SOURCE_IGNORE=volatile
else
- VERSION=0.2DrHouse
+ VERSION=0.2DrJekyll
SOURCE=${SPELL}-${VERSION}.tar.bz2
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
SOURCE_URL[0]=${SOURCEFORGE_URL}/${SPELL}/${SOURCE}
-
SOURCE_HASH=sha512:0923fcd42f6233c9b912945d94e889a05b30551d65c0b1702604e3c9811445a2872860af4388fd8831a75f7e1569a9692fa2bc43898e3408f2e4a2b94c4e92e3
+
SOURCE_HASH=sha512:a3e9e5852f716a323bd22758562757a04b2f0cbd9ad5418652b48c48be42626778010f6e16b40cd10b18c8c9bf9abe5c8d11a52979c0690d45b744f587d709c3
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 69f8e6a..51b6d6d 100644
--- a/audio-players/xmms2/HISTORY
+++ b/audio-players/xmms2/HISTORY
@@ -1,3 +1,17 @@
+2007-05-21 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DETAILS: final version update to 0.2DrJekyll
+
+2007-03-13 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * REPAIR^5357927979794c14a02dc869a1bd39d0^PRE_SUB_DEPENDS: added due
to
+ sub_depends removal
+ * BUILD: new build system
+ * CONFIGURE: updated for new build system
+ * DEPENDS: updated for new build system
+ * DETAILS: version update
+ * INSTALL: update for new build system
+ * PRE_SUB_DEPENDS: removal of a sub_depends
+ * SUB_DEPENDS: removal of a sub_depends
+
2006-12-04 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
* DETAILS: forgot to mention version update and hash

diff --git a/audio-players/xmms2/INSTALL b/audio-players/xmms2/INSTALL
index 2e59f73..0ea15cc 100755
--- a/audio-players/xmms2/INSTALL
+++ b/audio-players/xmms2/INSTALL
@@ -1,7 +1 @@
-cd $SOURCE_DIRECTORY/xmms* &&
-scons MANDIR=${INSTALL_ROOT}/usr/share/man \
- PREFIX=${INSTALL_ROOT}/usr \
- CCFLAGS="$CFLAGS" \
- CXXFLAGS="$CXXFLAGS" \
- EXCLUDE="$XMMS2_OPTS $OPTS" \
- install
+waf_install
diff --git a/audio-players/xmms2/PRE_BUILD b/audio-players/xmms2/PRE_BUILD
index 6b4b9eb..4735a7e 100755
--- a/audio-players/xmms2/PRE_BUILD
+++ b/audio-players/xmms2/PRE_BUILD
@@ -1,4 +1,7 @@
mk_source_dir $SOURCE_DIRECTORY &&
cd $SOURCE_DIRECTORY &&
unpack_file &&
-cd xmms*
+cd xmms* &&
+sedit "230s:.*: conf.env[\"CCFLAGS\"] =
Utils.to_list(conf.env[\"CFLAGS\"]):" wscript
+sedit "231s:.*: conf.env[\"CXXFLAGS\"] =
Utils.to_list(conf.env[\"CXXFLAGS\"]):" wscript
+
diff --git a/audio-players/xmms2/PRE_SUB_DEPENDS
b/audio-players/xmms2/PRE_SUB_DEPENDS
index 31b0717..5ad4eb2 100755
--- a/audio-players/xmms2/PRE_SUB_DEPENDS
+++ b/audio-players/xmms2/PRE_SUB_DEPENDS
@@ -1,16 +1,12 @@
. $GRIMOIRE/is_depends_enabled.function
case $THIS_SUB_DEPENDS in
- CLIENTLIB) [ -f $INSTALL_ROOT/usr/lib/libxmmsclient.so ];;
- CLIENTLIB_RUBY) [ -f
$INSTALL_ROOT/usr/lib/ruby/site_ruby/*/*/xmmsclient.so ] ||
- is_depends_enabled $SPELL ruby ;;
- CLIENTLIB_ECORE) [ -f $INSTALL_ROOT/usr/lib/libxmmsclient-ecore.so ] ||
- is_depends_enabled $SPELL ecore ;;
-CLIENTLIB_PYTHON) [ -f
$INSTALL_ROOT/usr/lib/python*/site-packages/xmmsclient.so ] ||
- is_depends_enabled $SPELL pyrex ;;
- CLIENTLIB_JAVA) [ -f $INSTALL_ROOT/usr/lib/libxmms2java.so ] ||
- is_depends_enabled $SPELL JAVA ;;
- CLIENTLIB_CXX) [ -f $INSTALL_ROOT/usr/lib/libxmmsclient++.so ]
- is_depends_enabled $SPELL boost ;;
+ CLIENTLIB) true ;;
+ CLIENTLIB_RUBY) is_depends_enabled $SPELL ruby ;;
+ CLIENTLIB_PERL) is_depends_enabled $SPELL perl ;;
+ CLIENTLIB_ECORE) is_depends_enabled $SPELL ecore ;;
+CLIENTLIB_PYTHON) is_depends_enabled $SPELL pyrex ;;
+ CLIENTLIB_JAVA) true ;;
+ CLIENTLIB_CXX) is_depends_enabled $SPELL boost ;;
*) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}" ;
return 1;;
esac
diff --git
a/audio-players/xmms2/REPAIR^5357927979794c14a02dc869a1bd39d0^PRE_SUB_DEPENDS
b/audio-players/xmms2/REPAIR^5357927979794c14a02dc869a1bd39d0^PRE_SUB_DEPENDS
new file mode 100755
index 0000000..5ad4eb2
--- /dev/null
+++
b/audio-players/xmms2/REPAIR^5357927979794c14a02dc869a1bd39d0^PRE_SUB_DEPENDS
@@ -0,0 +1,12 @@
+. $GRIMOIRE/is_depends_enabled.function
+case $THIS_SUB_DEPENDS in
+ CLIENTLIB) true ;;
+ CLIENTLIB_RUBY) is_depends_enabled $SPELL ruby ;;
+ CLIENTLIB_PERL) is_depends_enabled $SPELL perl ;;
+ CLIENTLIB_ECORE) is_depends_enabled $SPELL ecore ;;
+CLIENTLIB_PYTHON) is_depends_enabled $SPELL pyrex ;;
+ CLIENTLIB_JAVA) true ;;
+ CLIENTLIB_CXX) is_depends_enabled $SPELL boost ;;
+*) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}" ;
+ return 1;;
+esac
diff --git a/audio-players/xmms2/SUB_DEPENDS b/audio-players/xmms2/SUB_DEPENDS
index c0d5182..955f4e3 100755
--- a/audio-players/xmms2/SUB_DEPENDS
+++ b/audio-players/xmms2/SUB_DEPENDS
@@ -1,11 +1,12 @@
persistent_add XMMS2_OPTS1
case "$THIS_SUB_DEPENDS" in
- CLIENTLIB) list_add XMMS2_OPTS nolib && list_remove XMMS2_OPTS lib ;;
- CLIENTLIB_RUBY) list_add XMMS2_OPTS1 noruby && depends ruby ;;
-CLIENTLIB_PYTHON) list_add XMMS2_OPTS1 nopython && depends pyrex ;;
- CLIENTLIB_CXX) list_add XMMS2_OPTS1 noxmmsclient++ && depends boost ;;
- CLIENTLIB_ECORE) list_add XMMS2_OPTS1 noxmmsclient-ecore && depends ecore ;;
- CLIENTLIB_JAVA) list_add XMMS2_OPTS1 nojava && depends JAVA ;;
+ CLIENTLIB) true ;;
+ CLIENTLIB_RUBY) depends ruby "--with-optionals=ruby" ;;
+CLIENTLIB_PYTHON) depends pyrex "--with-optionals=python" ;;
+ CLIENTLIB_CXX) depends boost
"--with-optionals=xmmsclient++,xmmsclient++-glib" ;;
+ CLIENTLIB_ECORE) depends ecore "--with-optionals=xmmsclient-ecore" ;;
+ CLIENTLIB_JAVA) true ;;
+ CLIENTLIB_PERL) depends perl "--with-optionals=perl" ;;
*) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}" ;
return 1;;
esac



  • [SM-Commit] GIT changes to master grimoire by Andraž Levstik (9e16d6ecbb428ac2865af80cbe31234a17d48d67), Andraž Levstik, 05/21/2007

Archive powered by MHonArc 2.6.24.

Top of Page