audio/audacity: Updated for version 3.0.2.

Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

3 files changed, 52 insertions, 59 deletions

diff --git a/audio/audacity/README b/audio/audacity/README
index 02ca71e92a..8689c747e0 100644
--- a/audio/audacity/README
+++ b/audio/audacity/README
@@ -8,6 +8,3 @@ twolame, vamp-plugin-sdk, and lilv + suil (for lv2 support).
 The manual is packaged with the application only if you pass the script
 the additional option
   MANUAL=yes
-
-NOTE: This won't build if you had previously built and installed wxGTK3
-using the command line option STL=yes
diff --git a/audio/audacity/audacity.SlackBuild b/audio/audacity/audacity.SlackBuild
index 072f1e0fe6..4ce96b3aa5 100644
--- a/audio/audacity/audacity.SlackBuild
+++ b/audio/audacity/audacity.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for audacity
 
 # Copyright 2006-2010 Chess Griffin <chess@chessgriffin.com>
-# Copyright 2011-2020 Matteo Bernardini <ponce@slackbuilds.org>
+# Copyright 2011-2021 Matteo Bernardini <ponce@slackbuilds.org>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -31,8 +31,8 @@
 
 PRGNAM=audacity
 SRCNAM=Audacity
-VERSION=${VERSION:-2.4.1}
-MANVER=${MANVER:-2.4.1}
+VERSION=${VERSION:-3.0.2}
+MANVER=${MANVER:-3.0.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -63,12 +63,11 @@ else
   LIBDIRSUFFIX=""
 fi
 
-if [ -x /usr/bin/listplugins ];      then do_ladspa="--with-ladspa";          else do_ladspa="--without-ladspa";   fi
-if pkg-config --exists libavcodec;   then do_ffmpeg="-ffmpeg=system";         else do_ffmpeg="out-ffmpeg";         fi
-if pkg-config --exists soundtouch;   then do_soundtouch="-soundtouch=system"; else do_soundtouch="out-soundtouch"; fi
-if pkg-config --exists twolame;      then do_twolame="-libtwolame=system";    else do_twolame="out-libtwolame";    fi
-if pkg-config --exists vamp-hostsdk; then do_vamp="-libvamp=system";          else do_vamp="out-libvamp";          fi
-if $(pkg-config --exists lilv-0) && $(pkg-config --exists suil-0); then do_lv2="-lv2=system"; else do_lv2="out-lv2"; fi
+if [ -x /usr/bin/listplugins ];      then do_ladspa="on";         else do_ladspa="off";     fi
+if pkg-config --exists soundtouch;   then do_soundtouch="system"; else do_soundtouch="off"; fi
+if pkg-config --exists twolame;      then do_twolame="system";    else do_twolame="off";    fi
+if pkg-config --exists vamp-hostsdk; then do_vamp="system";       else do_vamp="off";       fi
+if $(pkg-config --exists lilv-0) && $(pkg-config --exists suil-0); then do_lv2="system"; else do_lv2="off"; fi
 
 set -e
 
@@ -78,12 +77,15 @@ cd $TMP
 rm -rf $PRGNAM-$SRCNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$SRCNAM-$VERSION.tar.gz
 cd $PRGNAM-$SRCNAM-$VERSION
+mkdir -p build/cmake-proxies/wxWidgets
+( cd build/cmake-proxies/wxWidgets
+  tar xvf $CWD/wxwidgets-audacity-$VERSION.tar.xz )
 chown -R root:root .
 find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 # fix vamp plugin search path on x86_64 - thanks to B. Watson
 sed -i "s,lib/vamp,lib$LIBDIRSUFFIX/vamp,g" \
@@ -92,43 +94,35 @@ sed -i "s,lib/vamp,lib$LIBDIRSUFFIX/vamp,g" \
 # fix building against ffmpeg-2.6.x, patch from archlinux
 patch -p1 < $CWD/audacity-ffmpeg.patch || exit 1
 
-autoreconf -fi
-
-# libsoxr is the new default resampling library
-LDFLAGS="-L/usr/lib$LIBDIRSUFFIX" \
-CFLAGS="$SLKCFLAGS -fcommon" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --enable-unicode \
-  --enable-nyquist \
-  --with-expat=system \
-  --with-lame=system \
-  --with-libvorbis=system \
-  --with-libmad=system \
-  --with-libflac=system \
-  --with-libsndfile=system \
-  --with-libid3tag=system \
-  --with-libsoxr \
-  --with-portaudio \
-  $do_ladspa \
-  --with$do_ffmpeg \
-  --with$do_lv2 \
-  --with$do_soundtouch \
-  --with$do_twolame \
-  --with$do_vamp \
-  --without-libresample \
-  --without-libsamplerate
-
-# ensure we use the system headers for these: note that we do this after the
-# configure as this last wants to run sub-configures in these dirs
-for i in ffmpeg expat lame libid3tag libflac libmad libresample libsndfile libvamp lv2 soundtouch twolame; do
-  rm -rf lib-src/$i
-done
-
-make
-make install DESTDIR=$PKG
+mkdir -p build
+cd build
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+    -DMAN_INSTALL_DIR=/usr/man \
+    -Daudacity_use_sndfile=system \
+    -Daudacity_use_soxr=system \
+    -Daudacity_use_lame=system \
+    -Daudacity_use_twolame=$do_twolame \
+    -Daudacity_use_flac=system \
+    -Daudacity_use_ladspa=$do_ladspa \
+    -Daudacity_use_vorbis=system \
+    -Daudacity_use_id3tag=system \
+    -Daudacity_use_expat=system \
+    -Daudacity_use_soundtouch=$do_soundtouch \
+    -Daudacity_use_vamp=$do_vamp \
+    -Daudacity_use_lv2=$do_lv2 \
+    -Daudacity_use_midi=system \
+    -Daudacity_use_ogg=system \
+    -Daudacity_use_ffmpeg=loaded \
+    -Daudacity_use_wxwidgets=local \
+    -Daudacity_use_portaudio=local \
+    -DCMAKE_BUILD_TYPE=Release ..
+  make
+  make install DESTDIR=$PKG
+cd ..
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
diff --git a/audio/audacity/audacity.info b/audio/audacity/audacity.info
index d4666de088..b3bf8e8cc1 100644
--- a/audio/audacity/audacity.info
+++ b/audio/audacity/audacity.info
@@ -1,12 +1,14 @@
 PRGNAM="audacity"
-VERSION="2.4.1"
+VERSION="3.0.2"
 HOMEPAGE="https://www.audacityteam.org"
-DOWNLOAD="https://github.com/audacity/audacity/archive/Audacity-2.4.1/audacity-Audacity-2.4.1.tar.gz \
-          http://ponce.cc/slackware/sources/repo/audacity-manual-2.4.1.zip"
-MD5SUM="c02a12a9f14f2db223f84e99e17b4850 \
-        b3640ddc811e0d3c6b22c9b411743f39"
+DOWNLOAD="https://github.com/audacity/audacity/archive/Audacity-3.0.2/audacity-Audacity-3.0.2.tar.gz \
+          http://ponce.cc/slackware/sources/repo/wxwidgets-audacity-3.0.2.tar.xz \
+          http://ponce.cc/slackware/sources/repo/audacity-manual-3.0.2.zip"
+MD5SUM="b3f9e40204548a945f081ab8ade5551f \
+        640ab07f7edfe64f8d1c4f7fd88e48a6 \
+        5ac5bf09a55e77e8a0bf5b68805b08c4"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="wxGTK3"
+REQUIRES=""
 MAINTAINER="Matteo Bernardini"
 EMAIL="ponce@slackbuilds.org"