aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/cogl
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2015-01-02 22:13:58 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-01-07 23:33:04 +0000
commitd61e3a6e63664ab2893a90e5525fe634d4514318 (patch)
tree11c9c8e14b672e95f1006d04d9564deee831f10d /meta/recipes-graphics/cogl
parente69a1a583bf65dd2b6358c1d925d8de6419e3d76 (diff)
downloadopenembedded-core-contrib-d61e3a6e63664ab2893a90e5525fe634d4514318.tar.gz
openembedded-core-contrib-d61e3a6e63664ab2893a90e5525fe634d4514318.tar.bz2
openembedded-core-contrib-d61e3a6e63664ab2893a90e5525fe634d4514318.zip
cogl: enable egl-x11 when build with x11
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>
Diffstat (limited to 'meta/recipes-graphics/cogl')
-rw-r--r--meta/recipes-graphics/cogl/cogl-1.0.inc6
1 files changed, 4 insertions, 2 deletions
diff --git a/meta/recipes-graphics/cogl/cogl-1.0.inc b/meta/recipes-graphics/cogl/cogl-1.0.inc
index b763dd5ba8..cc51bb4b21 100644
--- a/meta/recipes-graphics/cogl/cogl-1.0.inc
+++ b/meta/recipes-graphics/cogl/cogl-1.0.inc
@@ -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}"