xmms2: update to version 0.7DrNo

6 files changed, 26 insertions, 19 deletions

diff --git a/audio-players/xmms2/BUILD b/audio-players/xmms2/BUILD
index 015d3ee4ce..07a4915267 100755
--- a/audio-players/xmms2/BUILD
+++ b/audio-players/xmms2/BUILD
@@ -1,4 +1,4 @@
 cd xmms2*  &&
-OPTS="${XMMS2_OPTS/--with-xmms2d} --with-mandir=${INSTALL_ROOT}/usr/share/man $OPTS"
+OPTS="${XMMS2_OPTS/--with-xmms2d} --jobs=1 --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 07cac91989..656f288bd0 100755
--- a/audio-players/xmms2/CONFIGURE
+++ b/audio-players/xmms2/CONFIGURE
@@ -153,11 +153,6 @@ config_query_option XMMS2_OPTS                                     \
                     "--with-plugins=cdda"                          \
                     "--without-plugins=cdda"                       &&
 config_query_option XMMS2_OPTS                                     \
-                     "Do you want Game Music support"              \
-                     y                                             \
-                     "--with-plugins=gme"                          \
-                     "--without-plugins=gme"                       &&
-config_query_option XMMS2_OPTS                                     \
                      "Do you want GVFS support"                    \
                      y                                             \
                      "--with-plugins=gvfs"                         \
diff --git a/audio-players/xmms2/DEPENDS b/audio-players/xmms2/DEPENDS
index 5a2c6571e5..a53dd0f281 100755
--- a/audio-players/xmms2/DEPENDS
+++ b/audio-players/xmms2/DEPENDS
@@ -82,9 +82,10 @@ 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
+optional_depends game-music-emu                                           \
+                 "--with-plugins=gme"                                     \
+                 "--without-plugins=gme"                                  \
+                 "Game Music support"                                     &&
 
 #Output plugins  &&
 optional_depends alsa-lib                                                 \
@@ -156,7 +157,4 @@ optional_depends ecore                                                    \
 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
+                 "For C++ bindings."
diff --git a/audio-players/xmms2/DETAILS b/audio-players/xmms2/DETAILS
index 67d5ddd424..fde5c7336c 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.6DrMattDestruction
+         VERSION=0.7DrNo
           SOURCE=${SPELL}-${VERSION}.tar.bz2
 SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
    SOURCE_URL[0]=${SOURCEFORGE_URL}/${SPELL}/${SOURCE}
-     SOURCE_HASH=sha512:fd08234532c692ff1ddcdce6a6ace5f837799a6d214e0c3ba5bfa3f218fe22e465865d3416bc7baa6b0c212693990a941c6d9ca32c752d6a5dd1d68a94c3829f
+     SOURCE_HASH=sha512:e991c0c5d598ccfd868b81ae932255352bd3be014f86e05f1fa782d240b7ce059054cad746cf52c8c383058feba1fdf5675c43ec6495955c06b6e5e9f949ca01
 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 18240aa824..d0243d2ec2 100644
--- a/audio-players/xmms2/HISTORY
+++ b/audio-players/xmms2/HISTORY
@@ -1,3 +1,10 @@
+2010-03-01 Andraž "ruskie" Levstik <ruskie+f03a580f@codemages.net>
+	* DETAILS: updated to 0.7DrNo
+	* DEPENDS: gme now needs a dependency
+	* BUILD: changed mandir and added with jobs=1 else it fails
+	* CONFIGURE: removed gme
+	* fix_flags.diff: updated
+
 2010-02-25 Remko van der Vossen <wich@sourcemage.org>
 	* DEPENDS: updated ruby dependency to RUBY provider
 
diff --git a/audio-players/xmms2/fix_flags.diff b/audio-players/xmms2/fix_flags.diff
index 2bdcc5ff9d..1a8f185e43 100644
--- a/audio-players/xmms2/fix_flags.diff
+++ b/audio-players/xmms2/fix_flags.diff
@@ -1,12 +1,19 @@
---- wscript.orig	2008-08-14 16:39:37.000000000 +0200
-+++ wscript	2008-08-14 16:39:52.000000000 +0200
-@@ -263,8 +263,8 @@
+--- wscript.orig	2010-03-01 08:40:57.000000000 +0100
++++ wscript	2010-03-01 08:41:23.000000000 +0100
+@@ -275,7 +275,7 @@
          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"])
+     for warning in ('all',
+                     'no-format-extra-args',
+                     'no-format-zero-length',
+@@ -295,7 +295,7 @@
+             # autogenerate uselib definitions to disable warnings
+             conf.env["CCFLAGS_NO%s" % warning.replace("-","").upper()] = ["-Wno-%s" % warning]
+ 
+-    conf.env["CXXFLAGS"] = Utils.to_list(conf.env["CXXFLAGS"]) + ['-g', '-O0']
 +    conf.env["CXXFLAGS"] = Utils.to_list(conf.env["CXXFLAGS"])
      conf.env['XMMS_PKGCONF_FILES'] = []
      conf.env['XMMS_OUTPUT_PLUGINS'] = [(-1, "NONE")]