[Buildroot] [PATCH 1/6] package/aubio: new package

[Buildroot] [PATCH 1/6] package/aubio: new package

[Romain Naour]

Aubio attempt to build aubio.so shared library so disable it for static
build only.

Signed-off-by: Romain Naour <romain.naour@gmail.com>
---
 package/Config.in                         |  1 +
 package/aubio/0001-remove-unit-test.patch | 63 +++++++++++++++++++++++++++++++
 package/aubio/Config.in                   | 21 +++++++++++
 package/aubio/aubio.hash                  |  2 +
 package/aubio/aubio.mk                    | 24 ++++++++++++
 5 files changed, 111 insertions(+)
 create mode 100644 package/aubio/0001-remove-unit-test.patch
 create mode 100644 package/aubio/Config.in
 create mode 100644 package/aubio/aubio.hash
 create mode 100644 package/aubio/aubio.mk

diff --git a/package/Config.in b/package/Config.in
index b076dfd..f16e56d 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -828,6 +828,7 @@ menu "Libraries"
 
 menu "Audio/Sound"
 	source "package/alsa-lib/Config.in"
+	source "package/aubio/Config.in"
 	source "package/audiofile/Config.in"
 	source "package/celt051/Config.in"
 	source "package/fdk-aac/Config.in"
diff --git a/package/aubio/0001-remove-unit-test.patch b/package/aubio/0001-remove-unit-test.patch
new file mode 100644
index 0000000..947fc8e
--- /dev/null
+++ b/package/aubio/0001-remove-unit-test.patch
@@ -0,0 +1,63 @@
+From c71d72262568907ae8c3b988d42e575a8bd3a207 Mon Sep 17 00:00:00 2001
+From: Romain Naour <romain.naour@gmail.com>
+Date: Sat, 29 Oct 2016 20:14:02 +0200
+Subject: [PATCH] remove unit test
+
+Unit tests fail to build on some system.
+
+Waf: Entering directory `output/build/aubio-0.4.3/build'
+[170/217] Processing build/tests/test-sink
+[170/217] Processing build/tests/test-sink_apple_audio-multi
+[172/217] Processing build/tests/test-sink_sndfile-multi
+[172/217] Processing build/tests/test-source_apple_audio
+[174/217] Processing build/tests/test-source_avcodec
+[174/217] Processing build/tests/test-source_multi
+[174/217] Processing build/tests/test-source_seek
+[176/217] Processing build/tests/test-source_sndfile
+Waf: Leaving directory `output/build/aubio-0.4.3/build'
+Build failed
+Traceback (most recent call last):
+  File "output/build/aubio-0.4.3/waflib/Task.py", line 110, in process
+    ret=self.run()
+  File "output/build/aubio-0.4.3/waflib/Tools/waf_unit_test.py", line 66, in run
+    proc=Utils.subprocess.Popen(self.ut_exec,cwd=cwd,env=self.get_test_env(),stderr=Utils.subprocess.PIPE,stdout=Utils.subprocess.PIPE)
+  File "/usr/lib64/python2.7/subprocess.py", line 710, in __init__
+    errread, errwrite)
+  File "/usr/lib64/python2.7/subprocess.py", line 1335, in _execute_child
+    raise child_exception
+OSError: [Errno 2] No such file or directory
+
+Signed-off-by: Romain Naour <romain.naour@gmail.com>
+---
+ wscript | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/wscript b/wscript
+index c665ff5..c8fae6c 100644
+--- a/wscript
++++ b/wscript
+@@ -95,13 +95,11 @@ def options(ctx):
+             help='set target platform for cross-compilation', dest='target_platform')
+ 
+     ctx.load('compiler_c')
+-    ctx.load('waf_unit_test')
+     ctx.load('gnu_dirs')
+ 
+ def configure(ctx):
+     from waflib import Options
+     ctx.load('compiler_c')
+-    ctx.load('waf_unit_test')
+     ctx.load('gnu_dirs')
+ 
+     # check for common headers
+@@ -334,7 +332,6 @@ def build(bld):
+     bld.recurse('src')
+     if bld.env['DEST_OS'] not in ['ios', 'iosimulator', 'android']:
+         bld.recurse('examples')
+-        bld.recurse('tests')
+ 
+     bld( source = 'aubio.pc.in' )
+ 
+-- 
+2.5.5
+
diff --git a/package/aubio/Config.in b/package/aubio/Config.in
new file mode 100644
index 0000000..c4c60db
--- /dev/null
+++ b/package/aubio/Config.in
@@ -0,0 +1,21 @@
+config BR2_PACKAGE_AUBIO
+	bool "aubio"
+	depends on !BR2_STATIC_LIBS
+	depends on BR2_TOOLCHAIN_HAS_THREADS
+	help
+	  aubio is a tool designed for the extraction of annotations from
+	  audio signals. Its features include segmenting a sound file
+	  before each of its attacks, performing pitch detection, tapping
+	  the beat and producing midi streams from live audio.
+
+	  Because these tasks are difficult, we thought it was important
+	  to gather them in a dedicated library. To increase the fun, we
+	  have made these algorithms work in a causal way, so as to be
+	  used in real time applications with as low delay as possible.
+	  Functions can be used offline in sound editors and software
+	  samplers, or online in audio effects and virtual instruments.
+
+	  https://aubio.org
+
+comment "aubio needs a toolchain w/ threads, dynamic library"
+	depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS
diff --git a/package/aubio/aubio.hash b/package/aubio/aubio.hash
new file mode 100644
index 0000000..f4de92a
--- /dev/null
+++ b/package/aubio/aubio.hash
@@ -0,0 +1,2 @@
+# Locally computed
+sha256 b62cdb073c0c64ae301917fa162969d42cba45e478bdf1e74490bd87e9cceaab  aubio-0.4.3.tar.bz2
diff --git a/package/aubio/aubio.mk b/package/aubio/aubio.mk
new file mode 100644
index 0000000..aa4ddd0
--- /dev/null
+++ b/package/aubio/aubio.mk
@@ -0,0 +1,24 @@
+################################################################################
+#
+# aubio
+#
+################################################################################
+
+AUBIO_VERSION = 0.4.3
+AUBIO_SITE = https://aubio.org/pub
+AUBIO_SOURCE = aubio-$(AUBIO_VERSION).tar.bz2
+AUBIO_LICENSE = GPLv3+
+AUBIO_LICENSE_FILES = COPYING
+AUBIO_INSTALL_STAGING = YES
+
+AUBIO_CONF_OPTS = \
+	--disable-docs \
+	--disable-atlas \
+	--disable-samplerate \
+	--disable-avcodec \
+	--disable-sndfile \
+	--disable-jack \
+	--disable-fftw3 \
+	--disable-fftw3f
+
+$(eval $(waf-package))
-- 
2.5.5

