diff options
| author |   Peter Kjellerstedt <peter.kjellerstedt@axis.com> | 2017-02-27 14:02:50 +0100 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-03-01 11:17:22 +0000 |
| commit | 0a1427bf9aeeda6bee2cc0af8da4ea5fd90aef6f (patch) | |
| tree | 832a708208f36aa18b43b090f8963683f03986ee /meta/recipes-graphics/mesa | |
| parent | 6db26339522a22c3e3c13287ea0c9daf40c7c15e (diff) | |
| download | openembedded-core-0a1427bf9aeeda6bee2cc0af8da4ea5fd90aef6f.tar.gz | |
recipes: Make use of the new bb.utils.filter() function
Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/mesa')
| -rw-r--r-- | meta/recipes-graphics/mesa/mesa-demos_8.3.0.bb | 2 | ||||
| -rw-r--r-- | meta/recipes-graphics/mesa/mesa-gl_13.0.4.bb | 2 | ||||
| -rw-r--r-- | meta/recipes-graphics/mesa/mesa.inc | 3 |
3 files changed, 3 insertions, 4 deletions
diff --git a/meta/recipes-graphics/mesa/mesa-demos_8.3.0.bb b/meta/recipes-graphics/mesa/mesa-demos_8.3.0.bb index fab0bdb2ee..e80d1e8acb 100644 --- a/meta/recipes-graphics/mesa/mesa-demos_8.3.0.bb +++ b/meta/recipes-graphics/mesa/mesa-demos_8.3.0.bb @@ -30,7 +30,7 @@ PACKAGECONFIG ?= "drm osmesa freetype2 gbm egl gles1 gles2 \ x11 glew glu glx" # The Wayland code doesn't work with Wayland 1.0, so disable it for now -#${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)}" +#${@bb.utils.filter('DISTRO_FEATURES', 'wayland', d)}" EXTRA_OECONF = "--with-system-data-files" diff --git a/meta/recipes-graphics/mesa/mesa-gl_13.0.4.bb b/meta/recipes-graphics/mesa/mesa-gl_13.0.4.bb index f06a3e9b58..85cc396fe3 100644 --- a/meta/recipes-graphics/mesa/mesa-gl_13.0.4.bb +++ b/meta/recipes-graphics/mesa/mesa-gl_13.0.4.bb @@ -8,6 +8,6 @@ PROVIDES = "virtual/libgl virtual/mesa" S = "${WORKDIR}/mesa-${PV}" -PACKAGECONFIG ??= "dri ${MESA_CRYPTO} ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" +PACKAGECONFIG ??= "dri ${MESA_CRYPTO} ${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" EXCLUDE_FROM_WORLD = "1" diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc index 5d882b1001..87c6821e65 100644 --- a/meta/recipes-graphics/mesa/mesa.inc +++ b/meta/recipes-graphics/mesa/mesa.inc @@ -25,8 +25,7 @@ REQUIRED_DISTRO_FEATURES = "opengl" EXTRA_OECONF = "--enable-shared-glapi" PACKAGECONFIG ??= "gbm egl gles dri ${MESA_CRYPTO} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}\ - ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)}\ + ${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)} \ " PACKAGECONFIG[gbm] = "--enable-gbm,--disable-gbm" |