Attachment #120278 for bug #163056

View | Details | Raw Unified | Return to bug 163056
Collapse All | Expand All

Lines 5-11 Link Here

(-)audio/cpp-xmms2/Makefile (-1 lines)
5	# $FreeBSD: ports/audio/cpp-xmms2/Makefile,v 1.14 2011/02/24 23:38:27 miwi Exp $	5	# $FreeBSD: ports/audio/cpp-xmms2/Makefile,v 1.14 2011/02/24 23:38:27 miwi Exp $
6	#	6	#
7		7
8	PORTREVISION= 6
9	CATEGORIES= audio	8	CATEGORIES= audio
10	PKGNAMEPREFIX= cpp-	9	PKGNAMEPREFIX= cpp-
11		10

Lines 5-11 Link Here

(-)audio/p5-xmms2/Makefile (-1 lines)
5	# $FreeBSD: ports/audio/p5-xmms2/Makefile,v 1.7 2011/02/24 23:38:27 miwi Exp $	5	# $FreeBSD: ports/audio/p5-xmms2/Makefile,v 1.7 2011/02/24 23:38:27 miwi Exp $
6	#	6	#
7		7
8	PORTREVISION= 1
9	CATEGORIES= audio perl5	8	CATEGORIES= audio perl5
10	PKGNAMEPREFIX= p5-	9	PKGNAMEPREFIX= p5-
11		10

Lines 5-12 Link Here

(-)audio/py-xmms2/Makefile (-2 lines)
5	# $FreeBSD: ports/audio/py-xmms2/Makefile,v 1.12 2011/02/24 23:38:27 miwi Exp $	5	# $FreeBSD: ports/audio/py-xmms2/Makefile,v 1.12 2011/02/24 23:38:27 miwi Exp $
6	#	6	#
7		7
8	PORTREVISION= 5
9
10	CATEGORIES= audio python	8	CATEGORIES= audio python
11	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}	9	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
12		10

Lines 5-11 Link Here

(-)audio/ruby-xmms2/Makefile (-1 lines)
5	# $FreeBSD: ports/audio/ruby-xmms2/Makefile,v 1.11 2011/02/24 23:38:28 miwi Exp $	5	# $FreeBSD: ports/audio/ruby-xmms2/Makefile,v 1.11 2011/02/24 23:38:28 miwi Exp $
6	#	6	#
7		7
8	PORTREVISION= 4
9	CATEGORIES= audio ruby	8	CATEGORIES= audio ruby
10	PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX}	9	PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX}
11		10




#

PORTNAME?=	xmms2
PORTVERSION=	0.8
DISTVERSIONSUFFIX=DrO_o
DISTVERSIONSUFFIX=DrNo
CATEGORIES?=	audio
MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}%20${DISTVERSIONSUFFIX}



USE_LDCONFIG=	yes

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 \

		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 \


.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+=	--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+=	--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


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=""

.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


.endif # !XMMS2_SLAVE

do-configure:
	@cd ${WRKSRC} && ${MAKE_ENV} ./waf configure --conf-prefix=${LOCALBASE} \
		--prefix=${PREFIX} --mandir=${PREFIX}/man ${EXCLUDE} 

do-build:
	@cd ${WRKSRC} && ${MAKE_ENV} ./waf build

do-install:
	@cd ${WRKSRC} && ${MAKE_ENV} ./waf install --without-ldconfig

.include <bsd.port.post.mk>

Lines 1-2 Link Here

(-)audio/xmms2/distinfo (-2 / +2 lines)
1	SHA256 (xmms2-0.7DrNo.tar.bz2) = 59c58d9380e6b002920a8dc75f0fd4629ab175b82f29b6637f7816fdc9832b2c	1	SHA256 (xmms2-0.8DrO_o.tar.bz2) = c77e41e7bd5788889d5a2f78331ca8c748b8721bd2e59f36c36ad4c7cae8694a
2	SIZE (xmms2-0.7DrNo.tar.bz2) = 1519973	2	SIZE (xmms2-0.8DrO_o.tar.bz2) = 1670726

