diff options
author | Otavio Salvador <otavio@ossystems.com.br> | 2015-01-07 19:33:38 -0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2015-01-12 15:45:28 +0100 |
commit | ec50df68b80f9704f135dd4c9f384a5596ec77cb (patch) | |
tree | f983360e61ff68ff0011ba9bc0fa8e3d0965ea9b | |
parent | a7fa426daac8ce53e806db20e0fd7bf8ae9cfbfa (diff) | |
download | meta-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.inc | 9 |
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 @@ | |||
1 | require qt5.inc | 1 | require qt5.inc |
2 | 2 | ||
3 | DEPENDS += "qtdeclarative alsa-lib" | 3 | DEPENDS += "qtdeclarative" |
4 | 4 | ||
5 | PACKAGECONFIG ??= "" | 5 | PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)} \ |
6 | ${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)}" | ||
7 | PACKAGECONFIG[alsa] = ",,alsa-lib" | ||
8 | PACKAGECONFIG[pulseaudio] = ",,pulseaudio" | ||
6 | PACKAGECONFIG[openal] = ",,openal-soft" | 9 | PACKAGECONFIG[openal] = ",,openal-soft" |
7 | PACKAGECONFIG[gstreamer010] = ",,gstreamer gst-plugins-base" | 10 | PACKAGECONFIG[gstreamer010] = ",,gstreamer gst-plugins-base" |
8 | 11 | ||
12 | EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'alsa', '', 'CONFIG+=done_config_alsa', d)}" | ||
13 | EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'pulseaudio', '', 'CONFIG+=done_config_pulseaudio', d)}" | ||
9 | EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'openal', 'CONFIG+=OE_OPENAL_ENABLED', '', d)}" | 14 | EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'openal', 'CONFIG+=OE_OPENAL_ENABLED', '', d)}" |
10 | EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'gstreamer010', 'CONFIG+=OE_GSTREAMER010_ENABLED', '', d)}" | 15 | EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'gstreamer010', 'CONFIG+=OE_GSTREAMER010_ENABLED', '', d)}" |
11 | 16 | ||