diff options
| -rw-r--r-- | audio/ardour/README | 2 | ||||
| -rw-r--r-- | audio/ardour/ardour-gcc47.patch | 22 | ||||
| -rw-r--r-- | audio/ardour/ardour.SlackBuild | 15 | ||||
| -rw-r--r-- | audio/ardour/ardour.info | 8 |
4 files changed, 11 insertions, 36 deletions
diff --git a/audio/ardour/README b/audio/ardour/README index 4d7e4499c4..f18ecfa66f 100644 --- a/audio/ardour/README +++ b/audio/ardour/README @@ -6,7 +6,7 @@ Ardour requires liblo, liblrdf, scons, libgnomecanvas, aubio, and jack-audio-connection-kit. If you want ardour with lv2 support pass LV2=yes to the script. This will -additionally need slv2. +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. diff --git a/audio/ardour/ardour-gcc47.patch b/audio/ardour/ardour-gcc47.patch deleted file mode 100644 index 053b6b11ef..0000000000 --- a/audio/ardour/ardour-gcc47.patch +++ /dev/null @@ -1,22 +0,0 @@ -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 2570e723d3..078707d944 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=2.8.12 +VERSION=2.8.14 BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -41,9 +41,9 @@ PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} if [ "${LV2:-no}" = "no" ]; then - lv2opt="LV2=0" + lv2opt="LV2=0 LV2_UI=0" else - lv2opt="LV2=1" + lv2opt="LV2=1 LV2_UI=1" fi if [ "${WIIMOTE:-no}" = "no" ]; then @@ -99,21 +99,17 @@ patch -d gtk2_ardour -p0 -i $CWD/SConscript.diff # Omit -O3 from the CFLAGS 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 \ LIBDIR=/usr/lib${LIBDIRSUFFIX} \ DIST_TARGET="$TARGET" \ ARCH="$(echo $SLKCFLAGS)" \ FREEDESKTOP=1 \ + SYSLIBS=1 \ $wiiopt \ $lv2opt \ $vstopt + scons \ --implicit-deps-unchanged \ PREFIX=/usr \ @@ -121,6 +117,7 @@ scons \ DIST_TARGET="$TARGET" \ ARCH="$(echo $SLKCFLAGS)" \ FREEDESKTOP=1 \ + SYSLIBS=1 \ $wiiopt \ $lv2opt \ $vstopt \ diff --git a/audio/ardour/ardour.info b/audio/ardour/ardour.info index 9deffa78a2..411d2bae8c 100644 --- a/audio/ardour/ardour.info +++ b/audio/ardour/ardour.info @@ -1,10 +1,10 @@ PRGNAM="ardour" -VERSION="2.8.12" +VERSION="2.8.14" HOMEPAGE="http://ardour.org" -DOWNLOAD="http://www.liwjatan.at/files/src/ardour/ardour-2.8.12.tar.bz2" -MD5SUM="7c031892f53aeacf08a750fc320c79c5" +DOWNLOAD="http://www.liwjatan.at/files/src/ardour/ardour-2.8.14.tar.bz2" +MD5SUM="c79219ba10735d0b061d53a84ae611a4" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="aubio cwiid jack-audio-connection-kit libgnomecanvas liblo liblrdf lv2 scons slv2 wine" +REQUIRES="aubio gtkmm jack-audio-connection-kit libgnomecanvas libgnomecanvasmm liblo liblrdf scons" MAINTAINER="Heinz Wiesinger" EMAIL="pprkut@liwjatan.at" |