Attachment #167381 for bug #207307

Lines 14-33 Link Here

(-)audio/audacity/Makefile (-25 / +42 lines)
14	LICENSE= GPLv2	14	LICENSE= GPLv2
15	LICENSE_FILE= ${WRKSRC}/LICENSE.txt	15	LICENSE_FILE= ${WRKSRC}/LICENSE.txt
16		16
17	BROKEN_powerpc64= Does not build	17	BUILD_DEPENDS= autogen:${PORTSDIR}/devel/autogen \
18
19	LIB_DEPENDS= libsndfile.so:${PORTSDIR}/audio/libsndfile
20
21	BUILD_DEPENDS+= autogen:${PORTSDIR}/devel/autogen \
22	bash:${PORTSDIR}/shells/bash \	18	bash:${PORTSDIR}/shells/bash \
23	cmake:${PORTSDIR}/devel/cmake	19	cmake:${PORTSDIR}/devel/cmake
		20	LIB_DEPENDS= libexpat.so:${PORTSDIR}/textproc/expat2 \
		21	libsndfile.so:${PORTSDIR}/audio/libsndfile
24		22
		23	BROKEN_powerpc64= Does not build
		24
25	WRKSRC= ${WRKDIR}/${PORTNAME}-Audacity-${PORTVERSION}	25	WRKSRC= ${WRKDIR}/${PORTNAME}-Audacity-${PORTVERSION}
26		26
27	GNU_CONFIGURE= yes	27	GNU_CONFIGURE= yes
28	USES= compiler:c++11-lib cpe desktop-file-utils gmake pkgconfig shared-mime-info shebangfix dos2unix	28	USES= compiler:c++11-lib cpe desktop-file-utils gmake iconv pkgconfig shared-mime-info shebangfix dos2unix
29	NLS_USES= gettext	29	NLS_USES= gettext
30	NLS_CONFIGURE_ENABLE= nls	30	NLS_CONFIGURE_ENABLE= nls
		31	NLS_CONFIGURE_WITH= libintl-prefix="${LOCALBASE}"
31	OPTIONS_SUB= yes	32	OPTIONS_SUB= yes
32	USE_WX= 3.0+	33	USE_WX= 3.0+
33	WX_COMPS= wx	34	WX_COMPS= wx
Lines 36-42 Link Here
36	DOS2UNIX_GLOB= Makefile.* .c *.h	37	DOS2UNIX_GLOB= Makefile.* .c *.h
37	SHEBANG_FILES= lib-src/lv2/build	38	SHEBANG_FILES= lib-src/lv2/build
38		39
39	OPTIONS_DEFINE= NLS DEBUG DOCS FFMPEG FLAC ID3TAG LADSPA LAME LV2 MAD \	40	OPTIONS_DEFINE= NLS DEBUG DOCS DYNLOAD FFMPEG FLAC ID3TAG LADSPA LAME LV2 MAD \
40	SBSMS SOUNDTOUCH TWOLAME VAMP VORBIS VST	41	SBSMS SOUNDTOUCH TWOLAME VAMP VORBIS VST
41	OPTIONS_DEFAULT= FLAC ID3TAG LADSPA MAD \	42	OPTIONS_DEFAULT= FLAC ID3TAG LADSPA MAD \
42	SBSMS SOUNDTOUCH TWOLAME VAMP VORBIS VST	43	SBSMS SOUNDTOUCH TWOLAME VAMP VORBIS VST
Lines 47-52 Link Here
47	OPTIONS_DEFAULT_i386= ${MACHINE_CPU:tu:MSSE}	48	OPTIONS_DEFAULT_i386= ${MACHINE_CPU:tu:MSSE}
48		49
49	DEBUG_DESC= Enable debug support	50	DEBUG_DESC= Enable debug support
		51	DYNLOAD_DESC= Enable dynamic loading of lame and FFmpeg