Lines 38-44 bin/xmms2d Link Here

(-)audio/xmms2/pkg-plist (+8 lines)
38	%%INCLUDEDIR%%/xmmsc/xmmsc_util.h	38	%%INCLUDEDIR%%/xmmsc/xmmsc_util.h
39	%%INCLUDEDIR%%/xmmsc/xmmsc_visualization.h	39	%%INCLUDEDIR%%/xmmsc/xmmsc_visualization.h
40	%%INCLUDEDIR%%/xmmsc/xmmsv.h	40	%%INCLUDEDIR%%/xmmsc/xmmsv.h
		41	%%INCLUDEDIR%%/xmmsc/xmmsv_bitbuffer.h
		42	%%INCLUDEDIR%%/xmmsc/xmmsv_build.h
41	%%INCLUDEDIR%%/xmmsc/xmmsv_coll.h	43	%%INCLUDEDIR%%/xmmsc/xmmsv_coll.h
		44	%%INCLUDEDIR%%/xmmsc/xmmsv_deprecated.h
		45	%%INCLUDEDIR%%/xmmsc/xmmsv_dict.h
		46	%%INCLUDEDIR%%/xmmsc/xmmsv_general.h
		47	%%INCLUDEDIR%%/xmmsc/xmmsv_list.h
		48	%%INCLUDEDIR%%/xmmsc/xmmsv_util.h
42	%%INCLUDEDIR%%/xmmsclient/xmmsclient++-glib.h	49	%%INCLUDEDIR%%/xmmsclient/xmmsclient++-glib.h
43	%%INCLUDEDIR%%/xmmsclient/xmmsclient++.h	50	%%INCLUDEDIR%%/xmmsclient/xmmsclient++.h
44	%%INCLUDEDIR%%/xmmsclient/xmmsclient++/bindata.h	51	%%INCLUDEDIR%%/xmmsclient/xmmsclient++/bindata.h
Lines 114-119 lib/libxmmsclient.so.6.0.0 Link Here
114	%%XML%%%%LIBDIR%%/libxmms_rss.so	121	%%XML%%%%LIBDIR%%/libxmms_rss.so
115	%%SAMBA%%%%LIBDIR%%/libxmms_samba.so	122	%%SAMBA%%%%LIBDIR%%/libxmms_samba.so
116	%%SID%%%%LIBDIR%%/libxmms_sid.so	123	%%SID%%%%LIBDIR%%/libxmms_sid.so
		124	%%SNDFILE%%%%LIBDIR%%/libxmms_sndfile.so
117	%%SPEEX%%%%LIBDIR%%/libxmms_speex.so	125	%%SPEEX%%%%LIBDIR%%/libxmms_speex.so
118	%%TREMOR%%%%LIBDIR%%/libxmms_tremor.so	126	%%TREMOR%%%%LIBDIR%%/libxmms_tremor.so
119	%%LIBDIR%%/libxmms_tta.so	127	%%LIBDIR%%/libxmms_tta.so




--- src/clients/vistest/wscript~
+++ src/clients/vistest/wscript
@@ -23,17 +23,6 @@ def build(bld):
             t.install_path = None
     obj.uselib = 'glib2 math'
 
 
-    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:
         t = bld(features = 'c cprogram',
             target = 'xmms2-libvisual',
@@ -53,9 +42,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')
 
     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',




--- 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
@@ -8,7 +8,7 @@ def plugin_configure(conf):
         conf.check_cc(header_name="mpcdec/mpcdec.h", defines="HAVE_MPCDEC_OLD",
                 uselib_store="mpcdec")
 
-    conf.check_cc(lib="mpcdec", uselib_store="mpcdec")
+    conf.check_cc(lib="mpcdec", uselib="math", uselib_store="mpcdec")
         return False
 
 configure, build = plugin("musepack", configure=plugin_configure,
         libs=["mpcdec"])




--- 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
@@ -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")
 
 configure, build = plugin("airplay", configure=plugin_configure,
                           source = source, libs=["openssl"], output_prio=4)
-	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"],




--- 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,




--- 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):




