4 files changed, 36 insertions, 8 deletions
diff --git a/audio/ardour/ardour-gcc47.patch b/audio/ardour/ardour-gcc47.patch
new file mode 100644
index 0000000000000..053b6b11ef699
--- /dev/null
+++ b/audio/ardour/ardour-gcc47.patch
@@ -0,0 +1,22 @@
+diff -rupN ardour-2.8.12.old/libs/pbd/path.cc ardour-2.8.12/libs/pbd/path.cc
+--- ardour-2.8.12.old/libs/pbd/path.cc	2009-02-24 07:38:16.000000000 -0500
++++ ardour-2.8.12/libs/pbd/path.cc	2012-05-02 23:39:41.446682468 -0400
+@@ -17,6 +17,7 @@
+ */
+ 
+ #include <cerrno>
++#include <unistd.h>
+ 
+ #include <glib.h>
+ #include <glib/gstdio.h>
+diff -rupN ardour-2.8.12.old/libs/rubberband/src/main.cpp ardour-2.8.12/libs/rubberband/src/main.cpp
+--- ardour-2.8.12.old/libs/rubberband/src/main.cpp	2009-02-24 07:38:17.000000000 -0500
++++ ardour-2.8.12/libs/rubberband/src/main.cpp	2012-05-03 00:00:47.390285238 -0400
+@@ -21,6 +21,7 @@
+ #include <time.h>
+ #include <cstdlib>
+ #include <cstring>
++#include <unistd.h>
+ #include "sysutils.h"
+ 
+ #ifdef __MSVC__
diff --git a/audio/ardour/ardour.SlackBuild b/audio/ardour/ardour.SlackBuild
index a58a946f1660e..2570e723d317b 100644
--- a/audio/ardour/ardour.SlackBuild
+++ b/audio/ardour/ardour.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for ardour
 
-# Copyright 2008-2010 Heinz Wiesinger, Amsterdam, The Netherlands
+# Copyright 2008-2012 Heinz Wiesinger, Amsterdam, The Netherlands
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=ardour
-VERSION=2.8.11
+VERSION=2.8.12
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -97,7 +97,13 @@ find . \
 patch -d gtk2_ardour -p0 -i $CWD/SConscript.diff
 
 # Omit -O3 from the CFLAGS
-patch -p1 < $CWD/SConstruct.diff
+patch -p1 -i $CWD/SConstruct.diff
+
+# Fix issues with gcc-4.7
+patch -p1 -i $CWD/ardour-gcc47.patch
+
+# fix building vst support
+sed -i "s|string.h|ustring.h|" libs/ardour/vst_plugin.cc
 
 scons \
   PREFIX=/usr \
diff --git a/audio/ardour/ardour.info b/audio/ardour/ardour.info
index 8693bd32d3dc8..356dd5fb4c339 100644
--- a/audio/ardour/ardour.info
+++ b/audio/ardour/ardour.info
@@ -1,10 +1,10 @@
 PRGNAM="ardour"
-VERSION="2.8.11"
+VERSION="2.8.12"
 HOMEPAGE="http://ardour.org"
-DOWNLOAD="http://slackbuilds.org/sources/13.1/ardour-2.8.11.tar.bz2"
-MD5SUM="f451a8d0abc133a1700c3932e07a5612"
+DOWNLOAD="http://www.liwjatan.at/files/src/ardour/ardour-2.8.12.tar.bz2"
+MD5SUM="7c031892f53aeacf08a750fc320c79c5"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Heinz Wiesinger"
 EMAIL="pprkut@liwjatan.at"
-APPROVED="Erik Hanson"
+APPROVED="dsomero"
diff --git a/audio/ardour/slack-desc b/audio/ardour/slack-desc
index aad2a6dc8b147..ea16da2f2c6ce 100644
--- a/audio/ardour/slack-desc
+++ b/audio/ardour/slack-desc
@@ -5,7 +5,7 @@
 # make exactly 11 lines for the formatting to be correct.  It's also
 # customary to leave one space after the ':'.
 
-      |-----handy-ruler-----------------------------------------------------|
+      |-----handy-ruler------------------------------------------------------|
 ardour: ardour (Professional Audio Editing)
 ardour:
 ardour: Ardour is an application to fit the needs of musicians under