50	LAME_DESC= Use lame for import and export support	52	LAME_DESC= Use lame for import and export support
51	LV2_DESC= Add LV2 plug-in support	53	LV2_DESC= Add LV2 plug-in support
52	MAD_DESC= Use libmad for mp2/3 decoding support	54	MAD_DESC= Use libmad for mp2/3 decoding support
Lines 60-69 Link Here
60		62
61	CONFIGURE_ENV+= WX_CONFIG="${WX_CONFIG}"	63	CONFIGURE_ENV+= WX_CONFIG="${WX_CONFIG}"
62		64
63	CONFIGURE_ARGS+= --with-lib-preference="local system" \	65	CONFIGURE_ARGS+= --enable-unicode \
64	--enable-portaudio --enable-unicode --with-libsoxr	66	${ICONV_CONFIGURE_ARG} \
		67	--with-lib-preference="local" \
		68	--with-expat=system \
		69	--with-libsndfile=system \
		70	--with-libsoxr \
		71	--with-portaudio \
		72	--with-midi \
		73	--with-widgetextra \
		74	--with-portmixer=yes
65		75
66	CONFIGURE_SHELL?=${LOCALBASE}/bin/bash	76	CONFIGURE_SHELL?= ${LOCALBASE}/bin/bash
67		77
68	DEBUG_CONFIGURE_WITH= debug	78	DEBUG_CONFIGURE_WITH= debug
69		79
Lines 70-82 Link Here
70	DOCS_BUILD_DEPENDS= docbook-to-man:${PORTSDIR}/textproc/docbook-to-man \	80	DOCS_BUILD_DEPENDS= docbook-to-man:${PORTSDIR}/textproc/docbook-to-man \
71	docbook2man:${PORTSDIR}/textproc/docbook-utils	81	docbook2man:${PORTSDIR}/textproc/docbook-utils
72		82
		83	DYNLOAD_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/libavcodec.pc:${PORTSDIR}/multimedia/ffmpeg
		84	DYNLOAD_BUILD_DEPENDS= ${LOCALBASE}/include/lame/lame.h:${PORTSDIR}/audio/lame
		85	DYNLOAD_CONFIGURE_ENABLE= dynamic-loading
		86	DYNLOAD_CPPFLAGS= -I${LOCALBASE}/include # for audio/lame using
		87	DYNLOAD_LDFLAGS= -L${LOCALBASE}/lib # for audio/lame using
		88
73	FFMPEG_CONFIGURE_WITH= ffmpeg=system	89	FFMPEG_CONFIGURE_WITH= ffmpeg=system
74	FFMPEG_LIB_DEPENDS= libavcodec.so:${PORTSDIR}/multimedia/ffmpeg	90	FFMPEG_LIB_DEPENDS= libavcodec.so:${PORTSDIR}/multimedia/ffmpeg
75		91
76	FLAC_CONFIGURE_WITH= libflac	92	FLAC_CONFIGURE_WITH= libflac=system
77	FLAC_LIB_DEPENDS= libFLAC.so:${PORTSDIR}/audio/flac	93	FLAC_LIB_DEPENDS= libFLAC.so:${PORTSDIR}/audio/flac
78		94
79	ID3TAG_CONFIGURE_WITH= libid3tag	95	ID3TAG_CONFIGURE_WITH= libid3tag=system
80	ID3TAG_LIB_DEPENDS= libid3tag.so:${PORTSDIR}/audio/libid3tag	96	ID3TAG_LIB_DEPENDS= libid3tag.so:${PORTSDIR}/audio/libid3tag
81		97
82	JACK_LIB_DEPENDS= libjack.so:${PORTSDIR}/audio/jack	98	JACK_LIB_DEPENDS= libjack.so:${PORTSDIR}/audio/jack
Lines 84-93 Link Here
84	LADSPA_CONFIGURE_ENABLE= ladspa	100	LADSPA_CONFIGURE_ENABLE= ladspa
85	LADSPA_RUN_DEPENDS= listplugins:${PORTSDIR}/audio/ladspa	101	LADSPA_RUN_DEPENDS= listplugins:${PORTSDIR}/audio/ladspa
86		102
87	MAD_CONFIGURE_WITH= libmad	103	MAD_CONFIGURE_WITH= libmad=system
88	MAD_LIB_DEPENDS= libmad.so:${PORTSDIR}/audio/libmad	104	MAD_LIB_DEPENDS= libmad.so:${PORTSDIR}/audio/libmad
89		105
90	LAME_CONFIGURE_WITH= lame	106	LAME_CONFIGURE_ON= --with-lame=system
		107	LAME_CONFIGURE_OFF= --with-lame # --without-lame is broken
		108	LAME_CPPFLAGS= -I${LOCALBASE}/include
		109	LAME_LDFLAGS= -L${LOCALBASE}/lib
91	LAME_LIB_DEPENDS= libmp3lame.so:${PORTSDIR}/audio/lame	110	LAME_LIB_DEPENDS= libmp3lame.so:${PORTSDIR}/audio/lame
92		111
93	LV2_CONFIGURE_WITH= lv2	112	LV2_CONFIGURE_WITH= lv2
Lines 94-121 Link Here
94		113
95	SBSMS_CONFIGURE_WITH= sbsms	114	SBSMS_CONFIGURE_WITH= sbsms
96		115
97	SOUNDTOUCH_CONFIGURE_WITH= soundtouch	116	SOUNDTOUCH_CONFIGURE_WITH= soundtouch=system
98	SOUNDTOUCH_LIB_DEPENDS= libSoundTouch.so:${PORTSDIR}/audio/soundtouch	117	SOUNDTOUCH_LIB_DEPENDS= libSoundTouch.so:${PORTSDIR}/audio/soundtouch
99		118
100	SSE_CONFIGURE_ENABLE= sse	119	SSE_CONFIGURE_ENABLE= sse
101		120
102	TWOLAME_CONFIGURE_WITH= libtwolame	121	TWOLAME_CONFIGURE_WITH= libtwolame=system
103	TWOLAME_LIB_DEPENDS= libtwolame.so:${PORTSDIR}/audio/twolame	122	TWOLAME_LIB_DEPENDS= libtwolame.so:${PORTSDIR}/audio/twolame
104		123
105	VAMP_CONFIGURE_WITH= libvamp	124	VAMP_CONFIGURE_WITH= libvamp=system
		125	VAMP_LIB_DEPENDS= libvamp-hostsdk.so:${PORTSDIR}/audio/vamp-plugin-sdk
106		126
107	VORBIS_CONFIGURE_WITH= libvorbis	127	VORBIS_CONFIGURE_WITH= libvorbis=system
108	VORBIS_LIB_DEPENDS= libvorbis.so:${PORTSDIR}/audio/libvorbis	128	VORBIS_LIB_DEPENDS= libvorbis.so:${PORTSDIR}/audio/libvorbis
109		129
110	VST_CONFIGURE_ENABLE= vst	130	VST_CONFIGURE_ENABLE= vst
111		131
112	LDFLAGS+= -lpthread -L${LOCALBASE}/lib
113	CPPFLAGS+= -I${WRKSRC}/lib-src/portsmf
114	CXXFLAGS+= -I${WRKSRC}/lib-src/portsmf
115	CFLAGS+= -I${WRKSRC}/lib-src/portsmf \
116	-I${WRKSRC}/lib-src/portaudio-v19/include \
117	-I${WRKSRC}/lib-src/lame -I${LOCALBASE}/include
118
119	.include <bsd.port.pre.mk>	132	.include <bsd.port.pre.mk>
120		133
121	.if ${CHOSEN_COMPILER_TYPE} == gcc	134	.if ${CHOSEN_COMPILER_TYPE} == gcc
Lines 122-127 Link Here
122	CXXFLAGS+= -std=c++11	135	CXXFLAGS+= -std=c++11
123	.endif	136	.endif
124		137
		138	post-configure:
		139	${REINPLACE_CMD} -e '/SNDFILE_CFLAGS/s,%%LOCALBASE%%,${LOCALBASE},'\
		140	${WRKSRC}/lib-src/libnyquist/Makefile
		141
125	post-install:	142	post-install:
126	@${MKDIR} ${STAGEDIR}${DOCSDIR}	143	@${MKDIR} ${STAGEDIR}${DOCSDIR}
127	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}	144	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}

Line 0 Link Here

(-)audio/audacity/files/patch-lib-src_libnyquist_Makefile.am (+11 lines)
	1	--- lib-src/libnyquist/Makefile.am.orig 2016-01-08 22:05:48 UTC
	2	+++ lib-src/libnyquist/Makefile.am
	3	@@ -3,7 +3,7 @@
	4	# Written by Richard Ash following Gary Vaughan's Autobook
	5
	6	PORTAUDIO_CFLAGS = -I${srcdir}/../portaudio-v19/include
	7	-SNDFILE_CFLAGS = -I${builddir}/../libsndfile/src
	8	+#SNDFILE_CFLAGS = -I${builddir}/../libsndfile/src
	9
	10	# tell aclocal that extra macros can be found in autotools/m4/
	11	ACLOCAL_AMFLAGS = -I autotools/m4

