From b5cc46075699e10ed393742c2c46bf7664385cae Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Sat, 7 Feb 2015 18:33:26 -0200 Subject: [PATCH] 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. (From meta-qt5 rev: 0732449ee42bb3582e5c141fa2363e18beb43a9f) Signed-off-by: Otavio Salvador Signed-off-by: Mauro Carvalho Chehab --- meta-qt5/recipes-qt/qt5/qtmultimedia.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-qt5/recipes-qt/qt5/qtmultimedia.inc b/meta-qt5/recipes-qt/qt5/qtmultimedia.inc index 427f688..e85d202 100644 --- a/meta-qt5/recipes-qt/qt5/qtmultimedia.inc +++ b/meta-qt5/recipes-qt/qt5/qtmultimedia.inc @@ -7,7 +7,7 @@ PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d PACKAGECONFIG[alsa] = ",,alsa-lib" PACKAGECONFIG[pulseaudio] = ",,pulseaudio" PACKAGECONFIG[openal] = ",,openal-soft" -PACKAGECONFIG[gstreamer010] = ",,gstreamer gst-plugins-base" +PACKAGECONFIG[gstreamer010] = ",,gstreamer gst-plugins-base gst-plugins-bad" EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'alsa', '', 'CONFIG+=done_config_alsa', d)}" EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'pulseaudio', '', 'CONFIG+=done_config_pulseaudio', d)}" -- 2.7.4