Attachment #214771 for bug #246645




# $FreeBSD$

PORTNAME=	audacity
PORTVERSION=	2.4.1
PORTREVISION=	2
DISTVERSIONPREFIX=	Audacity-
CATEGORIES=	audio


LICENSE=	GPLv2+
LICENSE_FILE=	${WRKSRC}/LICENSE.txt

BUILD_DEPENDS=	bash:shells/bash \
		bash:shells/bash \
		cmake:devel/cmake
LIB_DEPENDS=	libasound.so:audio/alsa-lib \
		libexpat.so:textproc/expat2 \

		libsndfile.so:audio/libsndfile \
		libsoxr.so:audio/libsoxr

USES=		cmake compiler:c++14-lang cpe desktop-file-utils dos2unix \
		gettext-tools gnome iconv libtool localbase pkgconfig \
		shared-mime-info shebangfix

GNU_CONFIGURE=		yes
NLS_USES=		gettext-runtime
NLS_CONFIGURE_ENABLE=	nls
NLS_CONFIGURE_WITH=	libintl-prefix="${LOCALBASE}"

INSTALLS_ICONS=		yes
PORTDOCS=		README.txt
DOS2UNIX_GLOB=		*.c* *.h Makefile.*
SHEBANG_FILES=		lib-src/lv2/configure
USE_GITHUB=		yes

OPTIONS_DEFINE=		DEBUG DOCS DYNLOAD FFMPEG FLAC ID3TAG LADSPA LAME LV2 \


LV2_CONFIGURE_WITH=	lv2=system
LV2_LIB_DEPENDS=	liblilv-0.so:audio/lilv \
			libserd-0.so:devel/serd \
			libsord-0.so:devel/sord \
			libsratom-0.so:audio/sratom \
			libsuil-0.so:audio/suil

MAD_CONFIGURE_WITH=	libmad=system

MAD_LIB_DEPENDS=	libmad.so:audio/libmad

MOD_SCRIPT_PIPE_CONFIGURE_WITH=	mod-script-pipe
MOD_SCRIPT_PIPE_USES=		python:3.7+
MOD_NYQ_BENCH_CONFIGURE_WITH=	mod-nyq-bench
MOD_NYQ_BENCH_USES=		python:3.7+

SBSMS_CONFIGURE_WITH=	sbsms


Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	TIMESTAMP = 1579914119	1	TIMESTAMP = 1590090471
2	SHA256 (audacity-audacity-Audacity-2.3.3_GH0.tar.gz) = 404e6c49693dedc94212fc5525974058d848536025e19da31359ae02babe8bd7	2	SHA256 (audacity-audacity-Audacity-2.4.1_GH0.tar.gz) = 50240f07471373a7e5c2df65cc26eeeaaced9a0850ad1f95cb795f171ea3009f
3	SIZE (audacity-audacity-Audacity-2.3.3_GH0.tar.gz) = 62073352	3	SIZE (audacity-audacity-Audacity-2.4.1_GH0.tar.gz) = 63935461




--- configure.ac.orig	2019-02-24 08:28:05 UTC
+++ configure.ac
@@ -200,14 +200,6 @@ if test x$enable_universal_binary = xyes; then
    esac
 fi
 
-dnl Check if $CXX is clang by evaluating the version string because
-dnl $ax_cv_cxx_compiler_vendor seems not to work (it is either "gnu" or just empty).
-dnl If $CXX is clang (string is found), grep returns 0 and the if is executed.
-dnl Use /dev/null to suppress grep output to shell.
-if ($CXX --version | grep 'clang version' > /dev/null); then
-    LDFLAGS="${LDFLAGS} -latomic"
-fi
-
 if test x$enable_sse = xyes; then
 
    if test "${ax_cv_cxx_compiler_vendor}" = "gnu"; then
@@ -239,20 +231,7 @@ dnl check if alloca.h exists. If it does, we need to i
 dnl Solaris builds, by defining HAVE_ALLOCA_H
 AC_CHECK_HEADERS_ONCE(alloca.h)
 