--- wscript.orig	2010-02-19 18:43:54.000000000 +0100
+++ wscript	2010-03-17 15:21:16.184861151 +0100
@@ -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)
     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)
 
-    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 conf.options.config_prefix:
         for d in conf.options.config_prefix:

Return to bug 163056

Lines 6-14 Link Here

(-)audio/xmms2/Makefile (-13 / +27 lines)
6	#	6	#
7		7
8	PORTNAME?= xmms2	8	PORTNAME?= xmms2
9	PORTVERSION= 0.7	9	PORTVERSION= 0.8
10	PORTREVISION?= 2	10	DISTVERSIONSUFFIX=DrO_o
11	DISTVERSIONSUFFIX=DrNo
12	CATEGORIES?= audio	11	CATEGORIES?= audio
13	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}%20${DISTVERSIONSUFFIX}	12	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}%20${DISTVERSIONSUFFIX}
14		13
Lines 24-33 USE_SQLITE= 3 Link Here
24		23
25	USE_LDCONFIG= yes	24	USE_LDCONFIG= yes
26		25
27	MAN1= nyxmms2.1 xmms2.1 xmms2-et.1 xmms2d.1 xmms2-launcher.1	26	MAN1= xmms2.1 xmms2-et.1 xmms2d.1 xmms2-launcher.1
28	MANCOMPRESSED= yes	27	MANCOMPRESSED= yes
29	PLIST_SUB+= INCLUDEDIR="include/${PORTNAME}" LIBDIR="lib/${PORTNAME}"	28	PLIST_SUB+= INCLUDEDIR="include/${PORTNAME}" LIBDIR="lib/${PORTNAME}"
30		29
		30	CPPFLAGS+= -I${LOCALBASE}/include
		31
31	OPTIONS= AIRPLAY "Support output via Airport Express" off \	32	OPTIONS= AIRPLAY "Support output via Airport Express" off \
32	AO "Support to output via libao" off \	33	AO "Support to output via libao" off \
33	APE "Support to playback Monkey's Audio files" off \	34	APE "Support to playback Monkey's Audio files" off \
Lines 52-57 OPTIONS= AIRPLAY "Support output via Air Link Here
52	PULSE "Support to output via the PulseAudio" off \	53	PULSE "Support to output via the PulseAudio" off \
53	SAMBA "Support to playback files via SMB" off \	54	SAMBA "Support to playback files via SMB" off \
54	SID "Support to playback SID files" off \	55	SID "Support to playback SID files" off \
		56	SNDFILE "Support to playback AIFF/AU/CAF/PAF files" off \
55	SPEEX "Support to playback SPEEX files" off \	57	SPEEX "Support to playback SPEEX files" off \
56	TREMOR "Support to playback OGG files" off \	58	TREMOR "Support to playback OGG files" off \
57	VISUAL "Support for visualization plugins" off \	59	VISUAL "Support for visualization plugins" off \
Lines 206-229 PLIST_SUB+= MAD="@comment " Link Here
206		208
207	.if !defined(WITHOUT_MDNS_APPLE) && !defined(WITHOUT_MDNS_AVAHI)	209	.if !defined(WITHOUT_MDNS_APPLE) && !defined(WITHOUT_MDNS_AVAHI)
208	BROKEN= You may choose either MDNS_APPLE or MDNS_AVAHI, but not both	210	BROKEN= You may choose either MDNS_APPLE or MDNS_AVAHI, but not both
		211	.elif defined(WITHOUT_MDNS_APPLE) && defined(WITHOUT_MDNS_AVAHI)
		212	EXCLUDE+= --without-optionals="mdns"
