Attachment #183543 for bug #218104




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

GNU_CONFIGURE=	yes
USES=		autoreconf compiler:c++11-lib cpe desktop-file-utils gettext-tools gmake iconv libtool pkgconfig shared-mime-info shebangfix dos2unix
NLS_USES=	gettext-runtime
NLS_CONFIGURE_ENABLE=	nls
NLS_CONFIGURE_WITH=	libintl-prefix="${LOCALBASE}"
OPTIONS_SUB=	yes
USE_GCC=	4.9+
USE_WX=		3.0+
WX_COMPS=	wx
INSTALLS_ICONS=	yes

PORTDOCS=	README.txt
DOS2UNIX_GLOB=	Makefile.* *.c* *.h
SHEBANG_FILES=	lib-src/lv2/build
CONFIGURE_ENV=	ax_cv_gcc_4_9_0=yes

OPTIONS_DEFINE=	NLS DEBUG DOCS ALSA DYNLOAD FFMPEG FLAC ID3TAG LADSPA LAME LV2 \
		MAD SBSMS SOUNDTOUCH TWOLAME VAMP VORBIS VST

Line 0 Link Here

(-)files/patch-include_audacity_Types.h (+11 lines)
	1	--- include/audacity/Types.h.orig 2017-03-13 21:02:21 UTC
	2	+++ include/audacity/Types.h
	3	@@ -70,7 +70,7 @@ public:
	4	sampleCount ( int v ) : value { v } {}
	5	sampleCount ( unsigned v ) : value { v } {}
	6	sampleCount ( long v ) : value { v } {}
	7	- sampleCount ( unsigned long v ) : value { v } {}
	8	+ sampleCount ( unsigned long v ) : value { static_cast<type>(v) } {}
	9
	10	// Beware implicit conversions from floating point values!
	11	// Otherwise the meaning of binary operators with sampleCount change




--- src/Audacity.h.orig	2017-06-16 13:26:40 UTC
+++ src/Audacity.h
@@ -24,13 +24,6 @@
 #ifndef __AUDACITY_H__
 #define __AUDACITY_H__
 
-// If building with GNU compiler, then must be 4.9 or later.
-// TODO: This would be much nicer as a standalone test in configure.ac
-#if !defined(__APPLE__) && defined __GNUC__ && ( __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 9))
-#error insufficient compiler
-#endif
-
-
 // We only do alpha builds and release versions.
 // Most of the time we're in development, so IS_ALPHA should be defined
 // to 1.

Return to bug 218104

Lines 24-35 Link Here

(-)Makefile (-2 / +2 lines)
24	WRKSRC= ${WRKDIR}/${PORTNAME}-Audacity-${PORTVERSION}	24	WRKSRC= ${WRKDIR}/${PORTNAME}-Audacity-${PORTVERSION}
25		25
26	GNU_CONFIGURE= yes	26	GNU_CONFIGURE= yes
27	USES= autoreconf compiler:gcc-c++11-lib cpe desktop-file-utils gettext-tools gmake iconv libtool pkgconfig shared-mime-info shebangfix dos2unix	27	USES= autoreconf compiler:c++11-lib cpe desktop-file-utils gettext-tools gmake iconv libtool pkgconfig shared-mime-info shebangfix dos2unix
28	NLS_USES= gettext-runtime	28	NLS_USES= gettext-runtime
29	NLS_CONFIGURE_ENABLE= nls	29	NLS_CONFIGURE_ENABLE= nls
30	NLS_CONFIGURE_WITH= libintl-prefix="${LOCALBASE}"	30	NLS_CONFIGURE_WITH= libintl-prefix="${LOCALBASE}"
31	OPTIONS_SUB= yes	31	OPTIONS_SUB= yes
32	USE_GCC= 4.9+
33	USE_WX= 3.0+	32	USE_WX= 3.0+
34	WX_COMPS= wx	33	WX_COMPS= wx
35	INSTALLS_ICONS= yes	34	INSTALLS_ICONS= yes
Lines 36-41 Link Here
36	PORTDOCS= README.txt	35	PORTDOCS= README.txt
37	DOS2UNIX_GLOB= Makefile.* .c *.h	36	DOS2UNIX_GLOB= Makefile.* .c *.h
38	SHEBANG_FILES= lib-src/lv2/build	37	SHEBANG_FILES= lib-src/lv2/build
		38	CONFIGURE_ENV= ax_cv_gcc_4_9_0=yes
39		39
40	OPTIONS_DEFINE= NLS DEBUG DOCS ALSA DYNLOAD FFMPEG FLAC ID3TAG LADSPA LAME LV2 \	40	OPTIONS_DEFINE= NLS DEBUG DOCS ALSA DYNLOAD FFMPEG FLAC ID3TAG LADSPA LAME LV2 \
41	MAD SBSMS SOUNDTOUCH TWOLAME VAMP VORBIS VST	41	MAD SBSMS SOUNDTOUCH TWOLAME VAMP VORBIS VST

Line 0 Link Here

(-)files/patch-src_Audacity.h (+16 lines)
	1	--- src/Audacity.h.orig 2017-06-16 13:26:40 UTC
	2	+++ src/Audacity.h
	3	@@ -24,13 +24,6 @@
	4	#ifndef __AUDACITY_H__
	5	#define __AUDACITY_H__
	6
	7	-// If building with GNU compiler, then must be 4.9 or later.
	8	-// TODO: This would be much nicer as a standalone test in configure.ac
	9	-#if !defined(__APPLE__) && defined __GNUC__ && ( __GNUC__ < 4 \|\| (__GNUC__ == 4 && __GNUC_MINOR__ < 9))
	10	-#error insufficient compiler
	11	-#endif
	12	-
	13	-
	14	// We only do alpha builds and release versions.
	15	// Most of the time we're in development, so IS_ALPHA should be defined
	16	// to 1.