From 6c1c85a61113b185d75e120538a2093bcca2d4c7 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Fri, 7 Mar 2014 12:34:58 -0300 Subject: [PATCH] clutter-1.0: Rename bbappend to generic version This allow for version independant matching so we don't need to bump it every time OE-Core updates. This also removes the -DUSE_API_FB for X11 case as X11 cannot use it and fix the base_contains syntax in PACKAGECONFIG setting. Change-Id: I7b757906354e7c815e62fff6fd059a82f1ecff78 Signed-off-by: Otavio Salvador --- ...clutter-1.0_1.16.2.bbappend => clutter-1.0_%.bbappend} | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) rename meta-fsl-arm/recipes-graphics/clutter/{clutter-1.0_1.16.2.bbappend => clutter-1.0_%.bbappend} (56%) diff --git a/meta-fsl-arm/recipes-graphics/clutter/clutter-1.0_1.16.2.bbappend b/meta-fsl-arm/recipes-graphics/clutter/clutter-1.0_%.bbappend similarity index 56% rename from meta-fsl-arm/recipes-graphics/clutter/clutter-1.0_1.16.2.bbappend rename to meta-fsl-arm/recipes-graphics/clutter/clutter-1.0_%.bbappend index a4e6f46d..b4eb92de 100644 --- a/meta-fsl-arm/recipes-graphics/clutter/clutter-1.0_1.16.2.bbappend +++ b/meta-fsl-arm/recipes-graphics/clutter/clutter-1.0_%.bbappend @@ -1,9 +1,9 @@ # Provide the need flags and backend settings to work with Vivante GPU CFLAGS_append_mx6 = " -DLINUX \ - ${@base_contains('DISTRO_FEATURES', 'x11', '-DEGL_API_FB', \ + ${@base_contains('DISTRO_FEATURES', 'x11', '', \ base_contains('DISTRO_FEATURES', 'wayland', \ '-DEGL_API_WL', '', d), d)}" -PACKAGECONFIG_mx6 ??= "${base_contains('DISTRO_FEATURES', 'x11', 'glx x11', \ - base_contains('DISTRO_FEATURES', 'wayland', \ - 'wayland egl', '', d), d)}" +PACKAGECONFIG_mx6 ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'glx x11', \ + base_contains('DISTRO_FEATURES', 'wayland', \ + 'wayland egl', '', d), d)}" -- 2.40.1