209	.endif	213	.endif
210		214
211	.if !defined(WITHOUT_MDNS_APPLE)	215	.if !defined(WITHOUT_MDNS_APPLE)
212	EXCLUDE+= --without-optionals="avahi"	216	EXCLUDE+= --with-mdns-backend="dns_sd"
213	LIB_DEPENDS+= dns_sd:${PORTSDIR}/net/mDNSResponder	217	LIB_DEPENDS+= dns_sd:${PORTSDIR}/net/mDNSResponder
214	PLIST_SUB+= MDNS_APPLE=""	218	PLIST_SUB+= MDNS_APPLE=""
215	.else	219	.else
216	EXCLUDE+= --without-optionals="dns_sd"
217	PLIST_SUB+= MDNS_APPLE="@comment "	220	PLIST_SUB+= MDNS_APPLE="@comment "
218	.endif	221	.endif
219		222
220	.if !defined(WITHOUT_MDNS_AVAHI)	223	.if !defined(WITHOUT_MDNS_AVAHI)
221	EXCLUDE+= --without-optionals="dns_sd"	224	EXCLUDE+= --with-mdns-backend="avahi"
222	LIB_DEPENDS+= avahi-core:${PORTSDIR}/net/avahi-app	225	LIB_DEPENDS+= avahi-core:${PORTSDIR}/net/avahi-app
223	PLIST_SUB+= MDNS_AVAHI=""	226	PLIST_SUB+= MDNS_AVAHI=""
224	MAN1+= xmms2-mdns-avahi.1	227	MAN1+= xmms2-mdns-avahi.1
225	.else	228	.else
226	EXCLUDE+= --without-optionals="avahi"
227	PLIST_SUB+= MDNS_AVAHI="@comment "	229	PLIST_SUB+= MDNS_AVAHI="@comment "
228	.endif	230	.endif
229		231
Lines 291-296 EXCLUDE+= --without-plugins="sid" Link Here
291	PLIST_SUB+= SID="@comment "	293	PLIST_SUB+= SID="@comment "
292	.endif	294	.endif
293		295
		296	.if !defined(WITHOUT_SNDFILE)
		297	LIB_DEPENDS+= sndfile.1:${PORTSDIR}/audio/libsndfile
		298	PLIST_SUB+= SNDFILE=""
		299	.else
		300	EXCLUDE+= --without-plugins="sndfile"
		301	PLIST_SUB+= SNDFILE="@comment "
		302	.endif
		303
294	.if !defined(WITHOUT_SPEEX)	304	.if !defined(WITHOUT_SPEEX)
295	LIB_DEPENDS+= speex.1:${PORTSDIR}/audio/speex	305	LIB_DEPENDS+= speex.1:${PORTSDIR}/audio/speex
296	PLIST_SUB+= SPEEX=""	306	PLIST_SUB+= SPEEX=""
Lines 318-326 EXTRA_PATCHES+= ${FILESDIR}/extra-patch- Link Here
318	.if !defined(WITHOUT_VISUAL)	328	.if !defined(WITHOUT_VISUAL)
319	USE_SDL= yes	329	USE_SDL= yes
320	LIB_DEPENDS+= visual-0.4.0:${PORTSDIR}/graphics/libvisual04	330	LIB_DEPENDS+= visual-0.4.0:${PORTSDIR}/graphics/libvisual04
321	PLIST_SUB+= VISUAL=""
322	.else	331	.else
323	EXCLUDE+= --without-optionals="vistest"	332	EXCLUDE+= --without-optionals="vistest"
		333	.endif
		334
		335	.if !defined(WITHOUT_VISUAL) && ${EXCLUDE:M--with-vis-reference-clients}
		336	PLIST_SUB+= VISUAL=""
		337	.else
