Attachment #139123 for bug #185316




PORTNAME=	mixxx
PORTVERSION=	1.11.0
DISTVERSIONSUFFIX=	-src
PORTREVISION=	4
CATEGORIES=	audio
MASTER_SITES=	http://downloads.mixxx.org/%SUBDIR%/
MASTER_SITE_SUBDIR=	${PORTNAME}-${PORTVERSION}

MAINTAINER=	ports@FreeBSD.org
COMMENT=	DJ mixing application

LICENSE=	GPLv2 # (or later)

BUILD_DEPENDS=	portaudio2>=0:${PORTSDIR}/audio/portaudio2
		bzr>=0:${PORTSDIR}/devel/bzr
LIB_DEPENDS=	libFLAC.so:${PORTSDIR}/audio/flac \
		libid3tag.so:${PORTSDIR}/audio/libid3tag \
		libmad.so:${PORTSDIR}/audio/libmad \


WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}

USES=		scons
USE_QT4=	corelib gui network opengl script sql svg xml \
		linguist_build moc_build qmake_build rcc_build uic_build
USE_GL=		glu
MAKE_ARGS=	qtdir="${QT_PREFIX}" optimize=0
LATE_INSTALL_ARGS=	--install-sandbox=${STAGEDIR}
SCONS_ARGS=	qtdir="${QT_PREFIX}" optimize=0
USE_LDCONFIG=	yes

OPTIONS_DEFINE=		DOCS FAAD GPERFTOOLS LAME SHOUTCAST WAVPACK
OPTIONS_DEFAULT=	FAAD SHOUTCAST WAVPACK
OPTIONS_SUB=		yes
DOC_FILES1=	Mixxx-Manual.pdf README README.macro

DOCSRCDIR2=	${WRKSRC}/doc/HID
DOCSDIR2=	${DOCSDIR}/doc/HID
DOC_FILES2=	*.odt *.pdf

OPTIONS_DEFINE=	DOCS FAAD LAME SHOUTCAST TCMALLOC WAVPACK
OPTIONS_DEFAULT=	FAAD SHOUTCAST TCMALLOC WAVPACK

OPTIONS_SUB=	yes

TCMALLOC_DESC=	Use Google's TCMalloc

FAAD_LIB_DEPENDS=	libfaad.so:${PORTSDIR}/audio/faad \
			libmp4v2.so:${PORTSDIR}/multimedia/mp4v2
FAAD_MAKE_ARGS=		faad=1
FAAD_MAKE_ARGS_OFF=	faad=0
GPERFTOOLS_LIB_DEPENDS=	libtcmalloc.so:${PORTSDIR}/devel/google-perftools
GPERFTOOLS_MAKE_ARGS=	perftools=1
GPERFTOOLS_MAKE_ARGS_OFF=	perftools=0
LAME_RUN_DEPENDS=	lame:${PORTSDIR}/audio/lame
SHOUTCAST_LIB_DEPENDS=	libshout.so:${PORTSDIR}/audio/libshout2
SHOUTCAST_MAKE_ARGS=	shoutcast=1
SHOUTCAST_MAKE_ARGS_OFF=	shoutcast=0
SHOUTCAST_SCONS_ARGS_OFF=	shoutcast=0

TCMALLOC_LIB_DEPENDS=	libtcmalloc.so:${PORTSDIR}/devel/google-perftools
TCMALLOC_SCONS_ARGS_ON=	perftools=1
TCMALLOC_SCONS_ARGS_OFF=	perftools=0

WAVPACK_LIB_DEPENDS=	libwavpack.so:${PORTSDIR}/audio/wavpack
WAVPACK_MAKE_ARGS=	wv=1
WAVPACK_MAKE_ARGS_OFF=	wv=0

.include <bsd.port.options.mk>

post-patch:
	@${REINPLACE_CMD} -e "s|%%LOCALBASE%%|${LOCALBASE}|g ; \
		 s|%%PREFIX%%|${PREFIX}|g" \
		${WRKSRC}/build/depends.py
	@${REINPLACE_CMD} -e "s|bzr |true |g" \
		${WRKSRC}/build/util.py
	@${REINPLACE_CMD} -e "/('install', docs)/d" \
		${WRKSRC}/src/SConscript
	@${REINPLACE_CMD} -e "s|^Exec=.*|Exec=mixxx| ; \

