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 <otavio@ossystems.com.br>

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 a4e6f46d00505cf55e85efb457bd1c36a7e8715b..b4eb92de541e9d4970fc3aaf488ff7f731399caf 100644 (file)
--- 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)}"