Date: Sat, 13 Nov 2010 15:50:13 GMT From: Guido Falsi <mad@madpilot.net> To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/144821: [patch] audio/xmms2 : update to version 0.7 DrNo. Message-ID: <201011131550.oADFoDBk099935@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/144821; it has been noted by GNATS. From: Guido Falsi <mad@madpilot.net> To: bug-followup@FreeBSD.org, mad@madpilot.net Cc: Subject: Re: ports/144821: [patch] audio/xmms2 : update to version 0.7 DrNo. Date: Sat, 13 Nov 2010 16:46:47 +0100 This is a multi-part message in MIME format. --------------080203050201090208010200 Content-Type: text/plain; charset=ISO-8859-15; format=flowed Content-Transfer-Encoding: 7bit Sending the patch again. Hope gnats will detect it as such this time. -- Guido Falsi <mad@madpilot.net> --------------080203050201090208010200 Content-Type: text/plain; name="xmms2.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="xmms2.diff" --- audio/abraca/Makefile 8e2849e4d34ec6e13b739bdfb40540291efa4af3 +++ audio/abraca/Makefile c0719ae5baf5896b4ae1dec3ac07bec9f42d34fa @@ -6,25 +6,25 @@ PORTNAME= abraca # PORTNAME= abraca -PORTVERSION= 0.4 -PORTREVISION= 2 -DISTVERSIONSUFFIX=-pre2 +PORTVERSION= 0.5.0 CATEGORIES= audio -MASTER_SITES= http://abraca.xmms.se/attachments/download/100/ +MASTER_SITES= http://abraca.xmms.se/attachments/download/128/ MAINTAINER= olivier@gid0.org COMMENT= Abraca is a GTK2 client for the XMMS2 music player -LIB_DEPENDS= xmmsclient.5:${PORTSDIR}/audio/xmms2 +BUILD_DEPENDS= ${LOCALBASE}/bin/valac:${PORTSDIR}/lang/vala +LIB_DEPENDS= xmmsclient.6:${PORTSDIR}/audio/xmms2 \ + gee.2:${PORTSDIR}/devel/libgee -USE_GMAKE= yes -ALL_TARGET= # defined +USE_BZIP2= yes +USE_SCONS= yes USE_GNOME= gtk20 PLIST_FILES= bin/${PORTNAME} do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/build/src/${PORTNAME} ${PREFIX}/bin .include <bsd.port.pre.mk> ============================================================ --- audio/abraca/distinfo c2cd986d81a83f732e9fbf02eebe3fa9d5236e9c +++ audio/abraca/distinfo 168f7595f4b7830b8a533a7f5bdf6f79bc768f17 @@ -1,3 +1,2 @@ -MD5 (abraca-0.4-pre2.tar.gz) = ccfaf2bb1d01f0ab9915896bdad859c1 -SHA256 (abraca-0.4-pre2.tar.gz) = b2af3a885d6398735c581e43edb45658ed0190e69f99b3f55e7dfa3d6f85ce4b -SIZE (abraca-0.4-pre2.tar.gz) = 155504 +SHA256 (abraca-0.5.0.tar.bz2) = c4caf88e9c0c8d5d51ac5c0df4cc9022a0aa2574a4ff791dea11c7e212b766e2 +SIZE (abraca-0.5.0.tar.bz2) = 402497 ============================================================ --- audio/abraca/pkg-descr afc28b56b501354a96964e6291e20c0c07dbc96d +++ audio/abraca/pkg-descr a5744c07c0508c98dee787a79822c94823842e31 @@ -1,4 +1,4 @@ collections in mind, which makes managin Abraca is a GTK2 client for the XMMS2 music player. It is designed with collections in mind, which makes managing your music a breeze. -WWW: http://nooms.de/projects/abraca +WWW: http://abraca.xmms.se/wiki/abraca ============================================================ --- audio/cpp-xmms2/Makefile 46fdfa0217b730b23a8daf97272c42214cdab114 +++ audio/cpp-xmms2/Makefile af8e29b36fbb2fb3d668b99cc3d6307cff8fb595 @@ -5,7 +5,7 @@ # $FreeBSD: ports/audio/cpp-xmms2/Makefile,v 1.13 2009/08/19 11:56:15 miwi Exp $ # -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= audio PKGNAMEPREFIX= cpp- @@ -13,7 +13,7 @@ LIB_DEPENDS+= boost_signals.4:${PORTSDIR COMMENT= C++ Bindings for XMMS2 LIB_DEPENDS+= boost_signals.4:${PORTSDIR}/devel/boost-libs \ - xmmsclient.5:${PORTSDIR}/audio/xmms2 + xmmsclient.6:${PORTSDIR}/audio/xmms2 MASTERDIR= ${.CURDIR}/../xmms2 USE_LDCONFIG= yes ============================================================ --- audio/cpp-xmms2/pkg-plist 5614864fb853c20b01578442d2ce797feaa9c262 +++ audio/cpp-xmms2/pkg-plist cdc35ec3ec4fb481a0993d0988e26c40887ab84a @@ -2,7 +2,7 @@ lib/libxmmsclient++.so lib/libxmmsclient++-glib.so.1 lib/libxmmsclient++-glib.so.1.0.0 lib/libxmmsclient++.so -lib/libxmmsclient++.so.3 -lib/libxmmsclient++.so.3.0.0 +lib/libxmmsclient++.so.4 +lib/libxmmsclient++.so.4.0.0 libdata/pkgconfig/xmms2-client-cpp-glib.pc libdata/pkgconfig/xmms2-client-cpp.pc ============================================================ --- audio/gxmms2/Makefile 10f61d24068220ec28ab3df008faa792609dbe98 +++ audio/gxmms2/Makefile 9e2f9e19293f6c893ae14113e3860a7d4d47d272 @@ -7,7 +7,7 @@ PORTVERSION= 0.7.0.20090608 PORTNAME= gxmms2 PORTVERSION= 0.7.0.20090608 -PORTREVISION= 2 +PORTREVISION= 3 DISTVERSIONSUFFIX=.795a77a CATEGORIES= audio #MASTER_SITES= http://wejp.k.vu/projects/xmms2/ @@ -16,7 +16,7 @@ COMMENT= A GTK2 based XMMS2 client, writ MAINTAINER= ports@FreeBSD.org COMMENT= A GTK2 based XMMS2 client, written in C -LIB_DEPENDS= xmmsclient.5:${PORTSDIR}/audio/xmms2 +LIB_DEPENDS= xmmsclient.6:${PORTSDIR}/audio/xmms2 BROKEN= does not fetch ============================================================ --- audio/p5-xmms2/Makefile c4871cb8d41472796b07452b4aade7c03940f148 +++ audio/p5-xmms2/Makefile 1490424f8ebe59eb03f8275c6e2dcdbcc0d32d0b @@ -5,14 +5,14 @@ # $FreeBSD: ports/audio/p5-xmms2/Makefile,v 1.6 2009/08/19 11:56:15 miwi Exp $ # -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= audio perl5 PKGNAMEPREFIX= p5- MAINTAINER= ports@FreeBSD.org COMMENT= Perl Bindings for XMMS2 -LIB_DEPENDS+= xmmsclient.5:${PORTSDIR}/audio/xmms2 +LIB_DEPENDS+= xmmsclient.6:${PORTSDIR}/audio/xmms2 MASTERDIR= ${.CURDIR}/../xmms2 ============================================================ --- audio/p5-xmms2/pkg-plist 8a9af4c332afca1950105337db4b3e1f06ed8440 +++ audio/p5-xmms2/pkg-plist 80d07265d40517c1470b91a4d360b41ae3706444 @@ -1,8 +1,9 @@ -%%SITE_PERL%%/%%PERL_ARCH%%/Audio/Collection.pm -%%SITE_PERL%%/%%PERL_ARCH%%/Audio/Glib.pm -%%SITE_PERL%%/%%PERL_ARCH%%/Audio/Sync.pm %%SITE_PERL%%/%%PERL_ARCH%%/Audio/XMMSClient.pm +%%SITE_PERL%%/%%PERL_ARCH%%/Audio/XMMSClient/Collection.pm +%%SITE_PERL%%/%%PERL_ARCH%%/Audio/XMMSClient/Glib.pm +%%SITE_PERL%%/%%PERL_ARCH%%/Audio/XMMSClient/Sync.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Audio/XMMSClient/XMMSClient.so @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Audio/XMMSClient @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Audio +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Audio/XMMSClient @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Audio ============================================================ --- audio/py-xmms2/Makefile a2b907564e5587b3da0f6d1100333785143cb97d +++ audio/py-xmms2/Makefile 9bbe7a31bafc7059841cbbe75084666b1da36e37 @@ -5,7 +5,7 @@ # $FreeBSD: ports/audio/py-xmms2/Makefile,v 1.11 2009/08/19 11:56:15 miwi Exp $ # -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= audio python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -14,7 +14,7 @@ BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/Pyre COMMENT= Python Bindings for XMMS2 BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/Pyrex/__init__.py:${PORTSDIR}/devel/pyrex -LIB_DEPENDS+= xmmsclient.5:${PORTSDIR}/audio/xmms2 +LIB_DEPENDS+= xmmsclient.6:${PORTSDIR}/audio/xmms2 MASTERDIR= ${.CURDIR}/../xmms2 ============================================================ --- audio/ruby-xmms2/Makefile adf25f23364af7b8da6666652fe5275edd3de16c +++ audio/ruby-xmms2/Makefile 3c957a69f148711930ac7c4818b16d616615ce02 @@ -5,14 +5,14 @@ # $FreeBSD: ports/audio/ruby-xmms2/Makefile,v 1.10 2009/08/19 11:56:16 miwi Exp $ # -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= audio ruby PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX} MAINTAINER= ruby@FreeBSD.org COMMENT= Ruby Bindings for XMMS2 -LIB_DEPENDS+= xmmsclient.5:${PORTSDIR}/audio/xmms2 +LIB_DEPENDS+= xmmsclient.6:${PORTSDIR}/audio/xmms2 MASTERDIR= ${.CURDIR}/../xmms2 ============================================================ --- audio/xmms2/Makefile ed6b7c2d515f858b85ffc59da506ddcf0e387853 +++ audio/xmms2/Makefile 1d850cdd6741bd6eee9954c7f3234e22bc7bd533 @@ -6,11 +6,10 @@ PORTNAME?= xmms2 # PORTNAME?= xmms2 -PORTVERSION= 0.6 -PORTREVISION= 7 -DISTVERSIONSUFFIX=DrMattDestruction +PORTVERSION= 0.7 +DISTVERSIONSUFFIX=DrNo CATEGORIES?= audio -MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}%20DrMattDestruction +MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}%20${DISTVERSIONSUFFIX} MAINTAINER= ports@FreeBSD.org COMMENT?= Rewrite of xmms as a client/server system (developer release) @@ -37,6 +36,7 @@ OPTIONS= AIRPLAY "Support output via Air FAAD "Support to playback AAC files" on \ FAM "Support to update Media Library on file change" off \ FLAC "Support to playback FLAC files" on \ + GME "Support to playback video game music files" off \ GVFS "Support to playback files via GVFS" off \ ICES "Support to playback files to an icecast server" off \ JACK "Support to output via the Jack output server" off \ @@ -52,6 +52,7 @@ OPTIONS= AIRPLAY "Support output via Air SAMBA "Support to playback files via SMB" off \ SID "Support to playback SID files" off \ SPEEX "Support to playback SPEEX files" off \ + TREMOR "Support to playback OGG files" off \ VISUAL "Support for visualization plugins" off \ VOCODER "Phase Vocoder effect plugin" off \ VORBIS "Support to playback OGG files" on \ @@ -162,6 +163,14 @@ PLIST_SUB+= FLAC="@comment " PLIST_SUB+= FLAC="@comment " .endif +.if !defined(WITHOUT_GME) +LIB_DEPENDS+= gme.0:${PORTSDIR}/audio/libgme +PLIST_SUB+= GME="" +.else +EXCLUDE+= --without-plugins="gme" +PLIST_SUB+= GME="@comment " +.endif + .if !defined(WITHOUT_GVFS) USE_GNOME+= gvfs PLIST_SUB+= GVFS="" @@ -289,6 +298,14 @@ PLIST_SUB+= SPEEX="@comment " PLIST_SUB+= SPEEX="@comment " .endif +.if !defined(WITHOUT_TREMOR) +LIB_DEPENDS+= vorbisidec.1:${PORTSDIR}/audio/libtremor +PLIST_SUB+= TREMOR="" +.else +EXCLUDE+= --without-plugins="tremor" +PLIST_SUB+= TREMOR="@comment " +.endif + # xmms2-ripper .if !defined(WITHOUT_VISUAL) && !defined(WITHOUT_VORBIS) LIB_DEPENDS+= vorbisenc.2:${PORTSDIR}/audio/libvorbis @@ -344,7 +361,7 @@ do-configure: do-configure: cd ${WRKSRC} && ./waf configure --conf-prefix=${LOCALBASE} \ - --prefix=${PREFIX} --with-mandir=${PREFIX}/man ${EXCLUDE} + --prefix=${PREFIX} --mandir=${PREFIX}/man ${EXCLUDE} do-build: cd ${WRKSRC} && ./waf build ============================================================ --- audio/xmms2/distinfo 2120d15719abc6bf51053988fc09a9d4e914b959 +++ audio/xmms2/distinfo a7f30e59e5f90b61aa4405ddcf94a407c4c3399a @@ -1,3 +1,2 @@ -MD5 (xmms2-0.6DrMattDestruction.tar.bz2) = 954fb9c76b5db5e324a105e81b273200 -SHA256 (xmms2-0.6DrMattDestruction.tar.bz2) = 4fb4f469816d8a1a676f6660e370b0c73a07e3d7e59d07f57a43b67216291db8 -SIZE (xmms2-0.6DrMattDestruction.tar.bz2) = 1631304 +SHA256 (xmms2-0.7DrNo.tar.bz2) = 59c58d9380e6b002920a8dc75f0fd4629ab175b82f29b6637f7816fdc9832b2c +SIZE (xmms2-0.7DrNo.tar.bz2) = 1519973 ============================================================ --- audio/xmms2/files/patch-src-plugins-airplay-wscript d7e4686c5d52f6b36a4166af9373c6e3217b601c +++ audio/xmms2/files/patch-src-plugins-airplay-wscript df2e23420a47cd3e09ad399a79754a7aa75ca62c @@ -1,9 +1,13 @@ ---- src/plugins/airplay/wscript~ -+++ src/plugins/airplay/wscript -@@ -1,11 +1,6 @@ +--- 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 -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 ============================================================ --- audio/xmms2/files/patch-wscript b89b25862fb67eed114d8c1ea0c81ab65e5a08da +++ audio/xmms2/files/patch-wscript 4bba2ad0175f4dbeea9614de53ccf96018c487bb @@ -1,24 +1,27 @@ ---- wscript~ -+++ wscript -@@ -297,7 +297,7 @@ def configure(conf): +--- 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["PREFIX"], "lib", "pkgconfig") +- 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: -@@ -476,12 +476,5 @@ def set_options(opt): +@@ -480,15 +480,6 @@ opt.sub_options(o) def shutdown(): -- if Options.commands['install'] and os.geteuid() == 0: +- 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 -- + if Options.options.run_tests: - os.system(os.path.join(os.getenv('WAF_HOME'), "default/tests/test_xmmstypes")) + os.system(os.path.join(blddir, "default/tests/test_xmmstypes")) ============================================================ --- audio/xmms2/pkg-plist 62e418d3689791f55f39c0cd5f73911da09454bb +++ audio/xmms2/pkg-plist a4c7f634cbb547fc8b9822f327f7b0048c12ab1f @@ -22,7 +22,6 @@ bin/xmms2d %%INCLUDEDIR%%/xmms/xmms_plugin.h %%INCLUDEDIR%%/xmms/xmms_sample.h %%INCLUDEDIR%%/xmms/xmms_streamtype.h -%%INCLUDEDIR%%/xmms/xmms_strfunc.h %%INCLUDEDIR%%/xmms/xmms_util.h %%INCLUDEDIR%%/xmms/xmms_xformplugin.h %%INCLUDEDIR%%/xmmsc/xmmsc_compiler.h @@ -70,15 +69,14 @@ lib/libxmmsclient.so lib/libxmmsclient-glib.so.1 lib/libxmmsclient-glib.so.1.0.0 lib/libxmmsclient.so -lib/libxmmsclient.so.5 -lib/libxmmsclient.so.5.0.0 +lib/libxmmsclient.so.6 +lib/libxmmsclient.so.6.0.0 %%AIRPLAY%%%%LIBDIR%%/libxmms_airplay.so %%AO%%%%LIBDIR%%/libxmms_ao.so %%LIBDIR%%/libxmms_apefile.so %%LIBDIR%%/libxmms_asf.so %%LIBDIR%%/libxmms_asx.so %%AVCODEC%%%%LIBDIR%%/libxmms_avcodec.so -%%AVCODEC%%%%LIBDIR%%/libxmms_avformat.so %%CDDA%%%%LIBDIR%%/libxmms_cdda.so %%LIBDIR%%/libxmms_cue.so %%CURL%%%%LIBDIR%%/libxmms_curl.so @@ -89,7 +87,7 @@ lib/libxmmsclient.so.5.0.0 %%LIBDIR%%/libxmms_file.so %%FLAC%%%%LIBDIR%%/libxmms_flac.so %%LIBDIR%%/libxmms_flv.so -%%LIBDIR%%/libxmms_gme.so +%%GME%%%%LIBDIR%%/libxmms_gme.so %%GVFS%%%%LIBDIR%%/libxmms_gvfs.so %%LIBDIR%%/libxmms_html.so %%ICES%%%%LIBDIR%%/libxmms_ices.so @@ -117,6 +115,7 @@ lib/libxmmsclient.so.5.0.0 %%SAMBA%%%%LIBDIR%%/libxmms_samba.so %%SID%%%%LIBDIR%%/libxmms_sid.so %%SPEEX%%%%LIBDIR%%/libxmms_speex.so +%%TREMOR%%%%LIBDIR%%/libxmms_tremor.so %%LIBDIR%%/libxmms_tta.so %%VOCODER%%%%LIBDIR%%/libxmms_vocoder.so %%VORBIS%%%%LIBDIR%%/libxmms_vorbis.so ============================================================ --- sysutils/conky/Makefile 8ca653a5d190aae9f576a251d4b9b0b29778e7a4 +++ sysutils/conky/Makefile e83cbb08601ad65a1d9da6481f5b58bee476ef2a @@ -7,7 +7,7 @@ PORTVERSION= 1.8.1 PORTNAME= conky PORTVERSION= 1.8.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils MASTER_SITES= SF @@ -153,7 +153,7 @@ CONFIGURE_ARGS+= --enable-weather-xoap .endif .if defined(WITH_XMMS2) -LIB_DEPENDS+= xmmsclient.5:${PORTSDIR}/audio/xmms2 +LIB_DEPENDS+= xmmsclient.6:${PORTSDIR}/audio/xmms2 CONFIGURE_ARGS+= --enable-xmms2 .else CONFIGURE_ARGS+= --disable-xmms2 ============================================================ --- /dev/null +++ audio/gxmms2/files/patch-gxmms2src-gxmms2.c e5f270c2b68e35a917ccad176ae69101792cfb12 @@ -0,0 +1,11 @@ +--- gxmms2src/gxmms2.c.orig 2010-03-18 17:24:13.010581936 +0100 ++++ gxmms2src/gxmms2.c 2010-03-18 17:24:55.246502932 +0100 +@@ -88,7 +88,7 @@ + xmmsc_result_t *res; + + if (xmms2ctrl_get_error() != ERROR_CONNECTION) { +- res = xmmsc_playback_seek_ms(connection, ++ res = xmmsc_playback_seek_ms_abs(connection, + (guint)gtk_range_get_value(GTK_RANGE(widget))); + xmmsc_result_unref(res); + } ============================================================ --- /dev/null +++ audio/abraca/files/patch-src-components-collections-collections_view.vala b418894e7e6f007261f31ee376e54075b48621b4 @@ -0,0 +1,23 @@ +--- src/components/collections/collections_view.vala.orig 2010-04-03 04:19:53.000000000 +0200 ++++ src/components/collections/collections_view.vala 2010-11-12 20:11:48.471315596 +0100 +@@ -441,16 +441,11 @@ + Gtk.TreePath path = model.get_path(iter); + + if (path.get_depth() == 2) { +- unowned GLib.List<Gtk.CellRenderer> renderers; +- Gtk.CellRendererText renderer; +- GLib.List<unowned Gtk.TreeViewColumn> cols; +- Gtk.TreeViewColumn col; ++ var cols = get_columns(); ++ var col = cols.data; + +- cols = get_columns(); +- col = cols.data; +- +- renderers = col.get_cells(); +- renderer = (Gtk.CellRendererText) renderers.data; ++ var renderers = col.get_cells(); ++ var renderer = (Gtk.CellRendererText) renderers.data; + + renderer.editable = true; + set_cursor_on_cell(path, col, renderer, true); --------------080203050201090208010200--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201011131550.oADFoDBk099935>