On Sat, 26 May 2012 19:52:43 +0200, Pascal Stumpf wrote:
> Update to latest version (0.8); no feedback from maintainer yet.
>
> Working fine here on amd64, but some more testing is never wrong.
>
Missing dependency on audio/libsndfile, noticed by Brad.
Index: Makefile
===================================================================
RCS file: /cvs/ports/audio/xmms2/Makefile,v
retrieving revision 1.27
diff -u -p -r1.27 Makefile
--- Makefile 30 Apr 2012 06:05:17 -0000 1.27
+++ Makefile 31 May 2012 09:30:18 -0000
@@ -3,15 +3,14 @@
COMMENT = audio player daemon with library management
BROKEN-sparc64 = waf build goes into an infinite loop
-V = 0.7
-DISTNAME = xmms2-${V}DrNo
+V = 0.8
+DISTNAME = xmms2-${V}DrO_o
PKGNAME = xmms2-${V}
-REVISION = 14
-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 1.0 # 6.0.0
+SHARED_LIBS += xmmsclient++ 2.0 # 4.0.0
+SHARED_LIBS += xmmsclient++-glib 1.0 # 1.0.0
+SHARED_LIBS += xmmsclient-glib 1.0 # 1.0.0
+SHARED_LIBS += xmmsclient 2.0 # 6.0.0
CATEGORIES = audio
@@ -28,9 +27,9 @@ PERMIT_DISTFILES_FTP = Yes
WANTLIB += FLAC ao avahi-client avahi-common avahi-glib avcodec
WANTLIB += avutil c curl gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0
WANTLIB += gsm gthread-2.0 jack m mad mp3lame ncurses ogg orc-0.4
-WANTLIB += pthread readline schroedinger-1.0 speex sqlite3 stdc++
-WANTLIB += theoradec theoraenc util vorbis vorbisenc vorbisfile
-WANTLIB += vorbisidec vpx x264 xml2 z ${MODPY_WANTLIB}
+WANTLIB += pcre pthread readline schroedinger-1.0 sndfile speex
+WANTLIB += sqlite3 stdc++ theoradec theoraenc vorbis vorbisenc
+WANTLIB += vorbisfile vpx x264 xml2 xvidcore z
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=xmms2/}
@@ -46,8 +45,7 @@ NO_REGRESS = Yes
BUILD_DEPENDS = devel/pyrex \
devel/boost
-LIB_DEPENDS = ${MODPY_LIB_DEPENDS} \
- devel/glib2 \
+LIB_DEPENDS = devel/glib2 \
graphics/ffmpeg>=20080620p10 \
audio/libao \
audio/jack \
@@ -56,7 +54,7 @@ LIB_DEPENDS = ${MODPY_LIB_DEPENDS} \
net/curl \
audio/libmad \
net/avahi \
- audio/tremor
+ audio/libsndfile
WSCRIPT_PATCHES = src/clients/lib/xmmsclient++/wscript \
src/clients/lib/xmmsclient++-glib/wscript \
@@ -65,28 +63,33 @@ WSCRIPT_PATCHES = src/clients/lib/xmmscl
pre-configure:
cd ${WRKSRC} && ${SUBST_CMD} ${WSCRIPT_PATCHES}
-# Xmms2 uses it's own modified Waf, so we cannot use devel/waf.
+# Xmms2 uses its own modified Waf, so we cannot use devel/waf.
# Disable speex and sun because they are broken
# Disable shared memory support for visualization because it requires
semtimedop()
do-configure:
- cd ${WRKSRC} && PYTHON=${MODPY_BIN} ${MODPY_BIN} ./waf configure
--prefix=${PREFIX} \
+ cd ${WRKSRC} && PYTHON=${MODPY_BIN} ${MODPY_BIN} ./waf configure \
+ --prefix=${PREFIX} \
--mandir=${PREFIX}/man \
--conf-prefix=${PREFIX} \
--with-default-output-plugin=ao \
--disable-shmvis-server \
-
--without-optionals=dns_sd,medialib-updater,tests,xmmsclient-cf,xmmsclient-ecore,ruby
\
+
--without-optionals=medialib-updater,tests,xmmsclient-cf,xmmsclient-ecore,ruby \
--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
+post-configure:
+ # avoid linking to bogus libraries
+ perl -pi -e "s/SONAME_ST.*/SONAME_ST=''/"
${WRKSRC}/_build_/c4che/_cache.py
+
do-build:
cd ${WRKSRC} && ${MODPY_BIN} ./waf build
do-install:
- cd ${WRKSRC} && ${MODPY_BIN} ./waf install
-# These directories are empty after the fake
- rmdir ${WRKSRC}/_build_/default/src/clients/lib/perl/pm/XMMSClient
- rmdir ${WRKSRC}/_build_/default/src/clients/lib/perl/pm
- /usr/bin/pod2man ${WRKSRC}/src/clients/lib/perl/pm/XMMSClient.pm >
${WRKDIR}/Audio::XMMSClient.3p
- /usr/bin/pod2man ${WRKSRC}/src/clients/lib/perl/pm/XMMSClient/Glib.pm >
${WRKDIR}/Audio::XMMSClient::Glib.3p
+ cd ${WRKSRC} && ${MODPY_BIN} ./waf install --without-ldconfig
+ /usr/bin/pod2man ${PREFIX}/${P5ARCH}/Audio/XMMSClient.pod >
${WRKDIR}/Audio::XMMSClient.3p
+ /usr/bin/pod2man ${PREFIX}/${P5ARCH}/Audio/XMMSClient/Glib.pm >
${WRKDIR}/Audio::XMMSClient::Glib.3p
+ /usr/bin/pod2man ${PREFIX}/${P5ARCH}/Audio/XMMSClient/Collection.pod >
${WRKDIR}/Audio::XMMSClient::Collection.3p
+ /usr/bin/pod2man ${PREFIX}/${P5ARCH}/Audio/XMMSClient/Playlist.pod >
${WRKDIR}/Audio::XMMSClient::Playlist.3p
+ /usr/bin/pod2man ${PREFIX}/${P5ARCH}/Audio/XMMSClient/Result.pod >
${WRKDIR}/Audio::XMMSClient::Result.3p
${INSTALL_MAN} ${WRKDIR}/*.3p ${PREFIX}/man/man3p/
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/audio/xmms2/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo 24 Apr 2010 17:37:54 -0000 1.2
+++ distinfo 31 May 2012 09:30:18 -0000
@@ -1,5 +1,5 @@
-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
+MD5 (xmms2-0.8DrO_o.tar.bz2) = hNXAWnC/0x7TkqTj9wHqow==
+RMD160 (xmms2-0.8DrO_o.tar.bz2) = NVE9ft3V95FGy4qlxsC7NTaWGew=
+SHA1 (xmms2-0.8DrO_o.tar.bz2) = n3WFVx2VrNmN9Iw3lI6GOPrnzDo=
+SHA256 (xmms2-0.8DrO_o.tar.bz2) = x35B571XiIidWi94Mxyox0i4chvS5Z82w2rUx8roaUo=
+SIZE (xmms2-0.8DrO_o.tar.bz2) = 1670726
Index: patches/patch-src_clients_lib_xmmsclient++-glib_wscript
===================================================================
RCS file:
/cvs/ports/audio/xmms2/patches/patch-src_clients_lib_xmmsclient++-glib_wscript,v
retrieving revision 1.2
diff -u -p -r1.2 patch-src_clients_lib_xmmsclient++-glib_wscript
--- patches/patch-src_clients_lib_xmmsclient++-glib_wscript 12 Jul 2009
20:25:00 -0000 1.2
+++ patches/patch-src_clients_lib_xmmsclient++-glib_wscript 31 May 2012
09:30:18 -0000
@@ -1,12 +1,12 @@
$OpenBSD: patch-src_clients_lib_xmmsclient++-glib_wscript,v 1.2 2009/07/12
20:25:00 ajacoutot Exp $
---- src/clients/lib/xmmsclient++-glib/wscript.orig Sat May 16 17:19:44 2009
-+++ src/clients/lib/xmmsclient++-glib/wscript Sat May 16 17:35:49 2009
+--- src/clients/lib/xmmsclient++-glib/wscript.orig Thu Oct 20 21:26:08 2011
++++ src/clients/lib/xmmsclient++-glib/wscript Tue May 8 01:10:14 2012
@@ -6,7 +6,7 @@ def build(bld):
- lib.uselib = 'glib2'
- lib.uselib_local = 'xmmsclient xmmsclient-glib'
- lib.includes = '../../../.. ../../../include ../../../includepriv'
-- lib.vnum = '1.0.0'
-+ lib.vnum = '${LIBxmmsclient++-glib_VERSION}'
- tool.add_install_flag(bld, lib)
+ uselib = 'glib2',
+ use = 'xmmsclient xmmsclient-glib',
+ includes = '../../../.. ../../../include ../../../includepriv',
+- vnum = '1.0.0'
++ vnum = '${LIBxmmsclient++-glib_VERSION}'
+ )
- def configure(conf):
+ tool.add_install_flag(bld, obj)
Index: patches/patch-src_clients_lib_xmmsclient++_wscript
===================================================================
RCS file:
/cvs/ports/audio/xmms2/patches/patch-src_clients_lib_xmmsclient++_wscript,v
retrieving revision 1.2
diff -u -p -r1.2 patch-src_clients_lib_xmmsclient++_wscript
--- patches/patch-src_clients_lib_xmmsclient++_wscript 24 Apr 2010 17:37:54
-0000 1.2
+++ patches/patch-src_clients_lib_xmmsclient++_wscript 31 May 2012 09:30:18
-0000
@@ -1,12 +1,12 @@
$OpenBSD: patch-src_clients_lib_xmmsclient++_wscript,v 1.2 2010/04/24 17:37:54
jasper Exp $
---- src/clients/lib/xmmsclient++/wscript.orig Fri Feb 19 18:43:54 2010
-+++ src/clients/lib/xmmsclient++/wscript Sat Apr 24 19:31:49 2010
-@@ -26,7 +26,7 @@ def build(bld):
- """.split()
- obj.uselib_local = 'xmmsclient'
- obj.uselib = 'BOOST socket'
-- obj.vnum = '4.0.0'
-+ obj.vnum = '${LIBxmmsclient++_VERSION}'
+--- src/clients/lib/xmmsclient++/wscript.orig Thu Oct 20 21:26:08 2011
++++ src/clients/lib/xmmsclient++/wscript Tue May 8 01:11:05 2012
+@@ -28,7 +28,7 @@ def build(bld):
+ includes = '../../../.. ../../../include ../../../includepriv',
+ uselib = 'BOOST socket',
+ use = 'xmmsclient',
+- vnum = '4.0.0'
++ vnum = '${LIBxmmsclient++_VERSION}'
+ )
tool.add_install_flag(bld, obj)
- def configure(conf):
Index: patches/patch-src_clients_lib_xmmsclient-glib_wscript
===================================================================
RCS file:
/cvs/ports/audio/xmms2/patches/patch-src_clients_lib_xmmsclient-glib_wscript,v
retrieving revision 1.2
diff -u -p -r1.2 patch-src_clients_lib_xmmsclient-glib_wscript
--- patches/patch-src_clients_lib_xmmsclient-glib_wscript 12 Jul 2009
20:25:00 -0000 1.2
+++ patches/patch-src_clients_lib_xmmsclient-glib_wscript 31 May 2012
09:30:18 -0000
@@ -1,12 +1,12 @@
$OpenBSD: patch-src_clients_lib_xmmsclient-glib_wscript,v 1.2 2009/07/12
20:25:00 ajacoutot Exp $
---- src/clients/lib/xmmsclient-glib/wscript.orig Sat May 16 17:21:08 2009
-+++ src/clients/lib/xmmsclient-glib/wscript Sat May 16 17:35:25 2009
+--- src/clients/lib/xmmsclient-glib/wscript.orig Thu Oct 20 21:26:08 2011
++++ src/clients/lib/xmmsclient-glib/wscript Tue May 8 01:11:50 2012
@@ -7,7 +7,7 @@ def build(bld):
- obj.source = 'xmmsclient-glib.c'
- obj.uselib = 'glib2'
- obj.uselib_local = 'xmmsclient'
-- obj.vnum = '1.0.0'
-+ obj.vnum = '${LIBxmmsclient-glib_VERSION}'
- tool.add_install_flag(bld, obj)
+ source = 'xmmsclient-glib.c',
+ uselib = 'glib2',
+ use = 'xmmsclient',
+- vnum = '1.0.0'
++ vnum = '${LIBxmmsclient-glib_VERSION}'
+ )
- def configure(conf):
+ tool.add_install_flag(bld, obj)
Index: patches/patch-src_clients_lib_xmmsclient_wscript
===================================================================
RCS file:
/cvs/ports/audio/xmms2/patches/patch-src_clients_lib_xmmsclient_wscript,v
retrieving revision 1.2
diff -u -p -r1.2 patch-src_clients_lib_xmmsclient_wscript
--- patches/patch-src_clients_lib_xmmsclient_wscript 24 Apr 2010 17:37:54
-0000 1.2
+++ patches/patch-src_clients_lib_xmmsclient_wscript 31 May 2012 09:30:18
-0000
@@ -1,12 +1,12 @@
$OpenBSD: patch-src_clients_lib_xmmsclient_wscript,v 1.2 2010/04/24 17:37:54
jasper Exp $
---- 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
+--- src/clients/lib/xmmsclient/wscript.orig Thu Oct 20 21:26:08 2011
++++ src/clients/lib/xmmsclient/wscript Tue May 8 01:12:42 2012
@@ -31,7 +31,7 @@ def build(bld):
- else:
- obj.source += ["visualization/dummy.c"]
-
-- obj.vnum = "6.0.0"
-+ obj.vnum = "${LIBxmmsclient_VERSION}"
+ source = source,
+ uselib = 'socket time',
+ use = 'xmmsipc xmmssocket xmmsutils xmmstypes xmmsvisualization',
+- vnum = '6.0.0'
++ vnum = '${LIBxmmsclient_VERSION}'
+ )
tool.add_install_flag(bld, obj)
-
Index: patches/patch-src_plugins_avcodec_avcodec_c
===================================================================
RCS file: patches/patch-src_plugins_avcodec_avcodec_c
diff -N patches/patch-src_plugins_avcodec_avcodec_c
--- patches/patch-src_plugins_avcodec_avcodec_c 30 Apr 2012 06:05:17 -0000
1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,156 +0,0 @@
-$OpenBSD: patch-src_plugins_avcodec_avcodec_c,v 1.2 2012/04/30 06:05:17
ajacoutot Exp $
-
-- fix libavcodec initialisation.
-- update for newer libavcodec API.
-
-from upstream git:
-
-http://git.xmms.se/xmms2/xmms2-devel/commit/?id=71666f5ac8465fc40c8220043174f45e7088c3f0
-http://git.xmms.se/xmms2/xmms2-devel/commit/?id=247ca0a17334b19f30ff271fa19a450dc0e5ed86
-
---- src/plugins/avcodec/avcodec.c.orig Fri Feb 19 12:43:54 2010
-+++ src/plugins/avcodec/avcodec.c Sat Apr 28 20:32:49 2012
-@@ -31,6 +31,12 @@
- # include "avcodec.h"
- #endif
-
-+/* Map avcodec_decode_audio2 into the deprecated version
-+ * avcodec_decode_audio in versions earlier than 51.28 */
-+#if LIBAVCODEC_VERSION_INT < 0x331c00
-+# define avcodec_decode_audio2 avcodec_decode_audio
-+#endif
-+
- /* Handle API change that happened in libavcodec 52.00 */
- #if LIBAVCODEC_VERSION_INT < 0x340000
- # define CONTEXT_BPS(codecctx) (codecctx)->bits_per_sample
-@@ -38,12 +44,20 @@
- # define CONTEXT_BPS(codecctx) (codecctx)->bits_per_coded_sample
- #endif
-
--/* Map avcodec_decode_audio2 into the deprecated version
-- * avcodec_decode_audio in versions earlier than 51.28 */
--#if LIBAVCODEC_VERSION_INT < 0x331c00
--# define avcodec_decode_audio2 avcodec_decode_audio
-+/* Map avcodec_decode_audio3 into the deprecated version
-+ * avcodec_decode_audio2 in versions earlier than 52.26 */
-+#if LIBAVCODEC_VERSION_INT < 0x341a00
-+# define avcodec_decode_audio3(avctx, samples, frame_size_ptr, avpkt) \
-+ avcodec_decode_audio2(avctx, samples, frame_size_ptr, \
-+ (avpkt)->data, (avpkt)->size)
-+# define AVMEDIA_TYPE_AUDIO CODEC_TYPE_AUDIO
- #endif
-
-+/* Handle API change that happened in libavcodec 52.64 */
-+#if LIBAVCODEC_VERSION_INT < 0x344000
-+# define AVMEDIA_TYPE_AUDIO CODEC_TYPE_AUDIO
-+#endif
-+
- #define AVCODEC_BUFFER_SIZE 16384
-
- typedef struct {
-@@ -121,6 +135,7 @@ xmms_avcodec_destroy (xmms_xform_t *xform)
- g_return_if_fail (data);
-
- avcodec_close (data->codecctx);
-+ av_free (data->codecctx);
-
- g_string_free (data->outbuf, TRUE);
- g_free (data->buffer);
-@@ -135,7 +150,7 @@ xmms_avcodec_init (xmms_xform_t *xform)
- AVCodec *codec;
- const gchar *mimetype;
- const guchar *tmpbuf;
-- gssize tmpbuflen;
-+ gsize tmpbuflen;
- gint ret;
-
- g_return_val_if_fail (xform, FALSE);
-@@ -144,6 +159,7 @@ xmms_avcodec_init (xmms_xform_t *xform)
- data->outbuf = g_string_new (NULL);
- data->buffer = g_malloc (AVCODEC_BUFFER_SIZE);
- data->buffer_size = AVCODEC_BUFFER_SIZE;
-+ data->codecctx = NULL;
-
- xmms_xform_private_data_set (xform, data);
-
-@@ -160,7 +176,7 @@ xmms_avcodec_init (xmms_xform_t *xform)
- goto err;
- }
-
-- if (codec->type != CODEC_TYPE_AUDIO) {
-+ if (codec->type != AVMEDIA_TYPE_AUDIO) {
- XMMS_DBG ("Codec '%s' found but its type is not audio",
data->codec_id);
- goto err;
- }
-@@ -211,7 +227,7 @@ xmms_avcodec_init (xmms_xform_t *xform)
- }
- }
-
-- data->codecctx = g_new0 (AVCodecContext, 1);
-+ data->codecctx = avcodec_alloc_context ();
- data->codecctx->sample_rate = data->samplerate;
- data->codecctx->channels = data->channels;
- data->codecctx->bit_rate = data->bitrate;
-@@ -219,6 +235,8 @@ xmms_avcodec_init (xmms_xform_t *xform)
- data->codecctx->block_align = data->block_align;
- data->codecctx->extradata = data->extradata;
- data->codecctx->extradata_size = data->extradata_size;
-+ data->codecctx->codec_id = codec->id;
-+ data->codecctx->codec_type = codec->type;
-
- if (avcodec_open (data->codecctx, codec) < 0) {
- XMMS_DBG ("Opening decoder '%s' failed", codec->name);
-@@ -257,6 +275,9 @@ xmms_avcodec_init (xmms_xform_t *xform)
- return TRUE;
-
- err:
-+ if (data->codecctx) {
-+ av_free (data->codecctx);
-+ }
- g_string_free (data->outbuf, TRUE);
- g_free (data->extradata);
- g_free (data);
-@@ -278,6 +299,9 @@ xmms_avcodec_read (xmms_xform_t *xform, xmms_sample_t
-
- size = MIN (data->outbuf->len, len);
- while (size == 0) {
-+ AVPacket packet;
-+ av_init_packet (&packet);
-+
- if (data->buffer_length == 0) {
- gint read_total;
-
-@@ -331,10 +355,12 @@ xmms_avcodec_read (xmms_xform_t *xform, xmms_sample_t
- data->buffer_length = read_total;
- }
-
-+ packet.data = data->buffer_pos;
-+ packet.size = data->buffer_length;
-+
- outbufsize = sizeof (outbuf);
-- bytes_read = avcodec_decode_audio2 (data->codecctx, (short *)
outbuf,
-- &outbufsize,
data->buffer_pos,
-- data->buffer_length);
-+ bytes_read = avcodec_decode_audio3 (data->codecctx, (short *)
outbuf,
-+ &outbufsize, &packet);
-
- if (bytes_read < 0 || bytes_read > data->buffer_length) {
- XMMS_DBG ("Error decoding data!");
-@@ -381,10 +407,14 @@ xmms_avcodec_seek (xmms_xform_t *xform, gint64 samples
- /* The buggy ape decoder doesn't flush buffers, so we need to finish
decoding
- * the frame before seeking to avoid segfaults... this hack sucks */
- while (data->buffer_length > 0) {
-+ AVPacket packet;
-+ av_init_packet (&packet);
-+ packet.data = data->buffer;
-+ packet.size = data->buffer_length;
-+
- outbufsize = sizeof (outbuf);
-- bytes_read = avcodec_decode_audio2 (data->codecctx, (short *)
outbuf,
-- &outbufsize, data->buffer,
-- data->buffer_length);
-+ bytes_read = avcodec_decode_audio3 (data->codecctx, (short *)
outbuf,
-+ &outbufsize, &packet);
-
- if (bytes_read < 0 || bytes_read > data->buffer_length) {
- XMMS_DBG ("Error decoding data!");
Index: patches/patch-wafadmin_Tools_ccroot_py
===================================================================
RCS file: patches/patch-wafadmin_Tools_ccroot_py
diff -N patches/patch-wafadmin_Tools_ccroot_py
--- patches/patch-wafadmin_Tools_ccroot_py 1 Jun 2010 12:47:10 -0000
1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,33 +0,0 @@
-$OpenBSD: patch-wafadmin_Tools_ccroot_py,v 1.3 2010/06/01 12:47:10 dcoppa Exp $
-
-Don't create symlink for shared libraries versions.
-Use good version numbers for libs.
-
---- 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]
-
- if self.env.SONAME_ST:
-- v = self.env.SONAME_ST % name2
-+ v = self.env.SONAME_ST % name3
- self.env.append_value('LINKFLAGS', v.split())
-
- bld = self.bld
-@@ -590,13 +590,13 @@ def apply_vnum(self):
- if not path: return
-
- 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)
Index: patches/patch-wafadmin_Tools_python_py
===================================================================
RCS file: patches/patch-wafadmin_Tools_python_py
diff -N patches/patch-wafadmin_Tools_python_py
--- patches/patch-wafadmin_Tools_python_py 24 Apr 2010 17:37:54 -0000
1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,17 +0,0 @@
-$OpenBSD: patch-wafadmin_Tools_python_py,v 1.2 2010/04/24 17:37:54 jasper Exp $
-
-We remove the flag "-pthread" because waf is complety incapable to
-treat it correctly when it is in LIB_PYEMBED variable (it adds '-l').
-
---- wafadmin/Tools/python.py.orig Fri Feb 19 18:43:54 2010
-+++ wafadmin/Tools/python.py Sat Apr 24 19:31:49 2010
-@@ -215,6 +215,9 @@ MACOSX_DEPLOYMENT_TARGET = %r
- result = False
- name = 'python' + env['PYTHON_VERSION']
-
-+ env['LIB_PYEMBED'].remove('-pthread')
-+ env['LINKFLAGS_PYEMBED'].append('-pthread')
-+
- if python_LIBDIR is not None:
- path = [python_LIBDIR]
- conf.log.write("\n\n# Trying LIBDIR: %r\n" % path)
Index: patches/patch-waftools_man_py
===================================================================
RCS file: /cvs/ports/audio/xmms2/patches/patch-waftools_man_py,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-waftools_man_py
--- patches/patch-waftools_man_py 3 Jun 2009 18:25:25 -0000 1.1.1.1
+++ patches/patch-waftools_man_py 31 May 2012 09:30:18 -0000
@@ -2,30 +2,34 @@ $OpenBSD: patch-waftools_man_py,v 1.1.1.
Bypass the gzip function that compress man files.
---- waftools/man.py.orig Tue May 19 18:21:41 2009
-+++ waftools/man.py Tue May 19 18:32:57 2009
-@@ -22,6 +22,9 @@ def gzip_func(task):
+--- waftools/man.py.orig Thu Oct 20 21:26:08 2011
++++ waftools/man.py Tue May 8 12:50:16 2012
+@@ -24,11 +24,11 @@ def gzip_func(task):
+ if outf:
+ outf.close()
+-Task.task_factory('man', gzip_func, color='BLUE')
+-
@feature('man')
+ @before_method('process_source')
def process_man(self):
+ def empty(x):
+ pass
-+
- if not getattr(self, 'files', None):
- return
+ source = self.to_nodes(getattr(self, 'source', []))
+ self.source = []
-@@ -34,12 +37,10 @@ def process_man(self):
- if not target:
- target = node.name
+@@ -43,13 +43,7 @@ def process_man(self):
+ if not s:
+ raise Errors.BuildError('cannot determine man section from
filename')
-- out = self.path.find_or_declare(x + '.gz')
+- out = self.path.find_or_declare(node.name + '.gz')
-
- tsk = self.create_task('copy')
- tsk.set_inputs(node)
+- tsk = self.create_task('man')
+- tsk.set_inputs(node)
- tsk.set_outputs(out)
-- tsk.fun = gzip_func
-+ tsk.set_outputs(node)
-+ tsk.fun = empty
- tsk.install_path = '${MANDIR}/man' + getattr(self, 'section', '1')
- tsk.color = 'BLUE'
+-
+- self.bld.install_files('${MANDIR}/man%s' % s, out)
++ self.bld.install_files('${MANDIR}/man%s' % s, node)
+
+ def configure(conf):
Index: patches/patch-wscript
===================================================================
RCS file: /cvs/ports/audio/xmms2/patches/patch-wscript,v
retrieving revision 1.2
diff -u -p -r1.2 patch-wscript
--- patches/patch-wscript 24 Apr 2010 17:37:54 -0000 1.2
+++ patches/patch-wscript 31 May 2012 09:30:18 -0000
@@ -1,25 +1,11 @@
$OpenBSD: patch-wscript,v 1.2 2010/04/24 17:37:54 jasper Exp $
---- wscript.orig Fri Feb 19 18:43:54 2010
-+++ wscript Sat Apr 24 19:31:49 2010
-@@ -315,6 +315,7 @@ def configure(conf):
- # Our static libraries may link to dynamic libraries
+--- wscript.orig Thu Oct 20 21:26:08 2011
++++ wscript Tue May 8 01:22:59 2012
+@@ -342,6 +342,7 @@ def configure(conf):
if Options.platform != 'win32':
- conf.env["staticlib_CCFLAGS"] += ['-fPIC', '-DPIC']
+ conf.env.append_unique('CFLAGS_cstlib', ['-fPIC', '-DPIC'])
+ conf.env.append_unique('CPPFLAGS_cxxshlib', ['-fPIC', '-DPIC'])
+ conf.env["LINKFLAGS"] += ['-fPIC']
else:
# As we have to change target platform after the tools
# have been loaded there are a few variables that needs
-@@ -486,9 +487,10 @@ def shutdown():
- ):
- ldconfig = '/sbin/ldconfig'
- if os.path.isfile(ldconfig):
-- libprefix = Utils.subst_vars('${PREFIX}/lib', Build.bld.env)
-- try: Utils.cmd_output(ldconfig + ' ' + libprefix)
-- except: pass
-+ #libprefix = Utils.subst_vars('${PREFIX}/lib', Build.bld.env)
-+ #try: Utils.cmd_output(ldconfig + ' ' + libprefix)
-+ #except: pass
-+ pass
-
- if Options.options.run_tests:
- os.system(os.path.join(blddir, "default/tests/test_xmmstypes"))
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/audio/xmms2/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST
--- pkg/PLIST 24 Apr 2010 17:37:54 -0000 1.4
+++ pkg/PLIST 31 May 2012 09:30:18 -0000
@@ -1,13 +1,10 @@
@comment $OpenBSD: PLIST,v 1.4 2010/04/24 17:37:54 jasper Exp $
-@bin bin/nyxmms2
-@bin bin/vistest
-@bin bin/vistest-fft
+bin/nyxmms2
@bin bin/xmms2
@bin bin/xmms2-et
@bin bin/xmms2-find-avahi
@bin bin/xmms2-launcher
@bin bin/xmms2-mdns-avahi
-@bin bin/xmms2-ripper
@bin bin/xmms2d
include/xmms2/
include/xmms2/xmms/
@@ -39,7 +36,14 @@ include/xmms2/xmmsc/xmmsc_unistd.h
include/xmms2/xmmsc/xmmsc_util.h
include/xmms2/xmmsc/xmmsc_visualization.h
include/xmms2/xmmsc/xmmsv.h
+include/xmms2/xmmsc/xmmsv_bitbuffer.h
+include/xmms2/xmmsc/xmmsv_build.h
include/xmms2/xmmsc/xmmsv_coll.h
+include/xmms2/xmmsc/xmmsv_deprecated.h
+include/xmms2/xmmsc/xmmsv_dict.h
+include/xmms2/xmmsc/xmmsv_general.h
+include/xmms2/xmmsc/xmmsv_list.h
+include/xmms2/xmmsc/xmmsv_util.h
include/xmms2/xmmsclient/
include/xmms2/xmmsclient/xmmsclient++/
include/xmms2/xmmsclient/xmmsclient++-glib.h
@@ -68,9 +72,17 @@ include/xmms2/xmmsclient/xmmsclient-ecor
include/xmms2/xmmsclient/xmmsclient-glib.h
include/xmms2/xmmsclient/xmmsclient-qt.h
include/xmms2/xmmsclient/xmmsclient.h
+@comment lib/libxmmsclient++-glib.so
+@comment lib/libxmmsclient++-glib.so.0
@lib lib/libxmmsclient++-glib.so.${LIBxmmsclient++-glib_VERSION}
+@comment lib/libxmmsclient++.so
+@comment lib/libxmmsclient++.so.1
@lib lib/libxmmsclient++.so.${LIBxmmsclient++_VERSION}
+@comment lib/libxmmsclient-glib.so
+@comment lib/libxmmsclient-glib.so.0
@lib lib/libxmmsclient-glib.so.${LIBxmmsclient-glib_VERSION}
+@comment lib/libxmmsclient.so
+@comment lib/libxmmsclient.so.1
@lib lib/libxmmsclient.so.${LIBxmmsclient_VERSION}
lib/pkgconfig/xmms2-client-cpp-glib.pc
lib/pkgconfig/xmms2-client-cpp.pc
@@ -86,6 +98,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/xmmsclient/qt3.py
lib/python${MODPY_VERSION}/site-packages/xmmsclient/sync.py
lib/python${MODPY_VERSION}/site-packages/xmmsclient/xmmsapi.so
+lib/python${MODPY_VERSION}/site-packages/xmmsclient/xmmsvalue.so
lib/xmms2/
lib/xmms2/libxmms_ao.so
lib/xmms2/libxmms_apefile.so
@@ -115,7 +128,7 @@ lib/xmms2/libxmms_nulstripper.so
lib/xmms2/libxmms_pls.so
lib/xmms2/libxmms_replaygain.so
lib/xmms2/libxmms_rss.so
-lib/xmms2/libxmms_tremor.so
+lib/xmms2/libxmms_sndfile.so
lib/xmms2/libxmms_tta.so
lib/xmms2/libxmms_vorbis.so
lib/xmms2/libxmms_wave.so
@@ -125,21 +138,27 @@ ${P5ARCH}/
${P5ARCH}/Audio/
${P5ARCH}/Audio/XMMSClient/
${P5ARCH}/Audio/XMMSClient.pm
+${P5ARCH}/Audio/XMMSClient.pod
${P5ARCH}/Audio/XMMSClient/Collection.pm
+${P5ARCH}/Audio/XMMSClient/Collection.pod
${P5ARCH}/Audio/XMMSClient/Glib.pm
+${P5ARCH}/Audio/XMMSClient/Playlist.pod
+${P5ARCH}/Audio/XMMSClient/Result.pod
${P5ARCH}/Audio/XMMSClient/Sync.pm
${P5ARCH}/auto/
${P5ARCH}/auto/Audio/
${P5ARCH}/auto/Audio/XMMSClient/
${P5ARCH}/auto/Audio/XMMSClient/XMMSClient.so
-@man man/man1/nyxmms2.1
@man man/man1/xmms2-et.1
@man man/man1/xmms2-launcher.1
@man man/man1/xmms2-mdns-avahi.1
@man man/man1/xmms2.1
@man man/man1/xmms2d.1
@man man/man3p/Audio::XMMSClient.3p
+@man man/man3p/Audio::XMMSClient::Collection.3p
@man man/man3p/Audio::XMMSClient::Glib.3p
+@man man/man3p/Audio::XMMSClient::Playlist.3p
+@man man/man3p/Audio::XMMSClient::Result.3p
share/pixmaps/
share/pixmaps/xmms2-128.png
share/pixmaps/xmms2-16.png
