From 254bfb107134702d8d1e0bfbdd1b011212e8c291 Mon Sep 17 00:00:00 2001 From: Peter Kjellerstedt Date: Mon, 27 Feb 2017 14:02:50 +0100 Subject: recipes: Make use of the new bb.utils.filter() function (From OE-Core rev: 0a1427bf9aeeda6bee2cc0af8da4ea5fd90aef6f) Signed-off-by: Peter Kjellerstedt Signed-off-by: Richard Purdie --- meta/recipes-graphics/libsdl2/libsdl2_2.0.5.bb | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'meta/recipes-graphics/libsdl2') diff --git a/meta/recipes-graphics/libsdl2/libsdl2_2.0.5.bb b/meta/recipes-graphics/libsdl2/libsdl2_2.0.5.bb index 0d9a12993f..d747cf18f0 100644 --- a/meta/recipes-graphics/libsdl2/libsdl2_2.0.5.bb +++ b/meta/recipes-graphics/libsdl2/libsdl2_2.0.5.bb @@ -38,15 +38,12 @@ EXTRA_OECONF = "--disable-oss --disable-esd --disable-arts \ # opengl packageconfig factored out to make it easy for distros # and BSP layers to pick either (desktop) opengl, gles2, or no GL -PACKAGECONFIG_GL ?= "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'opengl', '', d)}" +PACKAGECONFIG_GL ?= "${@bb.utils.filter('DISTRO_FEATURES', 'opengl', d)}" PACKAGECONFIG ??= " \ ${PACKAGECONFIG_GL} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)} \ + ${@bb.utils.filter('DISTRO_FEATURES', 'alsa directfb pulseaudio x11', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland gles2', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \ " PACKAGECONFIG[alsa] = "--enable-alsa --disable-alsatest,--disable-alsa,alsa-lib," PACKAGECONFIG[directfb] = "--enable-video-directfb,--disable-video-directfb,directfb" -- cgit v1.2.3-54-g00ecf