From 4c14b094985216c433d330fb3d9532d4b6c91fcf Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Thu, 24 Apr 2014 15:59:20 -0300 Subject: Globally replace 'base_contains' calls with 'bb.utils.contains' The base_contains is kept as a compatibility method and we ought to not use it in OE-Core so we can remove it from base metadata in future. (From OE-Core rev: d83b16dbf0862be387f84228710cb165c6d2b03b) Signed-off-by: Otavio Salvador Signed-off-by: Richard Purdie --- meta/recipes-graphics/mesa/mesa-demos_8.1.0.bb | 4 ++-- meta/recipes-graphics/mesa/mesa-gl_9.2.5.bb | 2 +- meta/recipes-graphics/mesa/mesa.inc | 14 +++++++------- meta/recipes-graphics/mesa/mesa_9.2.5.bb | 4 ++-- meta/recipes-graphics/mesa/mesa_git.bb | 4 ++-- 5 files changed, 14 insertions(+), 14 deletions(-) (limited to 'meta/recipes-graphics/mesa') diff --git a/meta/recipes-graphics/mesa/mesa-demos_8.1.0.bb b/meta/recipes-graphics/mesa/mesa-demos_8.1.0.bb index 4bb92f4b05..d6e6fbceb1 100644 --- a/meta/recipes-graphics/mesa/mesa-demos_8.1.0.bb +++ b/meta/recipes-graphics/mesa/mesa-demos_8.1.0.bb @@ -22,10 +22,10 @@ SRC_URI[sha256sum] = "9703fa0646b32a1e68d2abf5628f936f77bf97c69ffcaac90de380820a inherit autotools pkgconfig PACKAGECONFIG ?= "drm osmesa freetype2 gbm egl gles1 gles2 \ - ${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" + ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" # The Wayland code doesn't work with Wayland 1.0, so disable it for now -#${@base_contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)}" +#${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)}" PACKAGECONFIG[drm] = "--enable-libdrm,--disable-libdrm,libdrm" PACKAGECONFIG[egl] = "--enable-egl,--disable-egl,virtual/egl" diff --git a/meta/recipes-graphics/mesa/mesa-gl_9.2.5.bb b/meta/recipes-graphics/mesa/mesa-gl_9.2.5.bb index 21f6151f29..8c7d8e8d63 100644 --- a/meta/recipes-graphics/mesa/mesa-gl_9.2.5.bb +++ b/meta/recipes-graphics/mesa/mesa-gl_9.2.5.bb @@ -6,6 +6,6 @@ FILESPATH = "${@base_set_filespath(["${FILE_DIRNAME}/mesa-${PV}", "${FILE_DIRNAM PROVIDES = "virtual/libgl virtual/mesa" -PACKAGECONFIG ??= "dri ${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" +PACKAGECONFIG ??= "dri ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" EXCLUDE_FROM_WORLD = "1" diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc index 96313b5da5..a33b7b52a0 100644 --- a/meta/recipes-graphics/mesa/mesa.inc +++ b/meta/recipes-graphics/mesa/mesa.inc @@ -26,8 +26,8 @@ REQUIRED_DISTRO_FEATURES = "opengl" EXTRA_OECONF = "--enable-shared-glapi" PACKAGECONFIG ??= "egl gles dri \ - ${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}\ - ${@base_contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)}\ + ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}\ + ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)}\ " X11_DEPS = "xf86driproto glproto virtual/libx11 libxext libxxf86vm libxdamage libxfixes" @@ -45,18 +45,18 @@ EXTRA_OECONF += "--enable-gbm" PACKAGECONFIG[gles] = "--enable-gles1 --enable-gles2, --disable-gles1 --disable-gles2" EGL_PLATFORMS = "drm" -EGL_PLATFORMS .="${@base_contains('PACKAGECONFIG', 'x11', ',x11', '', d)}" -EGL_PLATFORMS .="${@base_contains('PACKAGECONFIG', 'wayland', ',wayland', '', d)}" +EGL_PLATFORMS .="${@bb.utils.contains('PACKAGECONFIG', 'x11', ',x11', '', d)}" +EGL_PLATFORMS .="${@bb.utils.contains('PACKAGECONFIG', 'wayland', ',wayland', '', d)}" PACKAGECONFIG[egl] = "--enable-egl --with-egl-platforms=${EGL_PLATFORMS}, --disable-egl" PACKAGECONFIG[openvg] = "--enable-openvg, --disable-openvg" GALLIUMDRIVERS = "swrast" -GALLIUMDRIVERS_LLVM33 = "${@base_contains('PACKAGECONFIG', 'r600', 'radeonsi,r600', '', d)}" +GALLIUMDRIVERS_LLVM33 = "${@bb.utils.contains('PACKAGECONFIG', 'r600', 'radeonsi,r600', '', d)}" GALLIUMDRIVERS_LLVM33_ENABLED = "${@base_version_less_or_equal('MESA_LLVM_RELEASE', '3.2', False, len('${GALLIUMDRIVERS_LLVM33}') > 0, d)}" GALLIUMDRIVERS_LLVM = "r300,svga,nouveau${@',${GALLIUMDRIVERS_LLVM33}' if ${GALLIUMDRIVERS_LLVM33_ENABLED} else ''}" -GALLIUMDRIVERS_append_x86 = "${@base_contains('PACKAGECONFIG', 'gallium-llvm', ',${GALLIUMDRIVERS_LLVM}', '', d)}" -GALLIUMDRIVERS_append_x86-64 = "${@base_contains('PACKAGECONFIG', 'gallium-llvm', ',${GALLIUMDRIVERS_LLVM}', '', d)}" +GALLIUMDRIVERS_append_x86 = "${@bb.utils.contains('PACKAGECONFIG', 'gallium-llvm', ',${GALLIUMDRIVERS_LLVM}', '', d)}" +GALLIUMDRIVERS_append_x86-64 = "${@bb.utils.contains('PACKAGECONFIG', 'gallium-llvm', ',${GALLIUMDRIVERS_LLVM}', '', d)}" # keep --with-gallium-drivers separate, because when only one of gallium versions is enabled, other 2 were adding --without-gallium-drivers PACKAGECONFIG[gallium] = "--with-gallium-drivers=${GALLIUMDRIVERS}, --without-gallium-drivers" PACKAGECONFIG[gallium-egl] = "--enable-gallium-egl, --disable-gallium-egl" diff --git a/meta/recipes-graphics/mesa/mesa_9.2.5.bb b/meta/recipes-graphics/mesa/mesa_9.2.5.bb index 737ed1a6cb..02ecd463e6 100644 --- a/meta/recipes-graphics/mesa/mesa_9.2.5.bb +++ b/meta/recipes-graphics/mesa/mesa_9.2.5.bb @@ -13,7 +13,7 @@ S = "${WORKDIR}/Mesa-${PV}" #because we cannot rely on the fact that all apps will use pkgconfig, #make eglplatform.h independent of MESA_EGL_NO_X11_HEADER do_install_append() { - if ${@base_contains('PACKAGECONFIG', 'egl', 'true', 'false', d)}; then - sed -i -e 's/^#ifdef MESA_EGL_NO_X11_HEADERS/#if ${@base_contains('DISTRO_FEATURES', 'x11', '0', '1', d)}/' ${D}${includedir}/EGL/eglplatform.h + if ${@bb.utils.contains('PACKAGECONFIG', 'egl', 'true', 'false', d)}; then + sed -i -e 's/^#ifdef MESA_EGL_NO_X11_HEADERS/#if ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '0', '1', d)}/' ${D}${includedir}/EGL/eglplatform.h fi } diff --git a/meta/recipes-graphics/mesa/mesa_git.bb b/meta/recipes-graphics/mesa/mesa_git.bb index 0abedbcb83..1e6fdb5cf0 100644 --- a/meta/recipes-graphics/mesa/mesa_git.bb +++ b/meta/recipes-graphics/mesa/mesa_git.bb @@ -18,7 +18,7 @@ S = "${WORKDIR}/git" #because we cannot rely on the fact that all apps will use pkgconfig, #make eglplatform.h independent of MESA_EGL_NO_X11_HEADER do_install_append() { - if ${@base_contains('PACKAGECONFIG', 'egl', 'true', 'false', d)}; then - sed -i -e 's/^#ifdef MESA_EGL_NO_X11_HEADERS/#if ${@base_contains('DISTRO_FEATURES', 'x11', '0', '1', d)}/' ${D}${includedir}/EGL/eglplatform.h + if ${@bb.utils.contains('PACKAGECONFIG', 'egl', 'true', 'false', d)}; then + sed -i -e 's/^#ifdef MESA_EGL_NO_X11_HEADERS/#if ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '0', '1', d)}/' ${D}${includedir}/EGL/eglplatform.h fi } -- cgit v1.2.3-54-g00ecf