summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/cogl/cogl-1.0.inc
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:35:07 +0000
commit144630e6e83b131c7ed03d6e6a1a61aee0ba999e (patch)
treee728ee6fc4b1ef00a69e527aac1d8888184f1d65 /meta/recipes-graphics/cogl/cogl-1.0.inc
parent188db833ab00f55216cab73128e05a58ace8a1a4 (diff)
downloadpoky-144630e6e83b131c7ed03d6e6a1a61aee0ba999e.tar.gz
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. (From OE-Core rev: d61e3a6e63664ab2893a90e5525fe634d4514318) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/cogl/cogl-1.0.inc')
-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
42# EGL backends 42# EGL backends
43PACKAGECONFIG[egl-kms] = "--enable-kms-egl-platform,--disable-kms-egl-platform,${EDEPENDS_KMS}" 43PACKAGECONFIG[egl-kms] = "--enable-kms-egl-platform,--disable-kms-egl-platform,${EDEPENDS_KMS}"
44PACKAGECONFIG[egl-null] = "--enable-null-egl-platform,--disable-null-egl-platform" 44PACKAGECONFIG[egl-null] = "--enable-null-egl-platform,--disable-null-egl-platform"
45PACKAGECONFIG[egl-x11] = "--enable-xlib-egl-platform,--disable-xlib-egl-platform,${EDEPENDS_X11}" 45PACKAGECONFIG[egl-x11] = "--enable-xlib-egl-platform,--disable-xlib-egl-platform,${EDEPENDS_X11} ${EDEPENDS_EGL}"
46PACKAGECONFIG[egl-wayland] = "--enable-wayland-egl-platform,--disable-wayland-egl-platform,${EDEPENDS_WAYLAND}" 46PACKAGECONFIG[egl-wayland] = "--enable-wayland-egl-platform,--disable-wayland-egl-platform,${EDEPENDS_WAYLAND}"
47 47
48# Wayland (server-side) 48# Wayland (server-side)
@@ -55,7 +55,9 @@ PACKAGECONFIG[cogl-pango] = "--enable-cogl-pango,--disable-cogl-pango,pango"
55# default. 55# default.
56PACKAGECONFIG ??= "cogl-pango gles2 \ 56PACKAGECONFIG ??= "cogl-pango gles2 \
57 ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'egl-wayland', '', d)} \ 57 ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'egl-wayland', '', d)} \
58 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'glx', '', d)}" 58 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'glx egl-x11', '', d)} \
59 "
60
59 61
60FILES_${PN}-examples = "${bindir}/* ${datadir}/cogl/examples-data/*" 62FILES_${PN}-examples = "${bindir}/* ${datadir}/cogl/examples-data/*"
61FILES_libcogl = "${libdir}/libcogl${SOLIBS}" 63FILES_libcogl = "${libdir}/libcogl${SOLIBS}"