audacity: updated to 2.2.2

1 files changed, 88 insertions, 58 deletions

diff --git a/audacity/build/audacity.SlackBuild b/audacity/build/audacity.SlackBuild
index 69ca2173..2076ab72 100755
--- a/audacity/build/audacity.SlackBuild
+++ b/audacity/build/audacity.SlackBuild
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/bash
 # $Id$
-# Copyright (c) 2010 Eric Hameleers, Eindhoven, NL
+# Copyright 2010, 2019  Eric Hameleers, Eindhoven, NL
 # All rights reserved.
 #
 #   Permission to use, copy, modify, and distribute this software for
@@ -24,32 +24,34 @@
 #
 # Slackware SlackBuild script 
 # ===========================
-# By:         Eric Hameleers <alien@slackware.com>
-# For:        audacity
-# Descr:      sound editor
-# URL:        http://audacity.sourceforge.net/
-# Needs:      
-# Changelog:  
-# 1.3.12-1:   12/Apr/2010 by Eric Hameleers <alien@slackware.com>
-#             * Initial build.
-# 1.3.12-2:   31/may/2010 by Eric Hameleers <alien@slackware.com>
-#             * Rebuild for Slackware 13.1
+# By:          Eric Hameleers <alien@slackware.com>
+# For:         audacity
+# Descr:       multi-track audio editor and recorder
+# URL:         https://audacityteam.org
+# Build needs: 
+# Needs:       ffmpeg, jack2, ladspa_sdk, lame, lilv, suil, vamp-plugin-sdk,
+#              wxGTK3
+# Changelog:   
+# 1.3.12-1:    12/Apr/2010 by Eric Hameleers <alien@slackware.com>
+#              * Initial build.
+# 1.3.12-2:    31/may/2010 by Eric Hameleers <alien@slackware.com>
+#              * Rebuild for Slackware 13.1
+# 2.2.2-1:     22/Feb/2019 by Eric Hameleers <alien@slackware.com>
+#              * Overdue update.
 # 
 # Run 'sh audacity.SlackBuild' to build a Slackware package.
-# The package (.tgz) and .txt file as well as build logs are created in /tmp .
-# Install it using 'installpkg'. 
+# The package (.t?z) and .txt file as well as build logs are created in /tmp .
+# Install the package using 'installpkg' or 'upgradepkg --install-new'.
 #
 # -----------------------------------------------------------------------------
 
-# Set initial variables:
-
 PRGNAM=audacity
-VERSION=${VERSION:-1.3.12}
-BUILD=${BUILD:-2}
-NUMJOBS=${NUMJOBS:" -j4 "}
+VERSION=${VERSION:-2.2.2}
+BUILD=${BUILD:-1}
+NUMJOBS=${NUMJOBS:-" -j$(nproc) "}
 TAG=${TAG:-alien}
 
-DOCS="LICENSE.txt README.txt"
+DOCS="*.txt"
 
 # Where do we look for sources?
 SRCDIR=$(cd $(dirname $0); pwd)
@@ -59,8 +61,8 @@ TMP=${TMP:-/tmp/build}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-SOURCE="$SRCDIR/${PRGNAM}-minsrc-${VERSION}-beta.tar.bz2"
-SRCURL="http://audacity.googlecode.com/files/${PRGNAM}-minsrc-${VERSION}-beta.tar.bz2"
+SOURCE="$SRCDIR/${PRGNAM^}-${VERSION}.tar.gz"
+SRCURL="https://github.com/${PRGNAM}/${PRGNAM}/archive/${PRGNAM^}-${VERSION}.tar.gz"
 
 ##
 ## --- with a little luck, you won't have to edit below this point --- ##
@@ -68,24 +70,33 @@ SRCURL="http://audacity.googlecode.com/files/${PRGNAM}-minsrc-${VERSION}-beta.ta
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) export ARCH=i486 ;;
-    arm*) export ARCH=arm ;;
+  case "$(uname -m)" in
+    i?86) ARCH=i586 ;;
+    arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;;
     # Unless $ARCH is already set, use uname -m for all other archs:
-       *) export ARCH=$( uname -m ) ;;
+    *) ARCH=$(uname -m) ;;
   esac
+  export ARCH
 fi
-
+# Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
 case "$ARCH" in
-  i486)      SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  i?86)      SLKCFLAGS="-O2 -march=${ARCH} -mtune=i686"
              SLKLDFLAGS=""; LIBDIRSUFFIX=""
              ;;
   x86_64)    SLKCFLAGS="-O2 -fPIC"
              SLKLDFLAGS="-L/usr/lib64"; LIBDIRSUFFIX="64"
              ;;
-  *)         SLKCFLAGS="-O2"
+  armv7hl)   SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
              SLKLDFLAGS=""; LIBDIRSUFFIX=""
              ;;
+  *)         SLKCFLAGS=${SLKCFLAGS:-"-O2"}
+             SLKLDFLAGS=${SLKLDFLAGS:-""}; LIBDIRSUFFIX=${LIBDIRSUFFIX:-""}
+             ;;
+esac
+
+case "$ARCH" in
+    arm*)    TARGET=$ARCH-slackware-linux-gnueabi ;;
+    *)       TARGET=$ARCH-slackware-linux ;;
 esac
 
 # Exit the script on errors:
