Tue Aug 2 04:35:55 UTC 2011

3 files changed, 87 insertions, 11 deletions

diff --git a/extra/ardour/PKGBUILD b/extra/ardour/PKGBUILD
index 89fa98ad1..5780fa159 100644
--- a/extra/ardour/PKGBUILD
+++ b/extra/ardour/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 130903 2011-07-08 19:43:04Z schiv $
+# $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>
@@ -9,33 +9,43 @@
 
 pkgname=ardour
 pkgver=2.8.11
-pkgrel=4
+pkgrel=5
 pkgdesc="A multichannel hard disk recorder and digital audio workstation"
 arch=('i686' 'x86_64')
-url="http://ardour.org"
+url="http://ardour.org/"
 license=('GPL')
-depends=('liblrdf' 'liblo' 'aubio' 'libusb-compat'
-         'libgnomecanvasmm' 'soundtouch')
+depends=('liblrdf>=0.4.0-8' 'liblo' 'aubio' 'libusb-compat'
+         'libgnomecanvasmm' 'soundtouch' 'slv2>=0.6.6-6')
          # -rubberband -libgnomecanvas(+libgnomecanvasmm)
-         # +soundtouch -slv2
+         # +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)
+        gcc46.patch
+        raptor2.patch)
 md5sums=('f451a8d0abc133a1700c3932e07a5612'
          '8aeaf433ebf781733db48e5a16b0c4da'
-         'd709add59911d099c813162448e4db99')
+         '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
+  # use syslibs until internal sigc++ issue w/ latest gcc (?) resolves
   # TODO: report upstream
   scons ${MAKEFLAGS} ARCH="${CFLAGS}" \
                      PREFIX="/usr" \
@@ -43,7 +53,6 @@ build() {
                      FREEDESKTOP=0 \
                      FREESOUND=1 \
                      SYSLIBS=1 \
-                     LV2=0 \
                      DESTDIR="${pkgdir}"
 }
 
@@ -54,7 +63,6 @@ package() {
         FREEDESKTOP=0 \
         FREESOUND=1 \
         SYSLIBS=1 \
-        LV2=0 \
         DESTDIR="${pkgdir}" install
 
   # install some freedesktop.org compatibility
diff --git a/extra/ardour/ardour.changelog b/extra/ardour/ardour.changelog
index 69d289e8f..47c111f01 100644
--- a/extra/ardour/ardour.changelog
+++ b/extra/ardour/ardour.changelog
@@ -1,3 +1,14 @@
+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:
diff --git a/extra/ardour/raptor2.patch b/extra/ardour/raptor2.patch
new file mode 100644
index 000000000..fe7cacff3
--- /dev/null
+++ b/extra/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')
+