Wed Mar 27 00:05:42 PDT 2013

4 files changed, 45 insertions, 100 deletions

diff --git a/extra/ardour/PKGBUILD b/extra/ardour/PKGBUILD
index c153916c9..e1719ecc2 100644
--- a/extra/ardour/PKGBUILD
+++ b/extra/ardour/PKGBUILD
@@ -1,66 +1,45 @@
-# $Id: PKGBUILD 176990 2013-02-03 14:59:10Z schiv $
+# $Id: PKGBUILD 180842 2013-03-26 21:39:25Z schiv $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
-# Contributor: tobias <tobias@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 -- tobias
-
-# SYSLIBS enabled, support still valid; see ardour 2.8.13 rel notes
-# http://ardour.org/node/5263
+# Contributor: SpepS <dreamspepser at yahoo dot it>
+# Contributor: see .contrib
 
 pkgname=ardour
-pkgver=2.8.16
+pkgver=3.0
 pkgrel=1
-pkgdesc="A multichannel hard disk recorder and digital audio workstation"
+pkgdesc="Professional-grade digital audio workstation"
 arch=('i686' 'x86_64')
 url="http://ardour.org/"
 license=('GPL')
-depends=('liblrdf' 'libusb-compat' 'liblo' 'soundtouch'
-         'aubio' 'lilv' 'suil' 'libgnomecanvasmm')
-         # -libgnomecanvas(+libgnomecanvasmm)
-         # +soundtouch (these +/- changes are for SYSLIBS=1)
-         # cwiid removed for https://bugs.archlinux.org/task/28344
-makedepends=('scons' 'boost')
-changelog=$pkgname.changelog
-source=("ftp://ftp.archlinux.org/other/ardour/$pkgname-$pkgver.tar.bz2"
+depends=('liblrdf' 'liblo' 'libsmf' 'lilv>=0.16.0'
+         'aubio' 'libgnomecanvasmm' 'suil>=0.6.12')
+makedepends=('python2' 'boost' 'cppunit' 'doxygen' 'graphviz')
+install=$pkgname.install
+source=("ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.bz2"
         "$pkgname.desktop")
-md5sums=('5bafe41df00d25e7a357baaa1038f16d'
-         '8aeaf433ebf781733db48e5a16b0c4da')
+md5sums=('2759df2ac29e6075e006cc5b262bfee0'
+         '316bd21ece5e2208a104fd09cac521af')
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd "$pkgname-$pkgver"
 
-  # ardour defaults to -O3; use this in CFLAGS below
-  sed -i '/-O3/d' SConstruct
+  # python2 fix
+  sed -i 's/python ${SRC}/python2 ${SRC}/' libs/pbd/wscript
 
-  # work around boost linking error (see ardour3 svn r13081)
-  # thanks to Harry Harren for the heads-up
-  CFLAGS+=" -DBOOST_SYSTEM_NO_DEPRECATED"
-  CXXFLAGS+=" -DBOOST_SYSTEM_NO_DEPRECATED"
-  export CFLAGS CXXFLAGS
+  python2 waf configure --prefix=/usr \
+                        --configdir=/etc \
+                        --docs
 
-  scons $MAKEFLAGS ARCH="${CFLAGS/-O[0-9]/-O3}" \
-                   PREFIX="/usr" \
-                   DIST_LIBDIR="lib" \
-                   FREEDESKTOP=0 \
-                   FREESOUND=1 \
-                   SYSLIBS=1
+  python2 waf build $MAKEFLAGS
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd "$pkgname-$pkgver"
 
-  scons DESTDIR="$pkgdir" install
+  python2 waf install --destdir="$pkgdir"
 
   # install some freedesktop.org compatibility
   install -Dm644 "$srcdir/$pkgname.desktop" \
     "$pkgdir/usr/share/applications/$pkgname.desktop"
-
-  # upstream will not do this
-  # install templates
-  cp -r templates "$pkgdir/usr/share/ardour2/"
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/extra/ardour/ardour.changelog b/extra/ardour/ardour.changelog
deleted file mode 100644
index 242d5a78a..000000000
--- a/extra/ardour/ardour.changelog
+++ /dev/null
@@ -1,55 +0,0 @@
-11 Aug 2012 (GMT+8) Ray Rashif <schiv@archlinux.org>
-	* 2.8.14:
-	Upstream release
-	Dep on new (s)lv2 stack (lilv, suil et al replaces slv2)
-	SYSLIBS turned on by upstream decree; see 2.8.13 release notes
-
-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/extra/ardour/ardour.desktop b/extra/ardour/ardour.desktop
index b50f6c952..de68483e1 100644
--- a/extra/ardour/ardour.desktop
+++ b/extra/ardour/ardour.desktop
@@ -1,8 +1,8 @@
 [Desktop Entry]
-Name=Ardour
+Name=Ardour 3
 Comment=Multitrack hard disk recorder
-Exec=ardour2
-Icon=/usr/share/ardour2/icons/ardour_icon_48px.png
+Exec=ardour3
+Icon=/usr/share/ardour3/icons/ardour_icon_48px.png
 Terminal=false
 Type=Application
 X-MultipleArgs=false
diff --git a/extra/ardour/ardour.install b/extra/ardour/ardour.install
new file mode 100644
index 000000000..555d7377d
--- /dev/null
+++ b/extra/ardour/ardour.install
@@ -0,0 +1,21 @@
+post_install() {
+  cat << MSG
+  > Ardour 3 has support for native "Linux" VSTs. You may want to export
+  > LXVST_PATH to include any custom directories of *.so VST plug-ins.
+
+  > Please consider supporting Paul Davis, lead developer of Ardour, by
+  > either subscribing or at least donating to the project's cause:
+
+      https://community.ardour.org/s/subscribe
+      https://community.ardour.org/donate
+
+  > With your continued support, Ardour will continue to improve and will
+  > one day no longer be dependent on unstable funding.
+MSG
+}
+
+post_upgrade() {
+  post_install
+}
+
+# vim:set ts=2 sw=2 et: