audacity: update to 2.4.1

1 files changed, 28 insertions, 12 deletions

diff --git a/audacity/build/audacity.SlackBuild b/audacity/build/audacity.SlackBuild
index 16680abf..84ff04f8 100755
--- a/audacity/build/audacity.SlackBuild
+++ b/audacity/build/audacity.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/bash
 # $Id$
-# Copyright 2010, 2019  Eric Hameleers, Eindhoven, NL
+# Copyright 2010, 2019, 2020  Eric Hameleers, Eindhoven, NL
 # All rights reserved.
 #
 #   Permission to use, copy, modify, and distribute this software for
@@ -40,6 +40,9 @@
 #              * Overdue update.
 # 2.3.3-1:     27/nov/2019 by Eric Hameleers <alien@slackware.com>
 #              * Update.
+# 2.4.1-1:     28/may/2020 by Eric Hameleers <alien@slackware.com>
+#              * Update. Do not use the new 'cmake' configuration yet,
+#                because it is way too buggy.
 # 
 # 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 .
@@ -48,7 +51,7 @@
 # -----------------------------------------------------------------------------
 
 PRGNAM=audacity
-VERSION=${VERSION:-2.3.3}
+VERSION=${VERSION:-2.4.1}
 BUILD=${BUILD:-1}
 NUMJOBS=${NUMJOBS:-" -j$(nproc) "}
 TAG=${TAG:-alien}
@@ -161,45 +164,58 @@ cd ${PRGNAM^}*-${VERSION} || cd ${PRGNAM}*-${VERSION}
 sed -e "s,lib/vamp,lib${LIBDIRSUFFIX}/vamp,g" \
   -i lib-src/libvamp/src/vamp-hostsdk/PluginHostAdapter.cpp
 
+# Fix crash on resize (see https://bugs.archlinux.org/task/66771):
+cat $SRCDIR/patches/audacity-2.4.1_resize_crash.patch | patch -Np1 --verbose \
+  2>&1 | tee $OUTPUT/patch-${PRGNAM}.log
+
 chown -R root:root .
 chmod -R u+w,go+r-w,a+rX-st .
 
 echo Building ...
-[ ! -x configure ] && autoreconf -vif
+touch $OUTPUT/configure-${PRGNAM}.log
+autoreconf -vif \
+  2>&1 | tee -a $OUTPUT/configure-${PRGNAM}.log
+
 WX_CONFIG="/usr/bin/wx-config-gtk3" \
 LDFLAGS="$SLKLDFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS -DHAVE_VISIBILITY=1" \
 CFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --mandir=/usr/man \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --enable-shared \
+  --enable-static-wx \
   --with-lib-preference="system local" \
   --with-expat=system \
+  --with-ffmpeg=system \
   --with-lame=system \
-  --with-libvorbis=system \
+  --with-libid3tag=system \
   --with-libmad=system \
   --with-libflac=system \
   --with-libsndfile=system \
-  --with-libid3tag=system \
-  --with-ffmpeg \
+  --with-libvorbis=system \
   --with-ladspa \
   --with-libsamplerate \
   --with-libsoxr \
+  --with-libtwolame \
   --with-lv2 \
   --with-portaudio \
+  --with-portmidi \
+  --with-sbsms \
   --with-soundtouch \
-  --with-twolame \
   --with-vamp \
-  --without-libresample \
-  --enable-shared \
-  --enable-static-wx \
-  2>&1 | tee $OUTPUT/configure-${PRGNAM}.log
+  2>&1 | tee -a $OUTPUT/configure-${PRGNAM}.log
+  #--without-libresample \
 
 make $NUMJOBS 2>&1 | tee $OUTPUT/make-${PRGNAM}.log
 make DESTDIR=$PKG install 2>&1 | tee $OUTPUT/install-${PRGNAM}.log
 
+# Install libnyquist plugins and related files, this is broken since 2.4.0:
+install -vDm 644 plug-ins/*.ny -t ${PKG}/usr/share/${PRGNAM}/plug-ins
+install -vDm 644 nyquist/*.lsp -t ${PKG}/usr/share/${PRGNAM}/nyquist
+
 # Add this to the doinst.sh:
 mkdir -p $PKG/install
 cat <<EOINS >> $PKG/install/doinst.sh