audacity: Update to 2.4.1

Changes in version 2.4.1:

Critical Bug Fix:
 * Audacity 2.4.0 was released with a critical bug, (Bug 2436),
   which is fixed in 2.4.1.  The bug caused loss of data when using two projects at the same time.

Improvements

 * Audacity now runs on Mac Catalina.
 * A new Time Toolbar showing current record/playback time has been
   split from the Selection Toolbar.  It can be resized large.
 * Presets for more effects can be imported and exported.
 * A new Multi-View mode for tracks.  In this mode both
   spectrogram and waveform views are shown at the same time.
 * Opus available as a new audio export format on Windows and Linux.
 * Easier to convert labels between point labels and range labels.
 * New Loudness Normalization effect.
 * New RMS measurement analyzer.
 * New Noise Gate effect.
 * New Spectral Delete effect.

See also: https://wiki.audacityteam.org/wiki/New_features_in_Audacity_2.4.1


Bug Fixes

 Over 100 bugs in 2.3.3 fixed, including:

 * 2237 - Equalization effects have no Import or Export for curves
 * 2261 - Graphic EQ sliders have no frequency labels
 * 2265 - Track heights are reset to default on project re-opening
 * 2303 - Playback does not start at the saved cursor position on reopening a saved project.
 * 2314 - Zoom in fail when playing

4 files changed, 30 insertions, 76 deletions

diff --git a/audio/audacity/Makefile b/audio/audacity/Makefile
index b4c75ccd74d..2a5553b6f67 100644
--- a/audio/audacity/Makefile
+++ b/audio/audacity/Makefile
@@ -1,9 +1,6 @@
-# $NetBSD: Makefile,v 1.132 2020/04/16 21:54:06 nia Exp $
+# $NetBSD: Makefile,v 1.133 2020/05/23 15:51:28 nia Exp $
 
-DISTNAME=	audacity-2.3.3
-# XXX: Remove after updating!
-DIST_SUBDIR=	${DISTNAME}
-PKGREVISION=	3
+DISTNAME=	audacity-2.4.1
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_GITHUB:=audacity/}
 GITHUB_PROJECT=	Audacity
@@ -16,8 +13,6 @@ LICENSE=	gnu-gpl-v2 # AND cc-by-v3.0-license
 
 WRKSRC=		${WRKDIR}/audacity-${GITHUB_PROJECT}-${PKGVERSION_NOREV}
 
-EXTRACT_USING=	bsdtar
-
 GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
 
@@ -25,11 +20,13 @@ USE_TOOLS+=	automake autoreconf bash
 USE_TOOLS+=	gmake intltool msgfmt msgmerge pkg-config
 USE_TOOLS+=	xgettext zip:run
 
-USE_LANGUAGES=	c gnu++11
+USE_LANGUAGES=	c c++
 
 # configure: error: Audacity requires at least GCC 4.9
 GCC_REQD+=	4.9
 
+CFLAGS+=	-DHAVE_VISIBILITY=1 # ???
+
 WRAPPER_SHELL=	${BASH}
 CONFIG_SHELL=	${BASH}
 
@@ -41,7 +38,8 @@ CONFIGURE_ARGS+=	--with-libsndfile="system"
 CONFIGURE_ARGS+=	--with-libsoxr="system"
 CONFIGURE_ARGS+=	--with-portaudio="system"
 CONFIGURE_ARGS+=	--with-sbsms="local" # system version doesn't work
-CONFIGURE_ARGS+=	--with-portmidi="local"
+CONFIGURE_ARGS+=	--with-midi="no"
+CONFIGURE_ARGS+=	--with-portmidi="no"
 CONFIGURE_ARGS+=	--with-ffmpeg="system"
 CONFIGURE_ARGS+=	--with-lame="system"
 CONFIGURE_ARGS+=	--with-libflac="system"
