Attachment #215363 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=	autogen:devel/autogen \
		bash:shells/bash \
		cmake:devel/cmake
LIB_DEPENDS=	libasound.so:audio/alsa-lib \
		libexpat.so:textproc/expat2 \
		libportaudio.so:audio/portaudio \

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

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

USE_GNOME=		cairo gtk30
NLS_USES=		gettext-runtime
NLS_CONFIGURE_ENABLE=	nls
NLS_CONFIGURE_WITH=	libintl-prefix="${LOCALBASE}"
OPTIONS_SUB=		yes
USE_WX=			3.1+
WX_COMPS=		wx
INSTALLS_ICONS=		yes
PORTDOCS=		README.txt
DOS2UNIX_GLOB=		*.c* *.h Makefile.*
SHEBANG_FILES=		lib-src/lv2/build
USE_GITHUB=		yes

OPTIONS_DEFINE=		DEBUG DOCS FFMPEG FLAC ID3TAG LADSPA LAME LV2 MAD MIDI \
			NYQUIST OGG SBSMS SOUNDTOUCH TWOLAME VAMP VORBIS VST
OPTIONS_DEFAULT=	FLAC ID3TAG LADSPA MAD MIDI NYQUIST OGG SBSMS \
			SOUNDTOUCH TWOLAME VAMP VORBIS VST
OPTIONS_SUB=		yes

OPTIONS_DEFAULT_amd64=	SSE
OPTIONS_DEFAULT_i386=	${MACHINE_CPU:tu:MSSE}

DYNLOAD_DESC=		Enable dynamic loading of lame and FFmpeg
LAME_DESC=		Use lame for import and export support
LV2_DESC=		Add LV2 plug-in support
MAD_DESC=		Use libmad for mp2/3 decoding support
MIDI_DESC=		Add midi support
NYQUIST_DESC=		Enable Nyquist support
OGG_DESC=		Enable ogg support
SBSMS_DESC=		Use libsbsms for pitch and tempo changing
SOUNDTOUCH_DESC=	Use libSoundTouch for pitch and tempo changing
TWOLAME_DESC=		Use libtwolame for MP2 export support

VAMP_DESC=		Vamp plug-in support
VST_DESC=		VST plug-in support

CMAKE_ARGS=	-Daudacity_lib_preference:STRING=system -Daudacity_use_expat:STRING=system \
		-Daudacity_use_wxwidgets:STRING=system -Daudacity_use_soxr:STRING=system \
		-Daudacity_use_sndfile:STRING=system -Daudacity_use_portsmf:STRING=local \
		-Daudacity_use_portmixer:STRING=local -Daudacity_use_portaudio:STRING=system

DEBUG_CMAKE_ON=		wxWidgets_USE_DEBUG
			--disable-option-checking \
			--enable-unicode \
			--with-expat=system \
			--with-lib-preference="local" \
			--with-libsndfile=system \
			--with-libsoxr=system \
			--with-midi \
			--with-portaudio=system \
			--with-portmixer=yes \
			--with-widgetextra

CONFIGURE_SHELL?=	${LOCALBASE}/bin/bash

DEBUG_CONFIGURE_WITH=	debug

DOCS_BUILD_DEPENDS=	docbook-to-man:textproc/docbook-to-man \
			docbook2man:textproc/docbook-utils

FFMPEG_CMAKE_ON=	-Daudacity_use_ffmpeg:STRING=loaded
FFMPEG_CMAKE_OFF=	-Daudacity_use_ffmpeg:STRING=off
FFMPEG_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/libavcodec.pc:multimedia/ffmpeg
# for audio/lame
DYNLOAD_CPPFLAGS=		-I${LOCALBASE}/include
# for audio/lame
DYNLOAD_LDFLAGS=		-L${LOCALBASE}/lib

FFMPEG_CONFIGURE_WITH=	ffmpeg=system
FFMPEG_LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg

FLAC_CMAKE_ON=		-Daudacity_use_flac:STRING=system
FLAC_CMAKE_OFF=		-Daudacity_use_flac:STRING=local
FLAC_LIB_DEPENDS=	libFLAC.so:audio/flac

ID3TAG_CMAKE_ON=	-Daudacity_use_id3tag:STRING=system
ID3TAG_CMAKE_OFF=	-Daudacity_use_id3tag:STRING=off
ID3TAG_LIB_DEPENDS=	libid3tag.so:audio/libid3tag

LADSPA_CMAKE_BOOL=	audacity_use_ladspa
LADSPA_RUN_DEPENDS=	listplugins:audio/ladspa

LAME_CMAKE_ON=		-Daudacity_use_lame:STRING=system
LAME_CMAKE_OFF=		-Daudacity_use_lame:STRING=local
LAME_BUILD_DEPENDS=	${LOCALBASE}/include/lame/lame.h:audio/lame
LAME_CPPFLAGS=		-I${LOCALBASE}/include/lame
LAME_LDFLAGS=		-L${LOCALBASE}/lib
LAME_LIB_DEPENDS=	libmp3lame.so:audio/lame

LV2_CMAKE_ON=		-Daudacity_use_lv2:STRING=system
LV2_CMAKE_OFF=		-Daudacity_use_lv2:STRING=off
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_CMAKE_ON=		-Daudacity_use_mad:STRING=system
MAD_CMAKE_OFF=		-Daudacity_use_mad:STRING=off
MAD_LIB_DEPENDS=	libmad.so:audio/libmad

MIDI_CMAKE_ON=		-Daudacity_use_midi:STRING=local
MIDI_CMAKE_OFF=		-Daudacity_use_midi:STRING=off
MOD_NYQ_BENCH_CONFIGURE_WITH=	mod-nyq-bench
MOD_NYQ_BENCH_USES=		python:3.6+

OGG_CMAKE_ON=		-Daudacity_use_ogg:STRING=system
OGG_CMAKE_OFF=		-Daudacity_use_ogg:STRING=local
OGG_LIB_DEPENDS=	libogg.so:audio/libogg

SBSMS_CMAKE_ON=		-Daudacity_use_sbsms:STRING=local
SBSMS_CMAKE_OFF=	-Daudacity_use_sbsms:STRING=off

SOUNDTOUCH_CMAKE_ON=	-Daudacity_use_soundtouch:STRING=system
SOUNDTOUCH_CMAKE_OFF=	-Daudacity_use_soundtouch:STRING=off
SOUNDTOUCH_LIB_DEPENDS=		libSoundTouch.so:audio/soundtouch

TWOLAME_CMAKE_ON=	-Daudacity_use_twolame:STRING=system
TWOLAME_CMAKE_OFF=	-Daudacity_use_twolame:STRING=off
TWOLAME_CONFIGURE_WITH=	libtwolame=system
TWOLAME_LIB_DEPENDS=	libtwolame.so:audio/twolame

VAMP_CMAKE_ON=		-Daudacity_use_vamp:STRING=system
VAMP_CMAKE_OFF=		-Daudacity_use_vamp:STRING=off
VAMP_LIB_DEPENDS=	libvamp-hostsdk.so:audio/vamp-plugin-sdk

VORBIS_CMAKE_ON=	-Daudacity_use_vorbis:STRING=system
VORBIS_CMAKE_OFF=	-Daudacity_use_vorbis:STRING=off
VORBIS_LIB_DEPENDS=	libogg.so:audio/libogg \
			libvorbis.so:audio/libvorbis

VST_CMAKE_BOOL=		audacity_use_vst

post-extract:
# Unbundle portaudio
	#@${RM} -r ${WRKSRC}/lib-src/portaudio-v19
	@${RM} ${WRKSRC}/cmake-proxies/portaudio-v19/CMakeLists.txt

post-install:
	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
	@${RM} ${STAGEDIR}${DOCSDIR}/LICENSE.txt

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

Line 0 Link Here

