| Message ID | 1548078671-63318-7-git-send-email-gwenj@trabucayre.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [v4,01/17] package/fftw: prepare for splitting into multiple packages | expand |
Gwenhael, All, On 2019-01-21 14:51 +0100, Gwenhael Goavec-Merou spake thusly: > From: Gwenhael Goavec-Merou <gwenhael.goavec-merou@trabucayre.com> > > Signed-off-by: Gwenhael Goavec-Merou <gwenhael.goavec-merou@trabucayre.com> > [Thomas: drop the condition on BR2_PACKAGE_FFTW] > Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com> > --- > Changes v3 -> v4: > * allows to build samplerate without fft support and ensure samplerate and > double precision are not enabled in same time. (yann) > --- > package/aubio/aubio.mk | 13 ++++++------- > 1 file changed, 6 insertions(+), 7 deletions(-) > > diff --git a/package/aubio/aubio.mk b/package/aubio/aubio.mk > index b0cc8b899e..ba182d9bd7 100644 > --- a/package/aubio/aubio.mk > +++ b/package/aubio/aubio.mk > @@ -27,7 +27,7 @@ AUBIO_CONF_OPTS += --disable-sndfile > endif > > # Could not compile aubio in double precision mode with libsamplerate > -ifeq ($(BR2_PACKAGE_LIBSAMPLERATE)$(BR2_PACKAGE_FFTW_PRECISION_SINGLE),yy) > +ifeq ($(BR2_PACKAGE_LIBSAMPLERATE):$(BR2_PACKAGE_FFTW_DOUBLE),y:) > AUBIO_DEPENDENCIES += libsamplerate > AUBIO_CONF_OPTS += --enable-samplerate > else > @@ -41,15 +41,14 @@ 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) > +ifeq ($(BR2_PACKAGE_FFTW_DOUBLE),y) > AUBIO_CONF_OPTS += --enable-fftw3 --enable-double > -else ifeq ($(BR2_PACKAGE_FFTW_PRECISION_SINGLE),y) > +AUBIO_DEPENDENCIES += fftw-double > +else ifeq ($(BR2_PACKAGE_FFTW_SINGLE),y) > AUBIO_CONF_OPTS += --enable-fftw3f --disable-double > -endif > -else # !BR2_PACKAGE_FFTW > +AUBIO_DEPENDENCIES += fftw-single > +else > AUBIO_CONF_OPTS += --disable-fftw3 > endif So, with this new code, it means that using fftw-double takes precendence over libsamplerate, so we can get in a situation, when fftw-single, fftw-double, and libsamplerate are all three enabled. I wonder if, in that situation, we should not favour using libsamplerate and fftw-single, rather than using just fftw-double? Note that I am totally OK with the patch as is, and that someone can come later to change the conditions, so: Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Regards, Yann E. MORIN.
diff --git a/package/aubio/aubio.mk b/package/aubio/aubio.mk index b0cc8b899e..ba182d9bd7 100644 --- a/package/aubio/aubio.mk +++ b/package/aubio/aubio.mk @@ -27,7 +27,7 @@ AUBIO_CONF_OPTS += --disable-sndfile endif # Could not compile aubio in double precision mode with libsamplerate -ifeq ($(BR2_PACKAGE_LIBSAMPLERATE)$(BR2_PACKAGE_FFTW_PRECISION_SINGLE),yy) +ifeq ($(BR2_PACKAGE_LIBSAMPLERATE):$(BR2_PACKAGE_FFTW_DOUBLE),y:) AUBIO_DEPENDENCIES += libsamplerate AUBIO_CONF_OPTS += --enable-samplerate else @@ -41,15 +41,14 @@ 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) +ifeq ($(BR2_PACKAGE_FFTW_DOUBLE),y) AUBIO_CONF_OPTS += --enable-fftw3 --enable-double -else ifeq ($(BR2_PACKAGE_FFTW_PRECISION_SINGLE),y) +AUBIO_DEPENDENCIES += fftw-double +else ifeq ($(BR2_PACKAGE_FFTW_SINGLE),y) AUBIO_CONF_OPTS += --enable-fftw3f --disable-double -endif -else # !BR2_PACKAGE_FFTW +AUBIO_DEPENDENCIES += fftw-single +else AUBIO_CONF_OPTS += --disable-fftw3 endif