diff options
12 files changed, 24 insertions, 24 deletions
diff --git a/common/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.2.3.bbappend b/common/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.2.3.bbappend index 2f46ba3..ae95283 100644 --- a/common/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.2.3.bbappend +++ b/common/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.2.3.bbappend @@ -1,5 +1,5 @@ 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)} \ ivorbis ogg theora vorbis \ " diff --git a/common/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.2.3.bbappend b/common/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.2.3.bbappend index 910b031..c67449f 100644 --- a/common/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.2.3.bbappend +++ b/common/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.2.3.bbappend @@ -1,5 +1,5 @@ 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)} \ cairo flac gdk-pixbuf jpeg libpng soup speex taglib \ " diff --git a/common/recipes-multimedia/omxil-sh/omxil-sh_git.bb b/common/recipes-multimedia/omxil-sh/omxil-sh_git.bb index e65072b..96124f5 100644 --- a/common/recipes-multimedia/omxil-sh/omxil-sh_git.bb +++ b/common/recipes-multimedia/omxil-sh/omxil-sh_git.bb @@ -23,7 +23,7 @@ SRCREV_armadillo800eva = "bd43cfba750773cd323fb546f279e76b37c6d713" SRC_URI_append_armadillo800eva = " file://vcp1-library-change.patch" CHECK_OMXIL_SH_MW = "${USE_RENESAS_MW_VCP1}" CHECK_OMXIL_SH_MW += "${USE_RENESAS_MW_VPU5}" -DEPENDS_append_armadillo800eva = ' ${@base_contains("CHECK_OMXIL_SH_MW", "1", "vcp1", "", d)}' +DEPENDS_append_armadillo800eva = ' ${@bb.utils.contains("CHECK_OMXIL_SH_MW", "1", "vcp1", "", d)}' inherit autotools pkgconfig diff --git a/meta-rcar-gen2/include/omx-components-control.inc b/meta-rcar-gen2/include/omx-components-control.inc index 7848262..f8977fc 100644 --- a/meta-rcar-gen2/include/omx-components-control.inc +++ b/meta-rcar-gen2/include/omx-components-control.inc @@ -66,7 +66,7 @@ USE_AUDIO_COMMON = "${@'1' if '1' in '${AUDIO_ENCODER_ARRAY}' or '1' in '${AUDIO # Please add new encoder config into list when have new encoder (e.g. as RESERVE_ENCODER_CONF) VIDEO_ENCODER_ARRAY = "${USE_H264AVC_ENCODER}" #VIDEO_ENCODER_ARRAY += "${RESERVE_ENCODER_CONF}" -USE_VIDEO_COMMON_ENCODER = '${@base_contains("VIDEO_ENCODER_ARRAY", "1", "1", "0", d)}' +USE_VIDEO_COMMON_ENCODER = '${@bb.utils.contains("VIDEO_ENCODER_ARRAY", "1", "1", "0", d)}' # Audio codec config ARMAACP2_MDW_DECODER = '${@base_conditional("USE_AACP2_DECODER", "1", "1", "${USE_ARMAACP2_MDW_DECODER}", d)}' diff --git a/meta-rcar-gen2/recipes-graphics/gles-module/gles-user-module.bb b/meta-rcar-gen2/recipes-graphics/gles-module/gles-user-module.bb index 8a72b12..37e8052 100644 --- a/meta-rcar-gen2/recipes-graphics/gles-module/gles-user-module.bb +++ b/meta-rcar-gen2/recipes-graphics/gles-module/gles-user-module.bb @@ -26,23 +26,23 @@ OPENGLES3 ?= "0" SRC_URI_r8a7790 = '${@base_conditional( "OPENGLES3", "1", \ "file://r8a7790_linux_rgx_binaries_gles3.tar.bz2", \ "file://r8a7790_linux_rgx_binaries_gles2.tar.bz2", d )}' -SRC_URI_append_r8a7790 = " ${@base_contains("DISTRO_FEATURES", "wayland", " \ +SRC_URI_append_r8a7790 = " ${@bb.utils.contains("DISTRO_FEATURES", "wayland", " \ file://EGL_headers_for_wayland.patch \ file://change-shell.patch \ ", "", d)}" SRC_URI_r8a7791 = "file://r8a7791_linux_sgx_binaries_gles2.tar.bz2" -SRC_URI_append_r8a7791 = " ${@base_contains("DISTRO_FEATURES", "wayland", " \ +SRC_URI_append_r8a7791 = " ${@bb.utils.contains("DISTRO_FEATURES", "wayland", " \ file://EGL_headers_for_wayland.patch \ ", "", d)}" SRC_URI_r8a7793 = "file://r8a7791_linux_sgx_binaries_gles2.tar.bz2" -SRC_URI_append_r8a7793 = " ${@base_contains("DISTRO_FEATURES", "wayland", " \ +SRC_URI_append_r8a7793 = " ${@bb.utils.contains("DISTRO_FEATURES", "wayland", " \ file://EGL_headers_for_wayland.patch \ ", "", d)}" SRC_URI_r8a7794 = "file://r8a7794_linux_sgx_binaries_gles2.tar.bz2" -SRC_URI_append_r8a7794 = " ${@base_contains("DISTRO_FEATURES", "wayland", " \ +SRC_URI_append_r8a7794 = " ${@bb.utils.contains("DISTRO_FEATURES", "wayland", " \ file://EGL_headers_for_wayland.patch \ ", "", d)}" @@ -100,7 +100,7 @@ FILES_${PN}-dev = " \ " PROVIDES = "virtual/libgles2" -PROVIDES_append = "${@base_contains("DISTRO_FEATURES", "wayland", "", " virtual/egl", d)}" +PROVIDES_append = "${@bb.utils.contains("DISTRO_FEATURES", "wayland", "", " virtual/egl", d)}" RPROVIDES_${PN} += "${GLES}-user-module libgles2-mesa libgles2-mesa-dev libgles2 libgles2-dev" INSANE_SKIP_${PN} += "ldflags already-stripped" INSANE_SKIP_${PN}-dev += "ldflags" diff --git a/meta-rcar-gen2/recipes-graphics/images/core-image-renesas-base.inc b/meta-rcar-gen2/recipes-graphics/images/core-image-renesas-base.inc index bea1510..ee20a28 100644 --- a/meta-rcar-gen2/recipes-graphics/images/core-image-renesas-base.inc +++ b/meta-rcar-gen2/recipes-graphics/images/core-image-renesas-base.inc @@ -27,18 +27,18 @@ IMAGE_INSTALL_append_rcar-gen2 = '${@base_conditional("USE_GLES", "1", \ "gles-kernel-module gles-user-module", "", d)}' # pkg groups for multimedia -IMAGE_INSTALL_append_rcar-gen2 = ' ${@base_contains("USE_MULTIMEDIA", "1", " \ +IMAGE_INSTALL_append_rcar-gen2 = ' ${@bb.utils.contains("USE_MULTIMEDIA", "1", " \ packagegroup-rcar-gen2-multimedia \ ", "", d)}' # pkg groups for multimedia test program -IMAGE_INSTALL_append_rcar-gen2 = ' ${@base_contains("USE_MULTIMEDIA_TEST", "1", " \ +IMAGE_INSTALL_append_rcar-gen2 = ' ${@bb.utils.contains("USE_MULTIMEDIA_TEST", "1", " \ packagegroup-rcar-gen2-multimedia-tp \ ", "", d)}' # pkg groups for dtv -IMAGE_INSTALL_append_rcar-gen2 = ' ${@base_contains("USE_DTV", "1", " \ +IMAGE_INSTALL_append_rcar-gen2 = ' ${@bb.utils.contains("USE_DTV", "1", " \ packagegroup-rcar-gen2-dtv \ ", "", d)}' # pkg groups for graphic test program -IMAGE_INSTALL_append_rcar-gen2 = ' ${@base_contains("USE_GLES_TEST", "1", " \ +IMAGE_INSTALL_append_rcar-gen2 = ' ${@bb.utils.contains("USE_GLES_TEST", "1", " \ gles-test-module \ ", "", d)}' diff --git a/meta-rcar-gen2/recipes-graphics/wayland/libegl.bb b/meta-rcar-gen2/recipes-graphics/wayland/libegl.bb index 5fffe16..b53b2a3 100644 --- a/meta-rcar-gen2/recipes-graphics/wayland/libegl.bb +++ b/meta-rcar-gen2/recipes-graphics/wayland/libegl.bb @@ -4,8 +4,8 @@ LIC_FILES_CHKSUM = "file://egl.c;beginline=5;endline=15;md5=3677623633a6e459b1f6 COMPATIBLE_MACHINE = "(r8a7790|r8a7791|r8a7793|r8a7794)" -RPROVIDES_${PN} = "${@base_contains("DISTRO_FEATURES", "wayland", "libEGL.so", "", d)}" -PROVIDES = "${@base_contains("DISTRO_FEATURES", "wayland", "virtual/egl", "", d)}" +RPROVIDES_${PN} = "${@bb.utils.contains("DISTRO_FEATURES", "wayland", "libEGL.so", "", d)}" +PROVIDES = "${@bb.utils.contains("DISTRO_FEATURES", "wayland", "virtual/egl", "", d)}" SRCREV = "7b09cce97e8658ba927e71f1af43360c4cc392b7" SRC_URI = "git://github.com/thayama/libegl;protocol=git;branch=master \ file://0001-libegl-Remove-duplicate-header-files-of-gles-user-mo.patch" diff --git a/meta-rcar-gen2/recipes-kernel/gles-module/gles-kernel-module.bb b/meta-rcar-gen2/recipes-kernel/gles-module/gles-kernel-module.bb index e10710f..e3fea90 100644 --- a/meta-rcar-gen2/recipes-kernel/gles-module/gles-kernel-module.bb +++ b/meta-rcar-gen2/recipes-kernel/gles-module/gles-kernel-module.bb @@ -29,8 +29,8 @@ S_r8a7794 = "${WORKDIR}/eurasia_km" KERNEL_SRC_PATH_r8a7794 = "eurasiacon/build/linux2/r8a7794_linux/" TARGET_PATH_r8a7794 = "eurasia_km/eurasiacon/binary2_r8a7794_linux_release/target/kbuild" -GLES = "${@base_contains('MACHINE_FEATURES', 'rgx', 'rgx', \ - base_contains('MACHINE_FEATURES', 'sgx', 'sgx', '', d), d)}" +GLES = "${@bb.utils.contains('MACHINE_FEATURES', 'rgx', 'rgx', \ + bb.utils.contains('MACHINE_FEATURES', 'sgx', 'sgx', '', d), d)}" RPROVIDES_${PN} += "${GLES}-kernel-module" RPROVIDES_${PN} += "kernel-module-bc-example kernel-module-pvrsrvkm kernel-module-dc-linuxfb" diff --git a/meta-rcar-gen2/recipes-kernel/linux/linux.inc b/meta-rcar-gen2/recipes-kernel/linux/linux.inc index af8d8ac..6d1005f 100644 --- a/meta-rcar-gen2/recipes-kernel/linux/linux.inc +++ b/meta-rcar-gen2/recipes-kernel/linux/linux.inc @@ -16,7 +16,7 @@ UDEV_GE_141 ?= "1" KERNEL_ENABLE_CGROUPS ?= "1" # combine oe-core way with angstrom DISTRO_TYPE -DISTRO_TYPE ?= "${@base_contains("IMAGE_FEATURES", "debug-tweaks", "debug", "release",d)}" +DISTRO_TYPE ?= "${@bb.utils.contains("IMAGE_FEATURES", "debug-tweaks", "debug", "release",d)}" # Set the verbosity of kernel messages during runtime # You can define CMDLINE_DEBUG in your local.conf or distro.conf to override this behaviour @@ -185,7 +185,7 @@ do_configure_prepend() { kernel_configure_variable BLK_DEV_LOOP y fi - if [ "x1" = "x${@base_contains("DISTRO_FEATURES", "usbgadget", "1", "",d)}" ]; then + if [ "x1" = "x${@bb.utils.contains("DISTRO_FEATURES", "usbgadget", "1", "",d)}" ]; then # activate USB-OTG & Gadget kernel_configure_variable USB_OTG y kernel_configure_variable USB_RENESAS_USBHS_UDC y 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 )} \ " |