sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

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

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 (a73c4ec971e779de3f5f50cc0ffafdc85ff39fce)
Date: Fri, 24 Apr 2009 04:44:30 -0500

GIT changes to master grimoire by Andraž Levstik
<ruskie+2054d253 AT codemages.net>:

audio-players/xmms2/BUILD | 8 +---
audio-players/xmms2/CONFIGURE | 55
++++++++++++++++++++++-------
audio-players/xmms2/DEPENDS | 20 +++++-----
audio-players/xmms2/DETAILS | 4 +-
audio-players/xmms2/HISTORY | 8 ++++
audio-players/xmms2/PRE_BUILD | 3 -
audio-players/xmms2/helpers_path_max.patch | 15 -------
7 files changed, 66 insertions(+), 47 deletions(-)

New commits:
commit c47e9ee638ff2132c2d7abf5b0de698ba3b8a436
Author: Andraž Levstik <ruskie+2054d253 AT codemages.net>
Commit: Andraž Levstik <ruskie+2054d253 AT codemages.net>

xmms2: update to 0.6DrMattDestruction

diff --git a/audio-players/xmms2/BUILD b/audio-players/xmms2/BUILD
index cc9a571..015d3ee 100755
--- a/audio-players/xmms2/BUILD
+++ b/audio-players/xmms2/BUILD
@@ -1,8 +1,4 @@
cd xmms2* &&
-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
-OPTS="--without-plugins=html,speex $OPTS"
-fi &&
+OPTS="${XMMS2_OPTS/--with-xmms2d}
--with-mandir=${INSTALL_ROOT}/usr/share/man $OPTS"
+OPTS="${OPTS/--with-xmms2d}"
CCFLAGS=$CFLAGS waf_build
diff --git a/audio-players/xmms2/CONFIGURE b/audio-players/xmms2/CONFIGURE
index bdf46d3..07cac91 100755
--- a/audio-players/xmms2/CONFIGURE
+++ b/audio-players/xmms2/CONFIGURE
@@ -1,13 +1,17 @@
XMMS2_OPTS="$(echo $XMMS2_OPTS $XMMS2_OPTS1 | tr " " "\n" | grep "\-\-with"
| tr "\n" " ")"
+XMMS2_OPTS="${XMMS2_OPTS/--without-xmms2d=0/--with-xmms2d}"
+XMMS2_OPTS="${XMMS2_OPTS/--without-xmms2d=1/--without-xmms2d}"
+XMMS2_OPTS="${XMMS2_OPTS/--with-plugins=lastfm,lastfmeta,curl}"
+XMMS2_OPTS="${XMMS2_OPTS/--with-plugins=lastfm,lastfmeta,curl}"
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 \
- "--without-xmms2d=0" \
- "--without-xmms2d=1" &&
-if list_find "$XMMS2_OPTS" "--without-xmms2d=0" ; then
+ "--with-xmms2d" \
+ "--without-xmms2d" &&
+if list_find "$XMMS2_OPTS" "--with-xmms2d" ; then
config_query_option XMMS2_OPTS \
"Do you want diskwrite plugin" \
y \
@@ -18,11 +22,11 @@ config_query_option XMMS2_OPTS
\
y \
"--with-plugins=oss" \
"--without-plugins=oss" &&
-#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 html playlist support" \
+ y \
+ "--with-plugins=html" \
+ "--without-plugins=html" &&
config_query_option XMMS2_OPTS \
"Do you want id3 tag support" \
y \
@@ -69,11 +73,6 @@ config_query_option XMMS2_OPTS
\
"--with-plugins=ices" \
"--without-plugins=ices" &&
config_query_option XMMS2_OPTS \
- "Do you want lastfm stream transport support" \
- y \
- "--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" \
@@ -124,6 +123,31 @@ config_query_option XMMS2_OPTS
\
"--with-plugins=mp4" \
"--without-plugins=mp4" &&
config_query_option XMMS2_OPTS \
+ "Do you want APE support" \
+ y \
+ "--with-plugins=apefile" \
+ "--without-plugins=apefile" &&
+config_query_option XMMS2_OPTS \
+ "Do you want FLV support" \
+ y \
+ "--with-plugins=flv" \
+ "--without-plugins=flv" &&
+config_query_option XMMS2_OPTS \
+ "Do you want ReplayGain support" \
+ y \
+ "--with-plugins=replaygain" \
+ "--without-plugins=replaygain" &&
+config_query_option XMMS2_OPTS \
+ "Do you want TTA support" \
+ y \
+ "--with-plugins=tta" \
+ "--without-plugins=tta" &&
+config_query_option XMMS2_OPTS \
+ "Do you want WAVE support" \
+ y \
+ "--with-plugins=wave" \
+ "--without-plugins=wave" &&
+config_query_option XMMS2_OPTS \
"Do you want CDDA support" \
y \
"--with-plugins=cdda" \
@@ -151,6 +175,11 @@ config_query_option XMMS2_OPTS
\
"--with-optionals=cli" \
"--without-optionals=cli" &&
config_query_option XMMS2_OPTS \
+ "Do you want to build the new cli client" \
+ y \
+ "--with-optionals=nycli" \
+ "--without-optionals=nycli" &&
+config_query_option XMMS2_OPTS \
"Do you want to build the xmms2-launcher" \
y \
"--with-optionals=launcher" \
diff --git a/audio-players/xmms2/DEPENDS b/audio-players/xmms2/DEPENDS
index 689d00c..c9ecf14 100755
--- a/audio-players/xmms2/DEPENDS
+++ b/audio-players/xmms2/DEPENDS
@@ -3,7 +3,7 @@ depends sqlite
&&
depends glib2 &&

