audacity: update to 3.1.3. Mind the large set of new dependencies!!!

1 files changed, 36 insertions, 37 deletions

diff --git a/audacity/build/audacity.SlackBuild b/audacity/build/audacity.SlackBuild
index c0b61c30..87bd3d7a 100755
--- a/audacity/build/audacity.SlackBuild
+++ b/audacity/build/audacity.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/bash
 # $Id$
-# Copyright 2010, 2019, 2020, 2021  Eric Hameleers, Eindhoven, NL
+# Copyright 2010, 2019, 2020, 2021, 2022  Eric Hameleers, Eindhoven, NL
 # All rights reserved.
 #
 #   Permission to use, copy, modify, and distribute this software for
@@ -29,8 +29,9 @@
 # Descr:       multi-track audio editor and recorder
 # URL:         https://audacityteam.org
 # Build needs: 
-# Needs:       ffmpeg, jack2, ladspa_sdk, lame, lilv, suil,
-#              vamp-plugin-sdk
+# Needs:       jack2, ladspa_sdk, libsbsms, lilv, lv2, portaudio, portmidi,
+#              portsmf, serd, sord, soundtouch, soxr, sratom, suil,
+#              twolame, vamp-plugin-sdk, wxGTK3
 # Changelog:   
 # 1.3.12-1:    12/Apr/2010 by Eric Hameleers <alien@slackware.com>
 #              * Initial build.
@@ -53,6 +54,13 @@
 #              * Update.
 # 3.0.2-2:     19/aug/2021 by Eric Hameleers <alien@slackware.com>
 #              * Fix 'internal database error' when saving a project on exit.
+# 3.1.3-1:     18/sep/2022 by Eric Hameleers <alien@slackware.com>
+#              * Update. Don't use conan, instead provide all the external
+#                dependencies ourselves.
+#                Audacity on Linux can now use vanilla wxWidgets >= 3.1.3,
+#                as long as wx is provided as dynamic libraries.
+#                Also, portsmf version 234 is mandatory, since audacity
+#                won't link against newer releases.
 # 
 # Run 'sh audacity.SlackBuild' to build a Slackware package.
 # The package (.t?z) and .txt file as well as build logs are created in /tmp .
@@ -61,22 +69,14 @@
 # -----------------------------------------------------------------------------
 
 PRGNAM=audacity
-VERSION=${VERSION:-3.0.2}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-3.1.3}
+BUILD=${BUILD:-1}
 NUMJOBS=${NUMJOBS:-" -j$(nproc) "}
 TAG=${TAG:-alien}
 PKGTYPE="txz"
 
 DOCS="*.txt"
 
-# On 32bit we need to revert to an external soxr library for now, since
-# the included copy refuses to compile (check again with later releases):
-if pkg-config --exists soxr 2>/dev/null ; then
-  SOXR_TYPE="system"
-else
-  SOXR_TYPE="local"
-fi
-
 # Where do we look for sources?
 SRCDIR=$(cd $(dirname $0); pwd)
 
