From faad8d1df1aee67f9d1a7e9ea3c13f92d04baf8e Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sun, 19 Jan 2014 12:09:14 +0100 Subject: [PATCH] qtmultimedia: Use PACKAGECONFIG for gstremer-0.10 and change it to disabled by default * it doesn't support gst-1.x like qtwebkit yet, disable it by default to build images without gst-0.10 where possible. Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtmultimedia.inc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/recipes-qt/qt5/qtmultimedia.inc b/recipes-qt/qt5/qtmultimedia.inc index 87269850ab..66133f4b9e 100644 --- a/recipes-qt/qt5/qtmultimedia.inc +++ b/recipes-qt/qt5/qtmultimedia.inc @@ -1,13 +1,17 @@ require qt5.inc -DEPENDS += "qtdeclarative gstreamer gst-plugins-base alsa-lib " +DEPENDS += "qtdeclarative alsa-lib" PACKAGECONFIG ??= "" PACKAGECONFIG[openal] = ",,openal-soft" +PACKAGECONFIG[gstreamer010] = ",,gstreamer gst-plugins-base" do_configure_prepend() { # disable openal test if it isn't enabled by PACKAGECONFIG sed -i 's/^qtCompileTest(openal)/OE_OPENAL_ENABLED:qtCompileTest(openal)/g' ${S}/qtmultimedia.pro + # disable gstreamer-0.10 test if it isn't enabled by PACKAGECONFIG + sed -i 's/^\( *\)qtCompileTest(gstreamer)/\1OE_GSTREAMER010_ENABLED:qtCompileTest(gstreamer) {/g' ${S}/qtmultimedia.pro } EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'openal', 'CONFIG+=OE_OPENAL_ENABLED', '', d)}" +EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'gstreamer010', 'CONFIG+=OE_GSTREAMER010_ENABLED', '', d)}"