summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2015-02-07 18:53:46 -0200
committerOtavio Salvador <otavio@ossystems.com.br>2015-02-13 10:16:12 -0200
commit41fb141aa65ba40e11c6c0b65f3fa02edc50f4cd (patch)
treebc896788e928fadf1a674f48ff62aa30d0f23764
parent98740e63b06f3a156c27769b4d28004f07d8f8a9 (diff)
downloadmeta-qt5-41fb141aa65ba40e11c6c0b65f3fa02edc50f4cd.tar.gz
qtmultimedia: Use 'bb.utils.contains' function
The 'base_contains' function is deprecated and we should to use the bb.utils.contains one instead. Update the code accordingly. Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
-rw-r--r--recipes-qt/qt5/qtmultimedia.inc8
1 files changed, 4 insertions, 4 deletions
diff --git a/recipes-qt/qt5/qtmultimedia.inc b/recipes-qt/qt5/qtmultimedia.inc
index cd895833..1be4e859 100644
--- a/recipes-qt/qt5/qtmultimedia.inc
+++ b/recipes-qt/qt5/qtmultimedia.inc
@@ -9,10 +9,10 @@ PACKAGECONFIG[pulseaudio] = ",,pulseaudio"
9PACKAGECONFIG[openal] = ",,openal-soft" 9PACKAGECONFIG[openal] = ",,openal-soft"
10PACKAGECONFIG[gstreamer010] = ",,gstreamer gst-plugins-base gst-plugins-bad" 10PACKAGECONFIG[gstreamer010] = ",,gstreamer gst-plugins-base gst-plugins-bad"
11 11
12EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'alsa', '', 'CONFIG+=done_config_alsa', d)}" 12EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'alsa', '', 'CONFIG+=done_config_alsa', d)}"
13EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'pulseaudio', '', 'CONFIG+=done_config_pulseaudio', d)}" 13EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'pulseaudio', '', 'CONFIG+=done_config_pulseaudio', d)}"
14EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'openal', '', 'CONFIG+=done_config_openal', d)}" 14EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'openal', '', 'CONFIG+=done_config_openal', d)}"
15EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'gstreamer010', 'GST_VERSION=0.10', 'done_config_gstreamer', d)}" 15EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'gstreamer010', 'GST_VERSION=0.10', 'done_config_gstreamer', d)}"
16 16
17SRC_URI += "\ 17SRC_URI += "\
18 file://0001-Initial-porting-effort-to-GStreamer-1.0.patch \ 18 file://0001-Initial-porting-effort-to-GStreamer-1.0.patch \