Line 0 Link Here

(-)audio/audacity/files/patch-lib-src_libnyquist_Makefile.in (+11 lines)
	1	--- lib-src/libnyquist/Makefile.in.orig 2016-01-08 22:05:48 UTC
	2	+++ lib-src/libnyquist/Makefile.in
	3	@@ -467,7 +467,7 @@ top_build_prefix = @top_build_prefix@
	4	top_builddir = @top_builddir@
	5	top_srcdir = @top_srcdir@
	6	PORTAUDIO_CFLAGS = -I${srcdir}/../portaudio-v19/include
	7	-SNDFILE_CFLAGS = -I${builddir}/../libsndfile/src
	8	+SNDFILE_CFLAGS = -I%%LOCALBASE%%/include
	9
	10	# tell aclocal that extra macros can be found in autotools/m4/
	11	ACLOCAL_AMFLAGS = -I autotools/m4

Line 0 Link Here

(-)audio/audacity/files/patch-lib-src_libnyquist_configure.ac (+11 lines)
	1	--- lib-src/libnyquist/configure.ac.orig 2016-01-08 22:05:48 UTC
	2	+++ lib-src/libnyquist/configure.ac
	3	@@ -117,6 +117,8 @@ dnl Checks for typedefs, structures, and
	4	AC_C_CONST
	5	AC_TYPE_SIZE_T
	6
	7	+AC_SUBST([SNDFILE_CFLAGS])
	8	+
	9	AC_CONFIG_FILES([Makefile])
	10
	11	AC_OUTPUT

Line 0 Link Here

(-)audio/audacity/files/patch-lib-src_portmixer_configure (+11 lines)
	1	--- lib-src/portmixer/configure.orig 2016-01-08 22:05:48 UTC
	2	+++ lib-src/portmixer/configure
	3	@@ -12028,7 +12028,7 @@ fi
	4	#
	5
	6	cppflags_save="$CPPFLAGS"
	7	-CPPFLAGS="$CPPFLAGS $PORTAUDIO_CFLAGS"
	8	+CPPFLAGS="$PORTAUDIO_CFLAGS $CPPFLAGS"
	9
	10	have_oss=no
	11	for ac_header in sys/soundcard.h linux/soundcard.h machine/soundcard.h

Line 0 Link Here

(-)audio/audacity/files/patch-lib-src_portmixer_configure.ac (+11 lines)
	1	--- lib-src/portmixer/configure.ac.orig 2016-01-08 22:05:48 UTC
	2	+++ lib-src/portmixer/configure.ac
	3	@@ -43,7 +43,7 @@ PKG_CHECK_MODULES([PORTAUDIO], [portaudi
	4
	5	dnl The following tests need to have the header files of portaudio available.
	6	cppflags_save="$CPPFLAGS"
	7	-CPPFLAGS="$CPPFLAGS $PORTAUDIO_CFLAGS"
	8	+CPPFLAGS="$PORTAUDIO_CFLAGS $CPPFLAGS"
	9
	10	have_oss=no
	11	AC_CHECK_HEADERS([sys/soundcard.h linux/soundcard.h machine/soundcard.h], have_oss=yes)

Line 0 Link Here

(-)audio/audacity/files/patch-m4_audacity__checklib__libsndfile.m4 (+10 lines)
	1	--- m4/audacity_checklib_libsndfile.m4.orig 2016-01-08 22:05:48 UTC
	2	+++ m4/audacity_checklib_libsndfile.m4
	3	@@ -50,6 +50,7 @@ AC_DEFUN([AUDACITY_CONFIG_LIBSNDFILE], [
	4	SNDFILE_LIBS='$(top_builddir)/lib-src/libsndfile/src/.libs/libsndfile.a'
	5	AC_CONFIG_SUBDIRS([lib-src/libsndfile])
	6	fi
	7	+ export SNDFILE_CFLAGS
	8
	9	AC_SUBST([SNDFILE_CFLAGS])
	10	AC_SUBST([SNDFILE_LIBS])

Return to bug 207307