All of lore.kernel.org
 help / color / mirror / Atom feed
From: Gwenhael Goavec-Merou <gwenj@trabucayre.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH v4 07/17] package/aubio: use the new fftw-double and fftw-single packages
Date: Mon, 21 Jan 2019 14:51:01 +0100	[thread overview]
Message-ID: <1548078671-63318-7-git-send-email-gwenj@trabucayre.com> (raw)
In-Reply-To: <1548078671-63318-6-git-send-email-gwenj@trabucayre.com>

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
 
-- 
2.19.2

  reply	other threads:[~2019-01-21 13:51 UTC|newest]

Thread overview: 33+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-01-21 13:50 [Buildroot] [PATCH v4 01/17] package/fftw: prepare for splitting into multiple packages Gwenhael Goavec-Merou
2019-01-21 13:50 ` [Buildroot] [PATCH v4 02/17] package/fftw: break fftw-single into a dedicated package Gwenhael Goavec-Merou
2019-01-21 13:50   ` [Buildroot] [PATCH v4 03/17] package/fftw: break fftw-long-double " Gwenhael Goavec-Merou
2019-01-21 13:50     ` [Buildroot] [PATCH v4 04/17] package/fftw: break fftw-quad " Gwenhael Goavec-Merou
2019-01-21 13:50       ` [Buildroot] [PATCH v4 05/17] package/fftw: break fftw-double " Gwenhael Goavec-Merou
2019-01-21 13:51         ` [Buildroot] [PATCH v4 06/17] package/alsa-utils: use the new fftw-single package Gwenhael Goavec-Merou
2019-01-21 13:51           ` Gwenhael Goavec-Merou [this message]
2019-01-21 13:51             ` [Buildroot] [PATCH v4 08/17] package/gnuradio: " Gwenhael Goavec-Merou
2019-01-21 13:51               ` [Buildroot] [PATCH v4 09/17] package/gqrx: remove unneeded fftw dependency Gwenhael Goavec-Merou
2019-01-21 13:51                 ` [Buildroot] [PATCH v4 10/17] package/hackrf: use the new fftw-single package Gwenhael Goavec-Merou
2019-01-21 13:51                   ` [Buildroot] [PATCH v4 11/17] package/httping: use the new fftw-double package Gwenhael Goavec-Merou
2019-01-21 13:51                     ` [Buildroot] [PATCH v4 12/17] package/imagemagick: " Gwenhael Goavec-Merou
2019-01-21 13:51                       ` [Buildroot] [PATCH v4 13/17] package/libvips: " Gwenhael Goavec-Merou
2019-01-21 13:51                         ` [Buildroot] [PATCH v4 14/17] package/pulseaudio: use the new fftw-single package Gwenhael Goavec-Merou
2019-01-21 13:51                           ` [Buildroot] [PATCH v4 15/17] package/liquid-dsp: use the new fftw-{single, double, long-double} packages Gwenhael Goavec-Merou
2019-01-21 13:51                             ` [Buildroot] [PATCH v4 16/17] package/fftw: remove as regular package Gwenhael Goavec-Merou
2019-01-21 13:51                               ` [Buildroot] [PATCH v4 17/17] package/liquid-dsp: drop support for fftw-double and fftw-long-double Gwenhael Goavec-Merou
2019-02-05 21:09                                 ` Thomas Petazzoni
2019-02-06  5:40                                   ` Baruch Siach
2019-02-06  8:36                                     ` Thomas Petazzoni
2019-02-02 17:16                               ` [Buildroot] [PATCH v4 16/17] package/fftw: remove as regular package Yann E. MORIN
2019-02-06  9:23                                 ` Thomas Petazzoni
2019-02-02 22:08                               ` Yann E. MORIN
2019-02-02 16:54                             ` [Buildroot] [PATCH v4 15/17] package/liquid-dsp: use the new fftw-{single, double, long-double} packages Yann E. MORIN
2019-02-02 16:45                           ` [Buildroot] [PATCH v4 14/17] package/pulseaudio: use the new fftw-single package Yann E. MORIN
2019-02-02 16:44                         ` [Buildroot] [PATCH v4 13/17] package/libvips: use the new fftw-double package Yann E. MORIN
2019-02-02 16:42                       ` [Buildroot] [PATCH v4 12/17] package/imagemagick: " Yann E. MORIN
2019-02-02 16:41                     ` [Buildroot] [PATCH v4 11/17] package/httping: " Yann E. MORIN
2019-02-02 16:40                 ` [Buildroot] [PATCH v4 09/17] package/gqrx: remove unneeded fftw dependency Yann E. MORIN
2019-02-02 16:34               ` [Buildroot] [PATCH v4 08/17] package/gnuradio: use the new fftw-single package Yann E. MORIN
2019-02-02 14:52             ` [Buildroot] [PATCH v4 07/17] package/aubio: use the new fftw-double and fftw-single packages Yann E. MORIN
2019-02-02 14:38       ` [Buildroot] [PATCH v4 04/17] package/fftw: break fftw-quad into a dedicated package Yann E. MORIN
2019-02-06  9:16 ` [Buildroot] [PATCH v4 01/17] package/fftw: prepare for splitting into multiple packages Thomas Petazzoni

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1548078671-63318-7-git-send-email-gwenj@trabucayre.com \
    --to=gwenj@trabucayre.com \
    --cc=buildroot@busybox.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.