diff -urN audacity/Makefile audacity3/Makefile --- audacity/Makefile 2021-03-17 18:18:14.409967000 -0700 +++ audacity3/Makefile 2021-03-27 02:05:52.582172000 -0700 @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= audacity -PORTVERSION= 2.4.2 -PORTREVISION= 3 +PORTVERSION= 3.0.0 DISTVERSIONPREFIX= Audacity- CATEGORIES= audio @@ -17,9 +16,10 @@ libexpat.so:textproc/expat2 \ libportaudio.so:audio/portaudio \ libsndfile.so:audio/libsndfile \ - libsoxr.so:audio/libsoxr + libsoxr.so:audio/libsoxr \ + libsqlite3.so:databases/sqlite3 -USES= cmake compiler:c++11-lang cpe desktop-file-utils gettext \ +USES= cmake compiler:c++14-lang cpe desktop-file-utils gettext \ gnome libtool python:build pkgconfig shared-mime-info USE_GITHUB= yes USE_GNOME= cairo gtk30 @@ -134,10 +134,6 @@ -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} diff -urN audacity/distinfo audacity3/distinfo --- audacity/distinfo 2021-03-17 18:18:14.410544000 -0700 +++ audacity3/distinfo 2021-03-17 14:53:22.166990000 -0700 @@ -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 = 1616018002 +SHA256 (audacity-audacity-Audacity-3.0.0_GH0.tar.gz) = 14c5b6d661fbe85fa09b7caac5fa261e392a28150fa18fca91380e695ca76cc9 +SIZE (audacity-audacity-Audacity-3.0.0_GH0.tar.gz) = 64375465 diff -urN audacity/files/patch-cmake-proxies_CMakeLists.txt audacity3/files/patch-cmake-proxies_CMakeLists.txt --- audacity/files/patch-cmake-proxies_CMakeLists.txt 2021-03-17 18:18:14.411503000 -0700 +++ audacity3/files/patch-cmake-proxies_CMakeLists.txt 2021-03-17 17:06:27.993127000 -0700 @@ -1,11 +1,11 @@ ---- cmake-proxies/CMakeLists.txt.orig 2020-06-19 15:16:47 UTC -+++ cmake-proxies/CMakeLists.txt -@@ -132,7 +132,7 @@ addlib( expat expat EXPAT YES +--- cmake-proxies/CMakeLists.txt.orig 2021-03-09 02:19:38.000000000 -0800 ++++ cmake-proxies/CMakeLists.txt 2021-03-17 17:04:26.573245000 -0700 +@@ -132,7 +132,7 @@ 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 - # diff -urN audacity/files/patch-cmake-proxies_wxWidgets_CMakeLists.txt audacity3/files/patch-cmake-proxies_wxWidgets_CMakeLists.txt --- audacity/files/patch-cmake-proxies_wxWidgets_CMakeLists.txt 1969-12-31 16:00:00.000000000 -0800 +++ audacity3/files/patch-cmake-proxies_wxWidgets_CMakeLists.txt 2021-03-17 18:22:57.281686000 -0700 @@ -0,0 +1,20 @@ +--- cmake-proxies/wxWidgets/CMakeLists.txt.orig 2021-03-09 02:19:38.000000000 -0800 ++++ cmake-proxies/wxWidgets/CMakeLists.txt 2021-03-17 18:22:13.373870000 -0700 +@@ -237,17 +237,6 @@ + "^#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} ) diff -urN audacity/files/patch-lib-src_libnyquist_nyquist_cmt_cext.h audacity3/files/patch-lib-src_libnyquist_nyquist_cmt_cext.h --- audacity/files/patch-lib-src_libnyquist_nyquist_cmt_cext.h 2021-03-17 18:18:14.411995000 -0700 +++ audacity3/files/patch-lib-src_libnyquist_nyquist_cmt_cext.h 2021-03-17 17:29:00.558546000 -0700 @@ -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 -@@ -61,7 +61,7 @@ EXIT(n) -- calls exit(n) after shutting down/dealloca +--- lib-src/libnyquist/nyquist/cmt/cext.h.orig 2021-03-09 02:19:38.000000000 -0800 ++++ lib-src/libnyquist/nyquist/cmt/cext.h 2021-03-17 17:28:08.121777000 -0700 +@@ -61,7 +61,7 @@ #include #endif diff -urN audacity/files/patch-lib-src_libnyquist_nyquist_nyqstk_include_FileRead.h audacity3/files/patch-lib-src_libnyquist_nyquist_nyqstk_include_FileRead.h --- audacity/files/patch-lib-src_libnyquist_nyquist_nyqstk_include_FileRead.h 2021-03-17 18:18:14.412480000 -0700 +++ audacity3/files/patch-lib-src_libnyquist_nyquist_nyqstk_include_FileRead.h 1969-12-31 16:00:00.000000000 -0800 @@ -1,10 +0,0 @@ ---- lib-src/libnyquist/nyquist/nyqstk/include/FileRead.h.orig 2016-07-26 13:34:06 UTC -+++ lib-src/libnyquist/nyquist/nyqstk/include/FileRead.h -@@ -33,6 +33,7 @@ - #define STK_FILEREAD_H - - #include "Stk.h" -+#include - - namespace Nyq - { diff -urN audacity/files/patch-lib-src_libnyquist_nyquist_xlisp_xlfio.c audacity3/files/patch-lib-src_libnyquist_nyquist_xlisp_xlfio.c --- audacity/files/patch-lib-src_libnyquist_nyquist_xlisp_xlfio.c 1969-12-31 16:00:00.000000000 -0800 +++ audacity3/files/patch-lib-src_libnyquist_nyquist_xlisp_xlfio.c 2021-03-17 17:10:24.731448000 -0700 @@ -0,0 +1,12 @@ +--- lib-src/libnyquist/nyquist/xlisp/xlfio.c.orig 2021-03-09 02:19:38.000000000 -0800 ++++ lib-src/libnyquist/nyquist/xlisp/xlfio.c 2021-03-17 17:09:35.677331000 -0700 +@@ -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 diff -urN audacity/files/patch-lib-src_libnyquist_nyquist_xlisp_xlisp.h audacity3/files/patch-lib-src_libnyquist_nyquist_xlisp_xlisp.h --- audacity/files/patch-lib-src_libnyquist_nyquist_xlisp_xlisp.h 2021-03-17 18:18:14.412997000 -0700 +++ audacity3/files/patch-lib-src_libnyquist_nyquist_xlisp_xlisp.h 2021-03-17 17:24:54.245582000 -0700 @@ -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 -@@ -161,6 +161,15 @@ extern long ptrtoabs(); +--- lib-src/libnyquist/nyquist/xlisp/xlisp.h.orig 2021-03-17 17:23:49.169659000 -0700 ++++ lib-src/libnyquist/nyquist/xlisp/xlisp.h 2021-03-17 17:24:27.385843000 -0700 +@@ -172,6 +172,15 @@ #endif #endif @@ -13,6 +13,6 @@ +#endif +#endif + - /* Apple CC */ + /* Apple CC (xcode, macOS, macintosh) */ #ifdef __APPLE__ #define NNODES 2000 diff -urN audacity/files/patch-src_AboutDialog.cpp audacity3/files/patch-src_AboutDialog.cpp --- audacity/files/patch-src_AboutDialog.cpp 2021-03-17 18:18:14.414531000 -0700 +++ audacity3/files/patch-src_AboutDialog.cpp 2021-03-17 17:07:25.690640000 -0700 @@ -1,6 +1,6 @@ --- src/AboutDialog.cpp.orig 2020-06-28 06:25:54 UTC +++ src/AboutDialog.cpp -@@ -63,7 +63,7 @@ hold information about one contributor to Audacity. +@@ -62,7 +62,7 @@ hold information about one contributor to Audacity. // RevisionIdent.h may contain #defines like these ones: //#define REV_LONG "28864acb238cb3ca71dda190a2d93242591dd80e" //#define REV_TIME "Sun Apr 12 12:40:22 2015 +0100" diff -urN audacity/files/patch-src_AudioIO.cpp audacity3/files/patch-src_AudioIO.cpp --- audacity/files/patch-src_AudioIO.cpp 2021-03-17 18:18:14.415030000 -0700 +++ audacity3/files/patch-src_AudioIO.cpp 2021-03-17 17:07:04.224080000 -0700 @@ -1,6 +1,6 @@ --- src/AudioIO.cpp.orig 2020-06-19 15:16:47 UTC +++ src/AudioIO.cpp -@@ -491,7 +491,6 @@ time warp info and AudioIOListener and whether the pla +@@ -490,7 +490,6 @@ time warp info and AudioIOListener and whether the pla #define ROUND(x) (int) ((x)+0.5) //#include // #include "../lib-src/portmidi/pm_common/portmidi.h" @@ -8,7 +8,7 @@ #include "NoteTrack.h" #endif -@@ -815,13 +814,22 @@ struct AudioIoCallback::ScrubState (private) +@@ -814,13 +813,22 @@ struct AudioIoCallback::ScrubState (private) // return the system time as a double static double streamStartTime = 0; // bias system time to small number diff -urN audacity/files/patch-src_ProjectSerializer.cpp audacity3/files/patch-src_ProjectSerializer.cpp --- audacity/files/patch-src_ProjectSerializer.cpp 1969-12-31 16:00:00.000000000 -0800 +++ audacity3/files/patch-src_ProjectSerializer.cpp 2021-03-18 13:58:10.152824000 -0700 @@ -0,0 +1,60 @@ +--- src/ProjectSerializer.cpp.orig 2021-03-09 02:19:38.000000000 -0800 ++++ src/ProjectSerializer.cpp 2021-03-17 18:22:13.373870000 -0700 +@@ -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 & name, const wxString & value) + 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 & value) + { + 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 & value) + 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 ProjectSerializer & value) + + 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 & name) + { + // 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; diff -urN audacity/files/patch-src_widgets_Grid.cpp audacity3/files/patch-src_widgets_Grid.cpp --- audacity/files/patch-src_widgets_Grid.cpp 1969-12-31 16:00:00.000000000 -0800 +++ audacity3/files/patch-src_widgets_Grid.cpp 2021-03-17 17:11:40.933594000 -0700 @@ -0,0 +1,11 @@ +--- src/widgets/Grid.cpp.orig 2021-03-09 02:19:38.000000000 -0800 ++++ src/widgets/Grid.cpp 2021-03-17 17:03:30.286591000 -0700 +@@ -572,7 +572,7 @@ + { + wxTextDataObject *data = safenew wxTextDataObject(GetCellValue(crow, ccol)); + wxClipboard::Get()->SetData(data); +- SetCellValue(crow, ccol, {}); ++ SetCellValue(crow, ccol, ""); + return; + } + break; diff -urN audacity/pkg-plist audacity3/pkg-plist --- audacity/pkg-plist 2021-03-17 18:18:14.416880000 -0700 +++ audacity3/pkg-plist 2021-03-17 17:58:32.257598000 -0700 @@ -49,8 +49,6 @@ %%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 @@ -64,6 +62,7 @@ %%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 @@ -93,6 +92,7 @@ %%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 @@ -119,6 +119,7 @@ %%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