(-)files/patch-cmake-proxies_CMakeLists.txt (+11 lines)
	1	--- cmake-proxies/CMakeLists.txt.orig 2020-05-19 09:43:53 UTC
	2	+++ cmake-proxies/CMakeLists.txt
	3	@@ -150,7 +150,7 @@ addlib( lame lame LAME YES
	4	addlib( lib-widget-extra libextra EXTRA YES YES "" )
	5	addlib( libsndfile sndfile SNDFILE YES YES "sndfile >= 1.0.28" )
	6	addlib( libsoxr soxr SOXR YES YES "soxr >= 0.1.1" )
	7	-addlib( portaudio-v19 portaudio PORTAUDIO YES YES "" )
	8	+addlib( portaudio-v19 portaudio PORTAUDIO YES YES "portaudio-2.0 >= 19" )
	9
	10	# Optional libraries
	11	#




--- 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

Lines 1-6 Link Here

(-)files/patch-src_AudioIO.cpp (-3 / +3 lines)
1	--- src/AudioIO.cpp.orig 2018-10-01 14:07:33 UTC	1	--- src/AudioIO.cpp.orig 2020-05-19 09:43:53 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 @@ time warp info and AudioIOListener and whether the pla
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 +807,22 @@ struct AudioIoCallback::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
share/locale/af/LC_MESSAGES/audacity.mo
share/locale/ar/LC_MESSAGES/audacity.mo
share/locale/be/LC_MESSAGES/audacity.mo
share/locale/bg/LC_MESSAGES/audacity.mo
share/locale/bn/LC_MESSAGES/audacity.mo
share/locale/bs/LC_MESSAGES/audacity.mo
share/locale/ca/LC_MESSAGES/audacity.mo
share/locale/ca_ES@valencia/LC_MESSAGES/audacity.mo
share/locale/cs/LC_MESSAGES/audacity.mo
share/locale/cy/LC_MESSAGES/audacity.mo
share/locale/da/LC_MESSAGES/audacity.mo
share/locale/de/LC_MESSAGES/audacity.mo
share/locale/el/LC_MESSAGES/audacity.mo
share/locale/es/LC_MESSAGES/audacity.mo
share/locale/eu/LC_MESSAGES/audacity.mo
share/locale/eu_ES/LC_MESSAGES/audacity.mo
share/locale/fa/LC_MESSAGES/audacity.mo
share/locale/fi/LC_MESSAGES/audacity.mo
share/locale/fr/LC_MESSAGES/audacity.mo
share/locale/ga/LC_MESSAGES/audacity.mo
share/locale/gl/LC_MESSAGES/audacity.mo
share/locale/he/LC_MESSAGES/audacity.mo
share/locale/hi/LC_MESSAGES/audacity.mo
share/locale/hr/LC_MESSAGES/audacity.mo
share/locale/hu/LC_MESSAGES/audacity.mo
share/locale/hy/LC_MESSAGES/audacity.mo
share/locale/id/LC_MESSAGES/audacity.mo
share/locale/it/LC_MESSAGES/audacity.mo
share/locale/ja/LC_MESSAGES/audacity.mo
share/locale/ka/LC_MESSAGES/audacity.mo
share/locale/km/LC_MESSAGES/audacity.mo
share/locale/ko/LC_MESSAGES/audacity.mo
share/locale/lt/LC_MESSAGES/audacity.mo
share/locale/mk/LC_MESSAGES/audacity.mo
share/locale/my/LC_MESSAGES/audacity.mo
share/locale/nb/LC_MESSAGES/audacity.mo
share/locale/nl/LC_MESSAGES/audacity.mo
share/locale/oc/LC_MESSAGES/audacity.mo
share/locale/pl/LC_MESSAGES/audacity.mo
share/locale/pt_BR/LC_MESSAGES/audacity.mo
share/locale/pt_PT/LC_MESSAGES/audacity.mo
share/locale/ro/LC_MESSAGES/audacity.mo
share/locale/ru/LC_MESSAGES/audacity.mo
share/locale/sk/LC_MESSAGES/audacity.mo
share/locale/sl/LC_MESSAGES/audacity.mo
share/locale/sr_RS/LC_MESSAGES/audacity.mo
share/locale/sr_RS@latin/LC_MESSAGES/audacity.mo
share/locale/sv/LC_MESSAGES/audacity.mo
share/locale/ta/LC_MESSAGES/audacity.mo
share/locale/tg/LC_MESSAGES/audacity.mo
share/locale/tr/LC_MESSAGES/audacity.mo
share/locale/uk/LC_MESSAGES/audacity.mo
share/locale/vi/LC_MESSAGES/audacity.mo
share/locale/zh_CN/LC_MESSAGES/audacity.mo
share/locale/zh_TW/LC_MESSAGES/audacity.mo
share/mime/packages/audacity.xml
share/pixmaps/audacity.xpm
share/pixmaps/audacity16.xpm

Return to bug 246645

Lines 2-9 Link Here

(-)Makefile (-73 / +59 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-21 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 \
17	bash:shells/bash \
18	cmake:devel/cmake
19	LIB_DEPENDS= libasound.so:audio/alsa-lib \	15	LIB_DEPENDS= libasound.so:audio/alsa-lib \
20	libexpat.so:textproc/expat2 \	16	libexpat.so:textproc/expat2 \
21	libportaudio.so:audio/portaudio \	17	libportaudio.so:audio/portaudio \
Lines 22-59 Link Here
22	libsndfile.so:audio/libsndfile \	18	libsndfile.so:audio/libsndfile \
23	libsoxr.so:audio/libsoxr	19	libsoxr.so:audio/libsoxr
24		20
25	USES= autoreconf compiler:c++11-lib cpe desktop-file-utils dos2unix \	21	USES= cmake compiler:c++14-lang cpe desktop-file-utils gettext-runtime \
26	gettext-tools gmake gnome iconv libtool localbase pkgconfig \	22	gettext-tools gnome libtool localbase python:3.7+ pkgconfig shared-mime-info
27	shared-mime-info shebangfix
28		23
29	GNU_CONFIGURE= yes	24	USE_GNOME= cairo gtk30
30	NLS_USES= gettext-runtime
31	NLS_CONFIGURE_ENABLE= nls
32	NLS_CONFIGURE_WITH= libintl-prefix="${LOCALBASE}"
33	OPTIONS_SUB= yes
34	USE_WX= 3.1+	25	USE_WX= 3.1+
35	WX_COMPS= wx	26	WX_COMPS= wx
36	INSTALLS_ICONS= yes	27	INSTALLS_ICONS= yes
37	PORTDOCS= README.txt	28	PORTDOCS= README.txt
38	DOS2UNIX_GLOB= .c .h Makefile.
39	SHEBANG_FILES= lib-src/lv2/build
40	USE_GITHUB= yes	29	USE_GITHUB= yes
41		30
42	OPTIONS_DEFINE= DEBUG DOCS DYNLOAD FFMPEG FLAC ID3TAG LADSPA LAME LV2 \	31	OPTIONS_DEFINE= DEBUG DOCS FFMPEG FLAC ID3TAG LADSPA LAME LV2 MAD MIDI \
43	MAD MOD_NYQ_BENCH MOD_SCRIPT_PIPE NLS SBSMS SOUNDTOUCH \	32	NYQUIST OGG SBSMS SOUNDTOUCH TWOLAME VAMP VORBIS VST
44	SSE TWOLAME VAMP VORBIS VST	33	OPTIONS_DEFAULT= FLAC ID3TAG LADSPA MAD MIDI NYQUIST OGG SBSMS \
45	OPTIONS_DEFAULT= FLAC ID3TAG LADSPA MAD SBSMS SOUNDTOUCH TWOLAME VAMP \	34	SOUNDTOUCH TWOLAME VAMP VORBIS VST
46	VORBIS VST	35	OPTIONS_SUB= yes
47		36
48	OPTIONS_DEFAULT_amd64= SSE
49	OPTIONS_DEFAULT_i386= ${MACHINE_CPU:tu:MSSE}
50
51	DYNLOAD_DESC= Enable dynamic loading of lame and FFmpeg
52	LAME_DESC= Use lame for import and export support	37	LAME_DESC= Use lame for import and export support
53	LV2_DESC= Add LV2 plug-in support	38	LV2_DESC= Add LV2 plug-in support
54	MAD_DESC= Use libmad for mp2/3 decoding support	39	MAD_DESC= Use libmad for mp2/3 decoding support
55	MOD_SCRIPT_PIPE_DESC= mod-script-pipe scripting support	40	MIDI_DESC= Add midi support
56	MOD_NYQ_BENCH_DESC= Enable Nyquist Workbench	41	NYQUIST_DESC= Enable Nyquist support
		42	OGG_DESC= Enable ogg support
57	SBSMS_DESC= Use libsbsms for pitch and tempo changing	43	SBSMS_DESC= Use libsbsms for pitch and tempo changing
58	SOUNDTOUCH_DESC= Use libSoundTouch for pitch and tempo changing	44	SOUNDTOUCH_DESC= Use libSoundTouch for pitch and tempo changing
59	TWOLAME_DESC= Use libtwolame for MP2 export support	45	TWOLAME_DESC= Use libtwolame for MP2 export support
Lines 60-144 Link Here
60	VAMP_DESC= Vamp plug-in support	46	VAMP_DESC= Vamp plug-in support
61	VST_DESC= VST plug-in support	47	VST_DESC= VST plug-in support
62		48
63	CONFIGURE_ENV+= WX_CONFIG="${WX_CONFIG}"	49	CMAKE_ARGS= -Daudacity_lib_preference:STRING=system -Daudacity_use_expat:STRING=system \
		50	-Daudacity_use_wxwidgets:STRING=system -Daudacity_use_soxr:STRING=system \
		51	-Daudacity_use_sndfile:STRING=system -Daudacity_use_portsmf:STRING=local \
		52	-Daudacity_use_portmixer:STRING=local -Daudacity_use_portaudio:STRING=system
64		53
65	CONFIGURE_ARGS+= ${ICONV_CONFIGURE_ARG} \	54	DEBUG_CMAKE_ON= wxWidgets_USE_DEBUG
66	--disable-option-checking \
67	--enable-unicode \
68	--with-expat=system \
69	--with-lib-preference="local" \
70	--with-libsndfile=system \
71	--with-libsoxr=system \
72	--with-midi \
73	--with-portaudio=system \
74	--with-portmixer=yes \
75	--with-widgetextra
76		55
77	CONFIGURE_SHELL?= ${LOCALBASE}/bin/bash
78
79	DEBUG_CONFIGURE_WITH= debug
80
81	DOCS_BUILD_DEPENDS= docbook-to-man:textproc/docbook-to-man \	56	DOCS_BUILD_DEPENDS= docbook-to-man:textproc/docbook-to-man \
82	docbook2man:textproc/docbook-utils	57	docbook2man:textproc/docbook-utils
83		58
84	DYNLOAD_BUILD_DEPENDS= ${LOCALBASE}/include/lame/lame.h:audio/lame \	59	FFMPEG_CMAKE_ON= -Daudacity_use_ffmpeg:STRING=loaded
85	${LOCALBASE}/libdata/pkgconfig/libavcodec.pc:multimedia/ffmpeg	60	FFMPEG_CMAKE_OFF= -Daudacity_use_ffmpeg:STRING=off
86	DYNLOAD_CONFIGURE_ENABLE= dynamic-loading	61	FFMPEG_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/libavcodec.pc:multimedia/ffmpeg
87	# for audio/lame
88	DYNLOAD_CPPFLAGS= -I${LOCALBASE}/include
89	# for audio/lame
90	DYNLOAD_LDFLAGS= -L${LOCALBASE}/lib
91
92	FFMPEG_CONFIGURE_WITH= ffmpeg=system
93	FFMPEG_LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg	62	FFMPEG_LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg
94		63
95	FLAC_CONFIGURE_WITH= libflac=system	64	FLAC_CMAKE_ON= -Daudacity_use_flac:STRING=system
		65	FLAC_CMAKE_OFF= -Daudacity_use_flac:STRING=local
96	FLAC_LIB_DEPENDS= libFLAC.so:audio/flac	66	FLAC_LIB_DEPENDS= libFLAC.so:audio/flac
97		67
98	ID3TAG_CONFIGURE_WITH= libid3tag=system	68	ID3TAG_CMAKE_ON= -Daudacity_use_id3tag:STRING=system
		69	ID3TAG_CMAKE_OFF= -Daudacity_use_id3tag:STRING=off
99	ID3TAG_LIB_DEPENDS= libid3tag.so:audio/libid3tag	70	ID3TAG_LIB_DEPENDS= libid3tag.so:audio/libid3tag
100		71
101	LADSPA_CONFIGURE_ENABLE= ladspa	72	LADSPA_CMAKE_BOOL= audacity_use_ladspa
102	LADSPA_RUN_DEPENDS= listplugins:audio/ladspa	73	LADSPA_RUN_DEPENDS= listplugins:audio/ladspa
103		74
104	LAME_CONFIGURE_ON= --with-lame=system	75	LAME_CMAKE_ON= -Daudacity_use_lame:STRING=system
105	# --without-lame is broken	76	LAME_CMAKE_OFF= -Daudacity_use_lame:STRING=local
106	LAME_CONFIGURE_OFF= --with-lame	77	LAME_BUILD_DEPENDS= ${LOCALBASE}/include/lame/lame.h:audio/lame
107	LAME_CPPFLAGS= -I${LOCALBASE}/include	78	LAME_CPPFLAGS= -I${LOCALBASE}/include/lame
108	LAME_LDFLAGS= -L${LOCALBASE}/lib	79	LAME_LDFLAGS= -L${LOCALBASE}/lib
109	LAME_LIB_DEPENDS= libmp3lame.so:audio/lame	80	LAME_LIB_DEPENDS= libmp3lame.so:audio/lame
110		81
111	LV2_CONFIGURE_WITH= lv2=system	82	LV2_CMAKE_ON= -Daudacity_use_lv2:STRING=system
		83	LV2_CMAKE_OFF= -Daudacity_use_lv2:STRING=off
112	LV2_LIB_DEPENDS= liblilv-0.so:audio/lilv \	84	LV2_LIB_DEPENDS= liblilv-0.so:audio/lilv \
		85	libserd-0.so:devel/serd \
		86	libsord-0.so:devel/sord \
		87	libsratom-0.so:audio/sratom \
113	libsuil-0.so:audio/suil	88	libsuil-0.so:audio/suil
114		89
115	MAD_CONFIGURE_WITH= libmad=system	90	MAD_CMAKE_ON= -Daudacity_use_mad:STRING=system
		91	MAD_CMAKE_OFF= -Daudacity_use_mad:STRING=off
116	MAD_LIB_DEPENDS= libmad.so:audio/libmad	92	MAD_LIB_DEPENDS= libmad.so:audio/libmad
117		93
118	MOD_SCRIPT_PIPE_CONFIGURE_WITH= mod-script-pipe	94	MIDI_CMAKE_ON= -Daudacity_use_midi:STRING=local
119	MOD_SCRIPT_PIPE_USES= python:3.6+	95	MIDI_CMAKE_OFF= -Daudacity_use_midi:STRING=off
120	MOD_NYQ_BENCH_CONFIGURE_WITH= mod-nyq-bench
121	MOD_NYQ_BENCH_USES= python:3.6+
122		96
123	SBSMS_CONFIGURE_WITH= sbsms	97	OGG_CMAKE_ON= -Daudacity_use_ogg:STRING=system
		98	OGG_CMAKE_OFF= -Daudacity_use_ogg:STRING=local
		99	OGG_LIB_DEPENDS= libogg.so:audio/libogg
124		100
125	SOUNDTOUCH_CONFIGURE_WITH= soundtouch=system	101	SBSMS_CMAKE_ON= -Daudacity_use_sbsms:STRING=local
		102	SBSMS_CMAKE_OFF= -Daudacity_use_sbsms:STRING=off
		103
		104	SOUNDTOUCH_CMAKE_ON= -Daudacity_use_soundtouch:STRING=system
		105	SOUNDTOUCH_CMAKE_OFF= -Daudacity_use_soundtouch:STRING=off
126	SOUNDTOUCH_LIB_DEPENDS= libSoundTouch.so:audio/soundtouch	106	SOUNDTOUCH_LIB_DEPENDS= libSoundTouch.so:audio/soundtouch
127		107
128	SSE_CONFIGURE_ENABLE= sse	108	TWOLAME_CMAKE_ON= -Daudacity_use_twolame:STRING=system
129		109	TWOLAME_CMAKE_OFF= -Daudacity_use_twolame:STRING=off
130	TWOLAME_CONFIGURE_WITH= libtwolame=system
131	TWOLAME_LIB_DEPENDS= libtwolame.so:audio/twolame	110	TWOLAME_LIB_DEPENDS= libtwolame.so:audio/twolame
132		111
133	VAMP_CONFIGURE_WITH= libvamp=system	112	VAMP_CMAKE_ON= -Daudacity_use_vamp:STRING=system
		113	VAMP_CMAKE_OFF= -Daudacity_use_vamp:STRING=off
134	VAMP_LIB_DEPENDS= libvamp-hostsdk.so:audio/vamp-plugin-sdk	114	VAMP_LIB_DEPENDS= libvamp-hostsdk.so:audio/vamp-plugin-sdk
135		115
136	VORBIS_CONFIGURE_WITH= libvorbis=system	116	VORBIS_CMAKE_ON= -Daudacity_use_vorbis:STRING=system
		117	VORBIS_CMAKE_OFF= -Daudacity_use_vorbis:STRING=off
137	VORBIS_LIB_DEPENDS= libogg.so:audio/libogg \	118	VORBIS_LIB_DEPENDS= libogg.so:audio/libogg \
138	libvorbis.so:audio/libvorbis	119	libvorbis.so:audio/libvorbis
139		120
140	VST_CONFIGURE_ENABLE= vst	121	VST_CMAKE_BOOL= audacity_use_vst
141		122
		123	post-extract:
		124	# Unbundle portaudio
		125	#@${RM} -r ${WRKSRC}/lib-src/portaudio-v19
		126	@${RM} ${WRKSRC}/cmake-proxies/portaudio-v19/CMakeLists.txt
		127
142	post-install:	128	post-install:
143	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}	129	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
144	@${RM} ${STAGEDIR}${DOCSDIR}/LICENSE.txt	130	@${RM} ${STAGEDIR}${DOCSDIR}/LICENSE.txt

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)

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 (-72 / +67 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-147 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	share/locale/af/LC_MESSAGES/audacity.mo
91	%%NLS%%share/locale/ar/LC_MESSAGES/audacity.mo	86	share/locale/ar/LC_MESSAGES/audacity.mo
92	%%NLS%%share/locale/be/LC_MESSAGES/audacity.mo	87	share/locale/be/LC_MESSAGES/audacity.mo
93	%%NLS%%share/locale/bg/LC_MESSAGES/audacity.mo	88	share/locale/bg/LC_MESSAGES/audacity.mo
94	%%NLS%%share/locale/bn/LC_MESSAGES/audacity.mo	89	share/locale/bn/LC_MESSAGES/audacity.mo
95	%%NLS%%share/locale/bs/LC_MESSAGES/audacity.mo	90	share/locale/bs/LC_MESSAGES/audacity.mo
96	%%NLS%%share/locale/ca/LC_MESSAGES/audacity.mo	91	share/locale/ca/LC_MESSAGES/audacity.mo
97	%%NLS%%share/locale/ca_ES@valencia/LC_MESSAGES/audacity.mo	92	share/locale/ca_ES@valencia/LC_MESSAGES/audacity.mo
98	%%NLS%%share/locale/cs/LC_MESSAGES/audacity.mo	93	share/locale/cs/LC_MESSAGES/audacity.mo
99	%%NLS%%share/locale/cy/LC_MESSAGES/audacity.mo	94	share/locale/cy/LC_MESSAGES/audacity.mo
100	%%NLS%%share/locale/da/LC_MESSAGES/audacity.mo	95	share/locale/da/LC_MESSAGES/audacity.mo
101	%%NLS%%share/locale/de/LC_MESSAGES/audacity.mo	96	share/locale/de/LC_MESSAGES/audacity.mo
102	%%NLS%%share/locale/el/LC_MESSAGES/audacity.mo	97	share/locale/el/LC_MESSAGES/audacity.mo
103	%%NLS%%share/locale/es/LC_MESSAGES/audacity.mo	98	share/locale/es/LC_MESSAGES/audacity.mo
104	%%NLS%%share/locale/eu/LC_MESSAGES/audacity.mo	99	share/locale/eu/LC_MESSAGES/audacity.mo
105	%%NLS%%share/locale/eu_ES/LC_MESSAGES/audacity.mo	100	share/locale/eu_ES/LC_MESSAGES/audacity.mo
106	%%NLS%%share/locale/fa/LC_MESSAGES/audacity.mo	101	share/locale/fa/LC_MESSAGES/audacity.mo
107	%%NLS%%share/locale/fi/LC_MESSAGES/audacity.mo	102	share/locale/fi/LC_MESSAGES/audacity.mo
108	%%NLS%%share/locale/fr/LC_MESSAGES/audacity.mo	103	share/locale/fr/LC_MESSAGES/audacity.mo
109	%%NLS%%share/locale/ga/LC_MESSAGES/audacity.mo	104	share/locale/ga/LC_MESSAGES/audacity.mo
110	%%NLS%%share/locale/gl/LC_MESSAGES/audacity.mo	105	share/locale/gl/LC_MESSAGES/audacity.mo
111	%%NLS%%share/locale/he/LC_MESSAGES/audacity.mo	106	share/locale/he/LC_MESSAGES/audacity.mo
112	%%NLS%%share/locale/hi/LC_MESSAGES/audacity.mo	107	share/locale/hi/LC_MESSAGES/audacity.mo
113	%%NLS%%share/locale/hr/LC_MESSAGES/audacity.mo	108	share/locale/hr/LC_MESSAGES/audacity.mo
114	%%NLS%%share/locale/hu/LC_MESSAGES/audacity.mo	109	share/locale/hu/LC_MESSAGES/audacity.mo
115	%%NLS%%share/locale/hy/LC_MESSAGES/audacity.mo	110	share/locale/hy/LC_MESSAGES/audacity.mo
116	%%NLS%%share/locale/id/LC_MESSAGES/audacity.mo	111	share/locale/id/LC_MESSAGES/audacity.mo
117	%%NLS%%share/locale/it/LC_MESSAGES/audacity.mo	112	share/locale/it/LC_MESSAGES/audacity.mo
118	%%NLS%%share/locale/ja/LC_MESSAGES/audacity.mo	113	share/locale/ja/LC_MESSAGES/audacity.mo
119	%%NLS%%share/locale/ka/LC_MESSAGES/audacity.mo	114	share/locale/ka/LC_MESSAGES/audacity.mo
120	%%NLS%%share/locale/km/LC_MESSAGES/audacity.mo	115	share/locale/km/LC_MESSAGES/audacity.mo
121	%%NLS%%share/locale/ko/LC_MESSAGES/audacity.mo	116	share/locale/ko/LC_MESSAGES/audacity.mo
122	%%NLS%%share/locale/lt/LC_MESSAGES/audacity.mo	117	share/locale/lt/LC_MESSAGES/audacity.mo
123	%%NLS%%share/locale/mk/LC_MESSAGES/audacity.mo	118	share/locale/mk/LC_MESSAGES/audacity.mo
124	%%NLS%%share/locale/my/LC_MESSAGES/audacity.mo	119	share/locale/my/LC_MESSAGES/audacity.mo
125	%%NLS%%share/locale/nb/LC_MESSAGES/audacity.mo	120	share/locale/nb/LC_MESSAGES/audacity.mo
126	%%NLS%%share/locale/nl/LC_MESSAGES/audacity.mo	121	share/locale/nl/LC_MESSAGES/audacity.mo
127	%%NLS%%share/locale/oc/LC_MESSAGES/audacity.mo	122	share/locale/oc/LC_MESSAGES/audacity.mo
128	%%NLS%%share/locale/pl/LC_MESSAGES/audacity.mo	123	share/locale/pl/LC_MESSAGES/audacity.mo
129	%%NLS%%share/locale/pt_BR/LC_MESSAGES/audacity.mo	124	share/locale/pt_BR/LC_MESSAGES/audacity.mo
130	%%NLS%%share/locale/pt_PT/LC_MESSAGES/audacity.mo	125	share/locale/pt_PT/LC_MESSAGES/audacity.mo
131	%%NLS%%share/locale/ro/LC_MESSAGES/audacity.mo	126	share/locale/ro/LC_MESSAGES/audacity.mo
132	%%NLS%%share/locale/ru/LC_MESSAGES/audacity.mo	127	share/locale/ru/LC_MESSAGES/audacity.mo
133	%%NLS%%share/locale/sk/LC_MESSAGES/audacity.mo	128	share/locale/sk/LC_MESSAGES/audacity.mo
134	%%NLS%%share/locale/sl/LC_MESSAGES/audacity.mo	129	share/locale/sl/LC_MESSAGES/audacity.mo
135	%%NLS%%share/locale/sr_RS/LC_MESSAGES/audacity.mo	130	share/locale/sr_RS/LC_MESSAGES/audacity.mo
136	%%NLS%%share/locale/sr_RS@latin/LC_MESSAGES/audacity.mo	131	share/locale/sr_RS@latin/LC_MESSAGES/audacity.mo
137	%%NLS%%share/locale/sv/LC_MESSAGES/audacity.mo	132	share/locale/sv/LC_MESSAGES/audacity.mo
138	%%NLS%%share/locale/ta/LC_MESSAGES/audacity.mo	133	share/locale/ta/LC_MESSAGES/audacity.mo
139	%%NLS%%share/locale/tg/LC_MESSAGES/audacity.mo	134	share/locale/tg/LC_MESSAGES/audacity.mo
140	%%NLS%%share/locale/tr/LC_MESSAGES/audacity.mo	135	share/locale/tr/LC_MESSAGES/audacity.mo
141	%%NLS%%share/locale/uk/LC_MESSAGES/audacity.mo	136	share/locale/uk/LC_MESSAGES/audacity.mo
142	%%NLS%%share/locale/vi/LC_MESSAGES/audacity.mo	137	share/locale/vi/LC_MESSAGES/audacity.mo
143	%%NLS%%share/locale/zh_CN/LC_MESSAGES/audacity.mo	138	share/locale/zh_CN/LC_MESSAGES/audacity.mo
144	%%NLS%%share/locale/zh_TW/LC_MESSAGES/audacity.mo	139	share/locale/zh_TW/LC_MESSAGES/audacity.mo
145	share/mime/packages/audacity.xml	140	share/mime/packages/audacity.xml
146	share/pixmaps/audacity.xpm	141	share/pixmaps/audacity.xpm
147	share/pixmaps/audacity16.xpm	142	share/pixmaps/audacity16.xpm