@@ -105,17 +116,18 @@ mkdir -p $TMP/tmp-$PRGNAM # location to build the source
 mkdir -p $PKG             # place for the package to be built
 rm -rf $PKG/*             # always erase old package's contents
 rm -rf $TMP/tmp-$PRGNAM/* # remove the remnants of previous build
-rm -rf $OUTPUT/{configure,make,install,error,makepkg}-$PRGNAM.log
+rm -rf $OUTPUT/{checkout,configure,make,install,error,makepkg,patch}-$PRGNAM.log
                           # remove old log files
 
 # Source file availability:
 if ! [ -f ${SOURCE} ]; then
+  echo "Source '$(basename ${SOURCE})' not available yet..."
+  # Check if the $SRCDIR is writable at all - if not, download to $OUTPUT
+  [ -w "$SRCDIR" ] || SOURCE="$OUTPUT/$(basename $SOURCE)"
+  if [ -f ${SOURCE} ]; then echo "Ah, found it!"; continue; fi
   if ! [ "x${SRCURL}" == "x" ]; then
-    # Check if the $SRCDIR is writable at all - if not, download to $OUTPUT
-    [ -w "$SRCDIR" ] || SOURCE="$OUTPUT/$(basename $SOURCE)"
-    echo "Source '$(basename ${SOURCE})' not available yet..."
     echo "Will download file to $(dirname $SOURCE)"
-    wget -nv -T 20 -O "${SOURCE}" "${SRCURL}" || true
+    wget --no-check-certificate -nv -T 20 -O "${SOURCE}" "${SRCURL}" || true
     if [ $? -ne 0 -o ! -s "${SOURCE}" ]; then
       echo "Downloading '$(basename ${SOURCE})' failed... aborting the build."
       mv -f "${SOURCE}" "${SOURCE}".FAIL
@@ -141,11 +153,18 @@ echo "++"
 cd $TMP/tmp-$PRGNAM
 echo "Extracting the source archive(s) for $PRGNAM..."
 tar -xvf ${SOURCE}
-cd ${PRGNAM}-src-${VERSION}-beta
+cd ${PRGNAM^}*-${VERSION} || cd ${PRGNAM}*-${VERSION}
+
+# 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
+
 chown -R root:root .
-chmod -R u+w,go+r-w,a-s .
+chmod -R u+w,go+r-w,a+rX-st .
 
 echo Building ...
+[ ! -x configure ] && autoreconf -vif
+WX_CONFIG="/usr/bin/wx-config-gtk3" \
 LDFLAGS="$SLKLDFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 CFLAGS="$SLKCFLAGS" \
@@ -154,34 +173,52 @@ CFLAGS="$SLKCFLAGS" \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --mandir=/usr/man \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --localstatedir=/var \
-  --sysconfdir=/etc \
+  --with-lib-preference="system local" \
+  --with-expat=system \
+  --with-lame=system \
+  --with-libvorbis=system \
+  --with-libmad=system \
+  --with-libflac=system \
+  --with-libsndfile=system \
+  --with-libid3tag=system \
   --with-ffmpeg \
-  --program-prefix= \
-  --program-suffix= \
-  --build=$ARCH-slackware-linux \
+  --with-ladspa \
+  --with-libsamplerate \
+  --with-libsoxr \
+  --with-lv2 \
+  --with-portaudio \
+  --with-soundtouch \
+  --with-twolame \
+  --with-vamp \
+  --without-libresample \
+  --enable-shared \
+  --enable-static-wx \
   2>&1 | tee $OUTPUT/configure-${PRGNAM}.log
 
 make $NUMJOBS 2>&1 | tee $OUTPUT/make-${PRGNAM}.log
 make DESTDIR=$PKG install 2>&1 | tee $OUTPUT/install-${PRGNAM}.log
 
-# Remove this manually, since the configure option seems to be ignored:
-rm -rf $PKG/usr/share/doc
-
 # Add this to the doinst.sh:
-! [ -d $PKG/install ] && mkdir -p $PKG/install
-cat <<EOT >> $PKG/install/doinst.sh
+mkdir -p $PKG/install
+cat <<EOINS >> $PKG/install/doinst.sh
 # Update the desktop database:
 if [ -x usr/bin/update-desktop-database ]; then
   chroot . /usr/bin/update-desktop-database usr/share/applications > /dev/null 2>&1
 fi
 
+# Update hicolor theme cache:
+if [ -d usr/share/icons/hicolor ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    chroot . /usr/bin/gtk-update-icon-cache -f -t usr/share/icons/hicolor 1> /dev/null 2> /dev/null
+  fi
+fi
+
 # Update the mime database:
 if [ -x usr/bin/update-mime-database ]; then
   chroot . /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1
 fi
 
-EOT
+EOINS
 
 # Add documentation:
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
@@ -203,23 +240,16 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
 # Add a package description:
 mkdir -p $PKG/install
 cat $SRCDIR/slack-desc > $PKG/install/slack-desc
-if [ -f $SRCDIR/doinst.sh ]; then
-  cat $SRCDIR/doinst.sh >> $PKG/install/doinst.sh
-fi
-if [ -f $SRCDIR/slack-required ]; then
-  cat $SRCDIR/slack-required > $PKG/install/slack-required
-fi
+cat $SRCDIR/slack-required > $PKG/install/slack-required
 
 # Build the package:
 cd $PKG
-makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.tgz 2>&1 | tee $OUTPUT/makepkg-${PRGNAM}.log
+makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-tgz} 2>&1 | tee $OUTPUT/makepkg-${PRGNAM}.log
 cd $OUTPUT
-md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.tgz > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.tgz.md5
+md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-tgz} > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-tgz}.md5
 cd -
 cat $PKG/install/slack-desc | grep "^${PRGNAM}" > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txt
-if [ -f $PKG/install/slack-required ]; then
-  cat $PKG/install/slack-required > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.dep
-fi
+cat $PKG/install/slack-required > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.dep
 
 # Restore the original umask:
 umask ${_UMASK_}