audio/ardour: Updated for version 4.7.0.

Signed-off-by: Heinz Wiesinger <pprkut@slackbuilds.org>

8 files changed, 37 insertions, 266 deletions

diff --git a/audio/ardour/README b/audio/ardour/README
index c1b4f06e4f..3ba4794143 100644
--- a/audio/ardour/README
+++ b/audio/ardour/README
@@ -5,10 +5,4 @@ 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.
 
-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.
+Ardour optionally requires cwiid for wiimote support.
diff --git a/audio/ardour/SConscript.diff b/audio/ardour/SConscript.diff
deleted file mode 100644
index 8a7dc77cf4..0000000000
--- a/audio/ardour/SConscript.diff
+++ /dev/null
@@ -1,17 +0,0 @@
---- SConscript	2008-07-07 17:34:05.000000000 +0200
-+++ SConscript	2008-07-13 19:20:38.475141333 +0200
-@@ -499,14 +499,9 @@
- 	env.Alias('install', env.InstallAs(os.path.join(desktop_icon_install_prefix, '22x22', 'mimetypes', 'application-x-ardour2.png'), 'icons/application-x-ardour_22px.png'))
- 	env.Alias('install', env.InstallAs(os.path.join(desktop_icon_install_prefix, '32x32', 'mimetypes', 'application-x-ardour2.png'), 'icons/application-x-ardour_32px.png'))
- 	env.Alias('install', env.InstallAs(os.path.join(desktop_icon_install_prefix, '48x48', 'mimetypes', 'application-x-ardour2.png'), 'icons/application-x-ardour_48px.png'))
--	env.Alias('install', env.Command (os.path.join(install_prefix, 'share', 'mime'), [], 'update-mime-database $TARGET'))
--	# Update the icon cache #
--	env.Alias('install', env.Command (desktop_icon_install_prefix, [], 'touch --no-create $TARGET'))
--	env.Alias('install', env.Command (desktop_icon_install_prefix, [], 'gtk-update-icon-cache $TARGET'))
- 	# Make the ardour2.desktop file and install it #
- 	env.Alias('install', env.Command ('ardour2.desktop', 'ardour2.desktop.in', 'cat $SOURCES  > $TARGET'))
- 	env.Alias('install', env.Install(os.path.join(install_prefix, 'share', 'applications'), 'ardour2.desktop'))
--	env.Alias('install', env.Command (os.path.join(install_prefix, 'share', 'applications'), [], 'update-desktop-database $TARGET'))
- 	# uninstall target.. needed to run  update-mime-database and update-desktop-database after removal. #`
- 	remove_desktop_files = env.Command ('another_frobnicatory_decoy', [],
-                              [ Delete (install_prefix + '/share/mime/packages/ardour2.xml'),
diff --git a/audio/ardour/SConstruct.diff b/audio/ardour/SConstruct.diff
deleted file mode 100644
index 749318d3f4..0000000000
--- a/audio/ardour/SConstruct.diff
+++ /dev/null
@@ -1,11 +0,0 @@
-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 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 -
 
diff --git a/audio/ardour/ardour.info b/audio/ardour/ardour.info
index 5e21f1e0ee..85f235e26f 100644
--- a/audio/ardour/ardour.info
+++ b/audio/ardour/ardour.info
@@ -1,10 +1,10 @@
 PRGNAM="ardour"
-VERSION="2.8.16"
+VERSION="4.7.0"
 HOMEPAGE="http://ardour.org"
-DOWNLOAD="http://www.liwjatan.at/files/src/ardour/ardour-2.8.16.tar.bz2"
-MD5SUM="5bafe41df00d25e7a357baaa1038f16d"
+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 libgnomecanvasmm liblo liblrdf"
+REQUIRES="aubio jack-audio-connection-kit liblo liblrdf vamp-plugin-sdk rubberband"
 MAINTAINER="Heinz Wiesinger"
 EMAIL="pprkut@liwjatan.at"
diff --git a/audio/ardour/boost_startup.patch b/audio/ardour/boost_startup.patch
deleted file mode 100644
index 1d332fc4ce..0000000000
--- a/audio/ardour/boost_startup.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-commit 3e7a7df183a3fea024376797dd83e955ef9851c5
-Author: Paul Davis <paul@linuxaudiosystems.com>
-Date:   Fri Oct 4 17:51:03 2013 -0400
-
-    fix startup errors with 2.x related to boost linkage on some platforms
-    
-    Note: this should not be required because we do not actually link with ANY boost libraries, so the
-    occurence of this bug in ardour at run time indicates that the wrong version of boost was used and/or
-    incorrect flags for using boost are in use.
-    
-    Fix from  David Henningsson <david.henningsson@canonical.com>
-
-diff --git a/libs/surfaces/generic_midi/SConscript b/libs/surfaces/generic_midi/SConscript
-index 27f8865..ce37359 100644
---- a/libs/surfaces/generic_midi/SConscript
-+++ b/libs/surfaces/generic_midi/SConscript
-@@ -42,7 +42,8 @@ genericmidi.Merge ([
- 	libraries['usb'],
- 	libraries['xml'],
- 	libraries['glib2'],
--	libraries['glibmm2']
-+	libraries['glibmm2'],
-+	libraries['boost']
- 	])
- 
- libardour_genericmidi = genericmidi.SharedLibrary('ardour_genericmidi', genericmidi_files)
-diff --git a/libs/surfaces/tranzport/SConscript b/libs/surfaces/tranzport/SConscript
-index c2ab351..dae2ba2 100644
---- a/libs/surfaces/tranzport/SConscript
-+++ b/libs/surfaces/tranzport/SConscript
-@@ -63,6 +63,7 @@ tranzport.Merge ([
-     libraries['xml'],
-     libraries['glib2'],
-     libraries['glibmm2'],
-+    libraries['boost'],
-     libraries['usb'],
-     libraries['sndfile']
-     ])
diff --git a/audio/ardour/lilv.patch b/audio/ardour/lilv.patch
deleted file mode 100644
index cf5abec24e..0000000000
--- a/audio/ardour/lilv.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-commit 4ce89b51782ae8b86ee00175c5abdeec07cc4e4c
-Author: Paul Davis <paul@linuxaudiosystems.com>
-Date:   Thu Feb 21 14:53:49 2013 +0000
-
-    fix const-correctness for current lilv
-    
-    git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@14072 d708f5d6-7413-0410-9779-e7cbd77b26cf
-
-diff --git a/libs/ardour/ardour/lv2_plugin.h b/libs/ardour/ardour/lv2_plugin.h
-index eacefa4..595dcc1 100644
---- a/libs/ardour/ardour/lv2_plugin.h
-+++ b/libs/ardour/ardour/lv2_plugin.h
-@@ -154,7 +154,7 @@ class LV2Plugin : public ARDOUR::Plugin
- 	/** Find the LV2 input port with the given designation.
- 	 * If found, bufptrs[port_index] will be set to bufptr.
- 	 */
--	LilvPort* designated_input (const char* uri, void** bufptrs[], void** bufptr);
-+        const LilvPort* designated_input (const char* uri, void** bufptrs[], void** bufptr);
- };
- 
- 
-diff --git a/libs/ardour/lv2_plugin.cc b/libs/ardour/lv2_plugin.cc
-index 4a1719d..6d21091 100644
---- a/libs/ardour/lv2_plugin.cc
-+++ b/libs/ardour/lv2_plugin.cc
-@@ -644,10 +644,10 @@ LV2Plugin::latency_compute_run ()
- 	deactivate ();
- }
- 
--LilvPort*
-+const LilvPort*
- LV2Plugin::designated_input (const char* uri, void** bufptrs[], void** bufptr)
- {
--	LilvPort* port = NULL;
-+	const LilvPort* port = NULL;
- #ifdef HAVE_NEW_LILV
- 	LilvNode* designation = lilv_new_uri(_world.world, uri);
- 	port = lilv_plugin_get_port_by_designation(
diff --git a/audio/ardour/tempoline_crash.patch b/audio/ardour/tempoline_crash.patch
deleted file mode 100644
index cd93b1531b..0000000000
--- a/audio/ardour/tempoline_crash.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-commit b29f54fb6efcdb2facf0471bd8e24d8eea3231b0
-Author: Paul Davis <paul@linuxaudiosystems.com>
-Date:   Wed Feb 20 18:53:30 2013 +0000
-
-    back-port tempo line assert fix from 3.0 to stop crashing under some relatively easy to hit conditions
-    
-    git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@14067 d708f5d6-7413-0410-9779-e7cbd77b26cf
-
-diff --git a/gtk2_ardour/tempo_lines.cc b/gtk2_ardour/tempo_lines.cc
-index e8bd034..a373dec 100644
---- a/gtk2_ardour/tempo_lines.cc
-+++ b/gtk2_ardour/tempo_lines.cc
-@@ -146,9 +146,8 @@ TempoLines::draw (ARDOUR::TempoMap::BBTPointList& points, double frames_per_unit
- 			}
- 
- 			xpos = rint(((nframes64_t)(*i).frame) / (double)frames_per_unit);
--			if (inserted_last_time && !_lines.empty()) {
--				li = _lines.lower_bound(xpos); // first line >= xpos
--			}
-+
-+                        li = _lines.lower_bound(xpos); // first line >= xpos
-                              
- 			line = (li != _lines.end()) ? li->second : NULL;
- 			assert(!line || line->property_x1() == li->first);
-@@ -215,33 +214,35 @@ TempoLines::draw (ARDOUR::TempoMap::BBTPointList& points, double frames_per_unit
- 				// Create a new line
- 			} else if (_lines.size() < needed || _lines.size() < MAX_CACHED_LINES) {
- 				//cout << "*** CREATING LINE" << endl;
--				assert(_lines.find(xpos) == _lines.end());
--				line = new ArdourCanvas::SimpleLine (*_group);
--				line->property_x1() = xpos;
--				line->property_x2() = xpos;
--				line->property_y1() = 0.0;
--				line->property_y2() = _height;
--				line->property_color_rgba() = color;
--				_lines.insert(make_pair(xpos, line));
--				inserted_last_time = true;
-+				if (_lines.find(xpos) == _lines.end()) {
-+                                        line = new ArdourCanvas::SimpleLine (*_group);
-+                                        line->property_x1() = xpos;
-+                                        line->property_x2() = xpos;
-+                                        line->property_y1() = 0.0;
-+                                        line->property_y2() = _height;
-+                                        line->property_color_rgba() = color;
-+                                        _lines.insert(make_pair(xpos, line));
-+                                        inserted_last_time = true;
-+                                }
- 
- 				// Steal from the left
- 			} else {
- 				//cout << "*** STEALING FROM LEFT" << endl;
--				assert(_lines.find(xpos) == _lines.end());
--				Lines::iterator steal = _lines.begin();
--				line = steal->second;
--				_lines.erase(steal);
--				line->property_color_rgba() = color;
--				line->property_x1() = xpos;
--				line->property_x2() = xpos;
--				_lines.insert(make_pair(xpos, line));
--				inserted_last_time = true; // search next time
--				invalidated = true;
--                               
--				// Shift clean range right
--				_clean_left = max(_clean_left, steal->first);
--				_clean_right = max(_clean_right, xpos);
-+				if (_lines.find(xpos) == _lines.end()) {
-+                                        Lines::iterator steal = _lines.begin();
-+                                        line = steal->second;
-+                                        _lines.erase(steal);
-+                                        line->property_color_rgba() = color;
-+                                        line->property_x1() = xpos;
-+                                        line->property_x2() = xpos;
-+                                        _lines.insert(make_pair(xpos, line));
-+                                        inserted_last_time = true; // search next time
-+                                        invalidated = true;
-+                                        
-+                                        // Shift clean range right
-+                                        _clean_left = max(_clean_left, steal->first);
-+                                        _clean_right = max(_clean_right, xpos);
-+                                }
- 			}
- 
- 			break;