diff options
| author | Otavio Salvador <otavio@ossystems.com.br> | 2015-02-07 18:33:26 -0200 |
|---|---|---|
| committer | Otavio Salvador <otavio@ossystems.com.br> | 2015-02-13 10:16:12 -0200 |
| commit | 0732449ee42bb3582e5c141fa2363e18beb43a9f (patch) | |
| tree | ce419d83b655de84c1b33cb4ebfd0012b34ddb1c | |
| parent | 41772b33725f4adc19990aa201a399a6a6180348 (diff) | |
| download | meta-qt5-0732449ee42bb3582e5c141fa2363e18beb43a9f.tar.gz | |
qtmultimedia: Fix floating dependency gst-plugins-bad
When using GStreamer 0.10 support, QMake detects if GStreamer
Photography interface is available. To avoid a floating dependency we
add the gst-plugins-bad as dependency so it is always present.
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
| -rw-r--r-- | recipes-qt/qt5/qtmultimedia.inc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/recipes-qt/qt5/qtmultimedia.inc b/recipes-qt/qt5/qtmultimedia.inc index 427f6882..e85d202b 100644 --- a/recipes-qt/qt5/qtmultimedia.inc +++ b/recipes-qt/qt5/qtmultimedia.inc | |||
| @@ -7,7 +7,7 @@ PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d | |||
| 7 | PACKAGECONFIG[alsa] = ",,alsa-lib" | 7 | PACKAGECONFIG[alsa] = ",,alsa-lib" |
| 8 | PACKAGECONFIG[pulseaudio] = ",,pulseaudio" | 8 | PACKAGECONFIG[pulseaudio] = ",,pulseaudio" |
| 9 | PACKAGECONFIG[openal] = ",,openal-soft" | 9 | PACKAGECONFIG[openal] = ",,openal-soft" |
| 10 | PACKAGECONFIG[gstreamer010] = ",,gstreamer gst-plugins-base" | 10 | PACKAGECONFIG[gstreamer010] = ",,gstreamer gst-plugins-base gst-plugins-bad" |
| 11 | 11 | ||
| 12 | EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'alsa', '', 'CONFIG+=done_config_alsa', d)}" | 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)}" | 13 | EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'pulseaudio', '', 'CONFIG+=done_config_pulseaudio', d)}" |