.endfor

post-install:
	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/mixxx
	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/mixxx/plugins/soundsource
	@${MKDIR} ${STAGEDIR}${DOCSDIR}
.for i in Mixxx-Manual.pdf README README.macro
	(cd ${WRKSRC} && ${INSTALL_DATA} ${i} \
		${STAGEDIR}${DOCSDIR})
.endfor
	@${MKDIR} ${STAGEDIR}${DOCSDIR}/doc/HID
.for i in *.odt *.pdf
	(cd ${WRKSRC}/doc/HID && ${INSTALL_DATA} ${i} \
		${STAGEDIR}${DOCSDIR}/doc/HID)
.endfor

.include <bsd.port.mk>

Lines 52-58 Link Here

(-)audio/mixxx/files/patch-build__depends.py (-5 / +9 lines)
52		52
53	if build.platform_is_windows and build.static_dependencies:	53	if build.platform_is_windows and build.static_dependencies:
54	build.env.Append(CPPDEFINES = 'TAGLIB_STATIC')	54	build.env.Append(CPPDEFINES = 'TAGLIB_STATIC')
55	@@ -782,10 +783,8 @@	55	@@ -782,14 +783,9 @@
56	if build.toolchain_is_gnu:	56	if build.toolchain_is_gnu:
57	# Default GNU Options	57	# Default GNU Options
58	# TODO(XXX) always generate debugging info?	58	# TODO(XXX) always generate debugging info?
Lines 61-69 Link Here
61	build.env.Append(CCFLAGS = '-Wextra')	61	build.env.Append(CCFLAGS = '-Wextra')
62	- build.env.Append(CCFLAGS = '-g')	62	- build.env.Append(CCFLAGS = '-g')
63		63
64	# Check that g++ is present (yeah, SCONS is a bit dumb here)	64	- # Check that g++ is present (yeah, SCONS is a bit dumb here)
65	if os.system("which g++ > /dev/null"): #Checks for non-zero return code	65	- if os.system("which g++ > /dev/null"): #Checks for non-zero return code
66	@@ -851,16 +850,19 @@	66	- raise Exception("Did not find g++.")
		67	elif build.toolchain_is_msvs:
		68	# Validate the specified winlib directory exists
		69	mixxx_lib_path = SCons.ARGUMENTS.get('winlib', '..\\..\\..\\mixxx-win32lib-msvc100-release')
		70	@@ -851,16 +847,19 @@
67		71
68	elif build.platform_is_bsd:	72	elif build.platform_is_bsd:
69	build.env.Append(CPPDEFINES='__BSD__')	73	build.env.Append(CPPDEFINES='__BSD__')
Lines 91-97 Link Here
91		95
92	# Define for things that would like to special case UNIX (Linux or BSD)	96	# Define for things that would like to special case UNIX (Linux or BSD)
93	if build.platform_is_bsd or build.platform_is_linux:	97	if build.platform_is_bsd or build.platform_is_linux:
94	@@ -897,14 +899,14 @@	98	@@ -897,14 +896,14 @@
95	# Say where to find resources on Unix. TODO(XXX) replace this with a	99	# Say where to find resources on Unix. TODO(XXX) replace this with a
96	# RESOURCE_PATH that covers Win and OSX too:	100	# RESOURCE_PATH that covers Win and OSX too:
97	if build.platform_is_linux or build.platform_is_bsd:	101	if build.platform_is_linux or build.platform_is_bsd:




--- src/defs.h.orig
+++ src/defs.h
@@ -87,6 +87,8 @@
 #define math_min(a,b)            (((a) < (b)) ? (a) : (b))
 #endif
 
+#if !defined(__GNUC__)
+
 // MSVC 2005/2008 needs these
 #ifndef fmax
 #define fmax math_max
@@ -98,3 +100,5 @@
 
 #endif
 
+#endif
+

Lines 1-8 Link Here

