Attachment #168069 for bug #206914




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

CXXFLAGS+=	-std=c++11
.endif

post-configure:
	${REINPLACE_CMD} -e '/SNDFILE_CFLAGS/s,%%LOCALBASE%%,${LOCALBASE},'\
		${WRKSRC}/lib-src/libnyquist/Makefile

post-install:
	@${MKDIR} ${STAGEDIR}${DOCSDIR}
	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}

Line 0 Link Here

(-)audio/audacity/files/patch-configure.ac (+10 lines)
	1	--- configure.ac.orig 2016-01-08 22:05:48 UTC
	2	+++ configure.ac
	3	@@ -43,6 +43,7 @@ AC_CONFIG_MACRO_DIR([m4])
	4
	5	AM_INIT_AUTOMAKE([1.9 dist-xz foreign no-dist-gzip subdir-objects -Wall -Wno-override tar-ustar])
	6	AM_MAINTAINER_MODE([disable])
	7	+AM_SILENT_RULES([yes])
	8
	9	AM_GNU_GETTEXT_VERSION([0.18])
	10	AM_GNU_GETTEXT([external])




--- lib-src/FileDialog/Makefile.am.orig	2016-01-08 22:05:48 UTC
+++ lib-src/FileDialog/Makefile.am
@@ -1,5 +1,7 @@
 ACLOCAL_AMFLAGS = -I m4
 
+SUBDIRS=	$(GTK_SUBDIR) $(MAC_SUBDIR) $(WINDOWS_SUBDIR)
+DIST_SUBDIRS=	gtk mac win
 lib_LTLIBRARIES = libFileDialog.la
 
 libFileDialog_la_CPPFLAGS = $(WX_CXXFLAGS) -Wno-deprecated-declarations
@@ -7,22 +9,32 @@ libFileDialog_la_LIBADD = $(WX_LIBS)
 libFileDialog_la_SOURCES = FileDialog.cpp FileDialog.h
 
 if GTK
-libFileDialog_la_CPPFLAGS += $(GTK_CFLAGS)
-libFileDialog_la_LIBADD += $(GTK_LIBS)
+GTK_SUBDIR=	gtk
+libFileDialog_la_LIBADD += \
+	gtk/libFileDialog.la \
+	$(NULL)
 libFileDialog_la_SOURCES += \
-	gtk/FileDialogPrivate.cpp \
 	gtk/FileDialogPrivate.h \
 	$(NULL)
 endif
 
 if MAC
-libFileDialog_la_SOURCES += mac/FileDialogPrivate.mm \
-									 mac/FileDialogPrivate.h \
-									 $(NULL)
+MAC_SUBDIR=	mac
+libFileDialog_la_LIBADD+= \
+	mac/libFileDialog.la \
+	$(NULL)
+libFileDialog_la_SOURCES += \
+	mac/FileDialogPrivate.h \
+	$(NULL)
+#nodist_EXTRA_libFileDialog_la_SOURCES = dummy.mm
 endif
 
 if WINDOWS
-libFileDialog_la_SOURCES += win/FileDialogPrivate.cpp \
-									 win/FileDialogPrivate.h \
-									 $(NULL)
+WINDOWS_SUBDIR=	win
+libFileDialog_la_LIBADD+= \
+	win/libFileDialog.la \
+	$(NULL)
+libFileDialog_la_SOURCES += \
+	win/FileDialogPrivate.h \
+	$(NULL)
 endif

Lines 1-11 Link Here

(-)audio/audacity/files/patch-lib-src_FileDialog_Makefile.in (-11 lines)
1	--- lib-src/FileDialog/Makefile.in 2016-01-24 02:11:11.530847000 -0800
2	+++ lib-src/FileDialog/Makefile.in 2016-01-24 02:03:53.243242000 -0800
3	@@ -212,7 +212,7 @@
4	am__v_OBJCXX_0 = @echo " OBJCXX " $@;
5	am__v_OBJCXX_1 =
6	OBJCXXLD = $(OBJCXX)
7	-OBJCXXLINK = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
8	+OBJCXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
9	--mode=link $(OBJCXXLD) $(AM_OBJCXXFLAGS) $(OBJCXXFLAGS) \
10	$(AM_LDFLAGS) $(LDFLAGS) -o $@
11	AM_V_OBJCXXLD = $(am__v_OBJCXXLD_@AM_V@)

Line 0 Link Here

