From e688db270ab8dd438a317f3e9be515c75e31c0c6 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Thu, 6 Mar 2014 19:27:21 -0300 Subject: cogl-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. Change-Id: I20eef5c08ee8e6799c5038d5aa3dcd3ba4cb6f3f Signed-off-by: Otavio Salvador --- recipes-graphics/cogl/cogl-1.0_%.bbappend | 10 ++++++++++ recipes-graphics/cogl/cogl-1.0_1.16.0.bbappend | 10 ---------- 2 files changed, 10 insertions(+), 10 deletions(-) create mode 100644 recipes-graphics/cogl/cogl-1.0_%.bbappend delete mode 100644 recipes-graphics/cogl/cogl-1.0_1.16.0.bbappend (limited to 'recipes-graphics/cogl') diff --git a/recipes-graphics/cogl/cogl-1.0_%.bbappend b/recipes-graphics/cogl/cogl-1.0_%.bbappend new file mode 100644 index 0000000..40633c4 --- /dev/null +++ b/recipes-graphics/cogl/cogl-1.0_%.bbappend @@ -0,0 +1,10 @@ +# 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 ??= "cogl-pango gles2 \ + ${@base_contains('DISTRO_FEATURES', 'x11', 'egl-x11', \ + base_contains('DISTRO_FEATURES', 'wayland', \ + 'egl-wayland', '', d), d)}" diff --git a/recipes-graphics/cogl/cogl-1.0_1.16.0.bbappend b/recipes-graphics/cogl/cogl-1.0_1.16.0.bbappend deleted file mode 100644 index 9de6ceb..0000000 --- a/recipes-graphics/cogl/cogl-1.0_1.16.0.bbappend +++ /dev/null @@ -1,10 +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 ??= "cogl-pango gles2 \ - ${@base_contains('DISTRO_FEATURES', 'x11', 'egl-x11', \ - base_contains('DISTRO_FEATURES', 'wayland', \ - 'egl-wayland', '', d), d)}" -- cgit v1.2.3-54-g00ecf