From 38aab4dd63e6eb700d28cefb2e30cc550124f52d Mon Sep 17 00:00:00 2001
From: Matteo Bernardini <ponce@slackbuilds.org>
Date: Wed, 19 Apr 2017 10:14:22 +0200
Subject: audio/audacity: Set lame as a mandatory dependency.

Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
---
 audio/audacity/audacity.SlackBuild | 7 +++----
 audio/audacity/audacity.info       | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

(limited to 'audio')

diff --git a/audio/audacity/audacity.SlackBuild b/audio/audacity/audacity.SlackBuild
index 9f175f5ba2..0f30b2ec32 100644
--- a/audio/audacity/audacity.SlackBuild
+++ b/audio/audacity/audacity.SlackBuild
@@ -32,7 +32,7 @@
 PRGNAM=audacity
 SRCNAM=Audacity
 VERSION=${VERSION:-2.1.3}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -63,7 +63,6 @@ else
 fi
 
 if [ -x /usr/bin/listplugins ];      then do_ladspa="--with-ladspa";          else do_ladspa="--without-ladspa";   fi
-if [ $(which lame) ];                then do_lame="-lame=system";             else do_lame="out-lame";             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
@@ -104,6 +103,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --enable-unicode \
   --enable-nyquist \
   --with-expat=system \
+  --with-lame=system \
   --with-libvorbis=system \
   --with-libmad=system \
   --with-libflac=system \
@@ -112,7 +112,6 @@ CXXFLAGS="$SLKCFLAGS" \
   --with-libsoxr \
   --with-portaudio \
   $do_ladspa \
-  --with$do_lame \
   --with$do_ffmpeg \
   --with$do_lv2 \
   --with$do_soundtouch \
@@ -123,7 +122,7 @@ CXXFLAGS="$SLKCFLAGS" \
 
 # 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
+for i in ffmpeg expat lame libid3tag libflac libmad libresample libsndfile libvamp lv2 soundtouch twolame; do
   rm -rf lib-src/$i
 done
 
diff --git a/audio/audacity/audacity.info b/audio/audacity/audacity.info
index adc65efe66..0d454dd639 100644
--- a/audio/audacity/audacity.info
+++ b/audio/audacity/audacity.info
@@ -7,6 +7,6 @@ MD5SUM="82e7216ae4b9bb597ed6f291bd44f45b \
         5e32b26a48f79e82438998c3334fe117"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="wxGTK3"
+REQUIRES="lame wxGTK3"
 MAINTAINER="Matteo Bernardini"
 EMAIL="ponce@slackbuilds.org"
-- 
cgit v1.2.3