package: propagate pulseaudio dependencies correctly

The BR2_PACKAGE_PULSEAUDIO_HAS_ATOMIC dependency of
BR2_PACKAGE_PULSEAUDIO was not properly propagated to reverse
dependencies, causing the following kconfig warning:

warning: (BR2_PACKAGE_ESPEAK_AUDIO_BACKEND_PULSEAUDIO && BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_PULSE && BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_PULSE && BR2_PACKAGE_KODI_PULSEAUDIO && BR2_PACKAGE_MPD_PULSEAUDIO && BR2_PACKAGE_EFL_PULSEAUDIO) selects BR2_PACKAGE_PULSEAUDIO which has unmet direct dependencies (BR2_PACKAGE_PULSEAUDIO_HAS_ATOMIC && BR2_USE_WCHAR && BR2_TOOLCHAIN_HAS_THREADS && !BR2_STATIC_LIBS && BR2_USE_MMU)

This commit fixes that by propagating the dependency as it should have
been done.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>

diff --git a/package/efl/Config.in b/package/efl/Config.in
index e965d4d1428efd8e9a53cbc5f6842f2bab2df637..05be5aae565d7fdac15a997cd7cf6947504140fc 100644 (file)
--- a/package/efl/Config.in
+++ b/package/efl/Config.in
@@ -97,6 +97,11 @@ config BR2_PACKAGE_EFL_LIBSNDFILE
 config BR2_PACKAGE_EFL_PULSEAUDIO
        bool "Enable pulseaudio support (recommended)"
        default y
+       depends on BR2_PACKAGE_PULSEAUDIO_HAS_ATOMIC
+       depends on BR2_USE_WCHAR
+       depends on BR2_TOOLCHAIN_HAS_THREADS
+       depends on !BR2_STATIC_LIBS
+       depends on BR2_USE_MMU
        select BR2_PACKAGE_PULSEAUDIO
        help
          The only audio output method supported by Ecore right now is

diff --git a/package/espeak/Config.in b/package/espeak/Config.in
index 5e46b17e322274c8caab1349e24b2abee791d160..5f9007a165860d508d8da5163e4db197d170c391 100644 (file)
--- a/package/espeak/Config.in
+++ b/package/espeak/Config.in
@@ -35,6 +35,7 @@ config BR2_PACKAGE_ESPEAK_AUDIO_BACKEND_ALSA
 
 config BR2_PACKAGE_ESPEAK_AUDIO_BACKEND_PULSEAUDIO
        bool "pulseaudio"
+       depends on BR2_PACKAGE_PULSEAUDIO_HAS_ATOMIC
        select BR2_PACKAGE_PULSEAUDIO
 
 endchoice

diff --git a/package/gstreamer/gst-plugins-good/Config.in b/package/gstreamer/gst-plugins-good/Config.in
index e92cd0c5b2717ed2f0575b61e02f09bdb16f32b8..3b2a99f5b4eb6d05b1ce523ce9e56e429979bb41 100644 (file)
--- a/package/gstreamer/gst-plugins-good/Config.in
+++ b/package/gstreamer/gst-plugins-good/Config.in
@@ -205,11 +205,14 @@ config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_PULSE
        depends on BR2_TOOLCHAIN_HAS_THREADS # pulseaudio
        depends on BR2_USE_MMU # pulseaudio
        depends on !BR2_STATIC_LIBS # pulseaudio
+       depends on BR2_USE_WCHAR # pulseaudio
+       depends on BR2_PACKAGE_PULSEAUDIO_HAS_ATOMIC # pulseaudio
        select BR2_PACKAGE_PULSEAUDIO
 
-comment "pulseaudio support needs a toolchain w/ threads, dynamic library"
+comment "pulseaudio support needs a toolchain w/ threads, wchar, dynamic library"
        depends on BR2_USE_MMU
