audacity: version 2.4.2

5 files changed, 97 insertions, 111 deletions

diff --git a/audio-creation/audacity/BUILD b/audio-creation/audacity/BUILD
index fd3dd8f195..5e1772ba53 100755
--- a/audio-creation/audacity/BUILD
+++ b/audio-creation/audacity/BUILD
@@ -1,11 +1,5 @@
-if [ "$AUDACITY_UNI" == "y" ]; then
-   OPTS="$OPTS --enable-unicode"
-fi &&
-
-OPTS="$AUDACITY_LADSPA $OPTS"    &&
-OPTS="$AUDACITY_PORTMIXER $OPTS" &&
-OPTS="$AUDACITY_NYQUIST $OPTS"   &&
-# Things are too fragile for that.
-#OPTS="--with-lib-preferences=system $OPTS" &&
-
-default_build
+# Rationale: prevent untracked dependencies.
+# Generally, external libs are not that well tested.
+OPTS+=" -Daudacity_lib_preference=local" &&
+OPTS+=" $AUDACITY_NYQUIST $AUDACITY_VST2" &&
+cmake_build
diff --git a/audio-creation/audacity/CONFIGURE b/audio-creation/audacity/CONFIGURE
index f4212bdf97..1fea642738 100755
--- a/audio-creation/audacity/CONFIGURE
+++ b/audio-creation/audacity/CONFIGURE
@@ -1,9 +1,7 @@
-config_query_option  AUDACITY_NYQUIST  "Compile with Nyquist plug-in support?"  y  \
-                     "--enable-nyquist"  "--disable-nyquist"          &&
+config_query_option AUDACITY_NYQUIST \
+  "Compile with Nyquist plug-in support?" y \
+  -Daudacity_use_nyquist={local,off} &&
 
-config_query_option  AUDACITY_LADSPA  "Compile with LADSPA plug-in support?"  y  \
-                     "--enable-ladspa"  "--disable-ladspa"
-
-# Breaks horribly without.
-#config_query_option  AUDACITY_PORTMIXER  "Compile with PortMixer?"  y    \
-#                     "--with-portmixer"  "--without-portmixer"
+config_query_option AUDACITY_VST2 \
+  "Compiler with VST2 plug-in support?" y \
+  -Daudacity_use_vst={ON,OFF}
diff --git a/audio-creation/audacity/DEPENDS b/audio-creation/audacity/DEPENDS
index 0dc56fd85a..3a2be1934a 100755
--- a/audio-creation/audacity/DEPENDS
+++ b/audio-creation/audacity/DEPENDS
@@ -1,87 +1,78 @@
-depends  zip    &&
-depends  WXWIDGET &&
-optional_depends  lame "--with-lame" \
-                       "--without-lame" \
-                       "for mp3 import/export support" &&
-
-optional_depends  libsndfile              \
-               "--with-libsndfile=system"  \
-               "--with-libsndfile=local"   \
-               "to use system libsndfile" &&
-if [[ "$AUDACITY_BRANCH" == "scm" ]]; then
-   depends CVS
-fi  &&
-
-optional_depends flac "--with-flac" "--without-flac" "For flac support" &&
-
-optional_depends twolame "--with-libtwolame"               \
-                         "--without-libtwolame"            \
-                         "For twolame MP2 export support"  &&
-
-optional_depends libvorbis "--with-vorbis"          \
-                           "--without-vorbis"       \
-                           "for ogg/vorbis support" &&
-
-optional_depends  libmad  "--with-libmad=system"  "--without-libmad"  \
-                  "for MP3 importing support"                         &&
-
-optional_depends  libid3tag                   \
-                  "--with-id3tag"             \
-                  "--without-id3tag"          \
-                  "for MP3 ID3 tag support"   &&
-
-optional_depends  expat                       \
-                  "--with-expat=system"       \
-                  "--with-expat=local"        \
-                  "to use system expat"       &&
-
-optional_depends  JACK-DRIVER                  \
-                  ""                           \
-                  ""                           \
-                  "to build with jack support" &&
-
-message "${PROBLEM_COLOR}Do not use libsamplerate in conjunction with VST plug-in support!${DEFAULT_COLOR}" &&
-
-optional_depends  libsamplerate                   \
-                  "--with-libsamplerate=system"   \
-                  "--with-libsamplerate=local"    \
-                  "to use external libsamplerate" &&
-
-optional_depends soundtouch    \
-                 "--with-soundtouch=system"  \
-                 "--with-soundtouch=no"      \
-                 "to use external soundtouch for editing" &&
-
-optional_depends  vamp-plugin-sdk "--with-libvamp=system"  "--with-libvamp=local" \
-                  "Compile with external vamp plug-in support?"
-
-optional_depends  LIBAVCODEC                              \
-                  "--with-ffmpeg"                         \
-                  "--without-ffmpeg"                      \
-                  "for ffmpeg import and export support"  &&
-
-## no spell yet
-#optional_depends  libresample                   \
-#                  "--with-libresample"          \
-#                  "--without-libresample"       \
-#                  "for sample rate conversion"  &&
-
-optional_depends  redland                 \
-                  "--with-redland"        \
-                  "--without-redland"     \
-                  "for reading RDF data"  &&
-
-optional_depends  slv2                       \
-                  "--with-lv2=system"       \
-                  "--without-lv2"     \
-                  "for system LV2 loader"  &&
-
-optional_depends  liblrdf                                 \
-                  "--with-liblrdf"                        \
-                  "--without-liblrdf"                     \
-                  "for categorisation of LADSPA plugins"  &&
-
-optional_depends  portaudio19                             \
-                  "--with-portaudio=system"               \
-                  "--with-portaudio=local"                \
-                  "to use external portaudio"
+depends cmake &&
+depends python3 &&
+depends WXWIDGET -Daudacity_use_wxwidgets=system &&
+# Dunno what for, but is checked explicitly.
+depends gtk+3 &&
+depends glib2 &&
+depends expat -Daudacity_use_expat=system &&
+
+optional_depends ffmpeg \
+  -Daudacity_use_ffmpeg={loaded,off} \
+  "for conversions" &&
+
+optional_depends flac \
+  -Daudacity_use_flac={system,off} \
+  "for FLAC support" &&
+
+optional_depends libmad \
+  -Daudacity_use_mad={system,off} \
+  "as mp3 decoder" &&
+
+optional_depends libid3tag \
+  -Daudacity_use_id3tag={system,off} \
+  "for ID3 tagging" &&
+
+depends libsndfile -Daudacity_use_sndfile=system &&
+
+optional_depends libvorbis \
+  -Daudacity_use_vorbis={system,off} &&
+
+# Not strictly necessary, as the API is a shipped
+# header, but it helps to have the basic set of
+# example plugins present, and it's cheap.
+
+depends ladspa -Daudacity_use_ladspa=ON &&
+
+# insists on using shipped copy of lame, strange
+# so no depends here
+
+optional_depends lv2 \
+  -Daudacity_use_lv2={system,off} \
+  "for LV2 plugins (triggers some more related deps)" &&
+
+if is_depends_enabled "$SPELL" lv2; then
+  depends serd     &&
+  depends sord     &&
+  depends sratom-0 &&
+  depends lilv-0   &&
+  depends suil-0
+fi &&
+
+# dunno about smbms, keep it local
+
+optional_depends soundtouch \
+  -Daudacity_use_soundtouch={system,off} \
+  "for effects" &&
+
+depends soxr \
+  -Daudacity_use_soxr=system &&
+
+optional_depends vamp-plugin-sdk \
+  -Daudacity_use_vamp={system,off} &&
+
+optional_depends twolame \
+  -Daudacity_use_twolame={system,off} \
+  "for MP2 creation" &&
+
+# Not trying to force portaudio stuff,
+# that can be sensitive and is core to audacity.
+
+optional_depends alsa-lib \
+  -Daudacity_use_pa_alsa={YES,NO} \
+  "for audio I/O" &&
+
+optional_depends JACK-DRIVER \
+  -Daudacity_use_pa_jack={loaded,off} \
+  "for audio I/O" &&
+
+true
diff --git a/audio-creation/audacity/DETAILS b/audio-creation/audacity/DETAILS
index 61647d1408..00c0b0b261 100755
--- a/audio-creation/audacity/DETAILS
+++ b/audio-creation/audacity/DETAILS
@@ -1,9 +1,9 @@
            SPELL=audacity