(-)audio/mixxx/pkg-plist (-1 / +10 lines)
1	bin/mixxx	1	bin/mixxx
		2	@exec mkdir -p %D/lib/mixxx/plugins/soundsource
2	%%FAAD%%lib/mixxx/plugins/soundsource/libsoundsourcem4a.so	3	%%FAAD%%lib/mixxx/plugins/soundsource/libsoundsourcem4a.so
3	%%WAVPACK%%lib/mixxx/plugins/soundsource/libsoundsourcewv.so	4	%%WAVPACK%%lib/mixxx/plugins/soundsource/libsoundsourcewv.so
4	lib/mixxx/plugins/vamp/libmixxxminimal.so	5	lib/mixxx/plugins/vamp/libmixxxminimal.so
5	share/applications/mixxx.desktop	6	share/applications/mixxx.desktop
		7	%%PORTDOCS%%%%DOCSDIR%%/Mixxx-Manual.pdf
		8	%%PORTDOCS%%%%DOCSDIR%%/README
		9	%%PORTDOCS%%%%DOCSDIR%%/README.macro
		10	%%PORTDOCS%%%%DOCSDIR%%/doc/HID/HID Packet Parser Documentation.odt
		11	%%PORTDOCS%%%%DOCSDIR%%/doc/HID/HID Packet Parser Documentation.pdf
6	%%DATADIR%%/controllers/Akai MPD24.midi.xml	12	%%DATADIR%%/controllers/Akai MPD24.midi.xml
7	%%DATADIR%%/controllers/Akai-LPD8-RK-scripts.js	13	%%DATADIR%%/controllers/Akai-LPD8-RK-scripts.js
8	%%DATADIR%%/controllers/Akai-LPD8-RK.midi.xml	14	%%DATADIR%%/controllers/Akai-LPD8-RK.midi.xml
Lines 9950-9956 Link Here
9950	@dirrm %%DATADIR%%/keyboard	9956	@dirrm %%DATADIR%%/keyboard
9951	@dirrm %%DATADIR%%/controllers	9957	@dirrm %%DATADIR%%/controllers
9952	@dirrm %%DATADIR%%	9958	@dirrm %%DATADIR%%
		9959	%%PORTDOCS%%@dirrm %%DOCSDIR%%/doc/HID
		9960	%%PORTDOCS%%@dirrm %%DOCSDIR%%/doc
		9961	%%PORTDOCS%%@dirrm %%DOCSDIR%%
9953	@dirrm lib/mixxx/plugins/vamp	9962	@dirrm lib/mixxx/plugins/vamp
9954	%%FAAD%%@dirrmtry lib/mixxx/plugins/soundsource	9963	@dirrmtry lib/mixxx/plugins/soundsource
9955	@dirrm lib/mixxx/plugins	9964	@dirrm lib/mixxx/plugins
9956	@dirrm lib/mixxx	9965	@dirrm lib/mixxx

Return to bug 185316

Lines 4-20 Link Here

(-)audio/mixxx/Makefile (-48 / +34 lines)
4	PORTNAME= mixxx	4	PORTNAME= mixxx
5	PORTVERSION= 1.11.0	5	PORTVERSION= 1.11.0
6	DISTVERSIONSUFFIX= -src	6	DISTVERSIONSUFFIX= -src
7	PORTREVISION= 3	7	PORTREVISION= 4
8	CATEGORIES= audio	8	CATEGORIES= audio
9	MASTER_SITES= http://downloads.mixxx.org/${PORTNAME}-${PORTVERSION}/	9	MASTER_SITES= http://downloads.mixxx.org/%SUBDIR%/
		10	MASTER_SITE_SUBDIR= ${PORTNAME}-${PORTVERSION}
