From 0a1427bf9aeeda6bee2cc0af8da4ea5fd90aef6f 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 Signed-off-by: Peter Kjellerstedt Signed-off-by: Richard Purdie --- meta/recipes-gnome/gtk+/gtk+.inc | 4 +--- meta/recipes-gnome/gtk+/gtk+3.inc | 6 ++---- 2 files changed, 3 insertions(+), 7 deletions(-) (limited to 'meta/recipes-gnome/gtk+') diff --git a/meta/recipes-gnome/gtk+/gtk+.inc b/meta/recipes-gnome/gtk+/gtk+.inc index b9b4721780..558bc485ad 100644 --- a/meta/recipes-gnome/gtk+/gtk+.inc +++ b/meta/recipes-gnome/gtk+/gtk+.inc @@ -21,9 +21,7 @@ X11DEPENDS = "virtual/libx11 libxext libxcursor libxrandr libxdamage libxrender DEPENDS = "glib-2.0 pango atk jpeg libpng gdk-pixbuf-native \ cairo gdk-pixbuf" -PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)} \ -" +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'directfb x11', d)}" PACKAGECONFIG[x11] = "--with-x=yes --with-gdktarget=x11,--with-x=no,${X11DEPENDS}" # without --with-gdktarget=directfb it will check for cairo-xlib which isn't available without X11 DISTRO_FEATURE diff --git a/meta/recipes-gnome/gtk+/gtk+3.inc b/meta/recipes-gnome/gtk+/gtk+3.inc index 9c104e28c0..27da844fea 100644 --- a/meta/recipes-gnome/gtk+/gtk+3.inc +++ b/meta/recipes-gnome/gtk+/gtk+3.inc @@ -40,10 +40,8 @@ do_compile_prepend() { export GIR_EXTRA_LIBS_PATH="${B}/gdk/.libs" } -PACKAGECONFIG ??= "${@bb.utils.contains("DISTRO_FEATURES", "x11", "x11", "", d)} \ - ${@bb.utils.contains("DISTRO_FEATURES", "opengl", "opengl", "", d)} \ - ${@bb.utils.contains("DISTRO_FEATURES", "opengl x11", "glx", "", d)} \ - ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "wayland", "", d)}" +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'opengl wayland x11', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'opengl x11', 'glx', '', d)}" PACKAGECONFIG[x11] = "--enable-x11-backend,--disable-x11-backend,at-spi2-atk fontconfig libx11 libxext libxcursor libxi libxdamage libxrandr libxrender libxcomposite libxfixes" # this is provided by oe-core patch that removes epoxy/gl dependency from a X11 build -- cgit 1.2.3-korg