audio/audacity: Updated for version 2.1.1, cleanups.

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

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

3 files changed, 16 insertions, 13 deletions

diff --git a/audio/audacity/README b/audio/audacity/README
index e977fe06c5..c18b9debf5 100644
--- a/audio/audacity/README
+++ b/audio/audacity/README
@@ -3,4 +3,5 @@ With Audacity one can record live audio, convert tapes and records into
 digital recordings, edit Ogg, MP3, and WAV sound files, and much more.
 
 Optional dependencies (autodetected) are ffmpeg, jack-audio-connection-kit,
-ladspa_sdk, lame, lilv, soundtouch, twolame and vamp-plugin-sdk.
+ladspa_sdk, lame, soundtouch, twolame, vamp-plugin-sdk and lilv + suil
+(for lv2 support).
diff --git a/audio/audacity/audacity.SlackBuild b/audio/audacity/audacity.SlackBuild
index 3ac335fd25..d8c86f3d41 100644
--- a/audio/audacity/audacity.SlackBuild
+++ b/audio/audacity/audacity.SlackBuild
@@ -30,8 +30,9 @@
 # Modified by the SlackBuilds.org project
 
 PRGNAM=audacity
-VERSION=${VERSION:-2.1.0}
-BUILD=${BUILD:-2}
+SRCNAM=Audacity
+VERSION=${VERSION:-2.1.1}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -63,10 +64,10 @@ 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 lv2;          then do_lv2="-lv2=system";               else do_lv2="out-lv2";               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
 
 set -e
 
@@ -74,8 +75,8 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-src-$VERSION
-tar xvf $CWD/$PRGNAM-src-$VERSION.tar.?z*
-cd $PRGNAM-src-$VERSION
+tar xvf $CWD/$PRGNAM-$SRCNAM-$VERSION.tar.?z* || tar xvf $CWD/$SRCNAM-$VERSION.tar.?z*
+cd $PRGNAM-$SRCNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -91,6 +92,7 @@ sed -i "s,lib/vamp,lib$LIBDIRSUFFIX/vamp,g" \
 patch -p1 < $CWD/audacity-ffmpeg.patch
 
 # libsoxr is the new default resampling library
+LDFLAGS="-L/usr/lib$LIBDIRSUFFIX" \
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -115,8 +117,8 @@ CXXFLAGS="$SLKCFLAGS" \
   --without-libresample \
   --without-libsamplerate
 
-# ensure we use the system headers for these, note we do this after
-# configure as it wants to run sub-configures in these dirs
+# 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 libid3tag libflac libmad libresample libsndfile libvamp lv2 soundtouch twolame; do
   rm -rf lib-src/$i
 done
@@ -134,13 +136,13 @@ install -D -m 0644 $CWD/audacity.desktop \
 install -D -m 0644 images/AudacityLogo48x48.xpm \
   $PKG/usr/share/pixmaps/audacity.xpm
 
-# Move manpage directory to proper location
+# Move manpage directory to the proper location
 mv $PKG/usr/share/man $PKG/usr
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 rm -fr $PKG/usr/share/doc
-cp LICENSE.txt README.txt $PKG/usr/doc/$PRGNAM-$VERSION
+cp LICENSE.txt README.txt todo.txt $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/audio/audacity/audacity.info b/audio/audacity/audacity.info
index 85138b8c87..fd81bc0cf3 100644
--- a/audio/audacity/audacity.info
+++ b/audio/audacity/audacity.info
@@ -1,8 +1,8 @@
 PRGNAM="audacity"
-VERSION="2.1.0"
+VERSION="2.1.1"
 HOMEPAGE="http://audacity.sourceforge.net"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/audacity-src-2.1.0.tar.xz"
-MD5SUM="53785a020536ac3b28ddd22a9d6ca1bb"
+DOWNLOAD="https://github.com/audacity/audacity/archive/Audacity-2.1.1.tar.gz"
+MD5SUM="7cd627dc61da8b3698d234c96aee284d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="wxPython"