From 76de77202d01d280a2b0f4c6c98e8b8887e73675 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 16 Mar 2022 22:22:18 +0100 Subject: [PATCH] package/zynaddsubfx: fix alsa-lib handling alsa-lib is optional, not mandatory, since the addition of the package in commit 18a863063735e2c658fa6947a4e540e9dda6c431 Moreover, alsa support depends on BR2_PACKAGE_ALSA_LIB_SEQ (otherwise, it is silently disabled) Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 2fc2191845799ae2358b752fa29839817d33ad82) Signed-off-by: Peter Korsgaard --- package/zynaddsubfx/Config.in | 3 +-- package/zynaddsubfx/zynaddsubfx.mk | 8 +++++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/package/zynaddsubfx/Config.in b/package/zynaddsubfx/Config.in index 837a469e7c..f181a23944 100644 --- a/package/zynaddsubfx/Config.in +++ b/package/zynaddsubfx/Config.in @@ -2,8 +2,7 @@ config BR2_PACKAGE_ZYNADDSUBFX bool "zynaddsubfx" depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++11 - depends on BR2_TOOLCHAIN_HAS_THREADS # alsa-lib, liblo - select BR2_PACKAGE_ALSA_LIB + depends on BR2_TOOLCHAIN_HAS_THREADS # liblo select BR2_PACKAGE_FFTW select BR2_PACKAGE_FFTW_SINGLE select BR2_PACKAGE_LIBLO diff --git a/package/zynaddsubfx/zynaddsubfx.mk b/package/zynaddsubfx/zynaddsubfx.mk index db0459ce62..aeeb0b6405 100644 --- a/package/zynaddsubfx/zynaddsubfx.mk +++ b/package/zynaddsubfx/zynaddsubfx.mk @@ -18,10 +18,16 @@ ZYNADDSUBFX_CONF_OPTS += -DOS_LIBRARIES=-latomic endif ZYNADDSUBFX_DEPENDENCIES = \ - alsa-lib \ fftw-single \ liblo \ mxml \ zlib +ifeq ($(BR2_PACKAGE_ALSA_LIB_SEQ),y) +ZYNADDSUBFX_DEPENDENCIES += alsa-lib +ZYNADDSUBFX_CONF_OPTS += -DAlsaEnable=ON +else +ZYNADDSUBFX_CONF_OPTS += -DAlsaEnable=OFF +endif + $(eval $(cmake-package))