Sat Jul 9 23:10:17 UTC 2011

4 files changed, 154 insertions, 0 deletions

diff --git a/testing/ardour/PKGBUILD b/testing/ardour/PKGBUILD
new file mode 100644
index 000000000..89fa98ad1
--- /dev/null
+++ b/testing/ardour/PKGBUILD
@@ -0,0 +1,65 @@
+# $Id: PKGBUILD 130903 2011-07-08 19:43:04Z schiv $
+# Maintainer: tobias <tobias@archlinux.org>
+# Maintainer: Ray Rashif <schiv@archlinux.org>
+# Contributor: Giovanni Scafora <giovanni@archlinux.org>
+
+# ardour, liblrdf and raptor are heavily dependent on each other. Updating of
+# one package mostly will require an update of all the other packages. I vote
+# for fixed dependencies speaking in terms of versions
+
+pkgname=ardour
+pkgver=2.8.11
+pkgrel=4
+pkgdesc="A multichannel hard disk recorder and digital audio workstation"
+arch=('i686' 'x86_64')
+url="http://ardour.org"
+license=('GPL')
+depends=('liblrdf' 'liblo' 'aubio' 'libusb-compat'
+         'libgnomecanvasmm' 'soundtouch')
+         # -rubberband -libgnomecanvas(+libgnomecanvasmm)
+         # +soundtouch -slv2
+makedepends=('scons' 'boost' 'pkg-config')
+changelog=${pkgname}.changelog
+source=(ftp://ftp.archlinux.org/other/ardour/${pkgname}-${pkgver}.tar.bz2
+        ${pkgname}.desktop
+        gcc46.patch)
+md5sums=('f451a8d0abc133a1700c3932e07a5612'
+         '8aeaf433ebf781733db48e5a16b0c4da'
+         'd709add59911d099c813162448e4db99')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  # gcc 4.6 compatibility
+  patch -Np1 -i "$srcdir/gcc46.patch"
+
+  sed -i '/-O3/d' SConstruct
+
+  # use syslibs until internal sigc++ issue w/ latest gcc resolves
+  # TODO: report upstream
+  scons ${MAKEFLAGS} ARCH="${CFLAGS}" \
+                     PREFIX="/usr" \
+                     DIST_LIBDIR="lib" \
+                     FREEDESKTOP=0 \
+                     FREESOUND=1 \
+                     SYSLIBS=1 \
+                     LV2=0 \
+                     DESTDIR="${pkgdir}"
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  scons PREFIX="/usr" \
+        FREEDESKTOP=0 \
+        FREESOUND=1 \
+        SYSLIBS=1 \
+        LV2=0 \
+        DESTDIR="${pkgdir}" install
+
+  # install some freedesktop.org compatibility
+  install -Dm644 "${srcdir}/${pkgname}.desktop" \
+    "${pkgdir}/usr/share/applications/${pkgname}.desktop"
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/testing/ardour/ardour.changelog b/testing/ardour/ardour.changelog
new file mode 100644
index 000000000..69d289e8f
--- /dev/null
+++ b/testing/ardour/ardour.changelog
@@ -0,0 +1,38 @@
+9 Jul 2011 (GMT+8) Ray Rashif <schiv@archlinux.org>
+
+	* 2.8.11-4:
+	Fix build failures and runtime segfaults
+		- gcc 4.6 patch
+		- enable SYSLIBS due to ardour sigc++ issues
+		- remove slv2 dep due to ardour rasqal incompatibility [1][2]
+
+	[1] https://bugs.archlinux.org/task/25060
+	[2] https://ardour.org/node/4301
+
+22 Feb 2011 (GMT+8) Ray Rashif <schiv@archlinux.org>
+
+	* 2.8.11-2 :
+	raptor rebuild
+
+9 Aug 2010 (GMT+8) Ray Rashif <schiv@archlinux.org>
+
+	* 2.8.11-1 :
+	Testing build.
+	Removed libgnomecanvasmm depend (ardour internal).
+	Removed soundtouch makedepend (ardour internal, unneded).
+	Added new depends
+		- slv2 ("LV2" plug-ins support)
+		- rubberband (can "do more" than soundtouch)
+		- libgnomecanvas
+	Not using SYSLIBS because upstream does not support it.
+	Namcap warnings can be ignored; they're ardour internals.
+
+	* PKGBUILD :
+	Minor cosmetic ammendments.
+
+	* ardour.changelog :
+	Added this changelog.
+	Only important changes will be logged.
+
+	* ardour.install :
+	Removed install scriptlet; old and deprecated information.
diff --git a/testing/ardour/ardour.desktop b/testing/ardour/ardour.desktop
new file mode 100644
index 000000000..b50f6c952
--- /dev/null
+++ b/testing/ardour/ardour.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=Ardour
+Comment=Multitrack hard disk recorder
+Exec=ardour2
+Icon=/usr/share/ardour2/icons/ardour_icon_48px.png
+Terminal=false
+Type=Application
+X-MultipleArgs=false
+Categories=GTK;Audio;AudioVideoEditing;AudioVideo;Video;
diff --git a/testing/ardour/gcc46.patch b/testing/ardour/gcc46.patch
new file mode 100644
index 000000000..d01610d1d
--- /dev/null
+++ b/testing/ardour/gcc46.patch
@@ -0,0 +1,42 @@
+diff -rupN ardour-2.8.11.old/libs/ardour/enums.cc ardour-2.8.11/libs/ardour/enums.cc
+--- ardour-2.8.11.old/libs/ardour/enums.cc	2010-04-20 13:28:37.000000000 -0400
++++ ardour-2.8.11/libs/ardour/enums.cc	2011-02-13 11:23:02.000000000 -0500
+@@ -31,7 +31,8 @@
+ 
+ using namespace std;
+ using namespace PBD;
+-using namespace ARDOUR;
++namespace ARDOUR
++{
+ 
+ void
+ setup_enum_writer ()
+@@ -362,3 +363,5 @@ setup_enum_writer ()
+ 	REGISTER (_Track_FreezeState);
+ 	
+ }
++
++}
+diff -rupN ardour-2.8.11.old/libs/rubberband/rubberband/RubberBandStretcher.h ardour-2.8.11/libs/rubberband/rubberband/RubberBandStretcher.h
+--- ardour-2.8.11.old/libs/rubberband/rubberband/RubberBandStretcher.h	2009-03-26 10:25:40.000000000 -0400
++++ ardour-2.8.11/libs/rubberband/rubberband/RubberBandStretcher.h	2011-02-09 21:41:04.000000000 -0500
+@@ -19,6 +19,7 @@
+ #define RUBBERBAND_API_MAJOR_VERSION 2
+ #define RUBBERBAND_API_MINOR_VERSION 0
+ 
++#include <cstddef>
+ #include <vector>
+ 
+ /**
+diff -rupN ardour-2.8.11.old/libs/surfaces/wiimote/wiimote.cc ardour-2.8.11/libs/surfaces/wiimote/wiimote.cc
+--- ardour-2.8.11.old/libs/surfaces/wiimote/wiimote.cc	2009-02-24 07:38:19.000000000 -0500
++++ ardour-2.8.11/libs/surfaces/wiimote/wiimote.cc	2011-02-13 11:23:24.000000000 -0500
+@@ -177,7 +177,7 @@ wiimote_discovery:
+ 	std::cerr << "Wiimote: discovering, press 1+2" << std::endl;
+ 
+  	while (!wiimote_handle && !main_thread_quit) {
+-		bdaddr = *BDADDR_ANY;
++		bdaddr = (bdaddr_t) {{0, 0, 0, 0, 0, 0}};
+ 		callback_thread_registered_for_ardour = false;
+ 		wiimote_handle = cwiid_open(&bdaddr, 0);
+