5 files changed, 73 insertions, 22 deletions
diff --git a/audio/ardour/README b/audio/ardour/README
index 8bd85ee7d4..7994433feb 100644
--- a/audio/ardour/README
+++ b/audio/ardour/README
@@ -3,6 +3,15 @@ It is designed to be a fully functional professional audio application,
 that uses the professional sound server jack for sound i/o.
 
 Ardour requires liblo, raptor, liblrdf, boost, scons, fftw, libsamplerate,
-jack-audio-connection-kit, libgnomecanvas and aubio.  If you want ardour
-with lv2 support pass LV2=yes to the script. This will additionally need
-slv2. All available from SlackBuilds.org.
+jack-audio-connection-kit, libgnomecanvas and aubio.
+
+If you want ardour with lv2 support pass LV2=yes to the script. This will
+additionally need slv2.
+
+If you want support for controlling ardour via a wiimote device, you'll
+need to pass WIIMOTE=yes to the script. You need cwiid for that.
+
+For building ardour with support for VST-plugins, you have to pass
+VST=yes to the script. This will additionally require wine. Please
+note that VST-support will not be built on x86_64, regardless of
+the option passed.
+\ No newline at end of file
diff --git a/audio/ardour/SConstruct.diff b/audio/ardour/SConstruct.diff
new file mode 100644
index 0000000000..749318d3f4
--- /dev/null
+++ b/audio/ardour/SConstruct.diff
@@ -0,0 +1,11 @@
+diff -Nur ardour-2.8.orig/SConstruct ardour-2.8/SConstruct
+--- ardour-2.8.orig/SConstruct	2009-03-26 16:12:56.000000000 -0500
++++ ardour-2.8/SConstruct	2009-06-04 12:51:58.281589386 -0500
+@@ -798,7 +798,6 @@
+ #
+ 
+ opt_flags[:0] = [
+-    "-O3",
+     "-fomit-frame-pointer",
+     "-ffast-math",
+     "-fstrength-reduce",
diff --git a/audio/ardour/ardour.SlackBuild b/audio/ardour/ardour.SlackBuild
index 3bb9af1689..03ebacb84d 100644
--- a/audio/ardour/ardour.SlackBuild
+++ b/audio/ardour/ardour.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for ardour
 
-# Copyright 2008 Heinz Wiesinger <pprkut@liwjatan.at>
+# Copyright 2008-2009 Heinz Wiesinger <pprkut@liwjatan.at>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,9 +23,9 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=ardour
-VERSION=2.7
+VERSION=2.8
 ARCH=${ARCH:-i486}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 CWD=$(pwd)
@@ -33,20 +33,37 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-LV2=${LV2:-no}
-
-if [ "$LV2" = "no" ]; then
+if [ "${LV2:-no}" = "no" ]; then
   lv2opt="LV2=0"
 else
   lv2opt="LV2=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"
+fi
+
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+  TARGET="i386"
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+  TARGET="i686"
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+  TARGET="x86_64"
+  vstopt="VST=0"
 fi
 
 set -e
@@ -55,7 +72,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION-4225.tar.bz2
+tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find . \
@@ -67,20 +84,35 @@ find . \
 # Make FREEDESKTOP work with DESTDIR
 patch -d gtk2_ardour -p0 -i $CWD/SConscript.diff
 
-scons PREFIX=/usr \
-  DIST_TARGET="none" \
+# Omit -O3 from the CFLAGS
+patch -p1 < $CWD/SConstruct.diff
+
+scons \
+  PREFIX=/usr \
+  LIBDIR=/usr/lib${LIBDIRSUFFIX} \
+  DIST_TARGET="$TARGET" \
   ARCH="$(echo $SLKCFLAGS)" \
   FREEDESKTOP=1 \
-  $lv2opt
+  $wiiopt \
+  $lv2opt\
+  $vstopt
 scons \
+  --implicit-deps-unchanged \
   PREFIX=/usr \
-  DIST_TARGET="none" \
+  LIBDIR=/usr/lib${LIBDIRSUFFIX} \
+  DIST_TARGET="$TARGET" \
   ARCH="$(echo $SLKCFLAGS)" \
   FREEDESKTOP=1 \
+  $wiiopt \
   $lv2opt \
+  $vstopt \
   DESTDIR=$PKG \
   install
 
+if [ $vstopt = "VST=1" ]; then
+  ln -s /usr/bin/ardourvst $PKG/usr/bin/ardour2
+fi
+
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
@@ -102,4 +134,4 @@ cd $PKG/etc/ardour2
 cd -
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$TARGET-$BUILD$TAG.tgz
diff --git a/audio/ardour/ardour.info b/audio/ardour/ardour.info
index b16674fc4e..5db749ebfa 100644
--- a/audio/ardour/ardour.info
+++ b/audio/ardour/ardour.info
@@ -1,8 +1,8 @@
 PRGNAM="ardour"
-VERSION="2.7"
+VERSION="2.8"
 HOMEPAGE="http://ardour.org"
-DOWNLOAD="http://releases.ardour.org/ardour-2.7-4225.tar.bz2"
-MD5SUM="cda1db24e93bb443534bf7232bf02ca2"
-MAINTAINER="ppr:kut"
+DOWNLOAD="http://slackbuilds.org/sources/12.2/ardour-2.8.tar.bz2"
+MD5SUM="24bd768dbe08f1f2724dc97704ee0518"
+MAINTAINER="pprkut"
 EMAIL="pprkut@liwjatan.at"
-APPROVED="Erik Hanson"
+APPROVED="dsomero"
diff --git a/audio/ardour/doinst.sh b/audio/ardour/doinst.sh
index 0743536eb4..523c4b5549 100644
--- a/audio/ardour/doinst.sh
+++ b/audio/ardour/doinst.sh
@@ -1,5 +1,3 @@
-#!/bin/sh
-
 config() {
   NEW="$1"
   OLD="$(dirname $NEW)/$(basename $NEW .new)"
@@ -25,3 +23,4 @@ if [ -x /usr/bin/gtk-update-icon-cache ] \
   && [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
   /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
 fi
+