-       depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS
+       depends on BR2_PACKAGE_PULSEAUDIO_HAS_ATOMIC
+       depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || !BR2_USE_WCHAR
 
 config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_SOUPHTTPSRC
        bool "souphttpsrc (http client)"

diff --git a/package/gstreamer1/gst1-plugins-good/Config.in b/package/gstreamer1/gst1-plugins-good/Config.in
index 3bb98a43081275ea054db4613f6a336c5fb67326..afb9a418d892218e638c2d4f089a05fce67f9c37 100644 (file)
--- a/package/gstreamer1/gst1-plugins-good/Config.in
+++ b/package/gstreamer1/gst1-plugins-good/Config.in
@@ -333,13 +333,16 @@ config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_PULSE
        depends on BR2_TOOLCHAIN_HAS_THREADS # pulseaudio
        depends on BR2_USE_MMU # pulseaudio
        depends on !BR2_STATIC_LIBS # pulseaudio
+       depends on BR2_USE_WCHAR # pulseaudio
+       depends on BR2_PACKAGE_PULSEAUDIO_HAS_ATOMIC # pulseaudio
        select BR2_PACKAGE_PULSEAUDIO
        help
          PulseAudio plugin library
 
-comment "pulseaudio support needs a toolchain w/ threads, dynamic library"
+comment "pulseaudio support needs a toolchain w/ threads, wchar, dynamic library"
        depends on BR2_USE_MMU
-       depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS
+       depends on BR2_PACKAGE_PULSEAUDIO_HAS_ATOMIC
+       depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || !BR2_USE_WCHAR
 
 config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_SOUPHTTPSRC
        bool "souphttpsrc (http client)"

diff --git a/package/kodi/Config.in b/package/kodi/Config.in
index d96d546bf97aac2dcf22072f3e93037bc920e64c..5f9c95a7a09006e05a8c4d89254e607d92341bce 100644 (file)
--- a/package/kodi/Config.in
+++ b/package/kodi/Config.in
@@ -192,6 +192,7 @@ config BR2_PACKAGE_KODI_NONFREE
 
 config BR2_PACKAGE_KODI_PULSEAUDIO
        bool "pulseaudio"
+       depends on BR2_PACKAGE_PULSEAUDIO_HAS_ATOMIC
        # Pulseaudio support in kodi needs glib support in Pulseaudio,
        # see FindPulseAudio.cmake. Kodi meets all dependencies of
        # libglib2, so there is no need to propagate them here.

diff --git a/package/mpd/Config.in b/package/mpd/Config.in
index 1d50c7bf4491013ce2d8197bbea3cf9661ff19eb..d3844391a2a0cf987a4e1d42b517ba39b9fb3f69 100644 (file)
--- a/package/mpd/Config.in
+++ b/package/mpd/Config.in
@@ -264,13 +264,19 @@ config BR2_PACKAGE_MPD_OSS
 
 config BR2_PACKAGE_MPD_PULSEAUDIO
        bool "pulseaudio"
-       depends on !BR2_STATIC_LIBS # pulseaudio
+       depends on BR2_PACKAGE_PULSEAUDIO_HAS_ATOMIC
+       depends on BR2_USE_WCHAR
+       depends on BR2_TOOLCHAIN_HAS_THREADS
+       depends on !BR2_STATIC_LIBS
+       depends on BR2_USE_MMU
        select BR2_PACKAGE_PULSEAUDIO
        help
          Enable pulseaudio output support.
 
-comment "pulseaudio support needs a toolchain w/ dynamic library"
-       depends on BR2_STATIC_LIBS
+comment "pulseaudio support needs a toolchain w/ threads, wchar, dynamic library"
+       depends on BR2_USE_MMU
+       depends on BR2_PACKAGE_PULSEAUDIO_HAS_ATOMIC
+       depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || !BR2_USE_WCHAR
 
 config BR2_PACKAGE_MPD_SHOUTCAST
        bool "shoutcast"