Attachment #224073 for bug #254598




# Created by: Marc van Woerkom <3d@FreeBSD.org>

PORTNAME=	audacity
PORTVERSION=	3.0.0
DISTVERSIONPREFIX=	minsrc-
DISTVERSIONPREFIX=	Audacity-
CATEGORIES=	audio
MASTER_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/releases/download/Audacity-${PORTVERSION}/

MAINTAINER=	xxjack12xx@gmail.com
COMMENT=	GUI editor for digital audio waveforms

		libexpat.so:textproc/expat2 \
		libportaudio.so:audio/portaudio \
		libsndfile.so:audio/libsndfile \
		libsoxr.so:audio/libsoxr \
		libsqlite3.so:databases/sqlite3

USES=		cmake compiler:c++14-lang cpe desktop-file-utils gettext \
		gnome libtool python:build pkgconfig shared-mime-info tar:xz
USE_GITHUB=	yes
USE_GNOME=	cairo gtk30
USE_WX=		3.1+
WX_COMPS=	wx

		-DHAVE_SSE:BOOL=OFF \
		-DHAVE_SSE2:BOOL=OFF
.endif

post-patch:
	@${REINPLACE_CMD} -e 's,Python2,Python${PYTHON_MAJOR_VER}, ; \
		/CMAKE_CXX_STANDARD/s,14,11,' ${WRKSRC}/CMakeLists.txt

post-install:
	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}

Lines 1-3 Link Here

(-)audacity3/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1593304211	1	TIMESTAMP = 1616886054
2	SHA256 (audacity-audacity-Audacity-2.4.2_GH0.tar.gz) = cdb4800c8e9d1d4ca19964caf8d24000f80286ebd8a4db566c2622449744c099	2	SHA256 (audacity-minsrc-3.0.0.tar.xz) = d3bb1358b930ea4ef935ed83cc5a0f47006565762c5667c2fb376c6535876a6a
3	SIZE (audacity-audacity-Audacity-2.4.2_GH0.tar.gz) = 61248430	3	SIZE (audacity-minsrc-3.0.0.tar.xz) = 13308836

Lines 1-4 Link Here