[Buildroot] [PATCH 2/6] package/aubio: add libsndfile optional dependency

[Romain Naour]

Signed-off-by: Romain Naour <romain.naour@gmail.com>
---
 package/aubio/aubio.mk | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/package/aubio/aubio.mk b/package/aubio/aubio.mk
index aa4ddd0..e1694ab 100644
--- a/package/aubio/aubio.mk
+++ b/package/aubio/aubio.mk
@@ -16,9 +16,15 @@ AUBIO_CONF_OPTS = \
 	--disable-atlas \
 	--disable-samplerate \
 	--disable-avcodec \
-	--disable-sndfile \
 	--disable-jack \
 	--disable-fftw3 \
 	--disable-fftw3f
 
+ifeq ($(BR2_PACKAGE_LIBSNDFILE),y)
+AUBIO_DEPENDENCIES += libsndfile
+AUBIO_CONF_OPTS += --enable-sndfile
+else
+AUBIO_CONF_OPTS += --disable-sndfile
+endif
+
 $(eval $(waf-package))
-- 
2.5.5

[Buildroot] [PATCH 3/6] package/aubio: add libsamplerate optional dependency

[Romain Naour]

Signed-off-by: Romain Naour <romain.naour@gmail.com>
---
 package/aubio/aubio.mk | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/package/aubio/aubio.mk b/package/aubio/aubio.mk
index e1694ab..ed00088 100644
--- a/package/aubio/aubio.mk
+++ b/package/aubio/aubio.mk
@@ -14,7 +14,6 @@ AUBIO_INSTALL_STAGING = YES
 AUBIO_CONF_OPTS = \
 	--disable-docs \
 	--disable-atlas \
-	--disable-samplerate \
 	--disable-avcodec \
 	--disable-jack \
 	--disable-fftw3 \
@@ -27,4 +26,11 @@ else
 AUBIO_CONF_OPTS += --disable-sndfile
 endif
 
+ifeq ($(BR2_PACKAGE_LIBSAMPLERATE),y)
+AUBIO_DEPENDENCIES += libsamplerate
+AUBIO_CONF_OPTS += --enable-samplerate
+else
+AUBIO_CONF_OPTS += --disable-samplerate
+endif
+
 $(eval $(waf-package))
-- 
2.5.5

[Buildroot] [PATCH 4/6] package/aubio: add jack2 optional dependency

[Romain Naour]

Signed-off-by: Romain Naour <romain.naour@gmail.com>
---
 package/aubio/aubio.mk | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/package/aubio/aubio.mk b/package/aubio/aubio.mk
index ed00088..7aac6e5 100644
--- a/package/aubio/aubio.mk
+++ b/package/aubio/aubio.mk
@@ -15,7 +15,6 @@ AUBIO_CONF_OPTS = \
 	--disable-docs \
 	--disable-atlas \
 	--disable-avcodec \
-	--disable-jack \
 	--disable-fftw3 \
 	--disable-fftw3f
 
@@ -33,4 +32,11 @@ else
 AUBIO_CONF_OPTS += --disable-samplerate
 endif
 
+ifeq ($(BR2_PACKAGE_JACK2),y)
+AUBIO_DEPENDENCIES += jack2
+AUBIO_CONF_OPTS += --enable-jack
+else
+AUBIO_CONF_OPTS += --disable-jack
+endif
+
 $(eval $(waf-package))
