From ec50df68b80f9704f135dd4c9f384a5596ec77cb Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Wed, 7 Jan 2015 19:33:38 -0200 Subject: qtmultimedia: Add support to enable/disable PulseAudio and ALSA The way QtMultimedia use to detect the PulseAudio and ALSA makes it non obvious how to disable it. After researching how Gentoo does it the 'done_config_' has been found. So now, we respect the distro support for PulseAudio and ALSA. Signed-off-by: Otavio Salvador Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtmultimedia.inc | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'recipes-qt/qt5') diff --git a/recipes-qt/qt5/qtmultimedia.inc b/recipes-qt/qt5/qtmultimedia.inc index 8904ca53..427f6882 100644 --- a/recipes-qt/qt5/qtmultimedia.inc +++ b/recipes-qt/qt5/qtmultimedia.inc @@ -1,11 +1,16 @@ require qt5.inc -DEPENDS += "qtdeclarative alsa-lib" +DEPENDS += "qtdeclarative" -PACKAGECONFIG ??= "" +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)}" +PACKAGECONFIG[alsa] = ",,alsa-lib" +PACKAGECONFIG[pulseaudio] = ",,pulseaudio" PACKAGECONFIG[openal] = ",,openal-soft" PACKAGECONFIG[gstreamer010] = ",,gstreamer gst-plugins-base" +EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'alsa', '', 'CONFIG+=done_config_alsa', d)}" +EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'pulseaudio', '', 'CONFIG+=done_config_pulseaudio', d)}" EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'openal', 'CONFIG+=OE_OPENAL_ENABLED', '', d)}" EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'gstreamer010', 'CONFIG+=OE_GSTREAMER010_ENABLED', '', d)}" -- cgit v1.2.3-54-g00ecf