From e051deb4786e53149925cf8ee9608047089a5569 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Sat, 7 Feb 2015 18:56:19 -0200 Subject: [PATCH] qtmultimedia: Easy use of GStreamer 1.0 support This rework how we add the GStreamer 1.0 support in the code. A new PACKAGECONFIG option called 'gstreamer' has been added for it. (From meta-qt5 rev: a0fb5595129f50e36ce044d3269e96aa834aa0b0) Signed-off-by: Otavio Salvador Signed-off-by: Mauro Carvalho Chehab --- meta-qt5/recipes-qt/qt5/qtmultimedia.inc | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/meta-qt5/recipes-qt/qt5/qtmultimedia.inc b/meta-qt5/recipes-qt/qt5/qtmultimedia.inc index 1be4e85..30e5ed0 100644 --- a/meta-qt5/recipes-qt/qt5/qtmultimedia.inc +++ b/meta-qt5/recipes-qt/qt5/qtmultimedia.inc @@ -7,12 +7,18 @@ PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d PACKAGECONFIG[alsa] = ",,alsa-lib" PACKAGECONFIG[pulseaudio] = ",,pulseaudio" PACKAGECONFIG[openal] = ",,openal-soft" +PACKAGECONFIG[gstreamer] = ",,gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad" PACKAGECONFIG[gstreamer010] = ",,gstreamer gst-plugins-base gst-plugins-bad" EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'alsa', '', 'CONFIG+=done_config_alsa', d)}" EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'pulseaudio', '', 'CONFIG+=done_config_pulseaudio', d)}" EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'openal', '', 'CONFIG+=done_config_openal', d)}" -EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'gstreamer010', 'GST_VERSION=0.10', 'done_config_gstreamer', d)}" + +# Handles GStreamer support +EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'gstreamer', 'GST_VERSION=1.0', '', d)}" +EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'gstreamer010', 'GST_VERSION=0.10', '', d)}" +# Disable GStreamer if completely disabled +EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains_any('PACKAGECONFIG', 'gstreamer gstreamer010', '', 'CONFIG+=done_config_gstreamer', d)}" SRC_URI += "\ file://0001-Initial-porting-effort-to-GStreamer-1.0.patch \ -- 2.7.4