Date: Sun, 04 Dec 2011 08:18:23 -0200 From: Jan Beich <jbeich@tormail.net> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/163056: [patch] audio/xmms2: update to 0.8 Message-ID: <1RX9F0-0004x2-PG@internal.tormail.net> Resent-Message-ID: <201112041030.pB4AUBKW074821@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 163056
>Category: ports
>Synopsis: [patch] audio/xmms2: update to 0.8
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Sun Dec 04 10:30:11 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator: Jan Beich
>Release: FreeBSD 10.0-CURRENT amd64
>Organization:
>Environment:
>Description:
- update
- add SNDFILE option
- respect CC/CFLAGS and remove -g -O0[1]
- vistest clients are no longer installed by default unless
EXCLUDE+=--with-vis-reference-clients is added either
to Makefile.local, make.conf or to command-line args.
[1] according to git blame debug flags slipped in
http://git.xmms2.org/xmms2/xmms2-devel/commit/?id=5bd0db3
>How-To-Repeat:
>Fix:
--- update.diff begins here ---
Index: audio/cpp-xmms2/Makefile
===================================================================
RCS file: /a/.csup/ports/audio/cpp-xmms2/Makefile,v
retrieving revision 1.14
diff -u -p -r1.14 Makefile
--- audio/cpp-xmms2/Makefile 24 Feb 2011 23:38:27 -0000 1.14
+++ audio/cpp-xmms2/Makefile 4 Dec 2011 08:14:32 -0000
@@ -5,7 +5,6 @@
# $FreeBSD: ports/audio/cpp-xmms2/Makefile,v 1.14 2011/02/24 23:38:27 miwi Exp $
#
-PORTREVISION= 6
CATEGORIES= audio
PKGNAMEPREFIX= cpp-
Index: audio/p5-xmms2/Makefile
===================================================================
RCS file: /a/.csup/ports/audio/p5-xmms2/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- audio/p5-xmms2/Makefile 24 Feb 2011 23:38:27 -0000 1.7
+++ audio/p5-xmms2/Makefile 4 Dec 2011 08:15:18 -0000
@@ -5,7 +5,6 @@
# $FreeBSD: ports/audio/p5-xmms2/Makefile,v 1.7 2011/02/24 23:38:27 miwi Exp $
#
-PORTREVISION= 1
CATEGORIES= audio perl5
PKGNAMEPREFIX= p5-
Index: audio/py-xmms2/Makefile
===================================================================
RCS file: /a/.csup/ports/audio/py-xmms2/Makefile,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile
--- audio/py-xmms2/Makefile 24 Feb 2011 23:38:27 -0000 1.12
+++ audio/py-xmms2/Makefile 4 Dec 2011 08:15:12 -0000
@@ -5,8 +5,6 @@
# $FreeBSD: ports/audio/py-xmms2/Makefile,v 1.12 2011/02/24 23:38:27 miwi Exp $
#
-PORTREVISION= 5
-
CATEGORIES= audio python
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
Index: audio/ruby-xmms2/Makefile
===================================================================
RCS file: /a/.csup/ports/audio/ruby-xmms2/Makefile,v
retrieving revision 1.11
diff -u -p -r1.11 Makefile
--- audio/ruby-xmms2/Makefile 24 Feb 2011 23:38:28 -0000 1.11
+++ audio/ruby-xmms2/Makefile 4 Dec 2011 08:15:06 -0000
@@ -5,7 +5,6 @@
# $FreeBSD: ports/audio/ruby-xmms2/Makefile,v 1.11 2011/02/24 23:38:28 miwi Exp $
#
-PORTREVISION= 4
CATEGORIES= audio ruby
PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX}
Index: audio/xmms2/Makefile
===================================================================
RCS file: /a/.csup/ports/audio/xmms2/Makefile,v
retrieving revision 1.65
diff -u -p -r1.65 Makefile
--- audio/xmms2/Makefile 23 Oct 2011 16:06:54 -0000 1.65
+++ audio/xmms2/Makefile 4 Dec 2011 08:11:40 -0000
@@ -6,9 +6,8 @@
#
PORTNAME?= xmms2
-PORTVERSION= 0.7
-PORTREVISION?= 2
-DISTVERSIONSUFFIX=DrNo
+PORTVERSION= 0.8
+DISTVERSIONSUFFIX=DrO_o
CATEGORIES?= audio
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}%20${DISTVERSIONSUFFIX}
@@ -24,10 +23,12 @@ USE_SQLITE= 3
USE_LDCONFIG= yes
-MAN1= nyxmms2.1 xmms2.1 xmms2-et.1 xmms2d.1 xmms2-launcher.1
+MAN1= xmms2.1 xmms2-et.1 xmms2d.1 xmms2-launcher.1
MANCOMPRESSED= yes
PLIST_SUB+= INCLUDEDIR="include/${PORTNAME}" LIBDIR="lib/${PORTNAME}"
+CPPFLAGS+= -I${LOCALBASE}/include
+
OPTIONS= AIRPLAY "Support output via Airport Express" off \
AO "Support to output via libao" off \
APE "Support to playback Monkey's Audio files" off \
@@ -52,6 +53,7 @@ OPTIONS= AIRPLAY "Support output via Air
PULSE "Support to output via the PulseAudio" off \
SAMBA "Support to playback files via SMB" off \
SID "Support to playback SID files" off \
+ SNDFILE "Support to playback AIFF/AU/CAF/PAF files" off \
SPEEX "Support to playback SPEEX files" off \
TREMOR "Support to playback OGG files" off \
VISUAL "Support for visualization plugins" off \
@@ -206,24 +208,24 @@ PLIST_SUB+= MAD="@comment "
.if !defined(WITHOUT_MDNS_APPLE) && !defined(WITHOUT_MDNS_AVAHI)
BROKEN= You may choose either MDNS_APPLE or MDNS_AVAHI, but not both
+.elif defined(WITHOUT_MDNS_APPLE) && defined(WITHOUT_MDNS_AVAHI)
+EXCLUDE+= --without-optionals="mdns"
.endif
.if !defined(WITHOUT_MDNS_APPLE)
-EXCLUDE+= --without-optionals="avahi"
+EXCLUDE+= --with-mdns-backend="dns_sd"
LIB_DEPENDS+= dns_sd:${PORTSDIR}/net/mDNSResponder
PLIST_SUB+= MDNS_APPLE=""
.else
-EXCLUDE+= --without-optionals="dns_sd"
PLIST_SUB+= MDNS_APPLE="@comment "
.endif
.if !defined(WITHOUT_MDNS_AVAHI)
-EXCLUDE+= --without-optionals="dns_sd"
+EXCLUDE+= --with-mdns-backend="avahi"
LIB_DEPENDS+= avahi-core:${PORTSDIR}/net/avahi-app
PLIST_SUB+= MDNS_AVAHI=""
MAN1+= xmms2-mdns-avahi.1
.else
-EXCLUDE+= --without-optionals="avahi"
PLIST_SUB+= MDNS_AVAHI="@comment "
.endif
@@ -291,6 +293,14 @@ EXCLUDE+= --without-plugins="sid"
PLIST_SUB+= SID="@comment "
.endif
+.if !defined(WITHOUT_SNDFILE)
+LIB_DEPENDS+= sndfile.1:${PORTSDIR}/audio/libsndfile
+PLIST_SUB+= SNDFILE=""
+.else
+EXCLUDE+= --without-plugins="sndfile"
+PLIST_SUB+= SNDFILE="@comment "
+.endif
+
.if !defined(WITHOUT_SPEEX)
LIB_DEPENDS+= speex.1:${PORTSDIR}/audio/speex
PLIST_SUB+= SPEEX=""
@@ -318,9 +328,13 @@ EXTRA_PATCHES+= ${FILESDIR}/extra-patch-
.if !defined(WITHOUT_VISUAL)
USE_SDL= yes
LIB_DEPENDS+= visual-0.4.0:${PORTSDIR}/graphics/libvisual04
-PLIST_SUB+= VISUAL=""
.else
EXCLUDE+= --without-optionals="vistest"
+.endif
+
+.if !defined(WITHOUT_VISUAL) && ${EXCLUDE:M--with-vis-reference-clients}
+PLIST_SUB+= VISUAL=""
+.else
PLIST_SUB+= VISUAL="@comment "
.endif
@@ -361,13 +375,13 @@ PLIST_SUB+= XML="@comment "
.endif # !XMMS2_SLAVE
do-configure:
- cd ${WRKSRC} && ./waf configure --conf-prefix=${LOCALBASE} \
- --prefix=${PREFIX} --mandir=${PREFIX}/man ${EXCLUDE}
+ @cd ${WRKSRC} && ${MAKE_ENV} ./waf configure --conf-prefix=${LOCALBASE} \
+ --prefix=${PREFIX} --mandir=${PREFIX}/man ${EXCLUDE}
do-build:
- cd ${WRKSRC} && ./waf build
+ @cd ${WRKSRC} && ${MAKE_ENV} ./waf build
do-install:
- cd ${WRKSRC} && ./waf install
+ @cd ${WRKSRC} && ${MAKE_ENV} ./waf install --without-ldconfig
.include <bsd.port.post.mk>
Index: audio/xmms2/distinfo
===================================================================
RCS file: /a/.csup/ports/audio/xmms2/distinfo,v
retrieving revision 1.13
diff -u -p -r1.13 distinfo
--- audio/xmms2/distinfo 24 Feb 2011 23:38:27 -0000 1.13
+++ audio/xmms2/distinfo 2 Dec 2011 12:53:09 -0000
@@ -1,2 +1,2 @@
-SHA256 (xmms2-0.7DrNo.tar.bz2) = 59c58d9380e6b002920a8dc75f0fd4629ab175b82f29b6637f7816fdc9832b2c
-SIZE (xmms2-0.7DrNo.tar.bz2) = 1519973
+SHA256 (xmms2-0.8DrO_o.tar.bz2) = c77e41e7bd5788889d5a2f78331ca8c748b8721bd2e59f36c36ad4c7cae8694a
+SIZE (xmms2-0.8DrO_o.tar.bz2) = 1670726
Index: audio/xmms2/pkg-plist
===================================================================
RCS file: /a/.csup/ports/audio/xmms2/pkg-plist,v
retrieving revision 1.20
diff -u -p -r1.20 pkg-plist
--- audio/xmms2/pkg-plist 24 Feb 2011 23:38:27 -0000 1.20
+++ audio/xmms2/pkg-plist 4 Dec 2011 06:38:22 -0000
@@ -38,7 +38,14 @@ bin/xmms2d
%%INCLUDEDIR%%/xmmsc/xmmsc_util.h
%%INCLUDEDIR%%/xmmsc/xmmsc_visualization.h
%%INCLUDEDIR%%/xmmsc/xmmsv.h
+%%INCLUDEDIR%%/xmmsc/xmmsv_bitbuffer.h
+%%INCLUDEDIR%%/xmmsc/xmmsv_build.h
%%INCLUDEDIR%%/xmmsc/xmmsv_coll.h
+%%INCLUDEDIR%%/xmmsc/xmmsv_deprecated.h
+%%INCLUDEDIR%%/xmmsc/xmmsv_dict.h
+%%INCLUDEDIR%%/xmmsc/xmmsv_general.h
+%%INCLUDEDIR%%/xmmsc/xmmsv_list.h
+%%INCLUDEDIR%%/xmmsc/xmmsv_util.h
%%INCLUDEDIR%%/xmmsclient/xmmsclient++-glib.h
%%INCLUDEDIR%%/xmmsclient/xmmsclient++.h
%%INCLUDEDIR%%/xmmsclient/xmmsclient++/bindata.h
@@ -114,6 +121,7 @@ lib/libxmmsclient.so.6.0.0
%%XML%%%%LIBDIR%%/libxmms_rss.so
%%SAMBA%%%%LIBDIR%%/libxmms_samba.so
%%SID%%%%LIBDIR%%/libxmms_sid.so
+%%SNDFILE%%%%LIBDIR%%/libxmms_sndfile.so
%%SPEEX%%%%LIBDIR%%/libxmms_speex.so
%%TREMOR%%%%LIBDIR%%/libxmms_tremor.so
%%LIBDIR%%/libxmms_tta.so
Index: audio/xmms2/files/extra-patch-src-clients-vistest-wscript
===================================================================
RCS file: /a/.csup/ports/audio/xmms2/files/extra-patch-src-clients-vistest-wscript,v
retrieving revision 1.1
diff -u -p -r1.1 extra-patch-src-clients-vistest-wscript
--- audio/xmms2/files/extra-patch-src-clients-vistest-wscript 19 Aug 2009 11:55:54 -0000 1.1
+++ audio/xmms2/files/extra-patch-src-clients-vistest-wscript 2 Dec 2011 12:57:21 -0000
@@ -1,25 +1,30 @@
--- src/clients/vistest/wscript~
+++ src/clients/vistest/wscript
-@@ -15,14 +15,6 @@ def build(bld):
- obj.uselib_local = 'xmmsclient-glib xmmsclient'
- obj.uselib = 'glib2 math'
+@@ -23,17 +23,6 @@ def build(bld):
+ t.install_path = None
-- if bld.env['LIB_vorbisenc']:
-- obj = bld.new_task_gen('cc', 'program')
-- obj.target = 'xmms2-ripper'
-- obj.source = 'ripper.c'
-- obj.includes = '. ../../.. ../../include'
-- obj.uselib_local = 'xmmsclient'
-- obj.uselib = 'vorbisenc'
+
+- if bld.env.LIB_vorbisenc:
+- t = bld(features = 'c cprogram',
+- target = 'xmms2-ripper',
+- source = 'ripper.c',
+- includes = '. ../../.. ../../include',
+- uselib = 'vorbisenc',
+- use = 'xmmsclient'
+- )
+- if not bld.env.INSTALL_VIS_REFERENCE_CLIENTS:
+- t.install_path = None
-
- if bld.env['LIB_visual'] and bld.env['LIB_sdl']:
- obj = bld.new_task_gen('cc', 'program')
- obj.target = 'xmms2-libvisual'
-@@ -38,7 +30,6 @@ def configure(conf):
- conf.check_cc(lib="m", uselib_store="math")
- conf.check_cfg(package='libvisual-0.4', uselib_store='visual', args='--cflags --libs')
- conf.check_cfg(package='sdl', uselib_store='sdl', args='--cflags --libs')
-- conf.check_cfg(package='vorbisenc', uselib_store='vorbisenc', args='--cflags --libs')
+ if bld.env.LIB_visual and bld.env.LIB_sdl:
+ t = bld(features = 'c cprogram',
+ target = 'xmms2-libvisual',
+@@ -53,9 +42,6 @@ def configure(conf):
- return True
+ conf.check_cc(lib="m", uselib_store="math", mandatory=False)
+- conf.check_cfg(package='vorbisenc', uselib_store='vorbisenc',
+- args='--cflags --libs', mandatory=False)
+-
+ if conf.check_cfg(package='libvisual-0.4', uselib_store='visual',
+ args='--cflags --libs', mandatory=False):
+ conf.check_cfg(package='sdl', uselib_store='sdl',
Index: audio/xmms2/files/patch-patch-src-plugins-musepack-wscript
===================================================================
RCS file: /a/.csup/ports/audio/xmms2/files/patch-patch-src-plugins-musepack-wscript,v
retrieving revision 1.1
diff -u -p -r1.1 patch-patch-src-plugins-musepack-wscript
--- audio/xmms2/files/patch-patch-src-plugins-musepack-wscript 21 Sep 2010 16:51:17 -0000 1.1
+++ audio/xmms2/files/patch-patch-src-plugins-musepack-wscript 2 Dec 2011 12:59:59 -0000
@@ -1,11 +1,11 @@
--- src/plugins/musepack/wscript.orig 2010-09-10 22:55:03.412930402 +0200
+++ src/plugins/musepack/wscript 2010-09-10 23:02:05.738208553 +0200
-@@ -5,7 +5,7 @@
- if not conf.check_cc(header_name="mpcdec/mpcdec.h", defines="HAVE_MPCDEC_OLD", uselib_store="mpcdec"):
- return False
+@@ -8,7 +8,7 @@ def plugin_configure(conf):
+ conf.check_cc(header_name="mpcdec/mpcdec.h", defines="HAVE_MPCDEC_OLD",
+ uselib_store="mpcdec")
-- if not conf.check_cc(lib="mpcdec", uselib_store="mpcdec"):
-+ if not conf.check_cc(lib="mpcdec", uselib="math", uselib_store="mpcdec"):
- return False
+- conf.check_cc(lib="mpcdec", uselib_store="mpcdec")
++ conf.check_cc(lib="mpcdec", uselib="math", uselib_store="mpcdec")
- return True
+ configure, build = plugin("musepack", configure=plugin_configure,
+ libs=["mpcdec"])
Index: audio/xmms2/files/patch-src-plugins-airplay-wscript
===================================================================
RCS file: /a/.csup/ports/audio/xmms2/files/patch-src-plugins-airplay-wscript,v
retrieving revision 1.2
diff -u -p -r1.2 patch-src-plugins-airplay-wscript
--- audio/xmms2/files/patch-src-plugins-airplay-wscript 24 Feb 2011 23:38:27 -0000 1.2
+++ audio/xmms2/files/patch-src-plugins-airplay-wscript 2 Dec 2011 13:03:08 -0000
@@ -1,19 +1,11 @@
--- src/plugins/airplay/wscript.orig 2010-02-19 18:43:54.000000000 +0100
+++ src/plugins/airplay/wscript 2010-03-17 15:14:34.459359323 +0100
-@@ -1,15 +1,6 @@
- from waftools.plugin import plugin
+@@ -12,8 +12,6 @@ rtspmessage.c
+ def plugin_configure(conf):
+ # MinGW doesn't ship sys/select.h
+ conf.check_cc(header_name='sys/select.h')
+- conf.check_cfg(package="openssl", args="--cflags --libs",
+- uselib_store="openssl")
--def plugin_configure(conf):
-- # MinGW doesn't ship sys/select.h
-- if not conf.check_cc(header_name='sys/select.h'):
-- return False
--
-- if not conf.check_cfg(package="openssl", args="--cflags --libs", uselib_store="openssl"):
-- return False
-- return True
--
--configure, build = plugin("airplay", configure=plugin_configure,
-+configure, build = plugin("airplay",
- source=["airplay.c", "raop_client.c",
- "net_utils.c", "rtspdefs.c",
- "rtspconnection.c", "rtspmessage.c"],
+ configure, build = plugin("airplay", configure=plugin_configure,
+ source = source, libs=["openssl"], output_prio=4)
Index: audio/xmms2/files/patch-src-plugins-file-wscript
===================================================================
RCS file: audio/xmms2/files/patch-src-plugins-file-wscript
diff -N audio/xmms2/files/patch-src-plugins-file-wscript
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ audio/xmms2/files/patch-src-plugins-file-wscript 2 Dec 2011 13:47:33 -0000
@@ -0,0 +1,19 @@
+--- src/plugins/file/wscript~
++++ src/plugins/file/wscript
+@@ -1,7 +1,7 @@
+ from waftools.plugin import plugin
+
+ def plugin_build(bld, obj):
+- if bld.env.HAVE_FSTATAT and bld.env.HAVE_DIRFD:
++ if bld.env.HAVE_FSTATAT:
+ obj.source.append('browse/fstatat.c')
+ else:
+ obj.source.append('browse/gdir.c')
+@@ -9,7 +9,6 @@ def plugin_build(bld, obj):
+ def plugin_configure(conf):
+ conf.check_cc(function_name='fstatat', header_name=['fcntl.h','sys/stat.h'],
+ defines=['_ATFILE_SOURCE=1'])
+- conf.check_cc(function_name='dirfd', header_name=['dirent.h','sys/types.h'])
+
+ configure, build = plugin("file",
+ configure=plugin_configure, build=plugin_build,
Index: audio/xmms2/files/patch-wafadmin-Task.py
===================================================================
RCS file: audio/xmms2/files/patch-wafadmin-Task.py
diff -N audio/xmms2/files/patch-wafadmin-Task.py
--- audio/xmms2/files/patch-wafadmin-Task.py 23 Oct 2011 16:06:54 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,18 +0,0 @@
---- wafadmin/Task.py.orig 2010-02-19 18:43:54.000000000 +0100
-+++ wafadmin/Task.py 2011-10-14 14:36:57.000663231 +0200
-@@ -47,6 +47,7 @@
- import Build, Runner, Utils, Node, Logs, Options
- from Logs import debug, warn, error
- from Constants import *
-+import time
-
- algotype = NORMAL
- #algotype = JOBCONTROL
-@@ -406,6 +407,7 @@
- def call_run(self):
- if self.can_retrieve_cache():
- return 0
-+ time.sleep(0.02)
- return self.run()
-
- def run(self):
Index: audio/xmms2/files/patch-wscript
===================================================================
RCS file: /a/.csup/ports/audio/xmms2/files/patch-wscript,v
retrieving revision 1.2
diff -u -p -r1.2 patch-wscript
--- audio/xmms2/files/patch-wscript 24 Feb 2011 23:38:27 -0000 1.2
+++ audio/xmms2/files/patch-wscript 2 Dec 2011 13:28:19 -0000
@@ -1,27 +1,21 @@
--- wscript.orig 2010-02-19 18:43:54.000000000 +0100
+++ wscript 2010-03-17 15:21:16.184861151 +0100
-@@ -303,7 +303,7 @@
- conf.env['PKGCONFIGDIR'] = Options.options.pkgconfigdir
- print(conf.env['PKGCONFIGDIR'])
- else:
-- conf.env['PKGCONFIGDIR'] = os.path.join(conf.env["LIBDIR"], "pkgconfig")
-+ conf.env['PKGCONFIGDIR'] = os.path.join(conf.env["PREFIX"], "libdata", "pkgconfig")
-
- if Options.options.config_prefix:
- for dir in Options.options.config_prefix:
-@@ -480,15 +480,6 @@
- opt.sub_options(o)
+@@ -295,9 +295,6 @@ def configure(conf):
+ conf.msg("uncommited changed", changed and "yes" or "no")
+ conf.env.VERSION = "%s (git commit: %s%s)" % (BASEVERSION, nam, dirty)
- def shutdown():
-- if Options.commands['install'] and (
-- Options.options.ldconfig or
-- (Options.options.ldconfig is None and os.geteuid() == 0)
-- ):
-- 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
+- conf.env.append_unique('CFLAGS', ['-g', '-O0'])
+- conf.env.append_unique('CXXFLAGS', ['-g', '-O0'])
+-
+ if conf.options.with_profiling:
+ conf.env.with_profiling = True
+ conf.env.append_unique('CFLAGS', ['--coverage'])
+@@ -330,7 +327,7 @@ def configure(conf):
+ conf.env.PKGCONFIGDIR = conf.options.pkgconfigdir
+ Logs.pprint('Normal', conf.env.PKGCONFIGDIR) #XXX What is it ?
+ else:
+- conf.env.PKGCONFIGDIR = os.path.join(conf.env.LIBDIR, 'pkgconfig')
++ conf.env.PKGCONFIGDIR = os.path.join(conf.env.PREFIX, 'libdata', 'pkgconfig')
- if Options.options.run_tests:
- os.system(os.path.join(blddir, "default/tests/test_xmmstypes"))
+ if conf.options.config_prefix:
+ for d in conf.options.config_prefix:
--- update.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1RX9F0-0004x2-PG>