10		11
11	MAINTAINER= ports@FreeBSD.org	12	MAINTAINER= ports@FreeBSD.org
12	COMMENT= DJ mixing application	13	COMMENT= DJ mixing application
13		14
14	LICENSE= GPLv2 # (or later)	15	LICENSE= GPLv2 # (or later)
15		16
16	BUILD_DEPENDS= portaudio2>=0:${PORTSDIR}/audio/portaudio2 \	17	BUILD_DEPENDS= portaudio2>=0:${PORTSDIR}/audio/portaudio2
17	bzr>=0:${PORTSDIR}/devel/bzr
18	LIB_DEPENDS= libFLAC.so:${PORTSDIR}/audio/flac \	18	LIB_DEPENDS= libFLAC.so:${PORTSDIR}/audio/flac \
19	libid3tag.so:${PORTSDIR}/audio/libid3tag \	19	libid3tag.so:${PORTSDIR}/audio/libid3tag \
20	libmad.so:${PORTSDIR}/audio/libmad \	20	libmad.so:${PORTSDIR}/audio/libmad \
Lines 26-81 Link Here
26		26
27	WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}	27	WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
28		28
29	NO_STAGE= yes	29	USES= scons
30	USE_QT4= corelib gui network opengl script sql svg xml \	30	USE_QT4= corelib gui network opengl script sql svg xml \
31	linguist_build moc_build qmake_build rcc_build uic_build	31	linguist_build moc_build qmake_build rcc_build uic_build
32	USE_GL= glu	32	USE_GL= glu
33	USE_SCONS= yes	33	MAKE_ARGS= qtdir="${QT_PREFIX}" optimize=0
34	SCONS_BUILDENV= ${SCONS_ENV}	34	LATE_INSTALL_ARGS= --install-sandbox=${STAGEDIR}
35	SCONS_ARGS= qtdir="${QT_PREFIX}" optimize=0
36	USE_LDCONFIG= yes
37		35
38	PORTDOCS= *	36	OPTIONS_DEFINE= DOCS FAAD GPERFTOOLS LAME SHOUTCAST WAVPACK
39		37	OPTIONS_DEFAULT= FAAD SHOUTCAST WAVPACK
40	DOCSRCDIR1= ${WRKSRC}	38	OPTIONS_SUB= yes
41	DOC_FILES1= Mixxx-Manual.pdf README README.macro
42
43	DOCSRCDIR2= ${WRKSRC}/doc/HID
44	DOCSDIR2= ${DOCSDIR}/doc/HID
45	DOC_FILES2= .odt .pdf
46
47	OPTIONS_DEFINE= DOCS FAAD LAME SHOUTCAST TCMALLOC WAVPACK
48	OPTIONS_DEFAULT= FAAD SHOUTCAST TCMALLOC WAVPACK
49
50	OPTIONS_SUB= yes
51
52	TCMALLOC_DESC= Use Google's TCMalloc
53		39
54	FAAD_LIB_DEPENDS= libfaad.so:${PORTSDIR}/audio/faad \	40	FAAD_LIB_DEPENDS= libfaad.so:${PORTSDIR}/audio/faad \
55	libmp4v2.so:${PORTSDIR}/multimedia/mp4v2	41	libmp4v2.so:${PORTSDIR}/multimedia/mp4v2
56	FAAD_SCONS_ARGS_ON= faad=1	42	FAAD_MAKE_ARGS= faad=1
57	FAAD_SCONS_ARGS_OFF= faad=0	43	FAAD_MAKE_ARGS_OFF= faad=0
58		44	GPERFTOOLS_LIB_DEPENDS= libtcmalloc.so:${PORTSDIR}/devel/google-perftools
		45	GPERFTOOLS_MAKE_ARGS= perftools=1
		46	GPERFTOOLS_MAKE_ARGS_OFF= perftools=0