(-)audacity3/files/patch-cmake-proxies_CMakeLists.txt (-2 / +2 lines)
1	--- cmake-proxies/CMakeLists.txt.orig 2020-06-19 15:16:47 UTC	1	--- cmake-proxies/CMakeLists.txt.orig 2021-02-04 18:52:51 UTC
2	+++ cmake-proxies/CMakeLists.txt	2	+++ cmake-proxies/CMakeLists.txt
3	@@ -132,7 +132,7 @@ addlib( expat expat EXPAT YES	3	@@ -132,7 +132,7 @@ addlib( expat expat EXPAT YES
4	addlib( lame lame LAME YES YES "lame >= 3.100" )	4	addlib( lame lame LAME YES YES "lame >= 3.100" )
Lines 6-11 Link Here
6	addlib( libsoxr soxr SOXR YES YES "soxr >= 0.1.1" )	6	addlib( libsoxr soxr SOXR YES YES "soxr >= 0.1.1" )
7	-addlib( portaudio-v19 portaudio PORTAUDIO YES YES "" )	7	-addlib( portaudio-v19 portaudio PORTAUDIO YES YES "" )
8	+addlib( portaudio-v19 portaudio PORTAUDIO YES YES "portaudio-2.0 >= 19" )	8	+addlib( portaudio-v19 portaudio PORTAUDIO YES YES "portaudio-2.0 >= 19" )
		9	addlib( sqlite sqlite SQLITE YES YES "sqlite3 >= 3.32.0" )
9		10
10	# Optional libraries	11	# Optional libraries
11	#




--- cmake-proxies/wxWidgets/CMakeLists.txt.orig	2020-08-05 16:32:53 UTC
+++ cmake-proxies/wxWidgets/CMakeLists.txt
@@ -237,17 +237,6 @@ file(
       "^#define +wxVERSION_STRING +"
 )
 
-string( REGEX MATCHALL "\".+(Audacity).+\"" ours "${output}")
-if( NOT ours )
-   message( FATAL_ERROR
-      "\n########################################################################\n"
-      "Audacity version 3.0.0 or higher requires use of a customized version of "
-      "wxWidgets.  For details:\n"
-      "  https://wiki.audacityteam.org/wiki/Building_for_Distros\n"
-      "########################################################################\n"
-   )
-endif()
-
 target_include_directories( ${TARGET} INTERFACE ${INCLUDES} )
 target_compile_definitions( ${TARGET} INTERFACE ${DEFINES} )
 target_compile_options( ${TARGET} INTERFACE ${COPTS} )

Lines 1-4 Link Here

(-)audacity3/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 2021-02-04 18:52:51 UTC
2	+++ lib-src/libnyquist/nyquist/cmt/cext.h	2	+++ lib-src/libnyquist/nyquist/cmt/cext.h
3	@@ -61,7 +61,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>

Lines 1-10 Link Here

(-)audacity3/files/patch-lib-src_libnyquist_nyquist_nyqstk_include_FileRead.h (-10 lines)
1	--- lib-src/libnyquist/nyquist/nyqstk/include/FileRead.h.orig 2016-07-26 13:34:06 UTC
2	+++ lib-src/libnyquist/nyquist/nyqstk/include/FileRead.h
3	@@ -33,6 +33,7 @@
4	#define STK_FILEREAD_H
5
6	#include "Stk.h"
7	+#include <stdio.h>
8
9	namespace Nyq
10	{




--- lib-src/libnyquist/nyquist/xlisp/xlfio.c.orig	2021-02-04 18:52:51 UTC
+++ lib-src/libnyquist/nyquist/xlisp/xlfio.c
@@ -19,8 +19,7 @@
 /* do some sanity checking: */
 #ifndef XL_BIG_ENDIAN
 #ifndef XL_LITTLE_ENDIAN
-#error configuration error -- either XL_BIG_ or XL_LITTLE_ENDIAN must be defined
-in xlisp.h
+#error configuration error -- either XL_BIG_ or XL_LITTLE_ENDIAN must be defined in xlisp.h
 #endif
 #endif
 #ifdef XL_BIG_ENDIAN

Lines 1-6 Link Here

(-)audacity3/files/patch-lib-src_libnyquist_nyquist_xlisp_xlisp.h (-3 / +3 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 2021-02-04 18:52:51 UTC
2	+++ lib-src/libnyquist/nyquist/xlisp/xlisp.h	2	+++ lib-src/libnyquist/nyquist/xlisp/xlisp.h
3	@@ -161,6 +161,15 @@ extern long ptrtoabs();	3	@@ -172,6 +172,15 @@ extern long ptrtoabs();
4	#endif	4	#endif
5	#endif	5	#endif
6		6
Lines 13-18 Link Here
13	+#endif	13	+#endif
14	+#endif	14	+#endif
15	+	15	+
16	/* Apple CC */	16	/* Apple CC (xcode, macOS, macintosh) */
17	#ifdef __APPLE__	17	#ifdef __APPLE__
18	#define NNODES 2000	18	#define NNODES 2000

Lines 1-6 Link Here

(-)audacity3/files/patch-src_AboutDialog.cpp (-1 / +1 lines)
1	--- src/AboutDialog.cpp.orig 2020-06-28 06:25:54 UTC	1	--- src/AboutDialog.cpp.orig 2020-06-28 06:25:54 UTC
2	+++ src/AboutDialog.cpp	2	+++ src/AboutDialog.cpp
3	@@ -63,7 +63,7 @@ hold information about one contributor to Audacity.	3	@@ -62,7 +62,7 @@ hold information about one contributor to Audacity.
4	// RevisionIdent.h may contain #defines like these ones:	4	// RevisionIdent.h may contain #defines like these ones:
5	//#define REV_LONG "28864acb238cb3ca71dda190a2d93242591dd80e"	5	//#define REV_LONG "28864acb238cb3ca71dda190a2d93242591dd80e"
6	//#define REV_TIME "Sun Apr 12 12:40:22 2015 +0100"	6	//#define REV_TIME "Sun Apr 12 12:40:22 2015 +0100"

Lines 1-6 Link Here

(-)audacity3/files/patch-src_AudioIO.cpp (-2 / +2 lines)
1	--- src/AudioIO.cpp.orig 2020-06-19 15:16:47 UTC	1	--- src/AudioIO.cpp.orig 2020-06-19 15:16:47 UTC
2	+++ src/AudioIO.cpp	2	+++ src/AudioIO.cpp
3	@@ -491,7 +491,6 @@ time warp info and AudioIOListener and whether the pla	3	@@ -490,7 +490,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	@@ -815,13 +814,22 @@ struct AudioIoCallback::ScrubState (private)	11	@@ -814,13 +813,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/ProjectSerializer.cpp.orig	2021-02-04 18:52:51 UTC
+++ src/ProjectSerializer.cpp
@@ -206,9 +206,9 @@ ProjectSerializer::ProjectSerializer(size_t allocSize)
    std::call_once(flag, []{
       // Just once per run, store header information in the unique static
       // dictionary that will be written into each project that is saved.
-      // Store the size of "wxChar" so we can convert during recovery in
-      // case the file is used on a system with a different character size.
-      char size = sizeof(wxChar);
+      // Store the size of "wxStringCharType" so we can convert during recovery
+      // in case the file is used on a system with a different character size.
+      char size = sizeof(wxStringCharType);
       mDict.AppendByte(FT_CharSize);
       mDict.AppendData(&size, 1);
    });
@@ -242,7 +242,7 @@ void ProjectSerializer::WriteAttr(const wxString & nam
    mBuffer.AppendByte(FT_String);
    WriteName(name);
 
-   const Length len = value.length() * sizeof(wxChar);
+   const Length len = value.length() * sizeof(wxStringCharType);
    WriteLength( mBuffer, len );
    mBuffer.AppendData(value.wx_str(), len);
 }
@@ -309,7 +309,7 @@ void ProjectSerializer::WriteData(const wxString & val
 {
    mBuffer.AppendByte(FT_Data);
 
-   Length len = value.length() * sizeof(wxChar);
+   Length len = value.length() * sizeof(wxStringCharType);
    WriteLength( mBuffer, len );
    mBuffer.AppendData(value.wx_str(), len);
 }
@@ -317,7 +317,7 @@ void ProjectSerializer::WriteData(const wxString & val
 void ProjectSerializer::Write(const wxString & value)
 {
    mBuffer.AppendByte(FT_Raw);
-   Length len = value.length() * sizeof(wxChar);
+   Length len = value.length() * sizeof(wxStringCharType);
    WriteLength( mBuffer, len );
    mBuffer.AppendData(value.wx_str(), len);
 }
@@ -334,7 +334,7 @@ void ProjectSerializer::WriteSubTree(const ProjectSeri
 
 void ProjectSerializer::WriteName(const wxString & name)
 {
-   wxASSERT(name.length() * sizeof(wxChar) <= SHRT_MAX);
+   wxASSERT(name.length() * sizeof(wxStringCharType) <= SHRT_MAX);
    UShort id;
 
    auto nameiter = mNames.find(name);
@@ -346,7 +346,7 @@ void ProjectSerializer::WriteName(const wxString & nam
    {
       // mNames is static.  This appends each name to static mDict only once
       // in each run.
-      UShort len = name.length() * sizeof(wxChar);
+      UShort len = name.length() * sizeof(wxStringCharType);
 
       id = mNames.size();
       mNames[name] = id;




--- src/import/Import.cpp.orig	2021-02-04 18:52:51 UTC
+++ src/import/Import.cpp
@@ -803,9 +803,11 @@ bool Importer::Import( AudacityProject &project,
 /* i18n-hint: %s will be the filename */
 "Audacity did not recognize the type of the file '%s'.\n\n%sFor uncompressed files, also try File > Import > Raw Data.")
          .Format( fName,
+#if defined(USE_FFMPEG)
                   !FFmpegLibsInst()
-                  ? XO("Try installing FFmpeg.\n\n")
-                  : XO("") );
+                  ? XO("Try installing FFmpeg.\n\n") :
+#endif
+		Verbatim("") );
    }
    else
    {

Line 0 Link Here

(-)audacity3/files/patch-src_widgets_FileConfig.cpp (+11 lines)
	1	--- src/widgets/FileConfig.cpp.orig 2021-02-04 18:52:51 UTC
	2	+++ src/widgets/FileConfig.cpp
	3	@@ -10,6 +10,8 @@
	4
	5	#include "../Audacity.h"
	6
	7	+#include <errno.h>
	8	+
	9	#include <wx/defs.h>
	10	#include <wx/app.h>
	11	#include <wx/bmpbuttn.h>

Line 0 Link Here

(-)audacity3/files/patch-src_widgets_Grid.cpp (+11 lines)
	1	--- src/widgets/Grid.cpp.orig 2021-02-04 18:52:51 UTC
	2	+++ src/widgets/Grid.cpp
	3	@@ -572,7 +572,7 @@ void Grid::OnKeyDown(wxKeyEvent &event)
	4	{
	5	wxTextDataObject *data = safenew wxTextDataObject(GetCellValue(crow, ccol));
	6	wxClipboard::Get()->SetData(data);
	7	- SetCellValue(crow, ccol, {});
	8	+ SetCellValue(crow, ccol, "");
	9	return;
	10	}
	11	break;




%%DATADIR%%/nyquist/velocity.lsp
%%DATADIR%%/nyquist/xlinit.lsp
%%DATADIR%%/nyquist/xm.lsp
%%DATADIR%%/plug-ins/SilenceMarker.ny
%%DATADIR%%/plug-ins/SoundFinder.ny
%%DATADIR%%/plug-ins/SpectralEditMulti.ny
%%DATADIR%%/plug-ins/SpectralEditParametricEQ.ny
%%DATADIR%%/plug-ins/SpectralEditShelves.ny

%%DATADIR%%/plug-ins/eq-xml-to-txt-converter.ny
%%DATADIR%%/plug-ins/equalabel.ny
%%DATADIR%%/plug-ins/highpass.ny
%%DATADIR%%/plug-ins/label-sounds.ny
%%DATADIR%%/plug-ins/limiter.ny
%%DATADIR%%/plug-ins/lowpass.ny
%%DATADIR%%/plug-ins/noisegate.ny

%%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/co/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/ko/LC_MESSAGES/audacity.mo
%%NLS%%share/locale/lt/LC_MESSAGES/audacity.mo
%%NLS%%share/locale/mk/LC_MESSAGES/audacity.mo
%%NLS%%share/locale/mr/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

Return to bug 254598

Lines 1-10 Link Here

(-)audacity3/Makefile (-11 / +7 lines)
1	# Created by: Marc van Woerkom <3d@FreeBSD.org>	1	# Created by: Marc van Woerkom <3d@FreeBSD.org>
2		2
3	PORTNAME= audacity	3	PORTNAME= audacity
4	PORTVERSION= 2.4.2	4	PORTVERSION= 3.0.0
5	PORTREVISION= 3	5	DISTVERSIONPREFIX= minsrc-
6	DISTVERSIONPREFIX= Audacity-
7	CATEGORIES= audio	6	CATEGORIES= audio
		7	MASTER_SITES= https://github.com/${PORTNAME}/${PORTNAME}/releases/download/Audacity-${PORTVERSION}/
8		8
9	MAINTAINER= xxjack12xx@gmail.com	9	MAINTAINER= xxjack12xx@gmail.com
10	COMMENT= GUI editor for digital audio waveforms	10	COMMENT= GUI editor for digital audio waveforms
Lines 16-26 Link Here
16	libexpat.so:textproc/expat2 \	16	libexpat.so:textproc/expat2 \
17	libportaudio.so:audio/portaudio \	17	libportaudio.so:audio/portaudio \
18	libsndfile.so:audio/libsndfile \	18	libsndfile.so:audio/libsndfile \
19	libsoxr.so:audio/libsoxr	19	libsoxr.so:audio/libsoxr \
		20	libsqlite3.so:databases/sqlite3
20		21
21	USES= cmake compiler:c++11-lang cpe desktop-file-utils gettext \	22	USES= cmake compiler:c++14-lang cpe desktop-file-utils gettext \
22	gnome libtool python:build pkgconfig shared-mime-info	23	gnome libtool python:build pkgconfig shared-mime-info tar:xz
23	USE_GITHUB= yes
24	USE_GNOME= cairo gtk30	24	USE_GNOME= cairo gtk30
25	USE_WX= 3.1+	25	USE_WX= 3.1+
26	WX_COMPS= wx	26	WX_COMPS= wx
Lines 133-142 Link Here
133	-DHAVE_SSE:BOOL=OFF \	133	-DHAVE_SSE:BOOL=OFF \
134	-DHAVE_SSE2:BOOL=OFF	134	-DHAVE_SSE2:BOOL=OFF
135	.endif	135	.endif
136
137	post-patch:
138	@${REINPLACE_CMD} -e 's,Python2,Python${PYTHON_MAJOR_VER}, ; \
139	/CMAKE_CXX_STANDARD/s,14,11,' ${WRKSRC}/CMakeLists.txt
140		136
141	post-install:	137	post-install:
142	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}	138	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}

Line 0 Link Here

(-)audacity3/files/patch-cmake-proxies_wxWidgets_CMakeLists.txt (+20 lines)
	1	--- cmake-proxies/wxWidgets/CMakeLists.txt.orig 2020-08-05 16:32:53 UTC
	2	+++ cmake-proxies/wxWidgets/CMakeLists.txt
	3	@@ -237,17 +237,6 @@ file(
	4	"^#define +wxVERSION_STRING +"
	5	)
	6
	7	-string( REGEX MATCHALL "\".+(Audacity).+\"" ours "${output}")
	8	-if( NOT ours )
	9	- message( FATAL_ERROR
	10	- "\n########################################################################\n"
	11	- "Audacity version 3.0.0 or higher requires use of a customized version of "
	12	- "wxWidgets. For details:\n"
	13	- " https://wiki.audacityteam.org/wiki/Building_for_Distros\n"
	14	- "########################################################################\n"
	15	- )
	16	-endif()
	17	-
	18	target_include_directories( ${TARGET} INTERFACE ${INCLUDES} )
	19	target_compile_definitions( ${TARGET} INTERFACE ${DEFINES} )
	20	target_compile_options( ${TARGET} INTERFACE ${COPTS} )

Line 0 Link Here

(-)audacity3/files/patch-lib-src_libnyquist_nyquist_xlisp_xlfio.c (+12 lines)
	1	--- lib-src/libnyquist/nyquist/xlisp/xlfio.c.orig 2021-02-04 18:52:51 UTC
	2	+++ lib-src/libnyquist/nyquist/xlisp/xlfio.c
	3	@@ -19,8 +19,7 @@
	4	/* do some sanity checking: */
	5	#ifndef XL_BIG_ENDIAN
	6	#ifndef XL_LITTLE_ENDIAN
	7	-#error configuration error -- either XL_BIG_ or XL_LITTLE_ENDIAN must be defined
	8	-in xlisp.h
	9	+#error configuration error -- either XL_BIG_ or XL_LITTLE_ENDIAN must be defined in xlisp.h
	10	#endif
	11	#endif
	12	#ifdef XL_BIG_ENDIAN

Line 0 Link Here

(-)audacity3/files/patch-src_ProjectSerializer.cpp (+60 lines)
	1	--- src/ProjectSerializer.cpp.orig 2021-02-04 18:52:51 UTC
	2	+++ src/ProjectSerializer.cpp
	3	@@ -206,9 +206,9 @@ ProjectSerializer::ProjectSerializer(size_t allocSize)
	4	std::call_once(flag, []{
	5	// Just once per run, store header information in the unique static
	6	// dictionary that will be written into each project that is saved.
	7	- // Store the size of "wxChar" so we can convert during recovery in
	8	- // case the file is used on a system with a different character size.
	9	- char size = sizeof(wxChar);
	10	+ // Store the size of "wxStringCharType" so we can convert during recovery
	11	+ // in case the file is used on a system with a different character size.
	12	+ char size = sizeof(wxStringCharType);
	13	mDict.AppendByte(FT_CharSize);
	14	mDict.AppendData(&size, 1);
	15	});
	16	@@ -242,7 +242,7 @@ void ProjectSerializer::WriteAttr(const wxString & nam
	17	mBuffer.AppendByte(FT_String);
	18	WriteName(name);
	19
	20	- const Length len = value.length() * sizeof(wxChar);
	21	+ const Length len = value.length() * sizeof(wxStringCharType);
	22	WriteLength( mBuffer, len );
	23	mBuffer.AppendData(value.wx_str(), len);
	24	}
	25	@@ -309,7 +309,7 @@ void ProjectSerializer::WriteData(const wxString & val
	26	{
	27	mBuffer.AppendByte(FT_Data);
	28
	29	- Length len = value.length() * sizeof(wxChar);
	30	+ Length len = value.length() * sizeof(wxStringCharType);
	31	WriteLength( mBuffer, len );
	32	mBuffer.AppendData(value.wx_str(), len);
	33	}
	34	@@ -317,7 +317,7 @@ void ProjectSerializer::WriteData(const wxString & val
	35	void ProjectSerializer::Write(const wxString & value)
	36	{
	37	mBuffer.AppendByte(FT_Raw);
	38	- Length len = value.length() * sizeof(wxChar);
	39	+ Length len = value.length() * sizeof(wxStringCharType);
	40	WriteLength( mBuffer, len );
	41	mBuffer.AppendData(value.wx_str(), len);
	42	}
	43	@@ -334,7 +334,7 @@ void ProjectSerializer::WriteSubTree(const ProjectSeri
	44
	45	void ProjectSerializer::WriteName(const wxString & name)
	46	{
	47	- wxASSERT(name.length() * sizeof(wxChar) <= SHRT_MAX);
	48	+ wxASSERT(name.length() * sizeof(wxStringCharType) <= SHRT_MAX);
	49	UShort id;
	50
	51	auto nameiter = mNames.find(name);
	52	@@ -346,7 +346,7 @@ void ProjectSerializer::WriteName(const wxString & nam
	53	{
	54	// mNames is static. This appends each name to static mDict only once
	55	// in each run.
	56	- UShort len = name.length() * sizeof(wxChar);
	57	+ UShort len = name.length() * sizeof(wxStringCharType);
	58
	59	id = mNames.size();
	60	mNames[name] = id;

Line 0 Link Here

(-)audacity3/files/patch-src_import_Import.cpp (+16 lines)
	1	--- src/import/Import.cpp.orig 2021-02-04 18:52:51 UTC
	2	+++ src/import/Import.cpp
	3	@@ -803,9 +803,11 @@ bool Importer::Import( AudacityProject &project,
	4	/* i18n-hint: %s will be the filename */
	5	"Audacity did not recognize the type of the file '%s'.\n\n%sFor uncompressed files, also try File > Import > Raw Data.")
	6	.Format( fName,
	7	+#if defined(USE_FFMPEG)
	8	!FFmpegLibsInst()
	9	- ? XO("Try installing FFmpeg.\n\n")
	10	- : XO("") );
	11	+ ? XO("Try installing FFmpeg.\n\n") :
	12	+#endif
	13	+ Verbatim("") );
	14	}
	15	else
	16	{

Lines 49-56 Link Here

(-)audacity3/pkg-plist (-2 / +3 lines)
49	%%DATADIR%%/nyquist/velocity.lsp	49	%%DATADIR%%/nyquist/velocity.lsp
50	%%DATADIR%%/nyquist/xlinit.lsp	50	%%DATADIR%%/nyquist/xlinit.lsp
51	%%DATADIR%%/nyquist/xm.lsp	51	%%DATADIR%%/nyquist/xm.lsp
52	%%DATADIR%%/plug-ins/SilenceMarker.ny
53	%%DATADIR%%/plug-ins/SoundFinder.ny
54	%%DATADIR%%/plug-ins/SpectralEditMulti.ny	52	%%DATADIR%%/plug-ins/SpectralEditMulti.ny
55	%%DATADIR%%/plug-ins/SpectralEditParametricEQ.ny	53	%%DATADIR%%/plug-ins/SpectralEditParametricEQ.ny
56	%%DATADIR%%/plug-ins/SpectralEditShelves.ny	54	%%DATADIR%%/plug-ins/SpectralEditShelves.ny
Lines 64-69 Link Here
64	%%DATADIR%%/plug-ins/eq-xml-to-txt-converter.ny	62	%%DATADIR%%/plug-ins/eq-xml-to-txt-converter.ny
65	%%DATADIR%%/plug-ins/equalabel.ny	63	%%DATADIR%%/plug-ins/equalabel.ny
66	%%DATADIR%%/plug-ins/highpass.ny	64	%%DATADIR%%/plug-ins/highpass.ny
		65	%%DATADIR%%/plug-ins/label-sounds.ny
67	%%DATADIR%%/plug-ins/limiter.ny	66	%%DATADIR%%/plug-ins/limiter.ny
68	%%DATADIR%%/plug-ins/lowpass.ny	67	%%DATADIR%%/plug-ins/lowpass.ny
69	%%DATADIR%%/plug-ins/noisegate.ny	68	%%DATADIR%%/plug-ins/noisegate.ny
Lines 93-98 Link Here
93	%%NLS%%share/locale/bs/LC_MESSAGES/audacity.mo	92	%%NLS%%share/locale/bs/LC_MESSAGES/audacity.mo
94	%%NLS%%share/locale/ca/LC_MESSAGES/audacity.mo	93	%%NLS%%share/locale/ca/LC_MESSAGES/audacity.mo
95	%%NLS%%share/locale/ca_ES@valencia/LC_MESSAGES/audacity.mo	94	%%NLS%%share/locale/ca_ES@valencia/LC_MESSAGES/audacity.mo
		95	%%NLS%%share/locale/co/LC_MESSAGES/audacity.mo
96	%%NLS%%share/locale/cs/LC_MESSAGES/audacity.mo	96	%%NLS%%share/locale/cs/LC_MESSAGES/audacity.mo
97	%%NLS%%share/locale/cy/LC_MESSAGES/audacity.mo	97	%%NLS%%share/locale/cy/LC_MESSAGES/audacity.mo
98	%%NLS%%share/locale/da/LC_MESSAGES/audacity.mo	98	%%NLS%%share/locale/da/LC_MESSAGES/audacity.mo
Lines 119-124 Link Here
119	%%NLS%%share/locale/ko/LC_MESSAGES/audacity.mo	119	%%NLS%%share/locale/ko/LC_MESSAGES/audacity.mo
120	%%NLS%%share/locale/lt/LC_MESSAGES/audacity.mo	120	%%NLS%%share/locale/lt/LC_MESSAGES/audacity.mo
121	%%NLS%%share/locale/mk/LC_MESSAGES/audacity.mo	121	%%NLS%%share/locale/mk/LC_MESSAGES/audacity.mo
		122	%%NLS%%share/locale/mr/LC_MESSAGES/audacity.mo
122	%%NLS%%share/locale/my/LC_MESSAGES/audacity.mo	123	%%NLS%%share/locale/my/LC_MESSAGES/audacity.mo
123	%%NLS%%share/locale/nb/LC_MESSAGES/audacity.mo	124	%%NLS%%share/locale/nb/LC_MESSAGES/audacity.mo
124	%%NLS%%share/locale/nl/LC_MESSAGES/audacity.mo	125	%%NLS%%share/locale/nl/LC_MESSAGES/audacity.mo