Skip to contentSkip to conversation

package/aubio: bump to version 0.4.5

PATCH Superseded Romain Naour 2 participants 4 messages Apr 16, 2017 – Apr 17, 2017

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 package/aubio: bump to version 0.4.5

Since aubio 0.4.4, the libsamplerate support require fftw single precision mode.

Add a new option BR2_PACKAGE_AUBIO_LIBSAMPLERATE to enable libsamplerate support only if BR2_PACKAGE_FFTW_PRECISION_SINGLE is set.

---
v2: fix aubio version in the commit log.

---
 package/aubio/Config.in  | 14 ++++++++++++++
 package/aubio/aubio.hash |  4 ++--
 package/aubio/aubio.mk   |  4 ++--
 3 files changed, 18 insertions(+), 4 deletions(-)
package/aubio/Config.in +14 -0
index c4c60db..85f5d9a 100644
@@ -17,5 +17,19 @@ config BR2_PACKAGE_AUBIO
 
 	  https://aubio.org
 
+if BR2_PACKAGE_AUBIO
+
+config BR2_PACKAGE_AUBIO_LIBSAMPLERATE
+	bool "Enable libsamplerate support"
+	depends on BR2_PACKAGE_FFTW_PRECISION_SINGLE
+	help
+	  Aubio require fftw single precision mode with libsamplerate
+	  (libsamplerate only supports float).
+
+comment "aubio w/ libsamplerate needs fftw in single precision"
+	depends on !BR2_PACKAGE_FFTW_PRECISION_SINGLE
+
+endif
+
 comment "aubio needs a toolchain w/ threads, dynamic library"
 	depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS
package/aubio/aubio.hash +2 -2
index e447847..b4233ae 100644
@@ -1,2 +1,2 @@
-# From https://aubio.org/pub/aubio-0.4.3.tar.bz2.sha256
-sha256 b62cdb073c0c64ae301917fa162969d42cba45e478bdf1e74490bd87e9cceaab  aubio-0.4.3.tar.bz2
+# From https://aubio.org/pub/aubio-0.4.5.tar.bz2.sha256
+sha256 70c2804e6f4fbf0ebc0fb9ac8cc9d465ef4a4d438311c074c9a7364e98827af6  aubio-0.4.5.tar.bz2
package/aubio/aubio.mk +2 -2
index f8be19f..e58efa3 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-AUBIO_VERSION = 0.4.3
+AUBIO_VERSION = 0.4.5
 AUBIO_SITE = https://aubio.org/pub
 AUBIO_SOURCE = aubio-$(AUBIO_VERSION).tar.bz2
 AUBIO_LICENSE = GPL-3.0+
@@ -26,7 +26,7 @@ else
 AUBIO_CONF_OPTS += --disable-sndfile
 endif
 
-ifeq ($(BR2_PACKAGE_LIBSAMPLERATE),y)
+ifeq ($(BR2_PACKAGE_AUBIO_LIBSAMPLERATE),y)
 AUBIO_DEPENDENCIES += libsamplerate
 AUBIO_CONF_OPTS += --enable-samplerate
 else
Signature · 1 line
2.9.3
#1 lore raw

PATCH v2 1/1 package/aubio: bump to version 0.4.5

Hello,

package/aubio/aubio.mk else · line 29

Quoted 2 lines · Romain Naour
package/aubio/aubio.mk +1 -1
-ifeq ($(BR2_PACKAGE_LIBSAMPLERATE),y)
+ifeq ($(BR2_PACKAGE_AUBIO_LIBSAMPLERATE),y)

Since none of the other optional dependencies have a sub-option in this package, what about just:

ifeq ($(BR2_PACKAGE_LIBSAMPLERATE)$(BR2_PACKAGE_FFTW_PRECISION_SINGLE),yy)

Also, I don't quite understand your commit, because libsamplerate is itself built with --disable-fftw.

Thanks,

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
#2 lore raw

PATCH v2 1/1 package/aubio: bump to version 0.4.5

Hi Thomas,

Le 17/04/2017 ? 15:07, Thomas Petazzoni a ?crit :

Quoted 11 lines

Hello,

package/aubio/aubio.mk else · line 29

Quoted 2 lines · Romain Naour
package/aubio/aubio.mk +1 -1
-ifeq ($(BR2_PACKAGE_LIBSAMPLERATE),y)
+ifeq ($(BR2_PACKAGE_AUBIO_LIBSAMPLERATE),y)

Since none of the other optional dependencies have a sub-option in this package, what about just:

ifeq ($(BR2_PACKAGE_LIBSAMPLERATE)$(BR2_PACKAGE_FFTW_PRECISION_SINGLE),yy)

Yes, I hesitated by doing so but I thought it was better to handle the dependency from Config.in (for the help text and comment when not available). I've not a strong opinion.

Quoted 3 lines

Also, I don't quite understand your commit, because libsamplerate is itself built with --disable-fftw.

humm, I don't really know if libsamplerate without fftw support can really work with aubio. The build systemd doesn't check if fftw is enabled in libsamplerate. I'll ask upstream.

Best regards,
Romain

Quoted 5 lines

Thanks,

Thomas

#3 lore raw

PATCH v2 1/1 package/aubio: bump to version 0.4.5

Hi Thomas,

Le 17/04/2017 ? 15:50, Romain Naour a ?crit :

Quoted 13 lines

Hi Thomas,

Le 17/04/2017 ? 15:07, Thomas Petazzoni a ?crit :

Quoted 10 lines

Hello,

package/aubio/aubio.mk else · line 29

Quoted 2 lines · Romain Naour
package/aubio/aubio.mk +1 -1
-ifeq ($(BR2_PACKAGE_LIBSAMPLERATE),y)
+ifeq ($(BR2_PACKAGE_AUBIO_LIBSAMPLERATE),y)

Since none of the other optional dependencies have a sub-option in this package, what about just:

Quoted 9 lines
Quoted 1 line

ifeq ($(BR2_PACKAGE_LIBSAMPLERATE)$(BR2_PACKAGE_FFTW_PRECISION_SINGLE),yy)

Yes, I hesitated by doing so but I thought it was better to handle the dependency from Config.in (for the help text and comment when not available). I've not a strong opinion.

Quoted 3 lines

Also, I don't quite understand your commit, because libsamplerate is itself built with --disable-fftw.

As reported by Paul Brossier [1], fftw is not used by libsamplerate library. Only tests programs use it.

So we just have to make sure that fftw use single precision mode when libsamplerate is enabled [2].

Best regards,
Romain

[1] https://github.com/aubio/aubio/issues/100
[2] https://github.com/aubio/aubio/commit/8be88e77f5c275fdf4efc99ae182d14940948786

Quoted 14 lines

humm, I don't really know if libsamplerate without fftw support can really work with aubio. The build systemd doesn't check if fftw is enabled in libsamplerate. I'll ask upstream.

Best regards,
Romain

Quoted 5 lines

Thanks,

Thomas