59	LAME_RUN_DEPENDS= lame:${PORTSDIR}/audio/lame	47	LAME_RUN_DEPENDS= lame:${PORTSDIR}/audio/lame
60		48	SHOUTCAST_LIB_DEPENDS= libshout.so:${PORTSDIR}/audio/libshout2
61	SHOUTCAST_LIB_DEPENDS= libshout.so:${PORTSDIR}/audio/libshout	49	SHOUTCAST_MAKE_ARGS= shoutcast=1
62	SHOUTCAST_SCONS_ARGS_ON= shoutcast=1	50	SHOUTCAST_MAKE_ARGS_OFF= shoutcast=0
63	SHOUTCAST_SCONS_ARGS_OFF= shoutcast=0
64
65	TCMALLOC_LIB_DEPENDS= libtcmalloc.so:${PORTSDIR}/devel/google-perftools
66	TCMALLOC_SCONS_ARGS_ON= perftools=1
67	TCMALLOC_SCONS_ARGS_OFF= perftools=0
68
69	WAVPACK_LIB_DEPENDS= libwavpack.so:${PORTSDIR}/audio/wavpack	51	WAVPACK_LIB_DEPENDS= libwavpack.so:${PORTSDIR}/audio/wavpack
70	WAVPACK_SCONS_ARGS_ON= wv=1	52	WAVPACK_MAKE_ARGS= wv=1
71	WAVPACK_SCONS_ARGS_OFF= wv=0	53	WAVPACK_MAKE_ARGS_OFF= wv=0
72
73	.include <bsd.port.options.mk>
74		54
75	post-patch:	55	post-patch:
76	@${REINPLACE_CMD} -e "s\|%%LOCALBASE%%\|${LOCALBASE}\|g ; \	56	@${REINPLACE_CMD} -e "s\|%%LOCALBASE%%\|${LOCALBASE}\|g ; \
77	s\|%%PREFIX%%\|${PREFIX}\|g" \	57	s\|%%PREFIX%%\|${PREFIX}\|g" \
78	${WRKSRC}/build/depends.py	58	${WRKSRC}/build/depends.py
		59	@${REINPLACE_CMD} -e "s\|bzr \|true \|g" \
		60	${WRKSRC}/build/util.py
79	@${REINPLACE_CMD} -e "/('install', docs)/d" \	61	@${REINPLACE_CMD} -e "/('install', docs)/d" \
80	${WRKSRC}/src/SConscript	62	${WRKSRC}/src/SConscript
81	@${REINPLACE_CMD} -e "s\|^Exec=.*\|Exec=mixxx\| ; \	63	@${REINPLACE_CMD} -e "s\|^Exec=.*\|Exec=mixxx\| ; \
Lines 86-98 Link Here
86	.endfor	68	.endfor
87		69
88	post-install:	70	post-install:
89	@${STRIP_CMD} ${PREFIX}/bin/mixxx	71	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/mixxx
90		72	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/mixxx/plugins/soundsource
91	.if ${PORT_OPTIONS:MDOCS}	73	@${MKDIR} ${STAGEDIR}${DOCSDIR}
92	@${MKDIR} ${DOCSDIR}	74	.for i in Mixxx-Manual.pdf README README.macro
93	${INSTALL_DATA} ${DOC_FILES1:S\|^\|${DOCSRCDIR1}/\|} ${DOCSDIR}	75	(cd ${WRKSRC} && ${INSTALL_DATA} ${i} \
94	@${MKDIR} ${DOCSDIR2}	76	${STAGEDIR}${DOCSDIR})
95	${INSTALL_DATA} ${DOC_FILES2:S\|^\|${DOCSRCDIR2}/\|} ${DOCSDIR2}	77	.endfor
96	.endif	78	@${MKDIR} ${STAGEDIR}${DOCSDIR}/doc/HID
		79	.for i in .odt .pdf
		80	(cd ${WRKSRC}/doc/HID && ${INSTALL_DATA} ${i} \
		81	${STAGEDIR}${DOCSDIR}/doc/HID)
		82	.endfor
97		83
98	.include <bsd.port.mk>	84	.include <bsd.port.mk>

Line 0 Link Here

(-)audio/mixxx/files/patch-src__defs.h (+17 lines)
	1	--- src/defs.h.orig
	2	+++ src/defs.h
	3	@@ -87,6 +87,8 @@
	4	#define math_min(a,b) (((a) < (b)) ? (a) : (b))
	5	#endif
	6
	7	+#if !defined(__GNUC__)
	8	+
	9	// MSVC 2005/2008 needs these
	10	#ifndef fmax
	11	#define fmax math_max
	12	@@ -98,3 +100,5 @@
	13
	14	#endif
	15
	16	+#endif
	17	+