(-)audio/audacity/files/patch-lib-src_FileDialog_configure.ac (+11 lines)
	1	--- lib-src/FileDialog/configure.ac.orig 2016-01-08 22:05:48 UTC
	2	+++ lib-src/FileDialog/configure.ac
	3	@@ -124,7 +124,7 @@ AM_CONDITIONAL([WINDOWS], test "$IMPLEME
	4
	5	echo "Implementation to use: $IMPLEMENTATION"
	6
	7	-AC_CONFIG_FILES([Makefile])
	8	+AC_CONFIG_FILES([Makefile gtk/Makefile mac/Makefile win/Makefile])
	9
	10	#
	11	# Write it all out




--- lib-src/FileDialog/gtk/Makefile.am.orig	1970-01-01 00:00:00 UTC
+++ lib-src/FileDialog/gtk/Makefile.am
@@ -0,0 +1,12 @@
+ACLOCAL_AMFLAGS=	-I m4
+noinst_LTLIBRARIES=	libFileDialog.la
+libFileDialog_la_CPPFLAGS= \
+	$(WX_CXXFLAGS) -Wno-deprecated-declarations \
+	$(GTK_CFLAGS)
+libFileDialog_la_LIBADD= \
+	$(WX_LIBS) \
+	$(GTK_LIBS)
+libFileDialog_la_SOURCES= \
+	FileDialogPrivate.cpp \
+	FileDialogPrivate.h \
+	$(NULL)




--- lib-src/FileDialog/mac/Makefile.am.orig	1970-01-01 00:00:00 UTC
+++ lib-src/FileDialog/mac/Makefile.am
@@ -0,0 +1,10 @@
+ACLOCAL_AMFLAGS=	-I m4
+noinst_LTLIBRARIES=	libFileDialog.la
+libFileDialog_la_CPPFLAGS= \
+	$(WX_CXXFLAGS) -Wno-deprecated-declarations
+libFileDialog_la_LIBADD= \
+	$(WX_LIBS)
+libFileDialog_la_SOURCES= \
+	FileDialogPrivate.mm \
+	FileDialogPrivate.h \
+	$(NULL)




--- lib-src/FileDialog/win/Makefile.am.orig	1970-01-01 00:00:00 UTC
+++ lib-src/FileDialog/win/Makefile.am
@@ -0,0 +1,10 @@
+ACLOCAL_AMFLAGS=	-I m4
+noinst_LTLIBRARIES=	libFileDialog.la
+libFileDialog_la_CPPFLAGS= \
+	$(WX_CXXFLAGS) -Wno-deprecated-declarations
+libFileDialog_la_LIBADD= \
+	$(WX_LIBS)
+libFileDialog_la_SOURCES= \
+	FileDialogPrivate.cpp \
+	FileDialogPrivate.h \
+	$(NULL)




--- lib-src/libmad/configure.orig	2015-07-11 10:02:22 UTC
+++ lib-src/libmad/configure
@@ -11983,17 +11983,12 @@ then
 	    : #x optimize="$optimize -fforce-addr"
 	    : #x optimize="$optimize -finline-functions"
 	    : #- optimize="$optimize -fstrength-reduce"
-	    optimize="$optimize -fthread-jumps"
-	    optimize="$optimize -fcse-follow-jumps"
-	    optimize="$optimize -fcse-skip-blocks"
 	    : #x optimize="$optimize -frerun-cse-after-loop"
 	    : #x optimize="$optimize -frerun-loop-opt"
 	    : #x optimize="$optimize -fgcse"
 	    optimize="$optimize -fexpensive-optimizations"
-	    optimize="$optimize -fregmove"
 	    : #* optimize="$optimize -fdelayed-branch"
 	    : #x optimize="$optimize -fschedule-insns"
-	    optimize="$optimize -fschedule-insns2"
 	    : #? optimize="$optimize -ffunction-sections"
 	    : #? optimize="$optimize -fcaller-saves"
 	    : #> optimize="$optimize -funroll-loops"

Lines 1-11 Link Here

(-)audio/audacity/files/patch-lib-src__soundtouch__source__SoundTouch__Makefile.in (-11 lines)
1	--- lib-src/soundtouch/source/SoundTouch/Makefile.in.orig 2015-07-11 10:02:22 UTC
2	+++ lib-src/soundtouch/source/SoundTouch/Makefile.in
3	@@ -346,7 +346,7 @@ lib_LTLIBRARIES = libSoundTouch.la
4	libSoundTouch_la_SOURCES = AAFilter.cpp FIRFilter.cpp FIFOSampleBuffer.cpp RateTransposer.cpp SoundTouch.cpp TDStretch.cpp cpu_detect_x86.cpp BPMDetect.cpp PeakFinder.cpp
5
6	# Compiler flags
7	-AM_CXXFLAGS = -O3 -fcheck-new -I../../include
8	+AM_CXXFLAGS = -O3 -I../../include
9
10	# Compile the files that need MMX and SSE individually.
11	libSoundTouch_la_LIBADD = libSoundTouchMMX.la libSoundTouchSSE.la




--- lib-src/libmad/configure.ac.orig	2016-01-08 22:05:48 UTC
+++ lib-src/libmad/configure.ac
@@ -141,22 +141,25 @@ then
 
     case "$optimize" in
 	-O|"-O "*)