-         VERSION=2.3.1
-          SOURCE=Audacity-${VERSION}.tar.gz
-   SOURCE_URL[0]=https://github.com/audacity/audacity/archive/Audacity-2.3.1.tar.gz
-     SOURCE_HASH=sha512:066f57bd90d2baea6969f0cbfb63e41a42ed6dac955d87dc7b601c7a270888363e414c57e36393618801ea31b1068b7b22003f52897bf9a44fbc355aaf23cbaa
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-Audacity-$VERSION
+         VERSION=2.4.2
+          SOURCE=audacity-minsrc-$VERSION.tar.xz
+   SOURCE_URL[0]=http://sobukus.de/$SPELL/$SOURCE
+     SOURCE_HASH=sha512:0fcbb2d9e131b3d683b3f0b0d16f565f034d46e57dab1749c52fc8e72f2bc8c64606fd749ed13d925aecef31f38258ad8b79f8e1baa23c99c7b805686e5445b4
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SOURCE%.tar.xz}
         WEB_SITE=http://audacityteam.org/
          ENTERED=20011217
       LICENSE[0]=GPL
diff --git a/audio-creation/audacity/HISTORY b/audio-creation/audacity/HISTORY
index 18abd8f7eb..673a7d851b 100644
--- a/audio-creation/audacity/HISTORY
+++ b/audio-creation/audacity/HISTORY
@@ -1,3 +1,6 @@
+2020-09-24 Thomas Orgis <sobukus@sourcemage.org>
+	* DETAILS: version 2.4.2
+
 2019-06-09 Kenneth Raplee <kenneth@raplee.email>
 	* DETAILS: version 2.3.1, update SOURCE and SOURCE_URL
 	* DEPENDS: change slv2 disable parameter from "--with-lv2=local" to