mirror/buildroot
1
0
Fork 0
mirror of https://gitlab.com/buildroot.org/buildroot.git synced 2026-09-30 22:11:59 -09:00
Code Issues Packages Projects Releases Wiki Activity

package: propagate pulseaudio dependencies correctly

Browse Source 
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>
(cherry picked from commit 68161802eb)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Thomas Petazzoni
2018-07-31 23:10:23 +02:00
committed by Peter Korsgaard
parent 24e8c76e71
commit 1e0db1a880
6 changed files with 26 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
package/efl/Config.in
View File

@@ -97,6 +97,11 @@ config BR2_PACKAGE_EFL_LIBSNDFILE
config BR2_PACKAGE_EFL_PULSEAUDIO config BR2_PACKAGE_EFL_PULSEAUDIO
bool "Enable pulseaudio support (recommended)" bool "Enable pulseaudio support (recommended)"
default y 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 select BR2_PACKAGE_PULSEAUDIO
help help
The only audio output method supported by Ecore right now is The only audio output method supported by Ecore right now is

1
package/espeak/Config.in
View File

@@ -35,6 +35,7 @@ config BR2_PACKAGE_ESPEAK_AUDIO_BACKEND_ALSA
config BR2_PACKAGE_ESPEAK_AUDIO_BACKEND_PULSEAUDIO config BR2_PACKAGE_ESPEAK_AUDIO_BACKEND_PULSEAUDIO
bool "pulseaudio" bool "pulseaudio"
depends on BR2_PACKAGE_PULSEAUDIO_HAS_ATOMIC
select BR2_PACKAGE_PULSEAUDIO select BR2_PACKAGE_PULSEAUDIO
endchoice endchoice

7
package/gstreamer/gst-plugins-good/Config.in
View File

@@ -205,11 +205,14 @@ config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_PULSE
depends on BR2_TOOLCHAIN_HAS_THREADS # pulseaudio depends on BR2_TOOLCHAIN_HAS_THREADS # pulseaudio
depends on BR2_USE_MMU # pulseaudio depends on BR2_USE_MMU # pulseaudio
depends on !BR2_STATIC_LIBS # 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 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_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 config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_SOUPHTTPSRC
bool "souphttpsrc (http client)" bool "souphttpsrc (http client)"

7
package/gstreamer1/gst1-plugins-good/Config.in
View File

@@ -321,13 +321,16 @@ config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_PULSE
depends on BR2_TOOLCHAIN_HAS_THREADS # pulseaudio depends on BR2_TOOLCHAIN_HAS_THREADS # pulseaudio
depends on BR2_USE_MMU # pulseaudio depends on BR2_USE_MMU # pulseaudio
depends on !BR2_STATIC_LIBS # 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 select BR2_PACKAGE_PULSEAUDIO
help help
PulseAudio plugin library 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_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 config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_SOUPHTTPSRC
bool "souphttpsrc (http client)" bool "souphttpsrc (http client)"

1
package/kodi/Config.in
View File

@@ -192,6 +192,7 @@ config BR2_PACKAGE_KODI_NONFREE
config BR2_PACKAGE_KODI_PULSEAUDIO config BR2_PACKAGE_KODI_PULSEAUDIO
bool "pulseaudio" bool "pulseaudio"
depends on BR2_PACKAGE_PULSEAUDIO_HAS_ATOMIC
# Pulseaudio support in kodi needs glib support in Pulseaudio, # Pulseaudio support in kodi needs glib support in Pulseaudio,
# see FindPulseAudio.cmake. Kodi meets all dependencies of # see FindPulseAudio.cmake. Kodi meets all dependencies of
# libglib2, so there is no need to propagate them here. # libglib2, so there is no need to propagate them here.

12
package/mpd/Config.in
View File

@@ -254,13 +254,19 @@ config BR2_PACKAGE_MPD_OSS
config BR2_PACKAGE_MPD_PULSEAUDIO config BR2_PACKAGE_MPD_PULSEAUDIO
bool "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 select BR2_PACKAGE_PULSEAUDIO
help help
Enable pulseaudio output support. Enable pulseaudio output support.
comment "pulseaudio support needs a toolchain w/ dynamic library" comment "pulseaudio support needs a toolchain w/ threads, wchar, dynamic library"
depends on BR2_STATIC_LIBS 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 config BR2_PACKAGE_MPD_SHOUTCAST
bool "shoutcast" bool "shoutcast"