diff options
author | Otavio Salvador <otavio@ossystems.com.br> | 2015-02-07 18:53:46 -0200 |
---|---|---|
committer | Otavio Salvador <otavio@ossystems.com.br> | 2015-02-13 10:16:12 -0200 |
commit | 41fb141aa65ba40e11c6c0b65f3fa02edc50f4cd (patch) | |
tree | bc896788e928fadf1a674f48ff62aa30d0f23764 | |
parent | 98740e63b06f3a156c27769b4d28004f07d8f8a9 (diff) | |
download | meta-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.inc | 8 |
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" | |||
9 | PACKAGECONFIG[openal] = ",,openal-soft" | 9 | PACKAGECONFIG[openal] = ",,openal-soft" |
10 | PACKAGECONFIG[gstreamer010] = ",,gstreamer gst-plugins-base gst-plugins-bad" | 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 += "${@bb.utils.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 += "${@bb.utils.contains('PACKAGECONFIG', 'pulseaudio', '', 'CONFIG+=done_config_pulseaudio', d)}" |
14 | EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'openal', '', 'CONFIG+=done_config_openal', d)}" | 14 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'openal', '', 'CONFIG+=done_config_openal', d)}" |
15 | EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'gstreamer010', 'GST_VERSION=0.10', 'done_config_gstreamer', d)}" | 15 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'gstreamer010', 'GST_VERSION=0.10', 'done_config_gstreamer', d)}" |
16 | 16 | ||
17 | SRC_URI += "\ | 17 | SRC_URI += "\ |
18 | file://0001-Initial-porting-effort-to-GStreamer-1.0.patch \ | 18 | file://0001-Initial-porting-effort-to-GStreamer-1.0.patch \ |