Date: Fri, 24 May 2013 21:32:39 +0000 (UTC) From: Guido Falsi <madpilot@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r319017 - in head/audio/xmms2: . files Message-ID: <201305242132.r4OLWdlu099565@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: madpilot Date: Fri May 24 21:32:38 2013 New Revision: 319017 URL: http://svnweb.freebsd.org/changeset/ports/319017 Log: - Fix slave port audio/cpp-xmms2 build with recent clang [1] - While here hack build system to stop slave ports from overwriting master's files on installation Reported by: miwi [1] Added: head/audio/xmms2/files/patch-src-clients-lib-xmmsclient-glib-wscript (contents, props changed) head/audio/xmms2/files/patch-src-clients-lib-xmmsclient-wscript (contents, props changed) head/audio/xmms2/files/patch-src-include-wscript (contents, props changed) head/audio/xmms2/files/patch-src-include-xmmsclient-xmmsclient++-coll.h (contents, props changed) Modified: head/audio/xmms2/Makefile head/audio/xmms2/files/patch-wscript (contents, props changed) Modified: head/audio/xmms2/Makefile ============================================================================== --- head/audio/xmms2/Makefile Fri May 24 21:19:44 2013 (r319016) +++ head/audio/xmms2/Makefile Fri May 24 21:32:38 2013 (r319017) @@ -3,7 +3,7 @@ PORTNAME?= xmms2 PORTVERSION= 0.8 -PORTREVISION?= 1 +PORTREVISION?= 2 DISTVERSIONSUFFIX=DrO_o CATEGORIES?= audio MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}%20${DISTVERSIONSUFFIX} @@ -389,8 +389,10 @@ do-build: do-install: cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./waf install --without-ldconfig +.if !defined(XMMS2_SLAVE) if [ ! -d ${DATADIR}/scripts/startup.d ]; then \ ${MKDIR} ${DATADIR}/scripts/startup.d;\ fi +.endif .include <bsd.port.mk> Added: head/audio/xmms2/files/patch-src-clients-lib-xmmsclient-glib-wscript ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/xmms2/files/patch-src-clients-lib-xmmsclient-glib-wscript Fri May 24 21:32:38 2013 (r319017) @@ -0,0 +1,34 @@ +--- src/clients/lib/xmmsclient-glib/wscript.orig 2013-05-24 16:43:51.815281865 +0200 ++++ src/clients/lib/xmmsclient-glib/wscript 2013-05-24 17:00:04.966198019 +0200 +@@ -1,19 +1,21 @@ + from waftools import tool + + def build(bld): +- obj = bld(features='c cshlib', +- target = 'xmmsclient-glib', +- includes = '../../../.. ../../../include', +- source = 'xmmsclient-glib.c', +- uselib = 'glib2', +- use = 'xmmsclient', +- vnum = '1.0.0' +- ) ++ if bld.env.BUILD_XMMS2D: ++ obj = bld(features='c cshlib', ++ target = 'xmmsclient-glib', ++ includes = '../../../.. ../../../include', ++ source = 'xmmsclient-glib.c', ++ uselib = 'glib2', ++ use = 'xmmsclient', ++ vnum = '1.0.0' ++ ) + +- tool.add_install_flag(bld, obj) ++ tool.add_install_flag(bld, obj) + + def configure(conf): +- conf.env.XMMS_PKGCONF_FILES.append(('xmms2-client-glib', '-lxmmsclient-glib')) ++ if not conf.options.without_xmms2d: ++ conf.env.XMMS_PKGCONF_FILES.append(('xmms2-client-glib', '-lxmmsclient-glib')) + + return True + Added: head/audio/xmms2/files/patch-src-clients-lib-xmmsclient-wscript ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/xmms2/files/patch-src-clients-lib-xmmsclient-wscript Fri May 24 21:32:38 2013 (r319017) @@ -0,0 +1,34 @@ +--- src/clients/lib/xmmsclient/wscript.orig 2013-05-24 16:42:05.810273309 +0200 ++++ src/clients/lib/xmmsclient/wscript 2013-05-24 17:00:19.345205807 +0200 +@@ -25,19 +25,21 @@ + else: + source.extend(["visualization/dummy.c"]) + +- obj = bld(features = 'c cshlib', +- target = 'xmmsclient', +- includes = '../../../.. ../../../include ../../../includepriv', +- source = source, +- uselib = 'socket time', +- use = 'xmmsipc xmmssocket xmmsutils xmmstypes xmmsvisualization', +- vnum = '6.0.0' +- ) ++ if bld.env.BUILD_XMMS2D: ++ obj = bld(features = 'c cshlib', ++ target = 'xmmsclient', ++ includes = '../../../.. ../../../include ../../../includepriv', ++ source = source, ++ uselib = 'socket time', ++ use = 'xmmsipc xmmssocket xmmsutils xmmstypes xmmsvisualization', ++ vnum = '6.0.0' ++ ) + +- tool.add_install_flag(bld, obj) ++ tool.add_install_flag(bld, obj) + + def configure(conf): +- conf.env.XMMS_PKGCONF_FILES.append(("xmms2-client", "-lxmmsclient")) ++ if not conf.options.without_xmms2d: ++ conf.env.XMMS_PKGCONF_FILES.append(("xmms2-client", "-lxmmsclient")) + + conf.check_cc(function_name="semtimedop", + header_name=["sys/types.h", "sys/ipc.h", "sys/sem.h"], Added: head/audio/xmms2/files/patch-src-include-wscript ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/xmms2/files/patch-src-include-wscript Fri May 24 21:32:38 2013 (r319017) @@ -0,0 +1,22 @@ +--- src/include/wscript.orig 2011-10-20 21:26:08.000000000 +0200 ++++ src/include/wscript 2013-05-24 17:17:24.643159743 +0200 +@@ -2,12 +2,13 @@ + + def build(bld): + # FIXME: This is a test that should work. +- for d in bld.path.ant_glob('**', dir=True, src=False): +- rpath = d.path_from(bld.path) +- bld.recurse(rpath) +- f = d.ant_glob('*.h') +- if f: +- bld.install_files(os.path.join(bld.env.INCLUDEDIR, 'xmms2', rpath), f) ++ if bld.env.BUILD_XMMS2D: ++ for d in bld.path.ant_glob('**', dir=True, src=False): ++ rpath = d.path_from(bld.path) ++ bld.recurse(rpath) ++ f = d.ant_glob('*.h') ++ if f: ++ bld.install_files(os.path.join(bld.env.INCLUDEDIR, 'xmms2', rpath), f) + + #paths = ['xmms', 'xmmsc', 'xmmsclient', 'xmmsclient/xmmsclient++'] + #for p in paths: Added: head/audio/xmms2/files/patch-src-include-xmmsclient-xmmsclient++-coll.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/xmms2/files/patch-src-include-xmmsclient-xmmsclient++-coll.h Fri May 24 21:32:38 2013 (r319017) @@ -0,0 +1,11 @@ +--- src/include/xmmsclient/xmmsclient++/coll.h.orig 2013-05-24 12:04:02.505430442 +0200 ++++ src/include/xmmsclient/xmmsclient++/coll.h 2013-05-24 12:07:11.694426120 +0200 +@@ -612,7 +612,7 @@ + + template< typename keyT, typename valT > + AbstractElement< keyT, valT >::AbstractElement( const Coll& coll, keyT index ) +- : coll_ (coll), index_( index ) ++ : coll_ ( const_cast< Coll& >( coll ) ), index_( index ) + { + xmmsv_coll_ref( coll_.getColl() ); + } Modified: head/audio/xmms2/files/patch-wscript ============================================================================== --- head/audio/xmms2/files/patch-wscript Fri May 24 21:19:44 2013 (r319016) +++ head/audio/xmms2/files/patch-wscript Fri May 24 21:32:38 2013 (r319017) @@ -1,6 +1,16 @@ --- wscript.orig 2011-10-20 21:26:08.000000000 +0200 -+++ wscript 2012-05-06 18:28:07.902349353 +0200 -@@ -295,9 +295,6 @@ ++++ wscript 2013-05-24 16:57:29.409207485 +0200 +@@ -131,7 +131,8 @@ + VERSION = bld.env.VERSION + ) + +- bld.install_files('${SHAREDDIR}', "mind.in.a.box-lament_snipplet.ogg") ++ if bld.env.BUILD_XMMS2D: ++ bld.install_files('${SHAREDDIR}', "mind.in.a.box-lament_snipplet.ogg") + + bld.add_post_fun(shutdown) + +@@ -295,9 +296,6 @@ conf.msg("uncommited changed", changed and "yes" or "no") conf.env.VERSION = "%s (git commit: %s%s)" % (BASEVERSION, nam, dirty) @@ -10,7 +20,7 @@ if conf.options.with_profiling: conf.env.with_profiling = True conf.env.append_unique('CFLAGS', ['--coverage']) -@@ -330,7 +327,7 @@ +@@ -330,7 +328,7 @@ conf.env.PKGCONFIGDIR = conf.options.pkgconfigdir Logs.pprint('Normal', conf.env.PKGCONFIGDIR) #XXX What is it ? else: @@ -19,7 +29,7 @@ if conf.options.config_prefix: for d in conf.options.config_prefix: -@@ -339,6 +336,8 @@ +@@ -339,6 +337,8 @@ conf.env.prepend_value('LIBPATH', os.path.join(d, 'lib')) conf.env.prepend_value('CPPPATH', os.path.join(d, 'include'))
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201305242132.r4OLWdlu099565>