Attachment 215385 Details for Bug 246645 – Updated patch to use system portaudio

[patch] Updated patch to use system portaudio

audacity.diff (text/plain), 29.02 KB, created by Jack on 2020-06-09 08:01:45 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jack

Created: 2020-06-09 08:01:45 UTC

Size: 29.02 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 538266)
>+++ Makefile	(working copy)
>@@ -2,8 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	audacity
>-PORTVERSION=	2.3.3
>-PORTREVISION=	2
>+PORTVERSION=	2.4.1
> DISTVERSIONPREFIX=	Audacity-
> CATEGORIES=	audio
> 
>@@ -13,9 +12,6 @@
> 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 \
>@@ -22,38 +18,28 @@
> 		libsndfile.so:audio/libsndfile \
> 		libsoxr.so:audio/libsoxr
> 
>-USES=		autoreconf compiler:c++11-lib cpe desktop-file-utils dos2unix \
>-		gettext-tools gmake gnome iconv libtool localbase pkgconfig \
>-		shared-mime-info shebangfix
>+USES=		cmake compiler:c++14-lang cpe desktop-file-utils gettext-runtime \
>+		gettext-tools gnome libtool localbase python:3.7+ pkgconfig shared-mime-info
> 
>-GNU_CONFIGURE=		yes
>-NLS_USES=		gettext-runtime
>-NLS_CONFIGURE_ENABLE=	nls
>-NLS_CONFIGURE_WITH=	libintl-prefix="${LOCALBASE}"
>-OPTIONS_SUB=		yes
>+USE_GNOME=		cairo gtk30
> 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 DYNLOAD FFMPEG FLAC ID3TAG LADSPA LAME LV2 \
>-			MAD MOD_NYQ_BENCH MOD_SCRIPT_PIPE NLS SBSMS SOUNDTOUCH \
>-			SSE TWOLAME VAMP VORBIS VST
>-OPTIONS_DEFAULT=	FLAC ID3TAG LADSPA MAD SBSMS SOUNDTOUCH TWOLAME VAMP \
>-			VORBIS VST
>+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
>-MOD_SCRIPT_PIPE_DESC=	mod-script-pipe scripting support
>-MOD_NYQ_BENCH_DESC=	Enable Nyquist Workbench
>+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
>@@ -60,84 +46,79 @@
> VAMP_DESC=		Vamp plug-in support
> VST_DESC=		VST plug-in support
> 
>-CONFIGURE_ENV+=	WX_CONFIG="${WX_CONFIG}"
>+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
> 
>-CONFIGURE_ARGS+=	${ICONV_CONFIGURE_ARG} \
>-			--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
>+DEBUG_CMAKE_ON=		wxWidgets_USE_DEBUG
> 
>-CONFIGURE_SHELL?=	${LOCALBASE}/bin/bash
>-
>-DEBUG_CONFIGURE_WITH=	debug
>-
> DOCS_BUILD_DEPENDS=	docbook-to-man:textproc/docbook-to-man \
> 			docbook2man:textproc/docbook-utils
> 
>-DYNLOAD_BUILD_DEPENDS=		${LOCALBASE}/include/lame/lame.h:audio/lame \
>-				${LOCALBASE}/libdata/pkgconfig/libavcodec.pc:multimedia/ffmpeg
>-DYNLOAD_CONFIGURE_ENABLE=	dynamic-loading
>-# for audio/lame
>-DYNLOAD_CPPFLAGS=		-I${LOCALBASE}/include
>-# for audio/lame
>-DYNLOAD_LDFLAGS=		-L${LOCALBASE}/lib
>-
>-FFMPEG_CONFIGURE_WITH=	ffmpeg=system
>+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
> FFMPEG_LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg
> 
>-FLAC_CONFIGURE_WITH=	libflac=system
>+FLAC_CMAKE_ON=		-Daudacity_use_flac:STRING=system
>+FLAC_CMAKE_OFF=		-Daudacity_use_flac:STRING=local
> FLAC_LIB_DEPENDS=	libFLAC.so:audio/flac
> 
>-ID3TAG_CONFIGURE_WITH=	libid3tag=system
>+ID3TAG_CMAKE_ON=	-Daudacity_use_id3tag:STRING=system
>+ID3TAG_CMAKE_OFF=	-Daudacity_use_id3tag:STRING=off
> ID3TAG_LIB_DEPENDS=	libid3tag.so:audio/libid3tag
> 
>-LADSPA_CONFIGURE_ENABLE=	ladspa
>-LADSPA_RUN_DEPENDS=		listplugins:audio/ladspa
>+LADSPA_CMAKE_BOOL=	audacity_use_ladspa
>+LADSPA_RUN_DEPENDS=	listplugins:audio/ladspa
> 
>-LAME_CONFIGURE_ON=	--with-lame=system
>-# --without-lame is broken
>-LAME_CONFIGURE_OFF=	--with-lame
>-LAME_CPPFLAGS=		-I${LOCALBASE}/include
>+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_CONFIGURE_WITH=	lv2=system
>+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_CONFIGURE_WITH=	libmad=system
>+MAD_CMAKE_ON=		-Daudacity_use_mad:STRING=system
>+MAD_CMAKE_OFF=		-Daudacity_use_mad:STRING=off
> MAD_LIB_DEPENDS=	libmad.so:audio/libmad
> 
>-MOD_SCRIPT_PIPE_CONFIGURE_WITH=	mod-script-pipe
>-MOD_SCRIPT_PIPE_USES=		python:3.6+
>-MOD_NYQ_BENCH_CONFIGURE_WITH=	mod-nyq-bench
>-MOD_NYQ_BENCH_USES=		python:3.6+
>+MIDI_CMAKE_ON=		-Daudacity_use_midi:STRING=local
>+MIDI_CMAKE_OFF=		-Daudacity_use_midi:STRING=off
> 
>-SBSMS_CONFIGURE_WITH=	sbsms
>+OGG_CMAKE_ON=		-Daudacity_use_ogg:STRING=system
>+OGG_CMAKE_OFF=		-Daudacity_use_ogg:STRING=local
>+OGG_LIB_DEPENDS=	libogg.so:audio/libogg
> 
>-SOUNDTOUCH_CONFIGURE_WITH=	soundtouch=system
>+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
> 
>-SSE_CONFIGURE_ENABLE=	sse
>-
>-TWOLAME_CONFIGURE_WITH=	libtwolame=system
>+TWOLAME_CMAKE_ON=	-Daudacity_use_twolame:STRING=system
>+TWOLAME_CMAKE_OFF=	-Daudacity_use_twolame:STRING=off
> TWOLAME_LIB_DEPENDS=	libtwolame.so:audio/twolame
> 
>-VAMP_CONFIGURE_WITH=	libvamp=system
>+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_CONFIGURE_WITH=	libvorbis=system
>+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_CONFIGURE_ENABLE=	vst
>+VST_CMAKE_BOOL=		audacity_use_vst
> 
> post-install:
> 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
>Index: distinfo
>===================================================================
>--- distinfo	(revision 538266)
>+++ distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1579914119
>-SHA256 (audacity-audacity-Audacity-2.3.3_GH0.tar.gz) = 404e6c49693dedc94212fc5525974058d848536025e19da31359ae02babe8bd7
>-SIZE (audacity-audacity-Audacity-2.3.3_GH0.tar.gz) = 62073352
>+TIMESTAMP = 1590090471
>+SHA256 (audacity-audacity-Audacity-2.4.1_GH0.tar.gz) = 50240f07471373a7e5c2df65cc26eeeaaced9a0850ad1f95cb795f171ea3009f
>+SIZE (audacity-audacity-Audacity-2.4.1_GH0.tar.gz) = 63935461
>Index: files/patch-cmake-proxies_CMakeLists.txt
>===================================================================
>--- files/patch-cmake-proxies_CMakeLists.txt	(nonexistent)
>+++ files/patch-cmake-proxies_CMakeLists.txt	(working copy)
>@@ -0,0 +1,11 @@
>+--- cmake-proxies/CMakeLists.txt.orig	2020-05-19 09:43:53 UTC
>++++ cmake-proxies/CMakeLists.txt
>+@@ -150,7 +150,7 @@ addlib( lame               lame        LAME        YES
>+ addlib( lib-widget-extra   libextra    EXTRA       YES   YES   "" )
>+ addlib( libsndfile         sndfile     SNDFILE     YES   YES   "sndfile >= 1.0.28" )
>+ addlib( libsoxr            soxr        SOXR        YES   YES   "soxr >= 0.1.1" )
>+-addlib( portaudio-v19      portaudio   PORTAUDIO   YES   YES   "" )
>++addlib( portaudio-v19      portaudio   PORTAUDIO   YES   YES   "portaudio-2.0 >= 19" )
>+ 
>+ # Optional libraries
>+ #
>
>Property changes on: files/patch-cmake-proxies_CMakeLists.txt
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-configure.ac
>===================================================================
>--- files/patch-configure.ac	(revision 538266)
>+++ files/patch-configure.ac	(nonexistent)
>@@ -1,39 +0,0 @@
>---- 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
>
>Property changes on: files/patch-configure.ac
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: files/patch-lib-src_FileDialog_Makefile.am
>===================================================================
>--- files/patch-lib-src_FileDialog_Makefile.am	(revision 538266)
>+++ files/patch-lib-src_FileDialog_Makefile.am	(nonexistent)
>@@ -1,52 +0,0 @@
>---- 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
>
>Property changes on: files/patch-lib-src_FileDialog_Makefile.am
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: files/patch-lib-src_FileDialog_configure.ac
>===================================================================
>--- files/patch-lib-src_FileDialog_configure.ac	(revision 538266)
>+++ files/patch-lib-src_FileDialog_configure.ac	(nonexistent)
>@@ -1,11 +0,0 @@
>---- lib-src/FileDialog/configure.ac.orig	2018-09-20 14:35:07 UTC
>-+++ lib-src/FileDialog/configure.ac
>-@@ -132,7 +132,7 @@ AM_CONDITIONAL([WINDOWS], test "$IMPLEMENTATION" = "wi
>- 
>- echo "Implementation to use: $IMPLEMENTATION"
>- 
>--AC_CONFIG_FILES([Makefile])
>-+AC_CONFIG_FILES([Makefile gtk/Makefile mac/Makefile win/Makefile])
>- 
>- #
>- # Write it all out
>
>Property changes on: files/patch-lib-src_FileDialog_configure.ac
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: files/patch-lib-src_FileDialog_gtk_Makefile.am
>===================================================================
>--- files/patch-lib-src_FileDialog_gtk_Makefile.am	(revision 538266)
>+++ files/patch-lib-src_FileDialog_gtk_Makefile.am	(nonexistent)
>@@ -1,15 +0,0 @@
>---- 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)
>
>Property changes on: files/patch-lib-src_FileDialog_gtk_Makefile.am
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: files/patch-lib-src_FileDialog_mac_Makefile.am
>===================================================================
>--- files/patch-lib-src_FileDialog_mac_Makefile.am	(revision 538266)
>+++ files/patch-lib-src_FileDialog_mac_Makefile.am	(nonexistent)
>@@ -1,13 +0,0 @@
>---- 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)
>
>Property changes on: files/patch-lib-src_FileDialog_mac_Makefile.am
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: files/patch-lib-src_FileDialog_win_Makefile.am
>===================================================================
>--- files/patch-lib-src_FileDialog_win_Makefile.am	(revision 538266)
>+++ files/patch-lib-src_FileDialog_win_Makefile.am	(nonexistent)
>@@ -1,13 +0,0 @@
>---- 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)
>
>Property changes on: files/patch-lib-src_FileDialog_win_Makefile.am
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: files/patch-lib-src_libnyquist_nyquist_cmt_cext.h
>===================================================================
>--- files/patch-lib-src_libnyquist_nyquist_cmt_cext.h	(revision 538266)
>+++ files/patch-lib-src_libnyquist_nyquist_cmt_cext.h	(working copy)
>@@ -1,6 +1,6 @@
> --- lib-src/libnyquist/nyquist/cmt/cext.h.orig	2018-10-01 14:07:33 UTC
> +++ lib-src/libnyquist/nyquist/cmt/cext.h
>-@@ -58,7 +58,7 @@ EXIT(n)  -- calls exit(n) after shutting down/dealloca
>+@@ -61,7 +61,7 @@ EXIT(n)  -- calls exit(n) after shutting down/dealloca
>  #include <malloc.h>
>  #endif
>  
>Index: files/patch-lib-src_libnyquist_nyquist_xlisp_xlisp.h
>===================================================================
>--- files/patch-lib-src_libnyquist_nyquist_xlisp_xlisp.h	(revision 538266)
>+++ files/patch-lib-src_libnyquist_nyquist_xlisp_xlisp.h	(working copy)
>@@ -1,6 +1,6 @@
> --- lib-src/libnyquist/nyquist/xlisp/xlisp.h.orig	2016-07-26 13:34:06 UTC
> +++ lib-src/libnyquist/nyquist/xlisp/xlisp.h
>-@@ -160,6 +160,15 @@ extern long ptrtoabs();
>+@@ -161,6 +161,15 @@ extern long ptrtoabs();
>  #endif
>  #endif
>  
>Index: files/patch-lib-src_lv2_configure
>===================================================================
>--- files/patch-lib-src_lv2_configure	(revision 538266)
>+++ files/patch-lib-src_lv2_configure	(nonexistent)
>@@ -1,11 +0,0 @@
>---- lib-src/lv2/configure.orig	2016-01-08 22:05:48 UTC
>-+++ lib-src/lv2/configure
>-@@ -54,7 +54,7 @@ includedir=.
>- Name: ${pkg}
>- Version: ${version}
>- Description: Temporary fake config file
>--Libs: -L\${libdir} ${lib} -ldl -lm
>-+Libs: -L\${libdir} ${lib} -lm
>- Cflags: -I\${includedir}/${pkg}${major}
>- EOF
>- 
>
>Property changes on: files/patch-lib-src_lv2_configure
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: files/patch-src_AudioIO.cpp
>===================================================================
>--- files/patch-src_AudioIO.cpp	(revision 538266)
>+++ files/patch-src_AudioIO.cpp	(working copy)
>@@ -1,6 +1,6 @@
>---- src/AudioIO.cpp.orig	2018-10-01 14:07:33 UTC
>+--- src/AudioIO.cpp.orig	2020-05-19 09:43:53 UTC
> +++ src/AudioIO.cpp
>-@@ -480,7 +480,6 @@ TimeTrack and AudioIOListener and whether the playback
>+@@ -484,7 +484,6 @@ time warp info and AudioIOListener and whether the pla
>     #define ROUND(x) (int) ((x)+0.5)
>     //#include <string.h>
>  //   #include "../lib-src/portmidi/pm_common/portmidi.h"
>@@ -8,7 +8,7 @@
>     #include "NoteTrack.h"
>  #endif
>  
>-@@ -793,13 +797,22 @@ struct AudioIO::ScrubState (private)
>+@@ -808,13 +807,22 @@ struct AudioIoCallback::ScrubState (private)
>  // return the system time as a double
>  static double streamStartTime = 0; // bias system time to small number
>  
>Index: files/patch-src_FFmpeg.h
>===================================================================
>--- files/patch-src_FFmpeg.h	(revision 538266)
>+++ files/patch-src_FFmpeg.h	(working copy)
>@@ -1,6 +1,6 @@
> --- src/FFmpeg.h.orig	2018-10-01 14:07:33 UTC
> +++ src/FFmpeg.h
>-@@ -667,7 +667,7 @@ extern "C" {
>+@@ -685,7 +685,7 @@ extern "C" {
>     FFMPEG_FUNCTION_WITH_RETURN(
>        AVOutputFormat*,
>        av_oformat_next,
>@@ -9,7 +9,7 @@
>        (f)
>     );
>  #endif
>-@@ -748,7 +748,7 @@ extern "C" {
>+@@ -766,7 +766,7 @@ extern "C" {
>     FFMPEG_FUNCTION_WITH_RETURN(
>        int,
>        av_fifo_size,
>@@ -18,7 +18,7 @@
>        (f)
>     );
>  #endif
>-@@ -810,7 +810,7 @@ extern "C" {
>+@@ -828,7 +828,7 @@ extern "C" {
>     FFMPEG_FUNCTION_WITH_RETURN(
>        AVDictionaryEntry *,
>        av_dict_get,
>Index: files/patch-src_Makefile.am
>===================================================================
>--- files/patch-src_Makefile.am	(revision 538266)
>+++ files/patch-src_Makefile.am	(nonexistent)
>@@ -1,12 +0,0 @@
>---- 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 = \
>
>Property changes on: files/patch-src_Makefile.am
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 538266)
>+++ pkg-plist	(working copy)
>@@ -1,16 +1,6 @@
> 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
>@@ -17,9 +7,9 @@
> %%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
>@@ -46,11 +36,13 @@
> %%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
>@@ -66,10 +58,12 @@
> %%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
>@@ -78,70 +72,71 @@
> %%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/apps/audacity.png
>-share/icons/hicolor/22x22/apps/audacity.png
>-share/icons/hicolor/24x24/apps/audacity.png
>-share/icons/hicolor/32x32/apps/audacity.png
>-share/icons/hicolor/48x48/apps/audacity.png
>+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
>-%%NLS%%share/locale/be/LC_MESSAGES/audacity.mo
>-%%NLS%%share/locale/bg/LC_MESSAGES/audacity.mo
>-%%NLS%%share/locale/bn/LC_MESSAGES/audacity.mo
>-%%NLS%%share/locale/bs/LC_MESSAGES/audacity.mo
>-%%NLS%%share/locale/ca/LC_MESSAGES/audacity.mo
>-%%NLS%%share/locale/ca_ES@valencia/LC_MESSAGES/audacity.mo
>-%%NLS%%share/locale/cs/LC_MESSAGES/audacity.mo
>-%%NLS%%share/locale/cy/LC_MESSAGES/audacity.mo
>-%%NLS%%share/locale/da/LC_MESSAGES/audacity.mo
>-%%NLS%%share/locale/de/LC_MESSAGES/audacity.mo
>-%%NLS%%share/locale/el/LC_MESSAGES/audacity.mo
>-%%NLS%%share/locale/es/LC_MESSAGES/audacity.mo
>-%%NLS%%share/locale/eu/LC_MESSAGES/audacity.mo
>-%%NLS%%share/locale/eu_ES/LC_MESSAGES/audacity.mo
>-%%NLS%%share/locale/fa/LC_MESSAGES/audacity.mo
>-%%NLS%%share/locale/fi/LC_MESSAGES/audacity.mo
>-%%NLS%%share/locale/fr/LC_MESSAGES/audacity.mo
>-%%NLS%%share/locale/ga/LC_MESSAGES/audacity.mo
>-%%NLS%%share/locale/gl/LC_MESSAGES/audacity.mo
>-%%NLS%%share/locale/he/LC_MESSAGES/audacity.mo
>-%%NLS%%share/locale/hi/LC_MESSAGES/audacity.mo
>-%%NLS%%share/locale/hr/LC_MESSAGES/audacity.mo
>-%%NLS%%share/locale/hu/LC_MESSAGES/audacity.mo
>-%%NLS%%share/locale/hy/LC_MESSAGES/audacity.mo
>-%%NLS%%share/locale/id/LC_MESSAGES/audacity.mo
>-%%NLS%%share/locale/it/LC_MESSAGES/audacity.mo
>-%%NLS%%share/locale/ja/LC_MESSAGES/audacity.mo
>-%%NLS%%share/locale/ka/LC_MESSAGES/audacity.mo
>-%%NLS%%share/locale/km/LC_MESSAGES/audacity.mo
>-%%NLS%%share/locale/ko/LC_MESSAGES/audacity.mo
>-%%NLS%%share/locale/lt/LC_MESSAGES/audacity.mo
>-%%NLS%%share/locale/mk/LC_MESSAGES/audacity.mo
>-%%NLS%%share/locale/my/LC_MESSAGES/audacity.mo
>-%%NLS%%share/locale/nb/LC_MESSAGES/audacity.mo
>-%%NLS%%share/locale/nl/LC_MESSAGES/audacity.mo
>-%%NLS%%share/locale/oc/LC_MESSAGES/audacity.mo
>-%%NLS%%share/locale/pl/LC_MESSAGES/audacity.mo
>-%%NLS%%share/locale/pt_BR/LC_MESSAGES/audacity.mo
>-%%NLS%%share/locale/pt_PT/LC_MESSAGES/audacity.mo
>-%%NLS%%share/locale/ro/LC_MESSAGES/audacity.mo
>-%%NLS%%share/locale/ru/LC_MESSAGES/audacity.mo
>-%%NLS%%share/locale/sk/LC_MESSAGES/audacity.mo
>-%%NLS%%share/locale/sl/LC_MESSAGES/audacity.mo
>-%%NLS%%share/locale/sr_RS/LC_MESSAGES/audacity.mo
>-%%NLS%%share/locale/sr_RS@latin/LC_MESSAGES/audacity.mo
>-%%NLS%%share/locale/sv/LC_MESSAGES/audacity.mo
>-%%NLS%%share/locale/ta/LC_MESSAGES/audacity.mo
>-%%NLS%%share/locale/tg/LC_MESSAGES/audacity.mo
>-%%NLS%%share/locale/tr/LC_MESSAGES/audacity.mo
>-%%NLS%%share/locale/uk/LC_MESSAGES/audacity.mo
>-%%NLS%%share/locale/vi/LC_MESSAGES/audacity.mo
>-%%NLS%%share/locale/zh_CN/LC_MESSAGES/audacity.mo
>-%%NLS%%share/locale/zh_TW/LC_MESSAGES/audacity.mo
>+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

Flags:

xxjack12xx: maintainer-approval+

Actions: View | Diff

Attachments on bug 246645: 214740 | 214771 | 214772 | 214891 | 214950 | 214994 | 214995 | 214996 | 215345 | 215346 | 215363 | 215385