From 454c0c92e600902246323e0e1bbdd7d4b9611d65 Mon Sep 17 00:00:00 2001
From: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Date: Thu, 30 Jun 2016 08:08:38 +0700
Subject: audio/ardour: Fix DEP.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
---
 audio/ardour/README            |  3 ---
 audio/ardour/ardour.SlackBuild | 21 +++++++--------------
 audio/ardour/ardour.info       |  2 +-
 3 files changed, 8 insertions(+), 18 deletions(-)

(limited to 'audio/ardour')

diff --git a/audio/ardour/README b/audio/ardour/README
index 3ba479414397..605671129851 100644
--- a/audio/ardour/README
+++ b/audio/ardour/README
@@ -2,7 +2,4 @@ Ardour is an application to fit the needs of musicians under Linux.
 It is designed to be a fully functional professional audio application,
 that uses the professional sound server jack for sound i/o.
 
-If you want ardour with lv2 support pass LV2=yes to the script. This will
-additionally need lilv and suil.
-
 Ardour optionally requires cwiid for wiimote support.
diff --git a/audio/ardour/ardour.SlackBuild b/audio/ardour/ardour.SlackBuild
index 4b609ae45fc6..8eefcb395344 100644
--- a/audio/ardour/ardour.SlackBuild
+++ b/audio/ardour/ardour.SlackBuild
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=ardour
-VERSION=4.7.0
+VERSION=${VERSION:-4.7.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -40,12 +40,6 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "${LV2:-no}" = "no" ]; then
-  lv2opt="--no-lv2"
-else
-  lv2opt="--lv2"
-fi
-
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
   LIBDIRSUFFIX=""
@@ -74,10 +68,10 @@ tar xvf $CWD/Ardour-$VERSION.tar.bz2
 cd Ardour-$VERSION
 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 {} \;
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -92,15 +86,14 @@ CXXFLAGS="$SLKCFLAGS" \
   --optimize \
   --freedesktop \
   --no-phone-home \
-  --cxx11 \
-  $lv2opt
+  --cxx11
 
 ./waf build
 
 ./waf install \
   --destdir=$PKG
 
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+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
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/audio/ardour/ardour.info b/audio/ardour/ardour.info
index 85f235e26fa7..2e330088948b 100644
--- a/audio/ardour/ardour.info
+++ b/audio/ardour/ardour.info
@@ -5,6 +5,6 @@ DOWNLOAD="http://www.liwjatan.at/files/src/ardour/Ardour-4.7.0.tar.bz2"
 MD5SUM="60b7b889beb3727b55264513fd93af3b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="aubio jack-audio-connection-kit liblo liblrdf vamp-plugin-sdk rubberband"
+REQUIRES="aubio jack-audio-connection-kit liblo liblrdf vamp-plugin-sdk rubberband lv2"
 MAINTAINER="Heinz Wiesinger"
 EMAIL="pprkut@liwjatan.at"
-- 
cgit v1.2.3