Sun Jan 26 03:36:37 UTC 2014

2 files changed, 28 insertions, 52 deletions

diff --git a/extra/aubio/PKGBUILD b/extra/aubio/PKGBUILD
index d019dc25e..69a66510a 100644
--- a/extra/aubio/PKGBUILD
+++ b/extra/aubio/PKGBUILD
@@ -1,31 +1,40 @@
-# $Id: PKGBUILD 199836 2013-11-17 08:28:12Z allan $
-# Maintainer: Tobias Kieslich tobias [funnychar] archlinux org
-# Contributor: Peter Baldwin <bald_pete@hotmail.com>
-# Contributor: Shinlun Hsieh <yngwiexx@yahoo.com.tw>
+# $Id: PKGBUILD 204700 2014-01-25 13:01:02Z schiv $
+# Maintainer: Ray Rashif <schiv@archlinux.org>
+# Contributor: Tobias Kieslich tobias [funnychar] archlinux org
+# Contributor: see .contrib
 
 pkgname=aubio
-pkgver=0.3.2
-pkgrel=6
-pkgdesc="A library for audio labelling"
+pkgver=0.4.0
+pkgrel=1
+pkgdesc="A tool for extracting annotations from audio signals"
 arch=('i686' 'x86_64')
 url="http://aubio.org/"
 license=('GPL')
-depends=('libsamplerate' 'fftw' 'jack')
-source=("http://aubio.org/pub/${pkgname}-${pkgver}.tar.gz"
-        aubio-linking.patch)
-md5sums=('ffc3e5e4880fec67064f043252263a44'
-         '674259ce137ca28ef24bd62482829cd5')
+depends=('fftw' 'jack' 'ffmpeg')
+makedepends=('python2-numpy')
+optdepends=('python2-numpy: Python 2.x interface')
+source=("http://aubio.org/pub/$pkgname-$pkgver.tar.bz2")
+md5sums=('8de88baab79f7eec8e1c7f321c4026af')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "$srcdir/$pkgname-$pkgver"
 
-  patch -p1 -i $srcdir/aubio-linking.patch
-
-  ./configure --prefix=/usr
-  make
+  python2 waf configure --prefix=/usr --enable-fftw3f
+  python2 waf build $MAKEFLAGS
+  cd python; python2 setup.py build # python interface
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
+  cd "$srcdir/$pkgname-$pkgver"
+
+  python2 waf --destdir="$pkgdir" install
+
+  # python interface
+  cd python
+
+  python2 setup.py install --root="$pkgdir" --optimize=1
+
+  # python2 compat
+  sed -i 's:bin/env python:bin/env python2:' \
+      "$pkgdir/usr/lib/python2.7/site-packages/aubio/__init__.py"
 }
diff --git a/extra/aubio/aubio-linking.patch b/extra/aubio/aubio-linking.patch
deleted file mode 100644
index ea68335a4..000000000
--- a/extra/aubio/aubio-linking.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -rupN aubio-0.3.2.old/examples/Makefile.am aubio-0.3.2/examples/Makefile.am
---- aubio-0.3.2.old/examples/Makefile.am	2006-09-12 18:31:40.000000000 -0400
-+++ aubio-0.3.2/examples/Makefile.am	2010-02-10 04:06:51.000000000 -0500
-@@ -23,7 +23,7 @@ aubionotes_SOURCES = aubionotes.c utils.
- aubiotrack_SOURCES = aubiotrack.c utils.c
- aubioquiet_SOURCES = aubioquiet.c utils.c
- 
--aubioonset_LDADD = @JACK_LIBS@
--aubionotes_LDADD = @JACK_LIBS@
--aubiotrack_LDADD = @JACK_LIBS@
--aubioquiet_LDADD = @JACK_LIBS@
-+aubioonset_LDADD = @JACK_LIBS@ -lm
-+aubionotes_LDADD = @JACK_LIBS@ -lm
-+aubiotrack_LDADD = @JACK_LIBS@ -lm
-+aubioquiet_LDADD = @JACK_LIBS@ -lm
-diff -rupN aubio-0.3.2.old/examples/Makefile.in aubio-0.3.2/examples/Makefile.in
---- aubio-0.3.2.old/examples/Makefile.in	2006-10-08 19:22:10.000000000 -0400
-+++ aubio-0.3.2/examples/Makefile.in	2010-02-10 04:07:00.000000000 -0500
-@@ -247,10 +247,10 @@ aubioonset_SOURCES = aubioonset.c utils.
- aubionotes_SOURCES = aubionotes.c utils.c
- aubiotrack_SOURCES = aubiotrack.c utils.c
- aubioquiet_SOURCES = aubioquiet.c utils.c
--aubioonset_LDADD = @JACK_LIBS@
--aubionotes_LDADD = @JACK_LIBS@
--aubiotrack_LDADD = @JACK_LIBS@
--aubioquiet_LDADD = @JACK_LIBS@
-+aubioonset_LDADD = @JACK_LIBS@ -lm
-+aubionotes_LDADD = @JACK_LIBS@ -lm
-+aubiotrack_LDADD = @JACK_LIBS@ -lm
-+aubioquiet_LDADD = @JACK_LIBS@ -lm
- all: all-recursive
- 
- .SUFFIXES: