1 files changed, 32 insertions, 68 deletions
diff --git a/audio/ardour/ardour.SlackBuild b/audio/ardour/ardour.SlackBuild
index da8895a67c..4b609ae45f 100644
--- a/audio/ardour/ardour.SlackBuild
+++ b/audio/ardour/ardour.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for ardour
 
-# Copyright 2008-2014 Heinz Wiesinger, Amsterdam, The Netherlands
+# Copyright 2008-2016 Heinz Wiesinger, Amsterdam, The Netherlands
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,8 +23,8 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=ardour
-VERSION=2.8.16
-BUILD=${BUILD:-2}
+VERSION=4.7.0
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -41,21 +41,9 @@ PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 if [ "${LV2:-no}" = "no" ]; then
-  lv2opt="LV2=0 LV2_UI=0"
+  lv2opt="--no-lv2"
 else
-  lv2opt="LV2=1 LV2_UI=1"
-fi
-
-if [ "${WIIMOTE:-no}" = "no" ]; then
-  wiiopt="WIIMOTE=0"
-else
-  wiiopt="WIIMOTE=1"
-fi
-
-if [ "${VST:-no}" = "no" ]; then
-  vstopt="VST=0"
-else
-  vstopt="VST=1"
+  lv2opt="--lv2"
 fi
 
 if [ "$ARCH" = "i486" ]; then
@@ -70,12 +58,10 @@ elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
   TARGET="x86_64"
-  vstopt="VST=0"
 else
   SLKCFLAGS="-O2"
   LIBDIRSUFFIX=""
   TARGET="$ARCH"
-  vstopt="VST=0"
 fi
 
 set -e
@@ -83,9 +69,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
-cd $PRGNAM-$VERSION
+rm -rf Ardour-$VERSION
+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 \) \
@@ -93,54 +79,32 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-# Make FREEDESKTOP work with DESTDIR
-patch -d gtk2_ardour -p0 -i $CWD/SConscript.diff
-
-# Omit -O3 from the CFLAGS
-patch -p1 -i $CWD/SConstruct.diff
-
-# Bugfixes from git
-patch -p1 -i $CWD/tempoline_crash.patch
-patch -p1 -i $CWD/lilv.patch
-patch -p1 -i $CWD/boost_startup.patch
-
-# Fix linking with boost
-sed -i "s|lcwiid|lcwiid -lboost_system|" libs/surfaces/wiimote/SConscript
-
-scons \
-  PREFIX=/usr \
-  LIBDIR=/usr/lib${LIBDIRSUFFIX} \
-  DIST_TARGET="$TARGET" \
-  ARCH="$(echo $SLKCFLAGS)" \
-  FREEDESKTOP=1 \
-  SYSLIBS=1 \
-  $wiiopt \
-  $lv2opt \
-  $vstopt
-
-scons \
-  --implicit-deps-unchanged \
-  PREFIX=/usr \
-  LIBDIR=/usr/lib${LIBDIRSUFFIX} \
-  DIST_TARGET="$TARGET" \
-  ARCH="$(echo $SLKCFLAGS)" \
-  FREEDESKTOP=1 \
-  SYSLIBS=1 \
-  $wiiopt \
-  $lv2opt \
-  $vstopt \
-  DESTDIR=$PKG \
-  install
-
-if [ $vstopt = "VST=1" ]; then
-  ln -s /usr/bin/ardourvst $PKG/usr/bin/ardour2
-fi
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./waf configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --configdir=/etc \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --with-backends="jack,alsa" \
+  --libjack=weak \
+  --optimize \
+  --freedesktop \
+  --no-phone-home \
+  --cxx11 \
+  $lv2opt
+
+./waf build
+
+./waf install \
+  --destdir=$PKG
 
 find $PKG | xargs 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
-cp -a COPYING PACKAGER_README README \
+cp -a COPYING PACKAGER_README README TRANSLATORS \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
@@ -149,10 +113,10 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 # Let's not clobber config files
-cd $PKG/etc/ardour2
-  for i in * ; do
+cd $PKG/etc/ardour4
+  for i in $(find . -type f) ; do
     mv $i $i.new
-    echo "config etc/ardour2/$i.new" >> $PKG/install/doinst.sh
+    echo "config etc/ardour4/$i.new" >> $PKG/install/doinst.sh
   done
 cd -