+dnl (using audio/libmad/files/patch-configure as reference)
+AC_PROG_GREP
+AS_IF([$CC -v 2>&1 | $GREP -q clang], [CLANG=yes], [CLANG=])
 	    optimize="-O"
 	    : #x optimize="$optimize -fforce-mem"
 	    : #x optimize="$optimize -fforce-addr"
 	    : #x optimize="$optimize -finline-functions"
 	    : #- optimize="$optimize -fstrength-reduce"
-	    optimize="$optimize -fthread-jumps"
-	    optimize="$optimize -fcse-follow-jumps"
-	    optimize="$optimize -fcse-skip-blocks"
+	    if @<:@ x$CLANG != xyes @:>@ ; then optimize="$optimize -fthread-jumps" ; fi
+	    if @<:@ x$CLANG != xyes @:>@ ; then optimize="$optimize -fcse-follow-jumps" ; fi
+	    if @<:@ x$CLANG != xyes @:>@ ; then optimize="$optimize -fcse-skip-blocks" ; fi
 	    : #x optimize="$optimize -frerun-cse-after-loop"
 	    : #x optimize="$optimize -frerun-loop-opt"
 	    : #x optimize="$optimize -fgcse"
 	    optimize="$optimize -fexpensive-optimizations"
-	    optimize="$optimize -fregmove"
+	    if @<:@ x$CLANG != xyes @:>@ ; then optimize="$optimize -fregmove" ; fi
 	    : #* optimize="$optimize -fdelayed-branch"
 	    : #x optimize="$optimize -fschedule-insns"
-	    optimize="$optimize -fschedule-insns2"
+	    if @<:@ x$CLANG != xyes @:>@ ; then optimize="$optimize -fschedule-insns2" ; fi
 	    : #? optimize="$optimize -ffunction-sections"
 	    : #? optimize="$optimize -fcaller-saves"
 	    : #> optimize="$optimize -funroll-loops"

Lines 1-11 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_portaudio-v19_bindings_cpp_configure.ac (+11 lines)
	1	--- lib-src/portaudio-v19/bindings/cpp/configure.ac.orig 2016-01-08 22:05:48 UTC
	2	+++ lib-src/portaudio-v19/bindings/cpp/configure.ac
	3	@@ -14,7 +14,7 @@ m4_define([lt_age], [0])
	4
	5	AC_INIT([PortAudioCpp], [12])
	6	AC_CONFIG_SRCDIR([include/portaudiocpp/PortAudioCpp.hxx])
	7	-AM_INIT_AUTOMAKE
	8	+AM_INIT_AUTOMAKE([subdir-objects])
	9	AM_MAINTAINER_MODE
	10
	11	###### Top-level directory of pacpp

Lines 1-11 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




--- src/Makefile.am.orig	2016-01-08 22:05:48 UTC
+++ src/Makefile.am
@@ -75,8 +75,7 @@ audacity_CPPFLAGS = \
 #  /usr/local/include/wx-2.8/wx/buffer.h:289:9: note: in expansion of macro 'wxCHECK_RET'
 #           wxCHECK_RET( m_bufdata->m_data, wxT("invalid wxMemoryBuffer") );
 #           ^
-audacity_CXXFLAGS = \
-   -Wno-unused-local-typedefs
+audacity_CXXFLAGS =
 
 audacity_LDFLAGS = -rdynamic
 audacity_LDADD = \