-
-dnl Enable C++ 11 support. Use gnu++11 on GCC since wxWidgets uses extensions
-if "${CXX}" -v 2>&1 | grep -q '^gcc version'; then
-
-    dnl GCC < 4.9 has known bugs (#1397) and can't be used
-    AX_GCC_VERSION_ATLEAST(4,9,0,[gcc_ok=yes], [gcc_ok=no])
-    if test x$gcc_ok = xno; then
-        AC_MSG_ERROR([Audacity requires at least GCC 4.9])
-    fi
-
-    CXXFLAGS="${CXXFLAGS} --std=gnu++11"
-else
-    CXXFLAGS="${CXXFLAGS} --std=c++11"
-fi
+CXXFLAGS="${CXXFLAGS} --std=c++11"
 
 dnl --------------------------------------------------------------------------
 dnl We would like warnings enabled on the builds, but different compilers need




--- lib-src/FileDialog/Makefile.am.orig	2018-10-01 14:07:33 UTC
+++ lib-src/FileDialog/Makefile.am
@@ -2,5 +2,7 @@
 ACLOCAL_AMFLAGS = -I m4
 
+SUBDIRS=	$(GTK_SUBDIR) $(MAC_SUBDIR) $(WINDOWS_SUBDIR)
+DIST_SUBDIRS=	gtk mac win
 lib_LTLIBRARIES = libFileDialog.la
 
 libFileDialog_la_LIBTOOLFLAGS = --tag=CXX
@@ -11,22 +13,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

(-)files/patch-lib-src_FileDialog_configure.ac (-11 lines)
1	--- lib-src/FileDialog/configure.ac.orig 2018-09-20 14:35:07 UTC
2	+++ lib-src/FileDialog/configure.ac
3	@@ -132,7 +132,7 @@ AM_CONDITIONAL([WINDOWS], test "$IMPLEMENTATION" = "wi
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	2016-07-26 13:34:07 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	2016-07-26 13:34:07 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	2016-07-26 13:34:07 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)

Lines 1-6 Link Here

(-)files/patch-lib-src_libnyquist_nyquist_cmt_cext.h (-1 / +1 lines)
1	--- lib-src/libnyquist/nyquist/cmt/cext.h.orig 2018-10-01 14:07:33 UTC	1	--- lib-src/libnyquist/nyquist/cmt/cext.h.orig 2018-10-01 14:07:33 UTC
2	+++ lib-src/libnyquist/nyquist/cmt/cext.h	2	+++ lib-src/libnyquist/nyquist/cmt/cext.h
3	@@ -58,7 +58,7 @@ EXIT(n) -- calls exit(n) after shutting down/dealloca	3	@@ -61,7 +61,7 @@ EXIT(n) -- calls exit(n) after shutting down/dealloca
4	#include <malloc.h>	4	#include <malloc.h>
5	#endif	5	#endif
6		6

Lines 1-6 Link Here

(-)files/patch-lib-src_libnyquist_nyquist_xlisp_xlisp.h (-1 / +1 lines)
1	--- lib-src/libnyquist/nyquist/xlisp/xlisp.h.orig 2016-07-26 13:34:06 UTC	1	--- lib-src/libnyquist/nyquist/xlisp/xlisp.h.orig 2016-07-26 13:34:06 UTC
2	+++ lib-src/libnyquist/nyquist/xlisp/xlisp.h	2	+++ lib-src/libnyquist/nyquist/xlisp/xlisp.h
3	@@ -160,6 +160,15 @@ extern long ptrtoabs();	3	@@ -161,6 +161,15 @@ extern long ptrtoabs();
4	#endif	4	#endif
5	#endif	5	#endif
6		6

Lines 1-11 Link Here

(-)files/patch-lib-src_lv2_configure (-11 lines)
1	--- lib-src/lv2/configure.orig 2016-01-08 22:05:48 UTC
2	+++ lib-src/lv2/configure
3	@@ -54,7 +54,7 @@ includedir=.
4	Name: ${pkg}
5	Version: ${version}
6	Description: Temporary fake config file
7	-Libs: -L\${libdir} ${lib} -ldl -lm
8	+Libs: -L\${libdir} ${lib} -lm
9	Cflags: -I\${includedir}/${pkg}${major}
10	EOF
11




--- lib-src/lv2/lilv/src/util.c.orig	2020-05-18 17:13:29.952118000 -0700
+++ lib-src/lv2/lilv/src/util.c	2020-05-18 16:38:45.344052000 -0700
@@ -14,7 +14,9 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#define _POSIX_C_SOURCE 200809L  /* for fileno */
+#ifndef __FreeBSD__
+  #define _POSIX_C_SOURCE 200809L  /* for fileno */
+#endif
 #define _BSD_SOURCE     1        /* for realpath, symlink */
 #define _DEFAULT_SOURCE 1        /* for realpath, symlink */
 




--- lib-src/lv2/lilv/test/lilv_test.c.orig	2020-05-18 17:13:29.952774000 -0700
+++ lib-src/lv2/lilv/test/lilv_test.c	2020-05-18 16:32:22.956444000 -0700
@@ -15,8 +15,10 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#define _POSIX_C_SOURCE 200809L /* for setenv */
-#define _XOPEN_SOURCE   600     /* for mkstemp */
+#ifndef__FreeBSD__
+  #define _POSIX_C_SOURCE 200809L /* for setenv */
+  #define _XOPEN_SOURCE   600     /* for mkstemp */
+#endiff
 
 #include "../src/lilv_internal.h"
 

Lines 1-6 Link Here

(-)files/patch-src_AudioIO.cpp (-2 / +2 lines)
1	--- src/AudioIO.cpp.orig 2018-10-01 14:07:33 UTC	1	--- src/AudioIO.cpp.orig 2018-10-01 14:07:33 UTC
2	+++ src/AudioIO.cpp	2	+++ src/AudioIO.cpp
3	@@ -480,7 +480,6 @@ TimeTrack and AudioIOListener and whether the playback	3	@@ -484,7 +484,6 @@ TimeTrack and AudioIOListener and whether the playback
4	#define ROUND(x) (int) ((x)+0.5)	4	#define ROUND(x) (int) ((x)+0.5)
5	//#include <string.h>	5	//#include <string.h>
6	// #include "../lib-src/portmidi/pm_common/portmidi.h"	6	// #include "../lib-src/portmidi/pm_common/portmidi.h"
Lines 8-14 Link Here
8	#include "NoteTrack.h"	8	#include "NoteTrack.h"
9	#endif	9	#endif
10		10
11	@@ -793,13 +797,22 @@ struct AudioIO::ScrubState (private)	11	@@ -808,13 +808,22 @@ struct AudioIO::ScrubState (private)
12	// return the system time as a double	12	// return the system time as a double
13	static double streamStartTime = 0; // bias system time to small number	13	static double streamStartTime = 0; // bias system time to small number
14		14




--- src/FFmpeg.h.orig	2018-10-01 14:07:33 UTC
+++ src/FFmpeg.h
@@ -685,7 +685,7 @@ extern "C" {
    FFMPEG_FUNCTION_WITH_RETURN(
       AVOutputFormat*,
       av_oformat_next,

       (f)
    );
 #endif
@@ -766,7 +766,7 @@ extern "C" {
    FFMPEG_FUNCTION_WITH_RETURN(
       int,
       av_fifo_size,

       (f)
    );
 #endif
@@ -828,7 +828,7 @@ extern "C" {
    FFMPEG_FUNCTION_WITH_RETURN(
       AVDictionaryEntry *,
       av_dict_get,




--- src/Makefile.am.orig	2016-07-26 13:34:06 UTC
+++ src/Makefile.am
@@ -79,8 +79,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 = \




bin/audacity
man/man1/audacity.1.gz
share/appdata/audacity.appdata.xml
share/applications/audacity.desktop
%%DATADIR%%/EQDefaultCurves.xml
%%DATADIR%%/include/audacity/ComponentInterface.h
%%DATADIR%%/include/audacity/ConfigInterface.h
%%DATADIR%%/include/audacity/EffectAutomationParameters.h
%%DATADIR%%/include/audacity/EffectInterface.h
%%DATADIR%%/include/audacity/ImporterInterface.h
%%DATADIR%%/include/audacity/ModuleInterface.h
%%DATADIR%%/include/audacity/PluginInterface.h
%%DATADIR%%/include/audacity/Types.h
%%DATADIR%%/nyquist/aud-do-support.lsp
%%DATADIR%%/nyquist/dspprims.lsp
%%DATADIR%%/nyquist/envelopes.lsp

%%DATADIR%%/nyquist/equalizer.lsp
%%DATADIR%%/nyquist/evalenv.lsp
%%DATADIR%%/nyquist/fileio.lsp
%%DATADIR%%/nyquist/follow.lsp
%%DATADIR%%/nyquist/init.lsp
%%DATADIR%%/nyquist/misc.lsp
%%DATADIR%%/nyquist/nyinit-dbg.lsp
%%DATADIR%%/nyquist/nyinit.lsp
%%DATADIR%%/nyquist/nyqmisc.lsp
%%DATADIR%%/nyquist/nyquist-plot.txt

%%DATADIR%%/nyquist/seq.lsp
%%DATADIR%%/nyquist/seqfnint.lsp
%%DATADIR%%/nyquist/seqmidi.lsp
%%DATADIR%%/nyquist/sliders.lsp
%%DATADIR%%/nyquist/sndfnint.lsp
%%DATADIR%%/nyquist/spec-plot.lsp
%%DATADIR%%/nyquist/spectral-analysis.lsp
%%DATADIR%%/nyquist/stk.lsp
%%DATADIR%%/nyquist/system.lsp
%%DATADIR%%/nyquist/test.lsp
%%DATADIR%%/nyquist/upic.sal
%%DATADIR%%/nyquist/velocity.lsp
%%DATADIR%%/nyquist/xlinit.lsp
%%DATADIR%%/nyquist/xm.lsp

%%DATADIR%%/plug-ins/crossfadeclips.ny
%%DATADIR%%/plug-ins/crossfadetracks.ny
%%DATADIR%%/plug-ins/delay.ny
%%DATADIR%%/plug-ins/eq-xml-to-txt-converter.ny
%%DATADIR%%/plug-ins/equalabel.ny
%%DATADIR%%/plug-ins/highpass.ny
%%DATADIR%%/plug-ins/limiter.ny
%%DATADIR%%/plug-ins/lowpass.ny
%%DATADIR%%/plug-ins/noisegate.ny
%%DATADIR%%/plug-ins/notch.ny
%%DATADIR%%/plug-ins/nyquist-plug-in-installer.ny
%%DATADIR%%/plug-ins/pluck.ny

%%DATADIR%%/plug-ins/rms.ny
%%DATADIR%%/plug-ins/sample-data-export.ny
%%DATADIR%%/plug-ins/sample-data-import.ny
%%DATADIR%%/plug-ins/spectral-delete.ny
%%DATADIR%%/plug-ins/tremolo.ny
%%DATADIR%%/plug-ins/vocalrediso.ny
%%DATADIR%%/plug-ins/vocoder.ny
share/icons/hicolor/16x16/audacity.png
share/icons/hicolor/22x22/audacity.png
share/icons/hicolor/24x24/audacity.png
share/icons/hicolor/32x32/audacity.png
share/icons/hicolor/48x48/audacity.png
share/icons/hicolor/scalable/apps/audacity.svg
%%NLS%%share/locale/af/LC_MESSAGES/audacity.mo
%%NLS%%share/locale/ar/LC_MESSAGES/audacity.mo

Return to bug 246645

Lines 2-9 Link Here

(-)Makefile (-10 / +10 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= audacity	4	PORTNAME= audacity
5	PORTVERSION= 2.3.3	5	PORTVERSION= 2.4.1
6	PORTREVISION= 2
7	DISTVERSIONPREFIX= Audacity-	6	DISTVERSIONPREFIX= Audacity-
8	CATEGORIES= audio	7	CATEGORIES= audio
9		8
Lines 13-20 Link Here
13	LICENSE= GPLv2+	12	LICENSE= GPLv2+
14	LICENSE_FILE= ${WRKSRC}/LICENSE.txt	13	LICENSE_FILE= ${WRKSRC}/LICENSE.txt
15		14
16	BUILD_DEPENDS= autogen:devel/autogen \	15	BUILD_DEPENDS= bash:shells/bash \
17	bash:shells/bash \
18	cmake:devel/cmake	16	cmake:devel/cmake
19	LIB_DEPENDS= libasound.so:audio/alsa-lib \	17	LIB_DEPENDS= libasound.so:audio/alsa-lib \
20	libexpat.so:textproc/expat2 \	18	libexpat.so:textproc/expat2 \
Lines 22-32 Link Here
22	libsndfile.so:audio/libsndfile \	20	libsndfile.so:audio/libsndfile \
23	libsoxr.so:audio/libsoxr	21	libsoxr.so:audio/libsoxr
24		22
25	USES= autoreconf compiler:c++11-lib cpe desktop-file-utils dos2unix \	23	USES= cmake compiler:c++14-lang cpe desktop-file-utils dos2unix \
26	gettext-tools gmake gnome iconv libtool localbase pkgconfig \	24	gettext-tools gnome iconv libtool localbase pkgconfig \
27	shared-mime-info shebangfix	25	shared-mime-info shebangfix
28		26
29	GNU_CONFIGURE= yes
30	NLS_USES= gettext-runtime	27	NLS_USES= gettext-runtime
31	NLS_CONFIGURE_ENABLE= nls	28	NLS_CONFIGURE_ENABLE= nls
32	NLS_CONFIGURE_WITH= libintl-prefix="${LOCALBASE}"	29	NLS_CONFIGURE_WITH= libintl-prefix="${LOCALBASE}"
Lines 36-42 Link Here
36	INSTALLS_ICONS= yes	33	INSTALLS_ICONS= yes
37	PORTDOCS= README.txt	34	PORTDOCS= README.txt
38	DOS2UNIX_GLOB= .c .h Makefile.	35	DOS2UNIX_GLOB= .c .h Makefile.
39	SHEBANG_FILES= lib-src/lv2/build	36	SHEBANG_FILES= lib-src/lv2/configure
40	USE_GITHUB= yes	37	USE_GITHUB= yes
41		38
42	OPTIONS_DEFINE= DEBUG DOCS DYNLOAD FFMPEG FLAC ID3TAG LADSPA LAME LV2 \	39	OPTIONS_DEFINE= DEBUG DOCS DYNLOAD FFMPEG FLAC ID3TAG LADSPA LAME LV2 \
Lines 110-115 Link Here
110		107
111	LV2_CONFIGURE_WITH= lv2=system	108	LV2_CONFIGURE_WITH= lv2=system
112	LV2_LIB_DEPENDS= liblilv-0.so:audio/lilv \	109	LV2_LIB_DEPENDS= liblilv-0.so:audio/lilv \
		110	libserd-0.so:devel/serd \
		111	libsord-0.so:devel/sord \
		112	libsratom-0.so:audio/sratom \
113	libsuil-0.so:audio/suil	113	libsuil-0.so:audio/suil
114		114
115	MAD_CONFIGURE_WITH= libmad=system	115	MAD_CONFIGURE_WITH= libmad=system
Lines 116-124 Link Here
116	MAD_LIB_DEPENDS= libmad.so:audio/libmad	116	MAD_LIB_DEPENDS= libmad.so:audio/libmad
117		117
118	MOD_SCRIPT_PIPE_CONFIGURE_WITH= mod-script-pipe	118	MOD_SCRIPT_PIPE_CONFIGURE_WITH= mod-script-pipe
119	MOD_SCRIPT_PIPE_USES= python:3.6+	119	MOD_SCRIPT_PIPE_USES= python:3.7+
120	MOD_NYQ_BENCH_CONFIGURE_WITH= mod-nyq-bench	120	MOD_NYQ_BENCH_CONFIGURE_WITH= mod-nyq-bench
121	MOD_NYQ_BENCH_USES= python:3.6+	121	MOD_NYQ_BENCH_USES= python:3.7+
122		122
123	SBSMS_CONFIGURE_WITH= sbsms	123	SBSMS_CONFIGURE_WITH= sbsms
124		124

Lines 1-39 Link Here

(-)files/patch-configure.ac (-39 lines)
1	--- configure.ac.orig 2019-02-24 08:28:05 UTC
2	+++ configure.ac
3	@@ -200,14 +200,6 @@ if test x$enable_universal_binary = xyes; then
4	esac
5	fi
6
7	-dnl Check if $CXX is clang by evaluating the version string because
8	-dnl $ax_cv_cxx_compiler_vendor seems not to work (it is either "gnu" or just empty).
9	-dnl If $CXX is clang (string is found), grep returns 0 and the if is executed.
10	-dnl Use /dev/null to suppress grep output to shell.
11	-if ($CXX --version \| grep 'clang version' > /dev/null); then
12	- LDFLAGS="${LDFLAGS} -latomic"
13	-fi
14	-
15	if test x$enable_sse = xyes; then
16
17	if test "${ax_cv_cxx_compiler_vendor}" = "gnu"; then
18	@@ -239,20 +231,7 @@ dnl check if alloca.h exists. If it does, we need to i
19	dnl Solaris builds, by defining HAVE_ALLOCA_H
20	AC_CHECK_HEADERS_ONCE(alloca.h)
21
22	-
23	-dnl Enable C++ 11 support. Use gnu++11 on GCC since wxWidgets uses extensions
24	-if "${CXX}" -v 2>&1 \| grep -q '^gcc version'; then
25	-
26	- dnl GCC < 4.9 has known bugs (#1397) and can't be used
27	- AX_GCC_VERSION_ATLEAST(4,9,0,[gcc_ok=yes], [gcc_ok=no])
28	- if test x$gcc_ok = xno; then
29	- AC_MSG_ERROR([Audacity requires at least GCC 4.9])
30	- fi
31	-
32	- CXXFLAGS="${CXXFLAGS} --std=gnu++11"
33	-else
34	- CXXFLAGS="${CXXFLAGS} --std=c++11"
35	-fi
36	+CXXFLAGS="${CXXFLAGS} --std=c++11"
37
38	dnl --------------------------------------------------------------------------
39	dnl We would like warnings enabled on the builds, but different compilers need

Lines 1-52 Link Here

(-)files/patch-lib-src_FileDialog_Makefile.am (-52 lines)
1	--- lib-src/FileDialog/Makefile.am.orig 2018-10-01 14:07:33 UTC
2	+++ lib-src/FileDialog/Makefile.am
3	@@ -2,5 +2,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_LIBTOOLFLAGS = --tag=CXX
11	@@ -11,22 +13,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

Lines 1-15 Link Here

(-)files/patch-lib-src_FileDialog_gtk_Makefile.am (-15 lines)
1	--- lib-src/FileDialog/gtk/Makefile.am.orig 2016-07-26 13:34:07 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)

Lines 1-13 Link Here

(-)files/patch-lib-src_FileDialog_mac_Makefile.am (-13 lines)
1	--- lib-src/FileDialog/mac/Makefile.am.orig 2016-07-26 13:34:07 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)

Lines 1-13 Link Here

(-)files/patch-lib-src_FileDialog_win_Makefile.am (-13 lines)
1	--- lib-src/FileDialog/win/Makefile.am.orig 2016-07-26 13:34:07 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)

Line 0 Link Here

(-)files/patch-lib-src_lv2_lilv_src_util.c (+13 lines)
	1	--- lib-src/lv2/lilv/src/util.c.orig 2020-05-18 17:13:29.952118000 -0700
	2	+++ lib-src/lv2/lilv/src/util.c 2020-05-18 16:38:45.344052000 -0700
	3	@@ -14,7 +14,9 @@
	4	OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
	5	*/
	6
	7	-#define _POSIX_C_SOURCE 200809L /* for fileno */
	8	+#ifndef __FreeBSD__
	9	+ #define _POSIX_C_SOURCE 200809L /* for fileno */
	10	+#endif
	11	#define _BSD_SOURCE 1 /* for realpath, symlink */
	12	#define _DEFAULT_SOURCE 1 /* for realpath, symlink */
	13

Line 0 Link Here

(-)files/patch-lib-src_lv2_lilv_test_lilv_test.c (+15 lines)
	1	--- lib-src/lv2/lilv/test/lilv_test.c.orig 2020-05-18 17:13:29.952774000 -0700
	2	+++ lib-src/lv2/lilv/test/lilv_test.c 2020-05-18 16:32:22.956444000 -0700
	3	@@ -15,8 +15,10 @@
	4	OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
	5	*/
	6
	7	-#define _POSIX_C_SOURCE 200809L /* for setenv */
	8	-#define _XOPEN_SOURCE 600 /* for mkstemp */
	9	+#ifndef__FreeBSD__
	10	+ #define _POSIX_C_SOURCE 200809L /* for setenv */
	11	+ #define _XOPEN_SOURCE 600 /* for mkstemp */
	12	+#endiff
	13
	14	#include "../src/lilv_internal.h"
	15

Lines 1-6 Link Here

(-)files/patch-src_FFmpeg.h (-3 / +3 lines)
1	--- src/FFmpeg.h.orig 2018-10-01 14:07:33 UTC	1	--- src/FFmpeg.h.orig 2018-10-01 14:07:33 UTC
2	+++ src/FFmpeg.h	2	+++ src/FFmpeg.h
3	@@ -667,7 +667,7 @@ extern "C" {	3	@@ -685,7 +685,7 @@ extern "C" {
4	FFMPEG_FUNCTION_WITH_RETURN(	4	FFMPEG_FUNCTION_WITH_RETURN(
5	AVOutputFormat*,	5	AVOutputFormat*,
6	av_oformat_next,	6	av_oformat_next,
Lines 9-15 Link Here
9	(f)	9	(f)
10	);	10	);
11	#endif	11	#endif
12	@@ -748,7 +748,7 @@ extern "C" {	12	@@ -766,7 +766,7 @@ extern "C" {
13	FFMPEG_FUNCTION_WITH_RETURN(	13	FFMPEG_FUNCTION_WITH_RETURN(
14	int,	14	int,
15	av_fifo_size,	15	av_fifo_size,
Lines 18-24 Link Here
18	(f)	18	(f)
19	);	19	);
20	#endif	20	#endif
21	@@ -810,7 +810,7 @@ extern "C" {	21	@@ -828,7 +828,7 @@ extern "C" {
22	FFMPEG_FUNCTION_WITH_RETURN(	22	FFMPEG_FUNCTION_WITH_RETURN(
23	AVDictionaryEntry *,	23	AVDictionaryEntry *,
24	av_dict_get,	24	av_dict_get,

Lines 1-12 Link Here

(-)files/patch-src_Makefile.am (-12 lines)
1	--- src/Makefile.am.orig 2016-07-26 13:34:06 UTC
2	+++ src/Makefile.am
3	@@ -79,8 +79,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-16 Link Here

(-)pkg-plist (-17 / +12 lines)
1	bin/audacity	1	bin/audacity
2	man/man1/audacity.1.gz
3	share/appdata/audacity.appdata.xml
4	share/applications/audacity.desktop	2	share/applications/audacity.desktop
5	%%DATADIR%%/EQDefaultCurves.xml	3	%%DATADIR%%/EQDefaultCurves.xml
6	%%DATADIR%%/include/audacity/ComponentInterface.h
7	%%DATADIR%%/include/audacity/ConfigInterface.h
8	%%DATADIR%%/include/audacity/EffectAutomationParameters.h
9	%%DATADIR%%/include/audacity/EffectInterface.h
10	%%DATADIR%%/include/audacity/ImporterInterface.h
11	%%DATADIR%%/include/audacity/ModuleInterface.h
12	%%DATADIR%%/include/audacity/PluginInterface.h
13	%%DATADIR%%/include/audacity/Types.h
14	%%DATADIR%%/nyquist/aud-do-support.lsp	4	%%DATADIR%%/nyquist/aud-do-support.lsp
15	%%DATADIR%%/nyquist/dspprims.lsp	5	%%DATADIR%%/nyquist/dspprims.lsp
16	%%DATADIR%%/nyquist/envelopes.lsp	6	%%DATADIR%%/nyquist/envelopes.lsp
Lines 17-25 Link Here
17	%%DATADIR%%/nyquist/equalizer.lsp	7	%%DATADIR%%/nyquist/equalizer.lsp
18	%%DATADIR%%/nyquist/evalenv.lsp	8	%%DATADIR%%/nyquist/evalenv.lsp
19	%%DATADIR%%/nyquist/fileio.lsp	9	%%DATADIR%%/nyquist/fileio.lsp
20	%%DATADIR%%/nyquist/follow.lsp
21	%%DATADIR%%/nyquist/init.lsp	10	%%DATADIR%%/nyquist/init.lsp
22	%%DATADIR%%/nyquist/misc.lsp	11	%%DATADIR%%/nyquist/misc.lsp
		12	%%DATADIR%%/nyquist/nyinit-dbg.lsp
23	%%DATADIR%%/nyquist/nyinit.lsp	13	%%DATADIR%%/nyquist/nyinit.lsp
24	%%DATADIR%%/nyquist/nyqmisc.lsp	14	%%DATADIR%%/nyquist/nyqmisc.lsp
25	%%DATADIR%%/nyquist/nyquist-plot.txt	15	%%DATADIR%%/nyquist/nyquist-plot.txt
Lines 46-56 Link Here
46	%%DATADIR%%/nyquist/seq.lsp	36	%%DATADIR%%/nyquist/seq.lsp
47	%%DATADIR%%/nyquist/seqfnint.lsp	37	%%DATADIR%%/nyquist/seqfnint.lsp
48	%%DATADIR%%/nyquist/seqmidi.lsp	38	%%DATADIR%%/nyquist/seqmidi.lsp
		39	%%DATADIR%%/nyquist/sliders.lsp
49	%%DATADIR%%/nyquist/sndfnint.lsp	40	%%DATADIR%%/nyquist/sndfnint.lsp
		41	%%DATADIR%%/nyquist/spec-plot.lsp
		42	%%DATADIR%%/nyquist/spectral-analysis.lsp
50	%%DATADIR%%/nyquist/stk.lsp	43	%%DATADIR%%/nyquist/stk.lsp
51	%%DATADIR%%/nyquist/system.lsp	44	%%DATADIR%%/nyquist/system.lsp
52	%%DATADIR%%/nyquist/test.lsp	45	%%DATADIR%%/nyquist/test.lsp
53	%%DATADIR%%/nyquist/upic.sal
54	%%DATADIR%%/nyquist/velocity.lsp	46	%%DATADIR%%/nyquist/velocity.lsp
55	%%DATADIR%%/nyquist/xlinit.lsp	47	%%DATADIR%%/nyquist/xlinit.lsp
56	%%DATADIR%%/nyquist/xm.lsp	48	%%DATADIR%%/nyquist/xm.lsp
Lines 66-75 Link Here
66	%%DATADIR%%/plug-ins/crossfadeclips.ny	58	%%DATADIR%%/plug-ins/crossfadeclips.ny
67	%%DATADIR%%/plug-ins/crossfadetracks.ny	59	%%DATADIR%%/plug-ins/crossfadetracks.ny
68	%%DATADIR%%/plug-ins/delay.ny	60	%%DATADIR%%/plug-ins/delay.ny
		61	%%DATADIR%%/plug-ins/eq-xml-to-txt-converter.ny
69	%%DATADIR%%/plug-ins/equalabel.ny	62	%%DATADIR%%/plug-ins/equalabel.ny
70	%%DATADIR%%/plug-ins/highpass.ny	63	%%DATADIR%%/plug-ins/highpass.ny
71	%%DATADIR%%/plug-ins/limiter.ny	64	%%DATADIR%%/plug-ins/limiter.ny
72	%%DATADIR%%/plug-ins/lowpass.ny	65	%%DATADIR%%/plug-ins/lowpass.ny
		66	%%DATADIR%%/plug-ins/noisegate.ny
73	%%DATADIR%%/plug-ins/notch.ny	67	%%DATADIR%%/plug-ins/notch.ny
74	%%DATADIR%%/plug-ins/nyquist-plug-in-installer.ny	68	%%DATADIR%%/plug-ins/nyquist-plug-in-installer.ny
75	%%DATADIR%%/plug-ins/pluck.ny	69	%%DATADIR%%/plug-ins/pluck.ny
Lines 78-91 Link Here
78	%%DATADIR%%/plug-ins/rms.ny	72	%%DATADIR%%/plug-ins/rms.ny
79	%%DATADIR%%/plug-ins/sample-data-export.ny	73	%%DATADIR%%/plug-ins/sample-data-export.ny
80	%%DATADIR%%/plug-ins/sample-data-import.ny	74	%%DATADIR%%/plug-ins/sample-data-import.ny
		75	%%DATADIR%%/plug-ins/spectral-delete.ny
81	%%DATADIR%%/plug-ins/tremolo.ny	76	%%DATADIR%%/plug-ins/tremolo.ny
82	%%DATADIR%%/plug-ins/vocalrediso.ny	77	%%DATADIR%%/plug-ins/vocalrediso.ny
83	%%DATADIR%%/plug-ins/vocoder.ny	78	%%DATADIR%%/plug-ins/vocoder.ny
84	share/icons/hicolor/16x16/apps/audacity.png	79	share/icons/hicolor/16x16/audacity.png
85	share/icons/hicolor/22x22/apps/audacity.png	80	share/icons/hicolor/22x22/audacity.png
86	share/icons/hicolor/24x24/apps/audacity.png	81	share/icons/hicolor/24x24/audacity.png
87	share/icons/hicolor/32x32/apps/audacity.png	82	share/icons/hicolor/32x32/audacity.png
88	share/icons/hicolor/48x48/apps/audacity.png	83	share/icons/hicolor/48x48/audacity.png
89	share/icons/hicolor/scalable/apps/audacity.svg	84	share/icons/hicolor/scalable/apps/audacity.svg
90	%%NLS%%share/locale/af/LC_MESSAGES/audacity.mo	85	%%NLS%%share/locale/af/LC_MESSAGES/audacity.mo
91	%%NLS%%share/locale/ar/LC_MESSAGES/audacity.mo	86	%%NLS%%share/locale/ar/LC_MESSAGES/audacity.mo