]> code.ossystems Code Review - openembedded-core.git/commitdiff
cogl: enable egl-x11 when build with x11
authorRobert Yang <liezhi.yang@windriver.com>
Sat, 3 Jan 2015 06:13:58 +0000 (22:13 -0800)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Wed, 7 Jan 2015 23:33:04 +0000 (23:33 +0000)
Fixed clutter-1.0 compile error when build with x11:
clutter-backend-eglnative.h:31:27: fatal error: cogl/cogl-egl.h: No such file or directory
 #include <cogl/cogl-egl.h>
compilation terminated.

We need enable egl-x11 when x11 as we enable egl-wayland when wayland.

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
meta/recipes-graphics/cogl/cogl-1.0.inc

index b763dd5ba8e154a355fa2b396d281817e3415b35..cc51bb4b2105a1cb68a5234f57fb367624612763 100644 (file)
@@ -42,7 +42,7 @@ PACKAGECONFIG[gles2] = "--enable-gles2,--disable-gles2,${EDEPENDS_GLES2}, ${ERDE
 # EGL backends
 PACKAGECONFIG[egl-kms] = "--enable-kms-egl-platform,--disable-kms-egl-platform,${EDEPENDS_KMS}"
 PACKAGECONFIG[egl-null] = "--enable-null-egl-platform,--disable-null-egl-platform"
-PACKAGECONFIG[egl-x11] = "--enable-xlib-egl-platform,--disable-xlib-egl-platform,${EDEPENDS_X11}"
+PACKAGECONFIG[egl-x11] = "--enable-xlib-egl-platform,--disable-xlib-egl-platform,${EDEPENDS_X11} ${EDEPENDS_EGL}"
 PACKAGECONFIG[egl-wayland] = "--enable-wayland-egl-platform,--disable-wayland-egl-platform,${EDEPENDS_WAYLAND}"
 
 # Wayland (server-side)
@@ -55,7 +55,9 @@ PACKAGECONFIG[cogl-pango] = "--enable-cogl-pango,--disable-cogl-pango,pango"
 # default.
 PACKAGECONFIG ??= "cogl-pango gles2 \
                    ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'egl-wayland', '', d)} \
-                   ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'glx', '', d)}"
+                   ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'glx egl-x11', '', d)} \
+                   "
+
 
 FILES_${PN}-examples = "${bindir}/* ${datadir}/cogl/examples-data/*"
 FILES_libcogl = "${libdir}/libcogl${SOLIBS}"