summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2015-01-07 19:33:38 -0200
committerMartin Jansa <Martin.Jansa@gmail.com>2015-01-12 15:45:28 +0100
commitec50df68b80f9704f135dd4c9f384a5596ec77cb (patch)
treef983360e61ff68ff0011ba9bc0fa8e3d0965ea9b
parenta7fa426daac8ce53e806db20e0fd7bf8ae9cfbfa (diff)
downloadmeta-qt5-ec50df68b80f9704f135dd4c9f384a5596ec77cb.tar.gz
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_<flag>' has been found. So now, we respect the distro support for PulseAudio and ALSA. Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r--recipes-qt/qt5/qtmultimedia.inc9
1 files changed, 7 insertions, 2 deletions
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 @@
1require qt5.inc 1require qt5.inc
2 2
3DEPENDS += "qtdeclarative alsa-lib" 3DEPENDS += "qtdeclarative"
4 4
5PACKAGECONFIG ??= "" 5PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)} \
6 ${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)}"
7PACKAGECONFIG[alsa] = ",,alsa-lib"
8PACKAGECONFIG[pulseaudio] = ",,pulseaudio"
6PACKAGECONFIG[openal] = ",,openal-soft" 9PACKAGECONFIG[openal] = ",,openal-soft"
7PACKAGECONFIG[gstreamer010] = ",,gstreamer gst-plugins-base" 10PACKAGECONFIG[gstreamer010] = ",,gstreamer gst-plugins-base"
8 11
12EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'alsa', '', 'CONFIG+=done_config_alsa', d)}"
13EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'pulseaudio', '', 'CONFIG+=done_config_pulseaudio', d)}"
9EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'openal', 'CONFIG+=OE_OPENAL_ENABLED', '', d)}" 14EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'openal', 'CONFIG+=OE_OPENAL_ENABLED', '', d)}"
10EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'gstreamer010', 'CONFIG+=OE_GSTREAMER010_ENABLED', '', d)}" 15EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'gstreamer010', 'CONFIG+=OE_GSTREAMER010_ENABLED', '', d)}"
11 16