--- src/Makefile.in.orig	2015-07-11 10:02:22 UTC
+++ src/Makefile.in
@@ -1118,8 +1118,7 @@ audacity_CPPFLAGS = -D__STDC_CONSTANT_MA
 #  /usr/local/include/wx-2.8/wx/buffer.h:289:9: note: in expansion of macro 'wxCHECK_RET'
 #           wxCHECK_RET( m_bufdata->m_data, wxT("invalid wxMemoryBuffer") );
 #           ^
-audacity_CXXFLAGS = \
-   -Wno-unused-local-typedefs
+audacity_CXXFLAGS =
 
 audacity_LDFLAGS = -rdynamic
 audacity_LDADD = $(EXPAT_LIBS) $(FILEDIALOG_LIBS) $(PORTAUDIO_LIBS) \

Return to bug 206914

Lines 25-32 Link Here

(-)audio/audacity/Makefile (-6 / +2 lines)
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 iconv pkgconfig shared-mime-info shebangfix dos2unix	28	USES= autoreconf compiler:c++11-lib cpe desktop-file-utils gettext-tools gmake iconv libtool pkgconfig shared-mime-info shebangfix dos2unix
29	NLS_USES= gettext	29	NLS_USES= gettext-runtime
30	NLS_CONFIGURE_ENABLE= nls	30	NLS_CONFIGURE_ENABLE= nls
31	NLS_CONFIGURE_WITH= libintl-prefix="${LOCALBASE}"	31	NLS_CONFIGURE_WITH= libintl-prefix="${LOCALBASE}"
32	OPTIONS_SUB= yes	32	OPTIONS_SUB= yes
Lines 135-144 Link Here
135	CXXFLAGS+= -std=c++11	135	CXXFLAGS+= -std=c++11
136	.endif	136	.endif
137		137
138	post-configure:
139	${REINPLACE_CMD} -e '/SNDFILE_CFLAGS/s,%%LOCALBASE%%,${LOCALBASE},'\
140	${WRKSRC}/lib-src/libnyquist/Makefile
141
142	post-install:	138	post-install:
143	@${MKDIR} ${STAGEDIR}${DOCSDIR}	139	@${MKDIR} ${STAGEDIR}${DOCSDIR}
144	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}	140	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}

Line 0 Link Here

(-)audio/audacity/files/patch-lib-src_FileDialog_Makefile.am (+52 lines)
	1	--- lib-src/FileDialog/Makefile.am.orig 2016-01-08 22:05:48 UTC
	2	+++ lib-src/FileDialog/Makefile.am
	3	@@ -1,5 +1,7 @@
	4	ACLOCAL_AMFLAGS = -I m4
	5
	6	+SUBDIRS= $(GTK_SUBDIR) $(MAC_SUBDIR) $(WINDOWS_SUBDIR)
	7	+DIST_SUBDIRS= gtk mac win
	8	lib_LTLIBRARIES = libFileDialog.la
	9
	10	libFileDialog_la_CPPFLAGS = $(WX_CXXFLAGS) -Wno-deprecated-declarations
	11	@@ -7,22 +9,32 @@ libFileDialog_la_LIBADD = $(WX_LIBS)
	12	libFileDialog_la_SOURCES = FileDialog.cpp FileDialog.h
	13
	14	if GTK
	15	-libFileDialog_la_CPPFLAGS += $(GTK_CFLAGS)
	16	-libFileDialog_la_LIBADD += $(GTK_LIBS)
	17	+GTK_SUBDIR= gtk
	18	+libFileDialog_la_LIBADD += \
	19	+ gtk/libFileDialog.la \
	20	+ $(NULL)
	21	libFileDialog_la_SOURCES += \
	22	- gtk/FileDialogPrivate.cpp \
	23	gtk/FileDialogPrivate.h \
	24	$(NULL)
	25	endif
	26
	27	if MAC
	28	-libFileDialog_la_SOURCES += mac/FileDialogPrivate.mm \
	29	- mac/FileDialogPrivate.h \
	30	- $(NULL)
	31	+MAC_SUBDIR= mac
	32	+libFileDialog_la_LIBADD+= \
	33	+ mac/libFileDialog.la \
	34	+ $(NULL)
	35	+libFileDialog_la_SOURCES += \
	36	+ mac/FileDialogPrivate.h \
	37	+ $(NULL)
	38	+#nodist_EXTRA_libFileDialog_la_SOURCES = dummy.mm
	39	endif
	40
	41	if WINDOWS
	42	-libFileDialog_la_SOURCES += win/FileDialogPrivate.cpp \
	43	- win/FileDialogPrivate.h \
	44	- $(NULL)
	45	+WINDOWS_SUBDIR= win
	46	+libFileDialog_la_LIBADD+= \
	47	+ win/libFileDialog.la \
	48	+ $(NULL)
	49	+libFileDialog_la_SOURCES += \
	50	+ win/FileDialogPrivate.h \
	51	+ $(NULL)
	52	endif

