-
Notifications
You must be signed in to change notification settings - Fork 727
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
audio/audacity: Update 2.4.2 -> 3.0.0
I also changed the default of LADSPA to OFF and LV2 to ON because LV2 is a new generation of LADSPA. PR: 254598 Submitted by: xxjack12xx@gmail.com (maintainer)
- Loading branch information
Showing
16 changed files
with
157 additions
and
75 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| TIMESTAMP = 1593304211 | ||
| SHA256 (audacity-audacity-Audacity-2.4.2_GH0.tar.gz) = cdb4800c8e9d1d4ca19964caf8d24000f80286ebd8a4db566c2622449744c099 | ||
| SIZE (audacity-audacity-Audacity-2.4.2_GH0.tar.gz) = 61248430 | ||
| TIMESTAMP = 1616886054 | ||
| SHA256 (audacity-minsrc-3.0.0.tar.xz) = d3bb1358b930ea4ef935ed83cc5a0f47006565762c5667c2fb376c6535876a6a | ||
| SIZE (audacity-minsrc-3.0.0.tar.xz) = 13308836 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,11 +1,11 @@ | ||
| --- cmake-proxies/CMakeLists.txt.orig 2020-06-19 15:16:47 UTC | ||
| --- cmake-proxies/CMakeLists.txt.orig 2021-02-04 18:52:51 UTC | ||
| +++ cmake-proxies/CMakeLists.txt | ||
| @@ -132,7 +132,7 @@ addlib( expat expat EXPAT YES | ||
| addlib( lame lame LAME YES YES "lame >= 3.100" ) | ||
| 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" ) | ||
| addlib( sqlite sqlite SQLITE YES YES "sqlite3 >= 3.32.0" ) | ||
|
|
||
| # Optional libraries | ||
| # |
20 changes: 20 additions & 0 deletions
20
audio/audacity/files/patch-cmake-proxies_wxWidgets_CMakeLists.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| --- 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} ) |
2 changes: 1 addition & 1 deletion
2
audio/audacity/files/patch-lib-src_libnyquist_nyquist_cmt_cext.h
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
10 changes: 0 additions & 10 deletions
10
audio/audacity/files/patch-lib-src_libnyquist_nyquist_nyqstk_include_FileRead.h
This file was deleted.
Oops, something went wrong.
12 changes: 12 additions & 0 deletions
12
audio/audacity/files/patch-lib-src_libnyquist_nyquist_xlisp_xlfio.c
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| --- 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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,60 @@ | ||
| --- 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; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| --- 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 | ||
| { |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| --- src/widgets/FileConfig.cpp.orig 2021-02-04 18:52:51 UTC | ||
| +++ src/widgets/FileConfig.cpp | ||
| @@ -10,6 +10,8 @@ | ||
|
|
||
| #include "../Audacity.h" | ||
|
|
||
| +#include <errno.h> | ||
| + | ||
| #include <wx/defs.h> | ||
| #include <wx/app.h> | ||
| #include <wx/bmpbuttn.h> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| --- src/widgets/Grid.cpp.orig 2021-02-04 18:52:51 UTC | ||
| +++ src/widgets/Grid.cpp | ||
| @@ -572,7 +572,7 @@ void Grid::OnKeyDown(wxKeyEvent &event) | ||
| { | ||
| wxTextDataObject *data = safenew wxTextDataObject(GetCellValue(crow, ccol)); | ||
| wxClipboard::Get()->SetData(data); | ||
| - SetCellValue(crow, ccol, {}); | ||
| + SetCellValue(crow, ccol, ""); | ||
| return; | ||
| } | ||
| break; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters