aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZheng Ruoqin <zhengrq.fnst@cn.fujitsu.com>2016-12-16 12:04:38 +0900
committerYong-iL Joh <yong-il.joh@windriver.com>2016-12-16 16:14:46 +0900
commit25f0c0e7a5d86585218d4778c856c28389a8d3ea (patch)
treeefeaa48084f234c6a7cf3b84dc36e3bc97de14a8
parentfa123122114fc92217d7cb211969ef80486cfd95 (diff)
downloadmeta-ivi-25f0c0e7a5d86585218d4778c856c28389a8d3ea.tar.gz
meta-ivi-25f0c0e7a5d86585218d4778c856c28389a8d3ea.tar.bz2
meta-ivi-25f0c0e7a5d86585218d4778c856c28389a8d3ea.zip
fix the bug of bitbake waring
bitbake will note: meta-ivi/meta-ivi/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.2.3.bb: base_contains is deprecated, please use bb.utils.contains instead. Fix it by change the bitbake function base_contains. Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com>
-rw-r--r--meta-ivi/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.2.3.inc8
-rw-r--r--meta-ivi/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.2.3.inc6
-rw-r--r--meta-ivi/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.2.3.inc4
3 files changed, 9 insertions, 9 deletions
diff --git a/meta-ivi/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.2.3.inc b/meta-ivi/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.2.3.inc
index b755698..47ee4a8 100644
--- a/meta-ivi/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.2.3.inc
+++ b/meta-ivi/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.2.3.inc
@@ -10,10 +10,10 @@ inherit gettext bluetooth
PACKAGECONFIG ??= " \
- ${@base_contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)} \
- ${@base_contains('DISTRO_FEATURES', 'opengl', 'eglgles', '', d)} \
- ${@base_contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)} \
- ${@base_contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)} \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)} \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'eglgles', '', d)} \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)} \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)} \
orc curl uvch264 neon \
hls sbc dash bz2 smoothstreaming \
"
diff --git a/meta-ivi/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.2.3.inc b/meta-ivi/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.2.3.inc
index 993b51f..588a65a 100644
--- a/meta-ivi/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.2.3.inc
+++ b/meta-ivi/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.2.3.inc
@@ -2,7 +2,7 @@ require gstreamer1.0-plugins_1.2.3.inc
LICENSE = "GPLv2+ & LGPLv2+"
-DEPENDS += "${@base_contains('DISTRO_FEATURES', 'x11', 'virtual/libx11 libxv', '', d)}"
+DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'virtual/libx11 libxv', '', d)}"
DEPENDS += "freetype liboil util-linux"
inherit gettext
@@ -10,8 +10,8 @@ inherit gettext
PACKAGES_DYNAMIC =+ "^libgst.*"
PACKAGECONFIG ??= " \
- ${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \
- ${@base_contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)} \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)} \
orc ivorbis ogg theora vorbis \
"
diff --git a/meta-ivi/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.2.3.inc b/meta-ivi/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.2.3.inc
index 54c3af1..0c40c86 100644
--- a/meta-ivi/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.2.3.inc
+++ b/meta-ivi/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.2.3.inc
@@ -9,8 +9,8 @@ inherit gettext
PACKAGECONFIG ??= " \
- ${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \
- ${@base_contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)} \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)} \
orc cairo flac gdk-pixbuf jpeg libpng soup speex taglib \
"