324	PLIST_SUB+= VISUAL="@comment "	338	PLIST_SUB+= VISUAL="@comment "
325	.endif	339	.endif
326		340
Lines 361-373 PLIST_SUB+= XML="@comment " Link Here
361	.endif # !XMMS2_SLAVE	375	.endif # !XMMS2_SLAVE
362		376
363	do-configure:	377	do-configure:
364	cd ${WRKSRC} && ./waf configure --conf-prefix=${LOCALBASE} \	378	@cd ${WRKSRC} && ${MAKE_ENV} ./waf configure --conf-prefix=${LOCALBASE} \
365	--prefix=${PREFIX} --mandir=${PREFIX}/man ${EXCLUDE}	379	--prefix=${PREFIX} --mandir=${PREFIX}/man ${EXCLUDE}
366		380
367	do-build:	381	do-build:
368	cd ${WRKSRC} && ./waf build	382	@cd ${WRKSRC} && ${MAKE_ENV} ./waf build
369		383
370	do-install:	384	do-install:
371	cd ${WRKSRC} && ./waf install	385	@cd ${WRKSRC} && ${MAKE_ENV} ./waf install --without-ldconfig
372		386
373	.include <bsd.port.post.mk>	387	.include <bsd.port.post.mk>

Lines 1-25 Link Here

(-)audio/xmms2/files/extra-patch-src-clients-vistest-wscript (-19 / +24 lines)
1	--- src/clients/vistest/wscript~	1	--- src/clients/vistest/wscript~
2	+++ src/clients/vistest/wscript	2	+++ src/clients/vistest/wscript
3	@@ -15,14 +15,6 @@ def build(bld):	3	@@ -23,17 +23,6 @@ def build(bld):
4	obj.uselib_local = 'xmmsclient-glib xmmsclient'	4	t.install_path = None
5	obj.uselib = 'glib2 math'
6		5
7	- if bld.env['LIB_vorbisenc']:	6
8	- obj = bld.new_task_gen('cc', 'program')	7	- if bld.env.LIB_vorbisenc:
9	- obj.target = 'xmms2-ripper'	8	- t = bld(features = 'c cprogram',
10	- obj.source = 'ripper.c'	9	- target = 'xmms2-ripper',
11	- obj.includes = '. ../../.. ../../include'	10	- source = 'ripper.c',
12	- obj.uselib_local = 'xmmsclient'	11	- includes = '. ../../.. ../../include',
13	- obj.uselib = 'vorbisenc'	12	- uselib = 'vorbisenc',
		13	- use = 'xmmsclient'
		14	- )
		15	- if not bld.env.INSTALL_VIS_REFERENCE_CLIENTS:
		16	- t.install_path = None
