Hi, Here is a patch to update xmms2 to 0.7. You should use "patch -E" as it removes a file. There are nothing really new in this version. The client xmms2 has been deprecated in favor of nyxmms2. I have disabled gme plugin because it requires a new dependency and I think it's not used by a lot of people.
There are also a patch to update xmms2-scrobbler to 0.4. I have tested them on x86 and compiled on amd64. Comments? OK? Regards, Amaury
diff -x .hg* -x CVS -ruN xmms2.orig/Makefile xmms2/Makefile
--- xmms2.orig/Makefile Sun Mar 28 19:04:42 2010
+++ xmms2/Makefile Sun Mar 28 20:35:11 2010
@@ -2,14 +2,14 @@
COMMENT = audio player daemon with library management
-V = 0.6
-DISTNAME = xmms2-${V}DrMattDestruction
-PKGNAME = xmms2-${V}p3
+V = 0.7
+DISTNAME = xmms2-${V}DrNo
+PKGNAME = xmms2-${V}
-SHARED_LIBS += xmmsclient++ 0.0 # 3.0.0
+SHARED_LIBS += xmmsclient++ 1.0 # 4.0.0
SHARED_LIBS += xmmsclient++-glib 0.0 # 1.0.0
SHARED_LIBS += xmmsclient-glib 0.0 # 1.0.0
-SHARED_LIBS += xmmsclient 0.0 # 5.0.0
+SHARED_LIBS += xmmsclient 1.0 # 6.0.0
CATEGORIES = audio
@@ -50,7 +50,8 @@
FLAC.>=9::audio/flac \
curl.>=13::net/curl \
mad.>=2::audio/libmad \
- avahi-client,avahi-common,avahi-glib::net/avahi
+ avahi-client,avahi-common,avahi-glib::net/avahi \
+ vorbisidec.>=2::audio/tremor
WSCRIPT_PATCHES = src/clients/lib/xmmsclient++/wscript \
src/clients/lib/xmmsclient++-glib/wscript \
@@ -64,13 +65,12 @@
# Disable shared memory support for visualization because it requires semtimedop()
do-configure:
cd ${WRKSRC} && PYTHON=${MODPY_BIN} ${MODPY_BIN} ./waf configure --prefix=${PREFIX} \
- --with-mandir=${PREFIX}/man \
+ --mandir=${PREFIX}/man \
--conf-prefix=${PREFIX} \
- --without-plugins=speex,sun \
--with-default-output-plugin=ao \
--disable-shmvis-server \
--without-optionals=dns_sd,medialib-updater,tests,xmmsclient-cf,xmmsclient-ecore,ruby \
- --without-plugins=airplay,alsa,cdda,coreaudio,faad,ices,mac,mms,modplug,mpg123,musepack,nms,ofa,oss,pulse,samba,sid,vocoder,waveout,wavpack
+ --without-plugins=airplay,alsa,cdda,coreaudio,faad,gme,ices,mac,mms,modplug,mpg123,musepack,nms,ofa,oss,pulse,samba,sid,speex,sun,vocoder,waveout,wavpack
do-build:
cd ${WRKSRC} && ${MODPY_BIN} ./waf build
diff -x .hg* -x CVS -ruN xmms2.orig/distinfo xmms2/distinfo
--- xmms2.orig/distinfo Sun Mar 28 19:04:42 2010
+++ xmms2/distinfo Sun Mar 28 20:29:18 2010
@@ -1,5 +1,5 @@
-MD5 (xmms2-0.6DrMattDestruction.tar.bz2) = lU+5x2tdteMkoQXoGycyAA==
-RMD160 (xmms2-0.6DrMattDestruction.tar.bz2) = yNmyoZq3gi924S/Cx4ZAxajm5pg=
-SHA1 (xmms2-0.6DrMattDestruction.tar.bz2) = Uktk0vjbHX2ERJVmpG9rVq1M6rs=
-SHA256 (xmms2-0.6DrMattDestruction.tar.bz2) = T7T0aYFtihpnb2Zg43CwxzoH49flnQf1ekO2chYpHbg=
-SIZE (xmms2-0.6DrMattDestruction.tar.bz2) = 1631304
+MD5 (xmms2-0.7DrNo.tar.bz2) = YOULWRB4rLaoXNg94PKwdw==
+RMD160 (xmms2-0.7DrNo.tar.bz2) = OlJt+foe1RA7aiUsNMA5S/Dk8VY=
+SHA1 (xmms2-0.7DrNo.tar.bz2) = SZlWhlSg0quoS9pLIhRQWLvT/LI=
+SHA256 (xmms2-0.7DrNo.tar.bz2) = WcWNk4DmsAKSCo3HXw/UYpqxdbgvKbZjf3gW/cmDKyw=
+SIZE (xmms2-0.7DrNo.tar.bz2) = 1519973
diff -x .hg* -x CVS -ruN xmms2.orig/patches/patch-src_clients_lib_perl_wscript xmms2/patches/patch-src_clients_lib_perl_wscript
--- xmms2.orig/patches/patch-src_clients_lib_perl_wscript Sun Mar 28 19:04:41 2010
+++ xmms2/patches/patch-src_clients_lib_perl_wscript Thu Jan 1 01:00:00 1970
@@ -1,16 +0,0 @@
-$OpenBSD: patch-src_clients_lib_perl_wscript,v 1.1 2009/06/08 17:08:48 ajacoutot Exp $
---- src/clients/lib/perl/wscript.orig Thu Jun 4 12:11:24 2009
-+++ src/clients/lib/perl/wscript Thu Jun 4 12:12:19 2009
-@@ -17,9 +17,9 @@ def build(bld):
- obj.mac_bundle = True
-
- bld.install_files('${INSTALLDIR_PERL_LIB}', 'pm/XMMSClient.pm')
-- bld.install_files('${INSTALLDIR_PERL_LIB}', 'pm/XMMSClient/Sync.pm')
-- bld.install_files('${INSTALLDIR_PERL_LIB}', 'pm/XMMSClient/Glib.pm')
-- bld.install_files('${INSTALLDIR_PERL_LIB}', 'pm/XMMSClient/Collection.pm')
-+ bld.install_files('${INSTALLDIR_PERL_LIB}/XMMSClient', 'pm/XMMSClient/Sync.pm')
-+ bld.install_files('${INSTALLDIR_PERL_LIB}/XMMSClient', 'pm/XMMSClient/Glib.pm')
-+ bld.install_files('${INSTALLDIR_PERL_LIB}/XMMSClient', 'pm/XMMSClient/Collection.pm')
-
- def configure(conf):
- conf.check_tool('perl')
diff -x .hg* -x CVS -ruN xmms2.orig/patches/patch-src_clients_lib_xmmsclient++_wscript xmms2/patches/patch-src_clients_lib_xmmsclient++_wscript
--- xmms2.orig/patches/patch-src_clients_lib_xmmsclient++_wscript Sun Mar 28 19:04:42 2010
+++ xmms2/patches/patch-src_clients_lib_xmmsclient++_wscript Sun Mar 28 20:31:50 2010
@@ -4,8 +4,8 @@
@@ -26,7 +26,7 @@ def build(bld):
""".split()
obj.uselib_local = 'xmmsclient'
- obj.uselib = 'BOOST BOOST_SIGNALS socket'
-- obj.vnum = '3.0.0'
+ obj.uselib = 'BOOST socket'
+- obj.vnum = '4.0.0'
+ obj.vnum = '${LIBxmmsclient++_VERSION}'
tool.add_install_flag(bld, obj)
diff -x .hg* -x CVS -ruN xmms2.orig/patches/patch-src_clients_lib_xmmsclient_wscript xmms2/patches/patch-src_clients_lib_xmmsclient_wscript
--- xmms2.orig/patches/patch-src_clients_lib_xmmsclient_wscript Sun Mar 28 19:04:42 2010
+++ xmms2/patches/patch-src_clients_lib_xmmsclient_wscript Sun Mar 28 20:31:57 2010
@@ -1,11 +1,11 @@
$OpenBSD: patch-src_clients_lib_xmmsclient_wscript,v 1.1.1.1 2009/06/03 18:25:25 ajacoutot Exp $
---- src/clients/lib/xmmsclient/wscript.orig Sat May 16 17:20:23 2009
-+++ src/clients/lib/xmmsclient/wscript Sat May 16 17:36:07 2009
+--- src/clients/lib/xmmsclient/wscript.orig Sat Mar 13 19:27:38 2010
++++ src/clients/lib/xmmsclient/wscript Sat Mar 13 19:28:13 2010
@@ -31,7 +31,7 @@ def build(bld):
else:
obj.source += ["visualization/dummy.c"]
-- obj.vnum = "5.0.0"
+- obj.vnum = "6.0.0"
+ obj.vnum = "${LIBxmmsclient_VERSION}"
tool.add_install_flag(bld, obj)
diff -x .hg* -x CVS -ruN xmms2.orig/patches/patch-wafadmin_Tools_ccroot_py xmms2/patches/patch-wafadmin_Tools_ccroot_py
--- xmms2.orig/patches/patch-wafadmin_Tools_ccroot_py Sun Mar 28 19:04:42 2010
+++ xmms2/patches/patch-wafadmin_Tools_ccroot_py Sun Mar 28 20:31:57 2010
@@ -1,27 +1,33 @@
$OpenBSD: patch-wafadmin_Tools_ccroot_py,v 1.1.1.1 2009/06/03 18:25:25 ajacoutot Exp $
Don't create symlink for shared librairies versions.
-Don't put (wrong) SONAME in shared libraries.
+Use good version numbers for libs.
---- wafadmin/Tools/ccroot.py.orig Tue Apr 21 19:50:47 2009
-+++ wafadmin/Tools/ccroot.py Tue May 26 23:24:47 2009
-@@ -113,8 +113,8 @@ def install_shlib(self):
- filename = self.outputs[0].abspath(self.env)
- bld = Build.bld
- bld.install_as(os.path.join(path, name3), filename, env=self.env)
-- bld.symlink_as(os.path.join(path, name2), name3)
-- bld.symlink_as(os.path.join(path, name1), name3)
-+ #bld.symlink_as(os.path.join(path, name2), name3)
-+ #bld.symlink_as(os.path.join(path, name1), name3)
+--- wafadmin/Tools/ccroot.py.orig Sun Mar 14 17:57:48 2010
++++ wafadmin/Tools/ccroot.py Sun Mar 14 17:59:04 2010
+@@ -580,7 +580,7 @@ def apply_vnum(self):
+ name2 = libname + '.' + nums[0]
- # TODO reference the d programs, shlibs in d.py, not here
+ if self.env.SONAME_ST:
+- v = self.env.SONAME_ST % name2
++ v = self.env.SONAME_ST % name3
+ self.env.append_value('LINKFLAGS', v.split())
-@@ -384,7 +384,7 @@ def apply_vnum(self):
- try: name3 = self.soname
- except AttributeError: name3 = self.link_task.outputs[0].name + '.' + nums[0]
- self.link_task.outputs.append(self.link_task.outputs[0].parent.find_or_declare(name3))
-- self.env.append_value('LINKFLAGS', '-Wl,-h,'+name3)
-+ self.env.append_value('LINKFLAGS', '-Wl')
+ bld = self.bld
+@@ -590,13 +590,13 @@ def apply_vnum(self):
+ if not path: return
- @taskgen
- @after('apply_link')
+ bld.install_as(path + os.sep + name3, node, env=self.env)
+- bld.symlink_as(path + os.sep + name2, name3)
+- bld.symlink_as(path + os.sep + libname, name3)
++ #bld.symlink_as(path + os.sep + name2, name3)
++ #bld.symlink_as(path + os.sep + libname, name3)
+
+ # the following task is just to enable execution from the build dir :-/
+ tsk = self.create_task('vnum')
+ tsk.set_inputs([node])
+- tsk.set_outputs(node.parent.find_or_declare(name2))
++ tsk.set_outputs(node.parent.find_or_declare(name3))
+
+ def exec_vnum_link(self):
+ path = self.outputs[0].abspath(self.env)
diff -x .hg* -x CVS -ruN xmms2.orig/pkg/PLIST xmms2/pkg/PLIST
--- xmms2.orig/pkg/PLIST Sun Mar 28 19:04:42 2010
+++ xmms2/pkg/PLIST Sun Mar 28 20:35:06 2010
@@ -22,7 +22,6 @@
include/xmms2/xmms/xmms_plugin.h
include/xmms2/xmms/xmms_sample.h
include/xmms2/xmms/xmms_streamtype.h
-include/xmms2/xmms/xmms_strfunc.h
include/xmms2/xmms/xmms_util.h
include/xmms2/xmms/xmms_xformplugin.h
include/xmms2/xmmsc/
@@ -101,7 +100,6 @@
lib/xmms2/libxmms_file.so
lib/xmms2/libxmms_flac.so
lib/xmms2/libxmms_flv.so
-lib/xmms2/libxmms_gme.so
lib/xmms2/libxmms_gvfs.so
lib/xmms2/libxmms_html.so
lib/xmms2/libxmms_icymetaint.so
@@ -117,6 +115,7 @@
lib/xmms2/libxmms_pls.so
lib/xmms2/libxmms_replaygain.so
lib/xmms2/libxmms_rss.so
+lib/xmms2/libxmms_tremor.so
lib/xmms2/libxmms_tta.so
lib/xmms2/libxmms_vorbis.so
lib/xmms2/libxmms_wave.so
diff -x .hg* -x CVS -ruN xmms2-scrobbler.orig/Makefile xmms2-scrobbler-0.4/Makefile
--- xmms2-scrobbler.orig/Makefile Sun Mar 28 18:59:46 2010
+++ xmms2-scrobbler-0.4/Makefile Mon Mar 15 21:44:14 2010
@@ -2,8 +2,7 @@
COMMENT = last.fm client for xmms2
-DISTNAME = xmms2-scrobbler-0.3.0
-PKGNAME = ${DISTNAME}p0
+DISTNAME = xmms2-scrobbler-0.4.0
CATEGORIES = audio
diff -x .hg* -x CVS -ruN xmms2-scrobbler.orig/distinfo xmms2-scrobbler-0.4/distinfo
--- xmms2-scrobbler.orig/distinfo Sun Mar 28 18:59:46 2010
+++ xmms2-scrobbler-0.4/distinfo Mon Mar 15 20:10:55 2010
@@ -1,5 +1,5 @@
-MD5 (xmms2-scrobbler-0.3.0.tar.gz) = 70MBMnHRc42745ueiluWYg==
-RMD160 (xmms2-scrobbler-0.3.0.tar.gz) = YTRrcwLhX5Vo9oA2ijQbajG7zeA=
-SHA1 (xmms2-scrobbler-0.3.0.tar.gz) = kAO1rp63bwvt5N0/FGJ0zUmDAqw=
-SHA256 (xmms2-scrobbler-0.3.0.tar.gz) = 17OZV3RKFGz0e5kG2kViZGculBfj9f1WPvN3qqlqRFA=
-SIZE (xmms2-scrobbler-0.3.0.tar.gz) = 16988
+MD5 (xmms2-scrobbler-0.4.0.tar.gz) = 9b4VyQz3xgIJAxuJaPd7GQ==
+RMD160 (xmms2-scrobbler-0.4.0.tar.gz) = Ad3rJlWoqHyRZm338iL4WIV+rII=
+SHA1 (xmms2-scrobbler-0.4.0.tar.gz) = zwxvmCiAY0DP8QEpgKN+lEshK30=
+SHA256 (xmms2-scrobbler-0.4.0.tar.gz) = eu0WcPOBRj5ERmCD8uSRGWNulgBbm5OJnt951hOi0rw=
+SIZE (xmms2-scrobbler-0.4.0.tar.gz) = 19831
diff -x .hg* -x CVS -ruN xmms2-scrobbler.orig/patches/patch-Makefile xmms2-scrobbler-0.4/patches/patch-Makefile
--- xmms2-scrobbler.orig/patches/patch-Makefile Sun Mar 28 18:59:46 2010
+++ xmms2-scrobbler-0.4/patches/patch-Makefile Mon Mar 15 21:32:00 2010
@@ -1,18 +1,20 @@
$OpenBSD: patch-Makefile,v 1.1.1.1 2009/06/05 09:28:24 pea Exp $
---- Makefile.orig Sat May 9 21:28:01 2009
-+++ Makefile Sun May 17 01:20:26 2009
-@@ -22,11 +22,11 @@ OBJECTS := src/xmms2-scrobbler.o src/queue.o src/strbu
+--- Makefile.orig Wed Dec 30 18:04:01 2009
++++ Makefile Mon Mar 15 21:31:54 2010
+@@ -31,11 +31,13 @@ OBJECTS := src/xmms2-scrobbler.o \
all: $(BINARY)
install: $(BINARY)
- install -d $(DESTDIR)$(PREFIX)/bin
- install -m 755 $(BINARY) $(DESTDIR)$(PREFIX)/bin
+ install -d $(PREFIX)/bin
++ install -d $(PREFIX)/share/doc/xmms2-scrobbler
+ install -m 755 $(BINARY) $(PREFIX)/bin
++ install -m 644 README $(PREFIX)/share/doc/xmms2-scrobbler
$(BINARY): $(OBJECTS) bin
- $(QUIET_LINK)$(CC) $(LDFLAGS) $(XMMS_LDFLAGS) $(CURL_LDFLAGS) $(OBJECTS) -o $@
+ $(QUIET_LINK)$(CC) $(LDFLAGS) $(CFLAGS) $(XMMS_LDFLAGS) $(CURL_LDFLAGS) $(OBJECTS) -o $@
src/%.o : src/%.c
- $(QUIET_CC)$(CC) $(CFLAGS) $(XMMS_CFLAGS) $(CURL_CFLAGS) -o $@ -c $<
+ $(QUIET_CC)$(CC) $(CFLAGS) $(XMMS_CFLAGS) $(CURL_CFLAGS) $(ENDIAN_CFLAGS) -o $@ -c $<
diff -x .hg* -x CVS -ruN xmms2-scrobbler.orig/pkg/MESSAGE xmms2-scrobbler-0.4/pkg/MESSAGE
--- xmms2-scrobbler.orig/pkg/MESSAGE Sun Mar 28 18:59:46 2010
+++ xmms2-scrobbler-0.4/pkg/MESSAGE Mon Mar 15 21:39:55 2010
@@ -1,15 +1,4 @@
-You need to store your Audioscrobbler username and password in the
-config file:
- echo -e "user: foo\npassword: bar" > \
- ~/.config/xmms2/clients/xmms2-scrobbler/config
-
-Optionally, if you're behind a proxy, you'll need to tell
-XMMS2-Scrobbler about that proxy:
- echo -e "proxy: my.proxy\nproxy_port: 8080" >> \
- ~/.config/xmms2/clients/xmms2-scrobbler/config
-
-If you want to launch and stop xmms2-scrobbler with xmms2d you can
-execute:
- ln -s ${PREFIX}/bin/xmms2-scrobbler ~/.config/xmms2/startup.d
-
-Log will be saved in ~/.config/xmms2/clients/xmms2-scrobbler/logfile.log
\ No newline at end of file
+The format of the configuration file has changed since version 0.3.
+See section "Usage" and "Upgrading from 0.3.x" of
+${PREFIX}/share/doc/xmms2-scrobbler/README to update your current
+configuration, or to create a new one.
\ No newline at end of file
diff -x .hg* -x CVS -ruN xmms2-scrobbler.orig/pkg/PLIST xmms2-scrobbler-0.4/pkg/PLIST
--- xmms2-scrobbler.orig/pkg/PLIST Sun Mar 28 18:59:46 2010
+++ xmms2-scrobbler-0.4/pkg/PLIST Mon Mar 15 21:34:16 2010
@@ -1,2 +1,4 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2009/06/05 09:28:24 pea Exp $
@bin bin/xmms2-scrobbler
+share/doc/xmms2-scrobbler/
+share/doc/xmms2-scrobbler/README
pgp2FLUEPCoE6.pgp
Description: PGP signature