Line 0 Link Here

(-)audio/audacity/files/patch-lib-src_FileDialog_gtk_Makefile.am (+15 lines)
	1	--- lib-src/FileDialog/gtk/Makefile.am.orig 1970-01-01 00:00:00 UTC
	2	+++ lib-src/FileDialog/gtk/Makefile.am
	3	@@ -0,0 +1,12 @@
	4	+ACLOCAL_AMFLAGS= -I m4
	5	+noinst_LTLIBRARIES= libFileDialog.la
	6	+libFileDialog_la_CPPFLAGS= \
	7	+ $(WX_CXXFLAGS) -Wno-deprecated-declarations \
	8	+ $(GTK_CFLAGS)
	9	+libFileDialog_la_LIBADD= \
	10	+ $(WX_LIBS) \
	11	+ $(GTK_LIBS)
	12	+libFileDialog_la_SOURCES= \
	13	+ FileDialogPrivate.cpp \
	14	+ FileDialogPrivate.h \
	15	+ $(NULL)

Line 0 Link Here

(-)audio/audacity/files/patch-lib-src_FileDialog_mac_Makefile.am (+13 lines)
	1	--- lib-src/FileDialog/mac/Makefile.am.orig 1970-01-01 00:00:00 UTC
	2	+++ lib-src/FileDialog/mac/Makefile.am
	3	@@ -0,0 +1,10 @@
	4	+ACLOCAL_AMFLAGS= -I m4
	5	+noinst_LTLIBRARIES= libFileDialog.la
	6	+libFileDialog_la_CPPFLAGS= \
	7	+ $(WX_CXXFLAGS) -Wno-deprecated-declarations
	8	+libFileDialog_la_LIBADD= \
	9	+ $(WX_LIBS)
	10	+libFileDialog_la_SOURCES= \
	11	+ FileDialogPrivate.mm \
	12	+ FileDialogPrivate.h \
	13	+ $(NULL)

Line 0 Link Here

(-)audio/audacity/files/patch-lib-src_FileDialog_win_Makefile.am (+13 lines)
	1	--- lib-src/FileDialog/win/Makefile.am.orig 1970-01-01 00:00:00 UTC
	2	+++ lib-src/FileDialog/win/Makefile.am
	3	@@ -0,0 +1,10 @@
	4	+ACLOCAL_AMFLAGS= -I m4
	5	+noinst_LTLIBRARIES= libFileDialog.la
	6	+libFileDialog_la_CPPFLAGS= \
	7	+ $(WX_CXXFLAGS) -Wno-deprecated-declarations
	8	+libFileDialog_la_LIBADD= \
	9	+ $(WX_LIBS)
	10	+libFileDialog_la_SOURCES= \
	11	+ FileDialogPrivate.cpp \
	12	+ FileDialogPrivate.h \
	13	+ $(NULL)

Lines 1-20 Link Here

(-)audio/audacity/files/patch-lib-src__libmad__configure (-20 lines)
1	--- lib-src/libmad/configure.orig 2015-07-11 10:02:22 UTC
2	+++ lib-src/libmad/configure
3	@@ -11983,17 +11983,12 @@ then
4	: #x optimize="$optimize -fforce-addr"
5	: #x optimize="$optimize -finline-functions"
6	: #- optimize="$optimize -fstrength-reduce"
7	- optimize="$optimize -fthread-jumps"
8	- optimize="$optimize -fcse-follow-jumps"
9	- optimize="$optimize -fcse-skip-blocks"
10	: #x optimize="$optimize -frerun-cse-after-loop"
11	: #x optimize="$optimize -frerun-loop-opt"
12	: #x optimize="$optimize -fgcse"
13	optimize="$optimize -fexpensive-optimizations"
14	- optimize="$optimize -fregmove"
15	: #* optimize="$optimize -fdelayed-branch"
16	: #x optimize="$optimize -fschedule-insns"
17	- optimize="$optimize -fschedule-insns2"
18	: #? optimize="$optimize -ffunction-sections"
19	: #? optimize="$optimize -fcaller-saves"
20	: #> optimize="$optimize -funroll-loops"

