Parcourir la source

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 <fontaine.fabrice@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Fabrice Fontaine il y a 3 ans
Parent
commit
cc08b57079
2 fichiers modifiés avec 3 ajouts et 1 suppressions
  1. 2 0
      package/wine/Config.in
  2. 1 1
      package/wine/wine.mk

+ 2 - 0
package/wine/Config.in

@@ -15,6 +15,8 @@ config BR2_PACKAGE_WINE
 	depends on !BR2_STATIC_LIBS
 	depends on !BR2_STATIC_LIBS
 	# pthread_attr_setstack
 	# pthread_attr_setstack
 	depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL
 	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
 	help
 	  Wine is a compatibility layer capable of running Windows
 	  Wine is a compatibility layer capable of running Windows
 	  applications on Linux. Instead of simulating internal
 	  applications on Linux. Instead of simulating internal

+ 1 - 1
package/wine/wine.mk

@@ -41,7 +41,7 @@ ifeq ($(BR2_TOOLCHAIN_EXTERNAL),y)
 WINE_CONF_OPTS += TARGETFLAGS="-b $(TOOLCHAIN_EXTERNAL_PREFIX)"
 WINE_CONF_OPTS += TARGETFLAGS="-b $(TOOLCHAIN_EXTERNAL_PREFIX)"
 endif
 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_CONF_OPTS += --with-alsa
 WINE_DEPENDENCIES += alsa-lib
 WINE_DEPENDENCIES += alsa-lib
 else
 else