#Transport plugins &&
-if list_find "$XMMS2_OPTS" "--without-xmms2d=0" ; then
+if list_find "$XMMS2_OPTS" "--with-xmms2d" ; then
if list_find "$XMMS2_OPTS" "--with-plugins=cdda" ; then
depends libcdio &&
depends libdiscid
@@ -35,16 +35,13 @@ optional_depends openssl
\
"--without-plugins=airplay" \
"For airplay transport support" &&
#Decoder plugins &&
-if [[ $XMMS2_TREE == juhov ]] ||
- [[ $XMMS2_TREE == devel ]]; then
message "There are two MP3 decoding plugins." &&
message "One is mpg123 based the other MAD based." &&
message "Both can coexist." &&
optional_depends mpg123 \
"--with-plugins=mpg123" \
"--without-plugins=mpg123" \
- "For mp3 decoder plugin."
-fi
+ "For mp3 decoder plugin." &&
optional_depends libmad \
"--with-plugins=mad" \
"--without-plugins=mad" \
@@ -81,6 +78,10 @@ optional_depends LIBAVCODEC
\
"--with-plugins=avcodec" \
"--without-plugins=avcodec" \
"For WMA decoder plugin." &&
+optional_depends wavpack \
+ "--with-plugins=wavpack" \
+ "--without-plugins=wavpack" \
+ "For wavpack decoder plugin." &&
if list_find "$XMMS2_OPTS" "--with-plugins=gma" ; then
depends g++
fi
@@ -116,11 +117,12 @@ depends curl
if list_find "$XMMS2_OPTS" "--with-plugins=vocoder" ; then
depends libsamplerate &&
depends fftw
- fi &&
- if list_find "$XMMS2_OPTS" "--with-plugins=lastfm,lastfmmeta,curl" ; then
-depends curl
fi
-fi
+fi &&
+optional_depends libofa \
+ "--with-plugins=ofa" \
+ "--without-plugins=ofa" \
+ "For acoustic fingerprint plugin." &&

#Clients &&
optional_depends gamin \
diff --git a/audio-players/xmms2/DETAILS b/audio-players/xmms2/DETAILS
index c12cecf..56be6f2 100755
--- a/audio-players/xmms2/DETAILS
+++ b/audio-players/xmms2/DETAILS
@@ -13,11 +13,11 @@ SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${XMMS2_TREE}
FORCE_DOWNLOAD=ON
SOURCE_IGNORE=volatile
else
- VERSION=0.5DrLecter
+ VERSION=0.6DrMattDestruction
SOURCE=${SPELL}-${VERSION}.tar.bz2
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
SOURCE_URL[0]=${SOURCEFORGE_URL}/${SPELL}/${SOURCE}
-
SOURCE_HASH=sha512:e8476dcdf41d7b4c86cb0f613d76f305ef8f832e4169cc41e9dcec4ef57c528c74442180258d4441c118c7f5cd2337c22d9c2fba577fde54c78e37453272ba94
+
SOURCE_HASH=sha512:fd08234532c692ff1ddcdce6a6ace5f837799a6d214e0c3ba5bfa3f218fe22e465865d3416bc7baa6b0c212693990a941c6d9ca32c752d6a5dd1d68a94c3829f
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 717383b..1352a47 100644
--- a/audio-players/xmms2/HISTORY
+++ b/audio-players/xmms2/HISTORY
@@ -1,3 +1,11 @@
+2009-04-23 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
+ * DETAILS: updated spell to 0.6DrMattDestruction
+ * BUILD: updated for new version
+ * CONFIGURE: updated for new version
+ * DEPENDS: updated for new version
+ * PRE_BUILD: removed a patch
+ * helpers_path_max.patch: removed
+
2009-03-08 Bearcat M. Sandor <sourcemage AT feline-soul.com>
* PRE_BUILD: added patch to fix syntax error for stable builds

diff --git a/audio-players/xmms2/PRE_BUILD b/audio-players/xmms2/PRE_BUILD
index 1f3fb9d..d01d3d2 100755
--- a/audio-players/xmms2/PRE_BUILD
+++ b/audio-players/xmms2/PRE_BUILD
@@ -4,5 +4,4 @@ unpack_file &&
cd xmms* &&
echo -e "#!/bin/sh\ncd xmms*\n./waf configure --help" > ../configure &&
chmod +x ../configure &&
-patch -p0 < $SPELL_DIRECTORY/fix_flags.diff &&
-patch -p1 < $SPELL_DIRECTORY/helpers_path_max.patch
+patch -p0 < $SPELL_DIRECTORY/fix_flags.diff
diff --git a/audio-players/xmms2/helpers_path_max.patch
b/audio-players/xmms2/helpers_path_max.patch
deleted file mode 100644
index 7cdf16f..0000000
--- a/audio-players/xmms2/helpers_path_max.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/src/include/xmmsclient/xmmsclient++/helpers.h
b/src/include/xmmsclient/xmmsclient++/helpers.h
-index b131575..f237231 100644
---- a/src/include/xmmsclient/xmmsclient++/helpers.h
-+++ b/src/include/xmmsclient/xmmsclient++/helpers.h
-@@ -44,8 +44,8 @@ namespace Xmms
- */
- inline std::string getUserConfDir() {
-
-- char buf[PATH_MAX] = { '\0' };
-- if( !xmmsc_userconfdir_get( buf, PATH_MAX ) ) {
-+ char buf[XMMS_PATH_MAX] = { '\0' };
-+ if( !xmmsc_userconfdir_get( buf, XMMS_PATH_MAX ) ) {
- throw Xmms::result_error( "Error occured when trying
to get "
- "user config directory." );
- }

[SM-Commit] GIT changes to master grimoire by Andraž Levstik (a73c4ec971e779de3f5f50cc0ffafdc85ff39fce), Andraž Levstik, 04/24/2009