@@ -117,7 +117,7 @@ src_checkout() {
      mkdir -p $CODIR/${PRGNAM}_temp_checkout_$$ \
        && cd $CODIR/${PRGNAM}_temp_checkout_$$
      mkdir ${PBASE} \
-       && cd ${PBASE} \
+       && cd ${PBASE}
      echo "Checking out from '$GITURI':"
      git clone --depth 1 --single-branch --recurse-submodules ${GITURI} . \
        && chown -R root:root . \
@@ -232,40 +232,34 @@ cd ${PRGNAM}*-${VERSION} || cd ${PRGNAM^}*-${VERSION}
 
 # Patches and fixes:
 touch $OUTPUT/patch-${PRGNAM}.log
+
 # Fix vamp plugin search path on x86_64 - thanks to B. Watson
 sed -e "s,lib/vamp,lib${LIBDIRSUFFIX}/vamp,g" \
   -i lib-src/libvamp/src/vamp-hostsdk/PluginHostAdapter.cpp
 
-# Fix detection of JACK:
-sed  -e "s/find_package( jack )/find_package( Jack )/" \
-  -i cmake-proxies/portaudio-v19/CMakeLists.txt
-
-# Fix detection of local wx libraries:
-sed -i src/CMakeLists.txt \
-  -e 's#${WXWIN}/lib#$ENV{MYBUILD}/lib#' \
-  -e 's#-t ${_LIBDIR}#-t $ENV{MYBUILD}/bin/Release/${_LIBDIR}#'
-
 # Fix building with GCC11:
 cat $SRCDIR/patches/audacity-3.0.2_gcc11.patch | patch -p1 --verbose \
   2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log
 
+# Fix building against wxGTK3 >= 3.1.6;
+# https://github.com/audacity/audacity/issues/2774 :
+cat $SRCDIR/patches/audacity-3.1.3_wxbitmap_constructor.patch | patch -p1 --verbose \
+  2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log
+cat $SRCDIR/patches/audacity-3.1.3_wxwidgets_3.1.6.patch | patch -p1 --verbose \
+  2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log
+
 chown -R root:root .
 chmod -R u+w,go+r-w,a+rX-st .
 
 echo Building ...
 mkdir build
 cd build
-  # Put our git snapshot for wxwidgets in place:
-  mkdir -p cmake-proxies/wxWidgets
-  tar -xvf ${SOURCE[1]} -C cmake-proxies/wxWidgets/
-  mv cmake-proxies/wxWidgets/{wxWidgets_${PRGNAM}-${VERSION},wxwidgets}
-  export MYBUILD="$(pwd)"
-
   LDFLAGS="$SLKLDFLAGS -Wl,-rpath,/usr/lib${LIBDIRSUFFIX}/${PRGNAM}" \
   CXXFLAGS="$SLKCFLAGS" \
   CFLAGS="$SLKCFLAGS" \
   cmake .. \
     -DCMAKE_BUILD_TYPE=Release \
+    -DAUDACITY_BUILD_LEVEL=2 \
     -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
     -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS -DHAVE_VISIBILITY=1" \
@@ -276,7 +270,13 @@ cd build
     -DCMAKE_INSTALL_MANDIR=/usr/man \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_VERBOSE_MAKEFILE:BOOL="ON" \
+    -Daudacity_conan_enabled:BOOL="OFF" \
+    -Daudacity_has_crashreports:BOOL="OFF" \
+    -Daudacity_has_networking:BOOL="OFF" \
+    -Daudacity_has_sentry_reporting:BOOL="OFF" \
+    -Daudacity_has_updates_check:BOOL="OFF" \
     -Daudacity_lib_preference="system" \
+    -Daudacity_obey_system_dependencies:BOOL="ON" \
     -Daudacity_use_expat=system \
     -Daudacity_use_ffmpeg=loaded \
     -Daudacity_use_flac=system \
@@ -288,15 +288,17 @@ cd build
     -Daudacity_use_ogg=system \
     -Daudacity_use_pa_alsa:BOOL="ON" \
     -Daudacity_use_pa_jack=loaded \
-    -Daudacity_use_portaudio=local \
+    -Daudacity_use_portaudio=system \
     -Daudacity_use_sndfile=system \
-    -Daudacity_use_soxr=${SOXR_TYPE} \
-    -Daudacity_use_soundtouch=local \
-    -Daudacity_use_sqlite=local \
+    -Daudacity_use_soxr=system \
+    -Daudacity_use_soundtouch=system \
+    -Daudacity_use_sqlite=system \
     -Daudacity_use_twolame=system \
     -Daudacity_use_vamp=system \
     -Daudacity_use_vorbis=system \
-    -Daudacity_use_wxwidgets=local \
+    -Daudacity_use_wxwidgets=system \
+    -DwxWidgets_CONFIG_EXECUTABLE=/usr/bin/wx-config-gtk3 \
+    -DwxWidgets_wxrc_EXECUTABLE=/usr/bin/wxrc \
   2>&1 | tee $OUTPUT/configure-${PRGNAM}.log
 
   make $NUMJOBS 2>&1 | tee $OUTPUT/make-${PRGNAM}.log
@@ -364,9 +366,6 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
 mkdir -p $PKG/install
 cat $SRCDIR/slack-desc > $PKG/install/slack-desc
 cat $SRCDIR/slack-required > $PKG/install/slack-required
-if [ "$SOXR_TYPE" == "system" ]; then
-  echo "soxr" >> $PKG/install/slack-required
-fi
 
 # Build the package:
 cd $PKG