-- 
2.5.5

[Buildroot] [PATCH 5/6] package/aubio: add fftw optional dependency

[Romain Naour]

Signed-off-by: Romain Naour <romain.naour@gmail.com>
---
 package/aubio/aubio.mk | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/package/aubio/aubio.mk b/package/aubio/aubio.mk
index 7aac6e5..9339f44 100644
--- a/package/aubio/aubio.mk
+++ b/package/aubio/aubio.mk
@@ -14,9 +14,7 @@ AUBIO_INSTALL_STAGING = YES
 AUBIO_CONF_OPTS = \
 	--disable-docs \
 	--disable-atlas \
-	--disable-avcodec \
-	--disable-fftw3 \
-	--disable-fftw3f
+	--disable-avcodec
 
 ifeq ($(BR2_PACKAGE_LIBSNDFILE),y)
 AUBIO_DEPENDENCIES += libsndfile
@@ -39,4 +37,16 @@ else
 AUBIO_CONF_OPTS += --disable-jack
 endif
 
+ifeq ($(BR2_PACKAGE_FFTW),y)
+AUBIO_DEPENDENCIES += fftw
+# fftw3 require double otherwise it will look for fftw3f
+ifeq ($(BR2_PACKAGE_FFTW_PRECISION_DOUBLE),y)
+AUBIO_CONF_OPTS += --enable-fftw3 --enable-double
+else ifeq ($(BR2_PACKAGE_FFTW_PRECISION_SINGLE),y)
+AUBIO_CONF_OPTS += --enable-fftw3f --disable-double
+endif
+else  # !BR2_PACKAGE_FFTW
+AUBIO_CONF_OPTS += --disable-fftw3
+endif
+
 $(eval $(waf-package))
-- 
2.5.5

[Buildroot] [PATCH 6/6] package/aubio: add ffmpeg libav optional dependency

[Romain Naour]

Aubio libav support require libavcodec, libavformat, libavutil and
libavresample. Enable libav support only when
BR2_PACKAGE_FFMPEG_AVRESAMPLE is set.

Signed-off-by: Romain Naour <romain.naour@gmail.com>
---
 package/aubio/aubio.mk | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/package/aubio/aubio.mk b/package/aubio/aubio.mk
index 9339f44..cfa233f 100644
--- a/package/aubio/aubio.mk
+++ b/package/aubio/aubio.mk
@@ -13,8 +13,7 @@ AUBIO_INSTALL_STAGING = YES
 
 AUBIO_CONF_OPTS = \
 	--disable-docs \
-	--disable-atlas \
-	--disable-avcodec
+	--disable-atlas
 
 ifeq ($(BR2_PACKAGE_LIBSNDFILE),y)
 AUBIO_DEPENDENCIES += libsndfile
@@ -49,4 +48,11 @@ else  # !BR2_PACKAGE_FFTW
 AUBIO_CONF_OPTS += --disable-fftw3
 endif
 
+ifeq ($(BR2_PACKAGE_FFMPEG_AVRESAMPLE),y)
+AUBIO_DEPENDENCIES += ffmpeg
+AUBIO_CONF_OPTS += --enable-avcodec
+else
+AUBIO_CONF_OPTS += --disable-avcodec
+endif
+
 $(eval $(waf-package))
-- 
2.5.5

[Buildroot] [PATCH 1/6] package/aubio: new package

[Thomas Petazzoni]

Hello,

On Sat,  3 Dec 2016 13:17:34 +0100, Romain Naour wrote:
> Aubio attempt to build aubio.so shared library so disable it for static
> build only.
> 
> Signed-off-by: Romain Naour <romain.naour@gmail.com>
> ---
>  package/Config.in                         |  1 +
>  package/aubio/0001-remove-unit-test.patch | 63 +++++++++++++++++++++++++++++++
>  package/aubio/Config.in                   | 21 +++++++++++
>  package/aubio/aubio.hash                  |  2 +
>  package/aubio/aubio.mk                    | 24 ++++++++++++
>  5 files changed, 111 insertions(+)
>  create mode 100644 package/aubio/0001-remove-unit-test.patch
>  create mode 100644 package/aubio/Config.in
>  create mode 100644 package/aubio/aubio.hash
>  create mode 100644 package/aubio/aubio.mk

Applied to master, thanks. Could you please talk with upstream about
the issue with the unit test, so that it can be solved? Adding an
option to enable/disable tests would be good, for example.

Thanks,

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

[Buildroot] [PATCH 2/6] package/aubio: add libsndfile optional dependency

[Thomas Petazzoni]

Hello,

On Sat,  3 Dec 2016 13:17:35 +0100, Romain Naour wrote:
> Signed-off-by: Romain Naour <romain.naour@gmail.com>
> ---
>  package/aubio/aubio.mk | 8 +++++++-
>  1 file changed, 7 insertions(+), 1 deletion(-)

Patches 2 to 6 applied. Thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com