Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to test grimoire by Andra?? Levstik (56f04d11c57d01afc6b47ba137e3c5d1a87d03dd)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Andra?? Levstik <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to test grimoire by Andra?? Levstik (56f04d11c57d01afc6b47ba137e3c5d1a87d03dd)
  • Date: Fri, 16 Jun 2006 12:11:24 -0500

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

audio-players/xmms2/BUILD | 4 -
audio-players/xmms2/CONFIGURE | 58 +++++++++++--------
audio-players/xmms2/DEPENDS | 128
+++++++++++++++++++++++++++++++-----------
audio-players/xmms2/HISTORY | 7 ++
audio-players/xmms2/INSTALL | 3
5 files changed, 143 insertions(+), 57 deletions(-)

New commits:
commit 56f04d11c57d01afc6b47ba137e3c5d1a87d03dd
Author: Andra?? Levstik <ruskie AT mages.ath.cx>
Commit: Andra?? Levstik <ruskie AT mages.ath.cx>

Fixes for bugs 12702 and 12706

diff --git a/audio-players/xmms2/BUILD b/audio-players/xmms2/BUILD
index 1381d9d..3311a88 100755
--- a/audio-players/xmms2/BUILD
+++ b/audio-players/xmms2/BUILD
@@ -3,9 +3,9 @@ scons MANDIR=${INSTALL_ROOT}/usr/share/m
PREFIX=${INSTALL_ROOT}/usr \
CCFLAGS="$CFLAGS" \
CXXFLAGS="$CXXFLAGS" \
- EXCLUDE="$OPTS" &&
+ EXCLUDE="$XMMS2_OPTS $OPTS" &&
scons MANDIR=${INSTALL_ROOT}/usr/share/man \
PREFIX=${INSTALL_ROOT}/usr \
CCFLAGS="$CFLAGS" \
CXXFLAGS="$CXXFLAGS" \
- EXCLUDE="$OPTS"
+ EXCLUDE="$XMMS2_OPTS $OPTS"
diff --git a/audio-players/xmms2/CONFIGURE b/audio-players/xmms2/CONFIGURE
index 93692c0..2c3b5f8 100755
--- a/audio-players/xmms2/CONFIGURE
+++ b/audio-players/xmms2/CONFIGURE
@@ -1,24 +1,36 @@
-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 file transport support" y \
- "nolib" "file" &&
-config_query_option XMMS2_OPTS "Do you want to build the client lib" y \
- "nofile" "lib" &&
-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 \
+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 file transport support" y \
+ "nolib" "file" &&
+config_query_option XMMS2_OPTS \
+ "Do you want to build the client lib" y \
+ "nofile" "lib" &&
+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"
diff --git a/audio-players/xmms2/DEPENDS b/audio-players/xmms2/DEPENDS
index 1ab15a6..dd96741 100755
--- a/audio-players/xmms2/DEPENDS
+++ b/audio-players/xmms2/DEPENDS
@@ -1,37 +1,103 @@
-depends scons
-depends sqlite
-depends glib2
+depends scons &&
+depends sqlite &&
+depends glib2 &&

-#Transport plugins
-optional_depends curl "" "curl" "For http transport plugin."
-optional_depends libmms "" "mms" "For mms transport plugin."
-optional_depends samba "" "samba" "For samba transport plugin."
+#Transport plugins &&
+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 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."
+#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." &&

-#Clients
-optional_depends sdl_ttf "" "sdl-vis" "For visuialization client
support(sdl-vis)."
-optional_depends gamin "" "medialib-updater" "For medialib-updater support."
+#Clients &&
+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 "" "alsa" "For alsa output plugin."
-optional_depends jack "" "jack" "For jack output plugin."
+#Output plugins &&
+optional_depends alsa-lib \
+ "" \
+ "alsa" \
+ "For alsa output plugin." &&
+optional_depends jack \
+ "" \
+ "jack" \
+ "For jack output plugin." &&

-#Effect plugins
-optional_depends libshout "" "ices icymetaint" "Icecast effect plugin"
+#Effect plugins &&
+optional_depends libshout \
+ "" \
+ "ices icymetaint" \
+ "Icecast effect plugin" &&

-#Language 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 C++ bindings."
+#Language 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 C++ bindings."
diff --git a/audio-players/xmms2/HISTORY b/audio-players/xmms2/HISTORY
index e19346e..b5f3888 100644
--- a/audio-players/xmms2/HISTORY
+++ b/audio-players/xmms2/HISTORY
@@ -1,3 +1,10 @@
+2006-06-16 Andra?? "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * INSTALL: fixes bug #12702
+ * BUILD: minor fix
+ * DEPENDS: use LIBAVCODEC instead of ffmpeg bug #12706,
+ added nice linebreaks
+ * CONFIGURE: added nice linebreaks
+
2006-06-10 Andra?? "ruskie" Levstik <ruskie AT mages.ath.cx>
* PREPARE: ask for specific revision of the source,
ask for HEAD/$date versions
diff --git a/audio-players/xmms2/INSTALL b/audio-players/xmms2/INSTALL
index 7880db6..2e59f73 100755
--- a/audio-players/xmms2/INSTALL
+++ b/audio-players/xmms2/INSTALL
@@ -3,4 +3,5 @@ scons MANDIR=${INSTALL_ROOT}/usr/share/m
PREFIX=${INSTALL_ROOT}/usr \
CCFLAGS="$CFLAGS" \
CXXFLAGS="$CXXFLAGS" \
- EXCLUDE="$OPTS"
+ EXCLUDE="$XMMS2_OPTS $OPTS" \
+ install



  • [SM-Commit] GIT changes to test grimoire by Andra?? Levstik (56f04d11c57d01afc6b47ba137e3c5d1a87d03dd), Andra?? Levstik, 06/16/2006

Archive powered by MHonArc 2.6.24.

Top of Page