Line 0 Link Here

(-)audio/audacity/files/patch-lib-src_libmad_configure.ac (+33 lines)
	1	--- lib-src/libmad/configure.ac.orig 2016-01-08 22:05:48 UTC
	2	+++ lib-src/libmad/configure.ac
	3	@@ -141,22 +141,25 @@ then
	4
	5	case "$optimize" in
	6	-O\|"-O "*)
	7	+dnl (using audio/libmad/files/patch-configure as reference)
	8	+AC_PROG_GREP
	9	+AS_IF([$CC -v 2>&1 \| $GREP -q clang], [CLANG=yes], [CLANG=])
	10	optimize="-O"
	11	: #x optimize="$optimize -fforce-mem"
	12	: #x optimize="$optimize -fforce-addr"
	13	: #x optimize="$optimize -finline-functions"
	14	: #- optimize="$optimize -fstrength-reduce"
	15	- optimize="$optimize -fthread-jumps"
	16	- optimize="$optimize -fcse-follow-jumps"
	17	- optimize="$optimize -fcse-skip-blocks"
	18	+ if @<:@ x$CLANG != xyes @:>@ ; then optimize="$optimize -fthread-jumps" ; fi
	19	+ if @<:@ x$CLANG != xyes @:>@ ; then optimize="$optimize -fcse-follow-jumps" ; fi
	20	+ if @<:@ x$CLANG != xyes @:>@ ; then optimize="$optimize -fcse-skip-blocks" ; fi
	21	: #x optimize="$optimize -frerun-cse-after-loop"
	22	: #x optimize="$optimize -frerun-loop-opt"
	23	: #x optimize="$optimize -fgcse"
	24	optimize="$optimize -fexpensive-optimizations"
	25	- optimize="$optimize -fregmove"
	26	+ if @<:@ x$CLANG != xyes @:>@ ; then optimize="$optimize -fregmove" ; fi
	27	: #* optimize="$optimize -fdelayed-branch"
	28	: #x optimize="$optimize -fschedule-insns"
	29	- optimize="$optimize -fschedule-insns2"
	30	+ if @<:@ x$CLANG != xyes @:>@ ; then optimize="$optimize -fschedule-insns2" ; fi
	31	: #? optimize="$optimize -ffunction-sections"
	32	: #? optimize="$optimize -fcaller-saves"
	33	: #> optimize="$optimize -funroll-loops"

Line 0 Link Here

(-)audio/audacity/files/patch-src_Makefile.am (+12 lines)
	1	--- src/Makefile.am.orig 2016-01-08 22:05:48 UTC
	2	+++ src/Makefile.am
	3	@@ -75,8 +75,7 @@ audacity_CPPFLAGS = \
	4	# /usr/local/include/wx-2.8/wx/buffer.h:289:9: note: in expansion of macro 'wxCHECK_RET'
	5	# wxCHECK_RET( m_bufdata->m_data, wxT("invalid wxMemoryBuffer") );
	6	# ^
	7	-audacity_CXXFLAGS = \
	8	- -Wno-unused-local-typedefs
	9	+audacity_CXXFLAGS =
	10
	11	audacity_LDFLAGS = -rdynamic
	12	audacity_LDADD = \

Lines 1-12 Link Here

(-)audio/audacity/files/patch-src__Makefile.in (-12 lines)
1	--- src/Makefile.in.orig 2015-07-11 10:02:22 UTC
2	+++ src/Makefile.in
3	@@ -1118,8 +1118,7 @@ audacity_CPPFLAGS = -D__STDC_CONSTANT_MA
4	# /usr/local/include/wx-2.8/wx/buffer.h:289:9: note: in expansion of macro 'wxCHECK_RET'
5	# wxCHECK_RET( m_bufdata->m_data, wxT("invalid wxMemoryBuffer") );
6	# ^
7	-audacity_CXXFLAGS = \
8	- -Wno-unused-local-typedefs
9	+audacity_CXXFLAGS =
10
11	audacity_LDFLAGS = -rdynamic
12	audacity_LDADD = $(EXPAT_LIBS) $(FILEDIALOG_LIBS) $(PORTAUDIO_LIBS) \