diff options
author | root <root@rshg047.dnsready.net> | 2011-07-15 23:12:20 +0000 |
---|---|---|
committer | root <root@rshg047.dnsready.net> | 2011-07-15 23:12:20 +0000 |
commit | 76c26b027d797f3671bf0b6c6618eda2496cf88d (patch) | |
tree | c386be56a0a3bc7b668a674e9cec6405a4d2fb2f /testing/ardour | |
parent | 29657877f6a02dbba1bd58b417b4ccd211939690 (diff) |
Fri Jul 15 23:12:20 UTC 2011
Diffstat (limited to 'testing/ardour')
-rw-r--r-- | testing/ardour/PKGBUILD | 73 | ||||
-rw-r--r-- | testing/ardour/ardour.changelog | 49 | ||||
-rw-r--r-- | testing/ardour/ardour.desktop | 9 | ||||
-rw-r--r-- | testing/ardour/gcc46.patch | 42 | ||||
-rw-r--r-- | testing/ardour/raptor2.patch | 57 |
5 files changed, 230 insertions, 0 deletions
diff --git a/testing/ardour/PKGBUILD b/testing/ardour/PKGBUILD new file mode 100644 index 000000000..5780fa159 --- /dev/null +++ b/testing/ardour/PKGBUILD @@ -0,0 +1,73 @@ +# $Id: PKGBUILD 131778 2011-07-14 23:39:36Z 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=5 +pkgdesc="A multichannel hard disk recorder and digital audio workstation" +arch=('i686' 'x86_64') +url="http://ardour.org/" +license=('GPL') +depends=('liblrdf>=0.4.0-8' 'liblo' 'aubio' 'libusb-compat' + 'libgnomecanvasmm' 'soundtouch' 'slv2>=0.6.6-6') + # -rubberband -libgnomecanvas(+libgnomecanvasmm) + # +soundtouch (these +/- changes are for SYSLIBS) + # liblrdf versioned for https://bugs.archlinux.org/task/25005 + # slv2 versioned for https://bugs.archlinux.org/task/25060 +makedepends=('scons' 'boost' 'pkg-config') +changelog=${pkgname}.changelog +source=(ftp://ftp.archlinux.org/other/ardour/${pkgname}-${pkgver}.tar.bz2 + ${pkgname}.desktop + gcc46.patch + raptor2.patch) +md5sums=('f451a8d0abc133a1700c3932e07a5612' + '8aeaf433ebf781733db48e5a16b0c4da' + 'd709add59911d099c813162448e4db99' + 'a26a9bec0968fa0630c70f70c54f67de') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + # gcc 4.6 compatibility + # http://tracker.ardour.org/view.php?id=3771 + patch -Np1 -i "$srcdir/gcc46.patch" + + # raptor2 compatibility + # https://bugs.archlinux.org/task/25060 + # http://tracker.ardour.org/view.php?id=4179 + patch -Np0 -i "$srcdir/raptor2.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 \ + DESTDIR="${pkgdir}" +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + scons PREFIX="/usr" \ + FREEDESKTOP=0 \ + FREESOUND=1 \ + SYSLIBS=1 \ + 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..47c111f01 --- /dev/null +++ b/testing/ardour/ardour.changelog @@ -0,0 +1,49 @@ +15 Jul 2011 (GMT+8) Ray Rashif <schiv@archlinux.org> + + * 2.8.11-5: + Resolve previous issues with slv2 & redland/rasqal/raptor + - just needed rebuild of slv2 against latest redland suite [1] + - also needed ardour buildsystem patch for raptor2 [1][2] + - bring back support for slv2 + + [1] https://bugs.archlinux.org/task/25060 + [2] http://tracker.ardour.org/view.php?id=4179 + +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); + diff --git a/testing/ardour/raptor2.patch b/testing/ardour/raptor2.patch new file mode 100644 index 000000000..fe7cacff3 --- /dev/null +++ b/testing/ardour/raptor2.patch @@ -0,0 +1,57 @@ +Index: SConstruct +=================================================================== +--- SConstruct (revision 9877) ++++ SConstruct (revision 9878) +@@ -431,7 +431,6 @@ + 'gtk+-2.0' : '2.8.1', + 'libxml-2.0' : '2.6.0', + 'samplerate' : '0.1.0', +- 'raptor' : '1.4.2', + 'lrdf' : '0.4.0', + 'jack' : '0.109.0', + 'libgnomecanvas-2.0' : '2.0', +@@ -487,7 +486,10 @@ + + libraries['core'] = LibraryInfo (CCFLAGS = '-Ilibs') + +-conf = env.Configure (custom_tests = { 'CheckPKGExists' : CheckPKGExists } ) ++conf = env.Configure (custom_tests = { 'CheckPKGExists' : CheckPKGExists, ++ 'CheckPKGVersion' : CheckPKGVersion } ++ ) ++ + + if conf.CheckPKGExists ('fftw3f'): + libraries['fftw3f'] = LibraryInfo() +@@ -501,6 +503,22 @@ + libraries['aubio'] = LibraryInfo() + libraries['aubio'].ParseConfig('pkg-config --cflags --libs aubio') + ++raptorOK = 0 ++ ++if conf.CheckPKGExists ('raptor2'): ++ libraries['raptor'] = LibraryInfo() ++ libraries['raptor'].ParseConfig('pkg-config --cflags --libs raptor2') ++ raptorOK = 1 ++else: ++ if conf.CheckPKGExists ('raptor') and conf.CheckPKGVersion (pkg, '1.4.2'): ++ libraries['raptor'] = LibraryInfo() ++ libraries['raptor'].ParseConfig('pkg-config --cflags --libs raptor') ++ raptorOK = 1 ++ ++if raptorOK == 0: ++ print "Ardour requires either raptor or raptor2 to be available at build time" ++ Exit (1) ++ + env = conf.Finish () + + if env['FFT_ANALYSIS']: +@@ -570,9 +588,6 @@ + libraries['lrdf'] = LibraryInfo() + libraries['lrdf'].ParseConfig('pkg-config --cflags --libs lrdf') + +-libraries['raptor'] = LibraryInfo() +-libraries['raptor'].ParseConfig('pkg-config --cflags --libs raptor') +- + libraries['sndfile'] = LibraryInfo() + libraries['sndfile'].ParseConfig ('pkg-config --cflags --libs sndfile') + |