git: 0839e30cb3a7 - main - audio/audacity: update to 3.5.0
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 24 Apr 2024 00:24:04 UTC
The branch main has been updated by vvd:
URL: https://cgit.FreeBSD.org/ports/commit/?id=0839e30cb3a7acd883eb945b0fe3af77a8d1d5cc
commit 0839e30cb3a7acd883eb945b0fe3af77a8d1d5cc
Author: Vladimir Druzenko <vvd@FreeBSD.org>
AuthorDate: 2024-04-24 00:20:41 +0000
Commit: Vladimir Druzenko <vvd@FreeBSD.org>
CommitDate: 2024-04-24 00:23:57 +0000
audio/audacity: update to 3.5.0
Changelog:
https://github.com/audacity/audacity/releases/tag/Audacity-3.5.0
PR: 278538
Approved by: xxjack12xx@gmail.com (maintainer), arrowd (mentor, implicit)
Differential Revision: https://reviews.freebsd.org/D44909
---
audio/audacity/Makefile | 48 +++++++++++-----------
audio/audacity/distinfo | 8 ++--
.../patch-lib-src_libnyquist_nyquist_cmt_cext.h | 11 -----
.../patch-lib-src_libnyquist_nyquist_xlisp_xlisp.h | 18 --------
.../files/patch-libraries_lib-basic-ui_BasicUI.cpp | 10 -----
audio/audacity/files/patch-src_AboutDialog.cpp | 11 -----
.../audacity/files/patch-src_ListNavigationPanel.h | 11 -----
audio/audacity/files/patch-src_MIDIPlay.cpp | 11 -----
audio/audacity/pkg-plist | 11 ++++-
9 files changed, 37 insertions(+), 102 deletions(-)
diff --git a/audio/audacity/Makefile b/audio/audacity/Makefile
index 89c6462047b8..06af25652f7b 100644
--- a/audio/audacity/Makefile
+++ b/audio/audacity/Makefile
@@ -1,9 +1,12 @@
PORTNAME= audacity
DISTVERSIONPREFIX= Audacity-
-DISTVERSION= 3.4.2
-PORTREVISION= 3
+DISTVERSION= 3.5.0
CATEGORIES= audio
+PATCH_SITES= https://github.com/audacity/audacity/commit/
+# FreeBSD compilation fixes: https://github.com/audacity/audacity/pull/6331
+PATCHFILES+= 4191cfb8376d19d044cadaf31214182375a9af55.patch:-p1
+
MAINTAINER= xxjack12xx@gmail.com
COMMENT= GUI editor for digital audio waveforms
WWW= https://www.audacityteam.org/
@@ -13,18 +16,14 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt
BUILD_DEPENDS= conan:sysutils/conan \
rapidjson>0:devel/rapidjson
-LIB_DEPENDS= libasound.so:audio/alsa-lib \
- libcurl.so:ftp/curl \
- libexpat.so:textproc/expat2 \
+LIB_DEPENDS= libexpat.so:textproc/expat2 \
liblilv-0.so:audio/lilv \
libmp3lame.so:audio/lame \
libmpg123.so:audio/mpg123 \
- libopenjp2.so:graphics/openjpeg \
libopus.so:audio/opus \
libopusfile.so:audio/opusfile \
libportaudio.so:audio/portaudio \
libportmidi.so:audio/portmidi \
- libpng.so:graphics/png \
libserd-0.so:devel/serd \
libsndfile.so:audio/libsndfile \
libsord-0.so:devel/sord \
@@ -32,19 +31,17 @@ LIB_DEPENDS= libasound.so:audio/alsa-lib \
libsratom-0.so:audio/sratom \
libsqlite3.so:databases/sqlite3 \
libsuil-0.so:audio/suil \
- libturbojpeg.so:graphics/libjpeg-turbo \
libwavpack.so:audio/wavpack \
libuuid.so:misc/e2fsprogs-libuuid
USES= cmake compiler:c++20-lang cpe desktop-file-utils gettext \
gnome libtool python:build pkgconfig shared-mime-info
+CPE_VENDOR= audacityteam
USE_GITHUB= yes
USE_GNOME= cairo gdkpixbuf2 gtk30
USE_WX= 3.2+
-CPE_VENDOR= audacityteam
WX_COMPS= wx
-PORTDOCS= README.md
CMAKE_ARGS= -DAUDACITY_BUILD_LEVEL=2 \
-Daudacity_lib_preference:STRING=system \
@@ -74,12 +71,17 @@ CMAKE_OFF= audacity_has_audiocom_upload audacity_conan_enabled audacity_conan_fo
audacity_has_crashreports audacity_has_networking audacity_has_updates_check audacity_has_url_schemes_support \
audacity_has_tests audacity_has_vst3 audacity_perform_codesign audacity_use_pch
+# TODO: fix NLS support properly
+PLIST_SUB+= NLS=""
+PORTDOCS= README.md
+
OPTIONS_DEFINE= DEBUG DOCS FFMPEG FLAC ID3TAG LADSPA MANUAL \
OGG SBSMS SOUNDTOUCH TWOLAME VAMP \
VORBIS VST
OPTIONS_DEFAULT= FFMPEG FLAC ID3TAG LADSPA OGG SBSMS \
SOUNDTOUCH TWOLAME VAMP VORBIS VST
OPTIONS_EXCLUDE_i386= SBSMS
+OPTIONS_SUB= yes
MANUAL_DESC= Include manual
SBSMS_DESC= Use libsbsms for pitch and tempo changing
@@ -94,51 +96,47 @@ DOCS_BUILD_DEPENDS= docbook-to-man:textproc/docbook-to-man \
docbook2man:textproc/docbook-utils
DOCS_LIB_DEPENDS= libharfbuzz.so:print/harfbuzz
-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
+FFMPEG_CMAKE_ON= -Daudacity_use_ffmpeg:STRING=loaded
+FFMPEG_CMAKE_OFF= -Daudacity_use_ffmpeg:STRING=off
+FLAC_LIB_DEPENDS= libFLAC.so:audio/flac
FLAC_CMAKE_ON= -Daudacity_use_libflac:STRING=system
FLAC_CMAKE_OFF= -Daudacity_use_libflac:STRING=off
-FLAC_LIB_DEPENDS= libFLAC.so:audio/flac
+ID3TAG_LIB_DEPENDS= libid3tag.so:audio/libid3tag
ID3TAG_CMAKE_ON= -Daudacity_use_libid3tag:STRING=system
ID3TAG_CMAKE_OFF= -Daudacity_use_libid3tag:STRING=off
-ID3TAG_LIB_DEPENDS= libid3tag.so:audio/libid3tag
-LADSPA_CMAKE_BOOL= audacity_use_ladspa
LADSPA_RUN_DEPENDS= listplugins:audio/ladspa
+LADSPA_CMAKE_BOOL= audacity_use_ladspa
MANUAL_CMAKE_BOOL= audacity_package_manual
-# TODO: fix NLS support properly
-PLIST_SUB+= NLS=""
-OPTIONS_SUB= yes
-
+OGG_LIB_DEPENDS= libogg.so:audio/libogg
OGG_CMAKE_ON= -Daudacity_use_libogg:STRING=system
OGG_CMAKE_OFF= -Daudacity_use_libogg:STRING=off
-OGG_LIB_DEPENDS= libogg.so:audio/libogg
SBSMS_CMAKE_ON= -Daudacity_use_sbsms:STRING=local
SBSMS_CMAKE_OFF= -Daudacity_use_sbsms:STRING=off
+SOUNDTOUCH_LIB_DEPENDS= libSoundTouch.so:audio/soundtouch
SOUNDTOUCH_CMAKE_ON= -Daudacity_use_soundtouch:STRING=system
SOUNDTOUCH_CMAKE_OFF= -Daudacity_use_soundtouch:STRING=off
-SOUNDTOUCH_LIB_DEPENDS= libSoundTouch.so:audio/soundtouch
+TWOLAME_LIB_DEPENDS= libtwolame.so:audio/twolame
TWOLAME_CMAKE_ON= -Daudacity_use_twolame:STRING=system
TWOLAME_CMAKE_OFF= -Daudacity_use_twolame:STRING=off
-TWOLAME_LIB_DEPENDS= libtwolame.so:audio/twolame
+VAMP_LIB_DEPENDS= libvamp-hostsdk.so:audio/vamp-plugin-sdk
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_CMAKE_ON= -Daudacity_use_libvorbis:STRING=system
-VORBIS_CMAKE_OFF= -Daudacity_use_libvorbis:STRING=off
VORBIS_LIB_DEPENDS= libogg.so:audio/libogg \
libvorbis.so:audio/libvorbis
+VORBIS_CMAKE_ON= -Daudacity_use_libvorbis:STRING=system
+VORBIS_CMAKE_OFF= -Daudacity_use_libvorbis:STRING=off
VST_CMAKE_BOOL= audacity_use_vst
diff --git a/audio/audacity/distinfo b/audio/audacity/distinfo
index 41477bfe0891..1dc0ae2444f5 100644
--- a/audio/audacity/distinfo
+++ b/audio/audacity/distinfo
@@ -1,3 +1,5 @@
-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 = 1713915585
+SHA256 (audacity-audacity-Audacity-3.5.0_GH0.tar.gz) = ccdc68d86f082e532f64bbbcc35309d105fbf36da9e2b4cf19ee8e85d0b91f23
+SIZE (audacity-audacity-Audacity-3.5.0_GH0.tar.gz) = 57385696
+SHA256 (4191cfb8376d19d044cadaf31214182375a9af55.patch) = 3c0f1425930e0b07439282e879c48bff414c403c78f356847ea109e09bbcd314
+SIZE (4191cfb8376d19d044cadaf31214182375a9af55.patch) = 2015
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
index 2d0cca0557c2..000000000000
--- 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 <malloc.h>
- #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_xlisp.h b/audio/audacity/files/patch-lib-src_libnyquist_nyquist_xlisp_xlisp.h
deleted file mode 100644
index 22ab44bcac78..000000000000
--- 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
deleted file mode 100644
index 324ae029e6b1..000000000000
--- a/audio/audacity/files/patch-libraries_lib-basic-ui_BasicUI.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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
-
- #include <string>
-
-+extern char** environ;
- namespace
- {
-
diff --git a/audio/audacity/files/patch-src_AboutDialog.cpp b/audio/audacity/files/patch-src_AboutDialog.cpp
deleted file mode 100644
index 6e4a1fb8e752..000000000000
--- 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
deleted file mode 100644
index 5cf377b91f70..000000000000
--- a/audio/audacity/files/patch-src_ListNavigationPanel.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/ListNavigationPanel.h.orig 2023-04-27 07:55:48 UTC
-+++ src/ListNavigationPanel.h
-@@ -13,7 +13,7 @@
- #include <wx/window.h>
- #include <wx/containr.h>
-
--extern template class WXDLLIMPEXP_CORE wxNavigationEnabled<wxWindow>;
-+//extern template class WXDLLIMPEXP_CORE wxNavigationEnabled<wxWindow>;
-
- #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
index 44399cc73e0c..000000000000
--- 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
index 6e935282e251..f2fcfec08361 100644
--- a/audio/audacity/pkg-plist
+++ b/audio/audacity/pkg-plist
@@ -6,10 +6,13 @@ lib/audacity/lib-basic-ui.so
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 @@ lib/audacity/lib-ipc.so
%%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-sample-track.so
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-track.so
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 @@ lib/audacity/modules/mod-cl.so
%%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 @@ share/applications/audacity.desktop
%%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 @@ share/applications/audacity.desktop
%%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