14	-	17	-
15	if bld.env['LIB_visual'] and bld.env['LIB_sdl']:	18	if bld.env.LIB_visual and bld.env.LIB_sdl:
16	obj = bld.new_task_gen('cc', 'program')	19	t = bld(features = 'c cprogram',
17	obj.target = 'xmms2-libvisual'	20	target = 'xmms2-libvisual',
18	@@ -38,7 +30,6 @@ def configure(conf):	21	@@ -53,9 +42,6 @@ def configure(conf):
19	conf.check_cc(lib="m", uselib_store="math")
20	conf.check_cfg(package='libvisual-0.4', uselib_store='visual', args='--cflags --libs')
21	conf.check_cfg(package='sdl', uselib_store='sdl', args='--cflags --libs')
22	- conf.check_cfg(package='vorbisenc', uselib_store='vorbisenc', args='--cflags --libs')
23		22
24	return True	23	conf.check_cc(lib="m", uselib_store="math", mandatory=False)
25		24
		25	- conf.check_cfg(package='vorbisenc', uselib_store='vorbisenc',
		26	- args='--cflags --libs', mandatory=False)
		27	-
		28	if conf.check_cfg(package='libvisual-0.4', uselib_store='visual',
		29	args='--cflags --libs', mandatory=False):
		30	conf.check_cfg(package='sdl', uselib_store='sdl',

Lines 1-11 Link Here

(-)audio/xmms2/files/patch-patch-src-plugins-musepack-wscript (-7 / +7 lines)
1	--- src/plugins/musepack/wscript.orig 2010-09-10 22:55:03.412930402 +0200	1	--- src/plugins/musepack/wscript.orig 2010-09-10 22:55:03.412930402 +0200
2	+++ src/plugins/musepack/wscript 2010-09-10 23:02:05.738208553 +0200	2	+++ src/plugins/musepack/wscript 2010-09-10 23:02:05.738208553 +0200
3	@@ -5,7 +5,7 @@	3	@@ -8,7 +8,7 @@ def plugin_configure(conf):
4	if not conf.check_cc(header_name="mpcdec/mpcdec.h", defines="HAVE_MPCDEC_OLD", uselib_store="mpcdec"):	4	conf.check_cc(header_name="mpcdec/mpcdec.h", defines="HAVE_MPCDEC_OLD",
5	return False	5	uselib_store="mpcdec")
6		6
7	- if not conf.check_cc(lib="mpcdec", uselib_store="mpcdec"):	7	- conf.check_cc(lib="mpcdec", uselib_store="mpcdec")
8	+ if not conf.check_cc(lib="mpcdec", uselib="math", uselib_store="mpcdec"):	8	+ conf.check_cc(lib="mpcdec", uselib="math", uselib_store="mpcdec")
9	return False
10		9
11	return True	10	configure, build = plugin("musepack", configure=plugin_configure,
		11	libs=["mpcdec"])

Lines 1-19 Link Here

(-)audio/xmms2/files/patch-src-plugins-airplay-wscript (-16 / +8 lines)
1	--- src/plugins/airplay/wscript.orig 2010-02-19 18:43:54.000000000 +0100	1	--- src/plugins/airplay/wscript.orig 2010-02-19 18:43:54.000000000 +0100
2	+++ src/plugins/airplay/wscript 2010-03-17 15:14:34.459359323 +0100	2	+++ src/plugins/airplay/wscript 2010-03-17 15:14:34.459359323 +0100
3	@@ -1,15 +1,6 @@	3	@@ -12,8 +12,6 @@ rtspmessage.c
4	from waftools.plugin import plugin	4	def plugin_configure(conf):
		5	# MinGW doesn't ship sys/select.h
		6	conf.check_cc(header_name='sys/select.h')
		7	- conf.check_cfg(package="openssl", args="--cflags --libs",
		8	- uselib_store="openssl")
5		9
6	-def plugin_configure(conf):	10	configure, build = plugin("airplay", configure=plugin_configure,
7	- # MinGW doesn't ship sys/select.h	11	source = source, libs=["openssl"], output_prio=4)
8	- if not conf.check_cc(header_name='sys/select.h'):
9	- return False
10	-
11	- if not conf.check_cfg(package="openssl", args="--cflags --libs", uselib_store="openssl"):
12	- return False
13	- return True
14	-
15	-configure, build = plugin("airplay", configure=plugin_configure,
16	+configure, build = plugin("airplay",
17	source=["airplay.c", "raop_client.c",
18	"net_utils.c", "rtspdefs.c",
19	"rtspconnection.c", "rtspmessage.c"],

Added Link Here

(-)audio/xmms2/files/patch-src-plugins-file-wscript (+19 lines)
1	--- src/plugins/file/wscript~
2	+++ src/plugins/file/wscript
3	@@ -1,7 +1,7 @@
4	from waftools.plugin import plugin
5
6	def plugin_build(bld, obj):
7	- if bld.env.HAVE_FSTATAT and bld.env.HAVE_DIRFD:
8	+ if bld.env.HAVE_FSTATAT:
9	obj.source.append('browse/fstatat.c')
10	else:
11	obj.source.append('browse/gdir.c')
12	@@ -9,7 +9,6 @@ def plugin_build(bld, obj):
13	def plugin_configure(conf):
14	conf.check_cc(function_name='fstatat', header_name=['fcntl.h','sys/stat.h'],
15	defines=['_ATFILE_SOURCE=1'])
16	- conf.check_cc(function_name='dirfd', header_name=['dirent.h','sys/types.h'])
17
18	configure, build = plugin("file",
19	configure=plugin_configure, build=plugin_build,

Removed Link Here

(-)audio/xmms2/files/patch-wafadmin-Task.py (-18 lines)
1	--- wafadmin/Task.py.orig 2010-02-19 18:43:54.000000000 +0100
2	+++ wafadmin/Task.py 2011-10-14 14:36:57.000663231 +0200
3	@@ -47,6 +47,7 @@
4	import Build, Runner, Utils, Node, Logs, Options
5	from Logs import debug, warn, error
6	from Constants import *
7	+import time
8
9	algotype = NORMAL
10	#algotype = JOBCONTROL
11	@@ -406,6 +407,7 @@
12	def call_run(self):
13	if self.can_retrieve_cache():
14	return 0
15	+ time.sleep(0.02)
16	return self.run()
17
18	def run(self):

Lines 1-27 Link Here

(-)audio/xmms2/files/patch-wscript (-23 / +17 lines)
1	--- wscript.orig 2010-02-19 18:43:54.000000000 +0100	1	--- wscript.orig 2010-02-19 18:43:54.000000000 +0100
2	+++ wscript 2010-03-17 15:21:16.184861151 +0100	2	+++ wscript 2010-03-17 15:21:16.184861151 +0100
3	@@ -303,7 +303,7 @@	3	@@ -295,9 +295,6 @@ def configure(conf):
4	conf.env['PKGCONFIGDIR'] = Options.options.pkgconfigdir	4	conf.msg("uncommited changed", changed and "yes" or "no")
5	print(conf.env['PKGCONFIGDIR'])	5	conf.env.VERSION = "%s (git commit: %s%s)" % (BASEVERSION, nam, dirty)
6	else:
7	- conf.env['PKGCONFIGDIR'] = os.path.join(conf.env["LIBDIR"], "pkgconfig")
8	+ conf.env['PKGCONFIGDIR'] = os.path.join(conf.env["PREFIX"], "libdata", "pkgconfig")
9
10	if Options.options.config_prefix:
11	for dir in Options.options.config_prefix:
12	@@ -480,15 +480,6 @@
13	opt.sub_options(o)
14		6
15	def shutdown():	7	- conf.env.append_unique('CFLAGS', ['-g', '-O0'])
16	- if Options.commands['install'] and (	8	- conf.env.append_unique('CXXFLAGS', ['-g', '-O0'])
17	- Options.options.ldconfig or	9	-
18	- (Options.options.ldconfig is None and os.geteuid() == 0)	10	if conf.options.with_profiling:
19	- ):	11	conf.env.with_profiling = True
20	- ldconfig = '/sbin/ldconfig'	12	conf.env.append_unique('CFLAGS', ['--coverage'])
21	- if os.path.isfile(ldconfig):	13	@@ -330,7 +327,7 @@ def configure(conf):
22	- libprefix = Utils.subst_vars('${PREFIX}/lib', Build.bld.env)	14	conf.env.PKGCONFIGDIR = conf.options.pkgconfigdir
23	- try: Utils.cmd_output(ldconfig + ' ' + libprefix)	15	Logs.pprint('Normal', conf.env.PKGCONFIGDIR) #XXX What is it ?
24	- except: pass	16	else:
		17	- conf.env.PKGCONFIGDIR = os.path.join(conf.env.LIBDIR, 'pkgconfig')
		18	+ conf.env.PKGCONFIGDIR = os.path.join(conf.env.PREFIX, 'libdata', 'pkgconfig')
25		19
26	if Options.options.run_tests:	20	if conf.options.config_prefix:
27	os.system(os.path.join(blddir, "default/tests/test_xmmstypes"))	21	for d in conf.options.config_prefix: