From cc08b57079eaf1494ab4f2d1f79ccecc63a8d767 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 28 Jul 2022 14:28:39 +0200 Subject: [PATCH] package/wine: simplify alsa-lib feature selection Instead of having the user need to figure out that 2 alsa-lib features are needed for wine ALSA support, have the top-level wine option select the relevant alsa-lib features, when alsa-lib is enabled as already done for pulseaudio in commit 97cd3680a4cc4bc0c71bccccb1459eda4b880159 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/wine/Config.in | 2 ++ package/wine/wine.mk | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/package/wine/Config.in b/package/wine/Config.in index 18fb0a64a2..db3b1570ef 100644 --- a/package/wine/Config.in +++ b/package/wine/Config.in @@ -15,6 +15,8 @@ config BR2_PACKAGE_WINE depends on !BR2_STATIC_LIBS # pthread_attr_setstack depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_PACKAGE_ALSA_LIB_SEQ if BR2_PACKAGE_ALSA_LIB + select BR2_PACKAGE_ALSA_LIB_RAWMIDI if BR2_PACKAGE_ALSA_LIB help Wine is a compatibility layer capable of running Windows applications on Linux. Instead of simulating internal diff --git a/package/wine/wine.mk b/package/wine/wine.mk index 5f4d2ef6e3..a1c65bef4e 100644 --- a/package/wine/wine.mk +++ b/package/wine/wine.mk @@ -41,7 +41,7 @@ ifeq ($(BR2_TOOLCHAIN_EXTERNAL),y) WINE_CONF_OPTS += TARGETFLAGS="-b $(TOOLCHAIN_EXTERNAL_PREFIX)" endif -ifeq ($(BR2_PACKAGE_ALSA_LIB)$(BR2_PACKAGE_ALSA_LIB_SEQ)$(BR2_PACKAGE_ALSA_LIB_RAWMIDI),yyy) +ifeq ($(BR2_PACKAGE_ALSA_LIB),y) WINE_CONF_OPTS += --with-alsa WINE_DEPENDENCIES += alsa-lib else