From 20528ac5992b474143eda4d3fb98eee9fa895e27 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Sun, 23 Nov 2014 11:25:00 +0100
Subject: [PATCH] aubio: update to 0.4.1 (soname bump).

---
 common/shlibs                             |  3 +--
 srcpkgs/aubio/patches/aubio-linking.patch | 33 -----------------------
 srcpkgs/aubio/template                    | 22 ++++++++-------
 3 files changed, 14 insertions(+), 44 deletions(-)
 delete mode 100644 srcpkgs/aubio/patches/aubio-linking.patch

diff --git a/common/shlibs b/common/shlibs
index 660ed452318..bcf4e1ecc77 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -856,8 +856,7 @@ libfluidsynth.so.1 libfluidsynth-1.1.5_1
 liblo.so.7 liblo-0.26_1
 libvamp-sdk.so.2 libvamp-plugin-sdk-2.2_1
 librubberband.so.2 librubberband-1.6.0_1
-libaubio.so.2 libaubio-0.3.2_1
-libaubioext.so.2 libaubio-0.3.2_1
+libaubio.so.4 libaubio-0.4.1_1
 libraptor2.so.0 libraptor-2.0.4_1
 liblrdf.so.2 liblrdf-0.4.0_1
 libserd-0.so.0 libserd-0.18.0_1
diff --git a/srcpkgs/aubio/patches/aubio-linking.patch b/srcpkgs/aubio/patches/aubio-linking.patch
deleted file mode 100644
index 747dc0bafdc..00000000000
--- a/srcpkgs/aubio/patches/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
---- examples/Makefile.am	2006-09-12 18:31:40.000000000 -0400
-+++ 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
---- examples/Makefile.in	2006-10-08 19:22:10.000000000 -0400
-+++ 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:
diff --git a/srcpkgs/aubio/template b/srcpkgs/aubio/template
index 698d31c4c65..f4dfc55677d 100644
--- a/srcpkgs/aubio/template
+++ b/srcpkgs/aubio/template
@@ -1,18 +1,22 @@
 # Template file for 'aubio'
 pkgname=aubio
-version=0.3.2
-revision=7
-build_style=gnu-configure
-configure_args="--disable-static"
+version=0.4.1
+revision=1
+build_style=waf
 # XXX lash, pure and swig support.
-hostmakedepends="pkg-config"
+hostmakedepends="python pkg-config"
 makedepends="libsamplerate-devel fftw-devel jack-devel"
 short_desc="A library for audio labelling"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
 homepage="http://aubio.org"
-distfiles="${homepage}/pub/${pkgname}-${version}.tar.gz"
-checksum=dc1387b048610a6141f523c27314b7a60bd299c3d6789c372445ddc6511512cd
+distfiles="${homepage}/pub/${pkgname}-${version}.tar.bz2"
+checksum=25d7df0a9cd6366fda764a803424caddf5fb819fc75b42a7a03e1e6f8eb3c695
+
+pre_configure() {
+	# disable tests to allow cross builds
+	sed -i '/bld.recurse.*tests.*/d' wscript
+}
 
 libaubio_package() {
 	short_desc+=" - Runtime libraries"
@@ -20,13 +24,13 @@ libaubio_package() {
 		vmove "usr/lib/*.so.*"
 	}
 }
-
 aubio-devel_package() {
 	depends="libaubio-${version}_${revision}"
 	short_desc+=" - Development files"
 	pkg_install() {
         	vmove usr/include
         	vmove usr/lib/pkgconfig
-		vmove "usr/lib/*.so"
+		vmove usr/lib/*.so
+		vmove usr/lib/*.a
 	}
 }