diff --git a/audio/audacity/Makefile b/audio/audacity/Makefile --- a/audio/audacity/Makefile +++ b/audio/audacity/Makefile @@ -1,7 +1,6 @@ PORTNAME= audacity DISTVERSIONPREFIX= Audacity- -DISTVERSION= 3.4.2 -PORTREVISION= 3 +DISTVERSION= 3.5.0 CATEGORIES= audio MAINTAINER= xxjack12xx@gmail.com diff --git a/audio/audacity/distinfo b/audio/audacity/distinfo --- a/audio/audacity/distinfo +++ b/audio/audacity/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1700366068 -SHA256 (audacity-audacity-Audacity-3.4.2_GH0.tar.gz) = 752cbe51fea0c143085d453eecbf024f5225891fd0118f1866d5964d892f1c25 -SIZE (audacity-audacity-Audacity-3.4.2_GH0.tar.gz) = 57368804 +TIMESTAMP = 1713807740 +SHA256 (audacity-audacity-Audacity-3.5.0_GH0.tar.gz) = ccdc68d86f082e532f64bbbcc35309d105fbf36da9e2b4cf19ee8e85d0b91f23 +SIZE (audacity-audacity-Audacity-3.5.0_GH0.tar.gz) = 57385696 diff --git a/audio/audacity/files/patch-cmake-proxies_pffft_CMakeLists.txt b/audio/audacity/files/patch-cmake-proxies_pffft_CMakeLists.txt new file mode 100644 --- /dev/null +++ b/audio/audacity/files/patch-cmake-proxies_pffft_CMakeLists.txt @@ -0,0 +1,7 @@ +--- cmake-proxies/pffft/CMakeLists.txt.orig 2024-04-22 10:09:55 UTC ++++ cmake-proxies/pffft/CMakeLists.txt +@@ -13,3 +13,4 @@ set(INCLUDES + set_target_properties( ${TARGET} PROPERTIES FOLDER "lib-src" ) + target_sources( ${TARGET} PRIVATE ${SOURCES} ) + target_include_directories( ${TARGET} PUBLIC ${INCLUDES} ) ++set_property(TARGET ${TARGET} PROPERTY POSITION_INDEPENDENT_CODE ON) diff --git a/audio/audacity/files/patch-lib-src_libnyquist_nyquist_cmt_cext.h b/audio/audacity/files/patch-lib-src_libnyquist_nyquist_cmt_cext.h deleted file mode 100644 --- a/audio/audacity/files/patch-lib-src_libnyquist_nyquist_cmt_cext.h +++ /dev/null @@ -1,11 +0,0 @@ ---- lib-src/libnyquist/nyquist/cmt/cext.h.orig 2021-02-04 18:52:51 UTC -+++ lib-src/libnyquist/nyquist/cmt/cext.h -@@ -61,7 +61,7 @@ EXIT(n) -- calls exit(n) after shutting down/dealloca - #include - #endif - --#if NEED_ULONG -+#if NEED_ULONG || __FreeBSD__ - typedef unsigned long ulong; - #endif - diff --git a/audio/audacity/files/patch-lib-src_libnyquist_nyquist_xlisp_path.c b/audio/audacity/files/patch-lib-src_libnyquist_nyquist_xlisp_path.c new file mode 100644 --- /dev/null +++ b/audio/audacity/files/patch-lib-src_libnyquist_nyquist_xlisp_path.c @@ -0,0 +1,10 @@ +--- lib-src/libnyquist/nyquist/xlisp/path.c.orig 2024-04-22 10:09:55 UTC ++++ lib-src/libnyquist/nyquist/xlisp/path.c +@@ -25,6 +25,7 @@ + */ + + #include ++#include + + #include "switches.h" + #include "xlisp.h" diff --git a/audio/audacity/files/patch-lib-src_libnyquist_nyquist_xlisp_xlisp.h b/audio/audacity/files/patch-lib-src_libnyquist_nyquist_xlisp_xlisp.h deleted file mode 100644 --- a/audio/audacity/files/patch-lib-src_libnyquist_nyquist_xlisp_xlisp.h +++ /dev/null @@ -1,18 +0,0 @@ ---- lib-src/libnyquist/nyquist/xlisp/xlisp.h.orig 2022-09-22 16:16:06 UTC -+++ lib-src/libnyquist/nyquist/xlisp/xlisp.h -@@ -181,6 +181,15 @@ extern long ptrtoabs(); - #endif - #endif - -+/* FreeBSD */ -+#ifdef __FreeBSD__ -+#if __BYTE_ORDER == __LITTLE_ENDIAN -+#define XL_LITTLE_ENDIAN -+#else -+#define XL_BIG_ENDIAN -+#endif -+#endif -+ - /* Apple CC (xcode, macOS, macintosh) */ - #ifdef __APPLE__ - #define NNODES 2000 diff --git a/audio/audacity/files/patch-libraries_lib-basic-ui_BasicUI.cpp b/audio/audacity/files/patch-libraries_lib-basic-ui_BasicUI.cpp --- a/audio/audacity/files/patch-libraries_lib-basic-ui_BasicUI.cpp +++ b/audio/audacity/files/patch-libraries_lib-basic-ui_BasicUI.cpp @@ -1,10 +1,12 @@ --- libraries/lib-basic-ui/BasicUI.cpp.orig 2022-09-28 03:57:45 UTC +++ libraries/lib-basic-ui/BasicUI.cpp -@@ -29,6 +29,7 @@ Paul Licameli +@@ -29,6 +29,9 @@ Paul Licameli #include ++#ifdef __FreeBSD__ +extern char** environ; ++#endif namespace { diff --git a/audio/audacity/files/patch-src_AboutDialog.cpp b/audio/audacity/files/patch-src_AboutDialog.cpp deleted file mode 100644 --- a/audio/audacity/files/patch-src_AboutDialog.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- src/AboutDialog.cpp.orig 2022-09-22 16:16:06 UTC -+++ src/AboutDialog.cpp -@@ -55,7 +55,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" --#include "RevisionIdent.h" -+//#include "RevisionIdent.h" - - #ifndef REV_TIME - #define REV_TIME "unknown date and time" diff --git a/audio/audacity/files/patch-src_ListNavigationPanel.h b/audio/audacity/files/patch-src_ListNavigationPanel.h --- a/audio/audacity/files/patch-src_ListNavigationPanel.h +++ b/audio/audacity/files/patch-src_ListNavigationPanel.h @@ -1,11 +1,12 @@ --- src/ListNavigationPanel.h.orig 2023-04-27 07:55:48 UTC +++ src/ListNavigationPanel.h -@@ -13,7 +13,7 @@ +@@ -13,7 +13,9 @@ #include #include --extern template class WXDLLIMPEXP_CORE wxNavigationEnabled; -+//extern template class WXDLLIMPEXP_CORE wxNavigationEnabled; ++#ifndef __FreeBSD__ + extern template class WXDLLIMPEXP_CORE wxNavigationEnabled; ++#endif #include "ListNavigationEnabled.h" diff --git a/audio/audacity/files/patch-src_MIDIPlay.cpp b/audio/audacity/files/patch-src_MIDIPlay.cpp deleted file mode 100644 --- a/audio/audacity/files/patch-src_MIDIPlay.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- src/MIDIPlay.cpp.orig 2022-09-27 05:35:02 UTC -+++ src/MIDIPlay.cpp -@@ -490,7 +490,7 @@ static double SystemTime(bool usingAlsa) - if (usingAlsa) { - struct timespec now; - // CLOCK_MONOTONIC_RAW is unaffected by NTP or adj-time --#ifdef FreeBSD -+#ifdef __FreeBSD__ - clock_gettime(CLOCK_REALTIME, &now); - #else - clock_gettime(CLOCK_MONOTONIC_RAW, &now); diff --git a/audio/audacity/pkg-plist b/audio/audacity/pkg-plist --- a/audio/audacity/pkg-plist +++ b/audio/audacity/pkg-plist @@ -6,10 +6,13 @@ lib/audacity/lib-channel.so lib/audacity/lib-command-parameters.so lib/audacity/lib-components.so +lib/audacity/lib-concurrency.so +lib/audacity/lib-crypto.so lib/audacity/lib-effects.so lib/audacity/lib-exceptions.so lib/audacity/lib-export-ui.so %%FFMPEG%%lib/audacity/lib-ffmpeg-support.so +lib/audacity/lib-fft.so lib/audacity/lib-file-formats.so lib/audacity/lib-files.so lib/audacity/lib-graphics.so @@ -18,8 +21,11 @@ %%LADSPA%%lib/audacity/lib-ladspa.so lib/audacity/lib-lv2.so lib/audacity/lib-math.so +lib/audacity/lib-menus.so lib/audacity/lib-mixer.so lib/audacity/lib-module-manager.so +lib/audacity/lib-music-information-retrieval.so +lib/audacity/lib-note-track.so lib/audacity/lib-numeric-formats.so lib/audacity/lib-playable-track.so lib/audacity/lib-preferences.so @@ -33,6 +39,7 @@ lib/audacity/lib-screen-geometry.so lib/audacity/lib-shuttlegui.so lib/audacity/lib-snapping.so +lib/audacity/lib-sqlite-helpers.so lib/audacity/lib-stretching-sequence.so lib/audacity/lib-string-utils.so lib/audacity/lib-strings.so @@ -47,6 +54,7 @@ lib/audacity/lib-transactions.so lib/audacity/lib-utility.so lib/audacity/lib-uuid.so +lib/audacity/lib-viewport.so lib/audacity/lib-vst.so lib/audacity/lib-wave-track.so lib/audacity/lib-wx-init.so @@ -57,6 +65,7 @@ %%FFMPEG%%lib/audacity/modules/mod-ffmpeg.so %%FLAC%%lib/audacity/modules/mod-flac.so lib/audacity/modules/mod-lof.so +lib/audacity/modules/mod-midi-import-export.so %%TWOLAME%%lib/audacity/modules/mod-mp2.so lib/audacity/modules/mod-mp3.so lib/audacity/modules/mod-mpg123.so @@ -1532,7 +1541,6 @@ %%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/label-sounds.ny @@ -1549,7 +1557,6 @@ %%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