From 21f10c11f39020f9502d741c774a12d1aeb39499 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Fri, 22 Apr 2016 20:48:49 +0100 Subject: meta-oe: use bb.utils.contains() instead of base_contains() base_contains() is a compatibility wrapper and may warn in the future, so replace all instances with bb.utils.contains(). Signed-off-by: Ross Burton Signed-off-by: Martin Jansa --- meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb | 2 +- meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.6.2.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'meta-oe/recipes-multimedia') diff --git a/meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb b/meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb index 191d4b98c..145497a46 100644 --- a/meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb +++ b/meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb @@ -14,7 +14,7 @@ RCONFLICTS_${PN} = "mplayer" REQUIRED_DISTRO_FEATURES = "x11" # because it depends on libpostproc/libav which has commercial flag -LICENSE_FLAGS = "${@base_contains('PACKAGECONFIG', 'postproc', 'commercial', '', d)}" +LICENSE_FLAGS = "${@bb.utils.contains('PACKAGECONFIG', 'postproc', 'commercial', '', d)}" LICENSE = "GPLv3" LIC_FILES_CHKSUM = "file://LICENSE;md5=d32239bcb673463ab874e80d47fae504" diff --git a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.6.2.bb b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.6.2.bb index a5c802c09..75a42a20d 100644 --- a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.6.2.bb +++ b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.6.2.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=48da9957849056017dc568bbc43d8975 \ PROVIDES = "libv4l media-ctl" DEPENDS = "jpeg \ - ${@base_contains('DISTRO_FEATURES', 'x11', 'virtual/libx11', '', d)}" + ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'virtual/libx11', '', d)}" inherit autotools gettext pkgconfig -- cgit v1.2.3-54-g00ecf