From 35289ad4e94bbabf1dfa88e71d5d8bd05964aaa4 Mon Sep 17 00:00:00 2001 From: Ronan Date: Fri, 13 Jan 2017 15:28:04 +0100 Subject: replace deprecated function base_contains * replace base_contains by bb.utils.contains * base_contains is deprecated use bb.utils.contains instead * yocto version: 2.2 Change-Id: Ida44a8ded5040cb8bcc1e6140dcbdc795463ce9a Signed-off-by: Ronan --- .../gstreamer/gstreamer1.0-plugins-bad_1.2.3.bbappend | 2 +- .../gstreamer/gstreamer1.0-plugins-base_1.2.3.bbappend | 2 +- .../packagegroups/packagegroup-rcar-gen2-multimedia.bb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'meta-rcar-gen2/recipes-multimedia') diff --git a/meta-rcar-gen2/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.2.3.bbappend b/meta-rcar-gen2/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.2.3.bbappend index 8262f16..d09f5aa 100644 --- a/meta-rcar-gen2/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.2.3.bbappend +++ b/meta-rcar-gen2/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.2.3.bbappend @@ -21,7 +21,7 @@ do_configure_prepend() { # for wayland PACKAGECONFIG_remove_rcar-gen2 = "${@'orc' if '1' in '${USE_GLES_WAYLAND}' else ''}" -PACKAGECONFIG_append_rcar-gen2 = " faad ${@base_contains('USE_GLES_WAYLAND', '1', 'wayland', '', d)}" +PACKAGECONFIG_append_rcar-gen2 = " faad ${@bb.utils.contains('USE_GLES_WAYLAND', '1', 'wayland', '', d)}" DEPENDS += "wayland-kms" RDEPENDS_${PN} = "libwayland-egl" diff --git a/meta-rcar-gen2/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.2.3.bbappend b/meta-rcar-gen2/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.2.3.bbappend index 18d4b64..7faa133 100644 --- a/meta-rcar-gen2/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.2.3.bbappend +++ b/meta-rcar-gen2/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.2.3.bbappend @@ -25,7 +25,7 @@ VSPFILTER_CONFIGS = " \ " # For wayland -PACKAGECONFIG_remove_rcar-gen2 = "${@base_contains("DISTRO_FEATURES", "wayland", "orc", "", d)}" +PACKAGECONFIG_remove_rcar-gen2 = "${@bb.utils.contains("DISTRO_FEATURES", "wayland", "orc", "", d)}" SRC_URI_append_rcar-gen2 = \ "${@'${VSPFILTER_CONFIGS}' \ diff --git a/meta-rcar-gen2/recipes-multimedia/packagegroups/packagegroup-rcar-gen2-multimedia.bb b/meta-rcar-gen2/recipes-multimedia/packagegroups/packagegroup-rcar-gen2-multimedia.bb index 8fa557f..25afdb4 100644 --- a/meta-rcar-gen2/recipes-multimedia/packagegroups/packagegroup-rcar-gen2-multimedia.bb +++ b/meta-rcar-gen2/recipes-multimedia/packagegroups/packagegroup-rcar-gen2-multimedia.bb @@ -45,7 +45,7 @@ RDEPENDS_packagegroup-rcar-gen2-multimedia = "\ gstreamer1.0-plugins-bad-faad \ gstreamer1.0-plugins-bad-mpegtsdemux \ gstreamer1.0-plugins-bad-debugutilsbad \ - ${@base_contains("LICENSE_FLAGS_WHITELIST", "commercial", "gstreamer1.0-omx gstreamer1.0-plugins-ugly-asf", "", d )} \ + ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "gstreamer1.0-omx gstreamer1.0-plugins-ugly-asf", "", d )} \ ${@base_conditional("USE_GLES_WAYLAND", "1", "gstreamer1.0-plugins-base-vspfilter", "", d )} \ " -- cgit 1.2.3-korg