Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Andraž 'ruskie' Levstik (1eeb89c8e20ff66ec47e7b9760c12ae1e3f474dd)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Andraž 'ruskie' Levstik <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Andraž 'ruskie' Levstik (1eeb89c8e20ff66ec47e7b9760c12ae1e3f474dd)
  • Date: Fri, 15 Aug 2008 11:10:06 -0500

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

audio-players/xmms2/CONFLICTS | 1 +
audio-players/xmms2/DEPENDS | 9 +++++++++
audio-players/xmms2/DETAILS | 9 ++++-----
audio-players/xmms2/HISTORY | 8 ++++++++
audio-players/xmms2/PREPARE | 12 +++++++++++-
audio-players/xmms2/PRE_BUILD | 5 +----
audio-players/xmms2/fix_flags.diff | 13 +++++++++++++
7 files changed, 47 insertions(+), 10 deletions(-)

New commits:
commit 37ab4b5d3eda4a8a3d697196f5c4adef5a8bb7f6
Author: Andraž 'ruskie' Levstik <ruskie AT codemages.net>
Commit: Andraž 'ruskie' Levstik <ruskie AT codemages.net>

xmms2: added more branches and mpg123 support under juhov branch

diff --git a/audio-players/xmms2/CONFLICTS b/audio-players/xmms2/CONFLICTS
new file mode 100755
index 0000000..39599c4
--- /dev/null
+++ b/audio-players/xmms2/CONFLICTS
@@ -0,0 +1 @@
+conflicts xmms2 y
diff --git a/audio-players/xmms2/DEPENDS b/audio-players/xmms2/DEPENDS
index ec1aab0..8744538 100755
--- a/audio-players/xmms2/DEPENDS
+++ b/audio-players/xmms2/DEPENDS
@@ -35,6 +35,15 @@ optional_depends openssl
\
"--without-plugins=airplay" \
"For airplay transport support" &&
#Decoder plugins &&
+if [[ $XMMS_TREE == juhov ]]; 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
optional_depends libmad \
"--with-plugins=mad" \
"--without-plugins=mad" \
diff --git a/audio-players/xmms2/DETAILS b/audio-players/xmms2/DETAILS
index 1971b68..c12cecf 100755
--- a/audio-players/xmms2/DETAILS
+++ b/audio-players/xmms2/DETAILS
@@ -5,12 +5,11 @@ if [[ "$XMMS2_SNAPSHOT_AUTO" == "y" ]]
then
VERSION=$(date +%Y%m%d)
else
- VERSION=${XMMS2_TREE_REV}
+ VERSION=${XMMS2_TREE}-${XMMS2_TREE_REV}
fi
- PKG=${XMMS2_TREE_REV}
- SOURCE=${SPELL}-${XMMS2_TREE}.git-snapshot-${PKG}.tar.bz2
-SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${PKG}
- SOURCE_URL[0]=http://git.xmms.se/snapshot.cgi/${SOURCE}
+ SOURCE=${SPELL}-${XMMS2_TREE}.tar.bz2
+SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${XMMS2_TREE}
+
SOURCE_URL[0]=git://git.xmms.se/$SPELL/$SPELL-${XMMS2_TREE}.git/:${SPELL}-${XMMS2_TREE}::${XMMS2_TREE_REV}
FORCE_DOWNLOAD=ON
SOURCE_IGNORE=volatile
else
diff --git a/audio-players/xmms2/HISTORY b/audio-players/xmms2/HISTORY
index 6722a83..a1d449c 100644
--- a/audio-players/xmms2/HISTORY
+++ b/audio-players/xmms2/HISTORY
@@ -1,3 +1,11 @@
+2008-08-15 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * CONFLICTS: fix for bad linking to older libxmmsclient lib
+ * fix_flags.diff: fix for forcing -g and -O0
+ * DEPENDS: new depends mpg123 plugin(atm only on juhov branch)
+ * DETAILS: use git now
+ * PREPARE: added more branches
+ * PRE_BUILD: fix for forcing -g and -O0
+
2008-07-18 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
* CONFIGURE: forgot to add oss support

diff --git a/audio-players/xmms2/PREPARE b/audio-players/xmms2/PREPARE
index 103ef90..fe74bd7 100755
--- a/audio-players/xmms2/PREPARE
+++ b/audio-players/xmms2/PREPARE
@@ -19,7 +19,17 @@ config_query_list XMMS2_TREE
\
coledot \
danderson \
puzzles \
- rafl &&
+ rafl \
+ alex \
+ darkk \
+ eclipser \
+ greafine \
+ nesciens \
+ stoky \
+ tcoppi \
+ ypnos \
+ zeegeek \
+ zygfryd &&
config_query_string XMMS2_TREE_REV \
"Enter the revision you want to checkout \
(git hash) or HEAD(default) if you want the latest." "HEAD"
diff --git a/audio-players/xmms2/PRE_BUILD b/audio-players/xmms2/PRE_BUILD
index 37a80bc..d01d3d2 100755
--- a/audio-players/xmms2/PRE_BUILD
+++ b/audio-players/xmms2/PRE_BUILD
@@ -4,7 +4,4 @@ unpack_file &&
cd xmms* &&
echo -e "#!/bin/sh\ncd xmms*\n./waf configure --help" > ../configure &&
chmod +x ../configure &&
-#sedit "260s:.*: conf.env[\"CCFLAGS\"] =
Utils.to_list(conf.env[\"CFLAGS\"]):" wscript
-#sedit "261s:.*: conf.env[\"CXXFLAGS\"] =
Utils.to_list(conf.env[\"CXXFLAGS\"]):" wscript
-sedit "264s:.*: conf.env[\"CCFLAGS\"] =
Utils.to_list(conf.env[\"CFLAGS\"]):" wscript
-sedit "265s:.*: conf.env[\"CXXFLAGS\"] =
Utils.to_list(conf.env[\"CXXFLAGS\"]):" wscript
+patch -p0 < $SPELL_DIRECTORY/fix_flags.diff
diff --git a/audio-players/xmms2/fix_flags.diff
b/audio-players/xmms2/fix_flags.diff
new file mode 100644
index 0000000..2bdcc5f
--- /dev/null
+++ b/audio-players/xmms2/fix_flags.diff
@@ -0,0 +1,13 @@
+--- wscript.orig 2008-08-14 16:39:37.000000000 +0200
++++ wscript 2008-08-14 16:39:52.000000000 +0200
+@@ -263,8 +263,8 @@
+ conf.check_message("uncommitted changes", "", bool(changed))
+ conf.env["VERSION"] = BASEVERSION + " (git commit: %s%s)" % (nam,
dirty)
+
+- conf.env["CCFLAGS"] = Utils.to_list(conf.env["CCFLAGS"]) + ['-g', '-O0']
+- conf.env["CXXFLAGS"] = Utils.to_list(conf.env["CXXFLAGS"]) + ['-g',
'-O0']
++ conf.env["CCFLAGS"] = Utils.to_list(conf.env["CCFLAGS"])
++ conf.env["CXXFLAGS"] = Utils.to_list(conf.env["CXXFLAGS"])
+ conf.env['XMMS_PKGCONF_FILES'] = []
+ conf.env['XMMS_OUTPUT_PLUGINS'] = [(-1, "NONE")]
+



  • [SM-Commit] GIT changes to master grimoire by Andraž 'ruskie' Levstik (1eeb89c8e20ff66ec47e7b9760c12ae1e3f474dd), Andraž 'ruskie' Levstik, 08/15/2008

Archive powered by MHonArc 2.6.24.

Top of Page