@@ -73,7 +71,6 @@ CONFIG_SUB_OVERRIDE= \
 	config.sub */config.sub */*/config.sub */*/*/config.sub
 
 PTHREAD_AUTO_VARS=	yes
-BUILDLINK_TRANSFORM+=	rm:-Wl,--version-script=./build/vamp-plugin.map
 
 INSTALLATION_DIRS+=	lib
 
@@ -88,7 +85,6 @@ post-install:
 
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../audio/alsa-lib/buildlink3.mk"
 .include "../../audio/lilv/buildlink3.mk"
 .include "../../audio/lv2/buildlink3.mk"
 .include "../../audio/soundtouch/buildlink3.mk"
diff --git a/audio/audacity/PLIST b/audio/audacity/PLIST
index 402e1d82a98..53e3f57fcdb 100644
--- a/audio/audacity/PLIST
+++ b/audio/audacity/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.17 2019/11/24 00:47:34 nia Exp $
+@comment $NetBSD: PLIST,v 1.18 2020/05/23 15:51:28 nia Exp $
 bin/audacity
 lib/libFileDialog.so.0
 man/man1/audacity.1
@@ -19,70 +19,12 @@ share/audacity/nyquist/envelopes.lsp
 share/audacity/nyquist/equalizer.lsp
 share/audacity/nyquist/evalenv.lsp
 share/audacity/nyquist/fileio.lsp
-share/audacity/nyquist/follow.lsp
 share/audacity/nyquist/init.lsp
 share/audacity/nyquist/misc.lsp
+share/audacity/nyquist/nyinit-dbg.lsp
 share/audacity/nyquist/nyinit.lsp
 share/audacity/nyquist/nyqmisc.lsp
 share/audacity/nyquist/nyquist-plot.txt
-share/audacity/nyquist/nyquist.lsp
-share/audacity/nyquist/printrec.lsp
-share/audacity/nyquist/profile.lsp
-share/audacity/nyquist/rawwaves/mand1.raw
-share/audacity/nyquist/rawwaves/mand10.raw
-share/audacity/nyquist/rawwaves/mand11.raw
-share/audacity/nyquist/rawwaves/mand12.raw
-share/audacity/nyquist/rawwaves/mand2.raw
-share/audacity/nyquist/rawwaves/mand3.raw
-share/audacity/nyquist/rawwaves/mand4.raw
-share/audacity/nyquist/rawwaves/mand5.raw
-share/audacity/nyquist/rawwaves/mand6.raw
-share/audacity/nyquist/rawwaves/mand7.raw
-share/audacity/nyquist/rawwaves/mand8.raw
-share/audacity/nyquist/rawwaves/mand9.raw
-share/audacity/nyquist/rawwaves/mandpluk.raw
-share/audacity/nyquist/rawwaves/marmstk1.raw
-share/audacity/nyquist/rawwaves/sinewave.raw
-share/audacity/nyquist/sal-parse.lsp
-share/audacity/nyquist/sal.lsp
-share/audacity/nyquist/seq.lsp
-share/audacity/nyquist/seqfnint.lsp
-share/audacity/nyquist/seqmidi.lsp
-share/audacity/nyquist/sndfnint.lsp
-share/audacity/nyquist/stk.lsp
-share/audacity/nyquist/system.lsp
-share/audacity/nyquist/test.lsp
-share/audacity/nyquist/upic.sal
-share/audacity/nyquist/velocity.lsp
-share/audacity/nyquist/xlinit.lsp
-share/audacity/nyquist/xm.lsp
-share/audacity/plug-ins/SilenceMarker.ny
-share/audacity/plug-ins/SoundFinder.ny
-share/audacity/plug-ins/SpectralEditMulti.ny
-share/audacity/plug-ins/SpectralEditParametricEQ.ny
-share/audacity/plug-ins/SpectralEditShelves.ny
-share/audacity/plug-ins/StudioFadeOut.ny
-share/audacity/plug-ins/adjustable-fade.ny
-share/audacity/plug-ins/beat.ny
-share/audacity/plug-ins/clipfix.ny
-share/audacity/plug-ins/crossfadeclips.ny
-share/audacity/plug-ins/crossfadetracks.ny
-share/audacity/plug-ins/delay.ny
-share/audacity/plug-ins/equalabel.ny
-share/audacity/plug-ins/highpass.ny
-share/audacity/plug-ins/limiter.ny
-share/audacity/plug-ins/lowpass.ny
-share/audacity/plug-ins/notch.ny
-share/audacity/plug-ins/nyquist-plug-in-installer.ny
-share/audacity/plug-ins/pluck.ny
-share/audacity/plug-ins/rhythmtrack.ny
-share/audacity/plug-ins/rissetdrum.ny
-share/audacity/plug-ins/rms.ny
-share/audacity/plug-ins/sample-data-export.ny
-share/audacity/plug-ins/sample-data-import.ny
-share/audacity/plug-ins/tremolo.ny
-share/audacity/plug-ins/vocalrediso.ny
-share/audacity/plug-ins/vocoder.ny
 share/doc/audacity/LICENSE.txt
 share/doc/audacity/README.txt
 share/icons/hicolor/16x16/apps/audacity.png
diff --git a/audio/audacity/distinfo b/audio/audacity/distinfo
index cd1eeffe278..3cfe7e1b4a1 100644
--- a/audio/audacity/distinfo
+++ b/audio/audacity/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.42 2020/04/16 21:54:06 nia Exp $
+$NetBSD: distinfo,v 1.43 2020/05/23 15:51:28 nia Exp $
 
-SHA1 (audacity-2.3.3/audacity-2.3.3.tar.gz) = 165ad24f90728b644b928397eb75129977c16db1
-RMD160 (audacity-2.3.3/audacity-2.3.3.tar.gz) = 3963eeb7a59ba3435ff746bd3e39c60445edc0bb
-SHA512 (audacity-2.3.3/audacity-2.3.3.tar.gz) = 0789d5bc27933c688b8c99e0d9d9ca65f3b0c59cf74a235feee094a1815bdb59a32a4f50d2938b8fb9d72b0c5ba88451d02f90c5163931774a2088463562c5ef
-Size (audacity-2.3.3/audacity-2.3.3.tar.gz) = 62073352 bytes
+SHA1 (audacity-2.4.1.tar.gz) = f164b6a2e02947809cee2e313cb61279a60d4829
+RMD160 (audacity-2.4.1.tar.gz) = 8c0b5643d015c7dd5bbe1b47eae0025201eb51b2
+SHA512 (audacity-2.4.1.tar.gz) = 2f0a3f7e24dce91ae520e285dbb05778b68e0fe37b8ded55ac568b5f8135069951b3986764adc5d0791c165b283a3c19596f1d6f51ba17028e0eb04558c63f25
+Size (audacity-2.4.1.tar.gz) = 63935461 bytes
 SHA1 (patch-Makefile.in) = 2aca8c2ae0af7863f8f090a707c08fba693c7c86
 SHA1 (patch-aa) = 67c0ec5ff99004d9035de13f0263add46ed8c994
 SHA1 (patch-configure) = 2cf208a6104c73c761156e2373d21af64606c31e
@@ -11,6 +11,7 @@ SHA1 (patch-configure.ac) = b34f733208080d57b30877d762e61a3d3fdec888
 SHA1 (patch-lib-src_FileDialog_Makefile.am) = efa6ca612f3984a4cf8150e3c624e347d144af87
 SHA1 (patch-lib-src_FileDialog_Makefile.in) = 44ca2539d68ab3951ae44377ed56f574785c1b08
 SHA1 (patch-lib-src_lib-widget-extra_Makefile.am) = 03d080c141259fbf02a9c5a70ce06625fcebf75e
+SHA1 (patch-lib-src_libnyquist_nyquist_cmupv_src_cmupv.c) = 3d6cb845d82b1bcbe31dabd4bad30cb1f7ea27d5
 SHA1 (patch-lib-src_libnyquist_nyquist_nyqsrc_sndread.c) = dbc0b5b88043c7b2895742e78e6a5990f65012ef
 SHA1 (patch-lib-src_libnyquist_nyquist_sys_unix_switches.h) = d313f137f11d3e0fafa383ddeccbc89021e9ddee
 SHA1 (patch-lib-src_libnyquist_nyquist_xlisp_xlisp.h) = 2d4558f059d86633a1fcdda22ef0c914758b35a0
diff --git a/audio/audacity/patches/patch-lib-src_libnyquist_nyquist_cmupv_src_cmupv.c b/audio/audacity/patches/patch-lib-src_libnyquist_nyquist_cmupv_src_cmupv.c
new file mode 100644
index 00000000000..1fe4abbbe72
--- /dev/null
+++ b/audio/audacity/patches/patch-lib-src_libnyquist_nyquist_cmupv_src_cmupv.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-lib-src_libnyquist_nyquist_cmupv_src_cmupv.c,v 1.1 2020/05/23 15:51:28 nia Exp $
+
+Build on systems without log2l (NetBSD 9...)
+
+--- lib-src/libnyquist/nyquist/cmupv/src/cmupv.c.orig	2020-05-19 09:43:53.000000000 +0000
++++ lib-src/libnyquist/nyquist/cmupv/src/cmupv.c
+@@ -218,7 +218,7 @@ typedef struct {
+ //
+ int round_log_power(int fftsize, int *size_ptr)
+ {
+-    long double log2_fft = log2l(fftsize);
++    long double log2_fft = log2(fftsize);
+     int round_log2_fft = (int) log2_fft;
+     if (round_log2_fft < log2_fft) {
+         round_log2_fft += 1;