From a1363f627208c95be6db8568371db0de746c3c02 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Fri, 7 Mar 2014 12:34:58 -0300 Subject: 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 --- recipes-graphics/clutter/clutter-1.0_%.bbappend | 9 +++++++++ recipes-graphics/clutter/clutter-1.0_1.16.2.bbappend | 9 --------- 2 files changed, 9 insertions(+), 9 deletions(-) create mode 100644 recipes-graphics/clutter/clutter-1.0_%.bbappend delete mode 100644 recipes-graphics/clutter/clutter-1.0_1.16.2.bbappend diff --git a/recipes-graphics/clutter/clutter-1.0_%.bbappend b/recipes-graphics/clutter/clutter-1.0_%.bbappend new file mode 100644 index 0000000..b4eb92d --- /dev/null +++ b/recipes-graphics/clutter/clutter-1.0_%.bbappend @@ -0,0 +1,9 @@ +# Provide the need flags and backend settings to work with Vivante GPU +CFLAGS_append_mx6 = " -DLINUX \ + ${@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)}" diff --git a/recipes-graphics/clutter/clutter-1.0_1.16.2.bbappend b/recipes-graphics/clutter/clutter-1.0_1.16.2.bbappend deleted file mode 100644 index a4e6f46..0000000 --- a/recipes-graphics/clutter/clutter-1.0_1.16.2.bbappend +++ /dev/null @@ -1,9 +0,0 @@ -# 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', 'wayland', \ - '-DEGL_API_WL', '', d), d)}" - -PACKAGECONFIG_mx6 ??= "${base_contains('DISTRO_FEATURES', 'x11', 'glx x11', \ - base_contains('DISTRO_FEATURES', 'wayland', \ - 'wayland egl', '', d), d)}" -- cgit v1.2.3-54-g00ecf