summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2013-06-20 15:42:58 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-06-25 17:44:54 +0100
commit40ce8cf89b41084c27981a1e3705f2681b56e135 (patch)
tree4f12436f33f126705a9763e934c728186d959d83 /meta
parentd02b5453634e662986e7766871d0bfd3367465d7 (diff)
downloadpoky-40ce8cf89b41084c27981a1e3705f2681b56e135.tar.gz
cogl: add Wayland support
Add PACKAGECONFIG stanzas for Wayland client and server, and respect the x11 and wayland DISTRO_FEATURES to enable the relevant backends as appropriate by default. (From OE-Core rev: 84ffd212f9ca083301d19b9c7a9720d05c733e5c) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-graphics/cogl/cogl-1.0.inc24
1 files changed, 16 insertions, 8 deletions
diff --git a/meta/recipes-graphics/cogl/cogl-1.0.inc b/meta/recipes-graphics/cogl/cogl-1.0.inc
index c9c6165a88..55eb003f8a 100644
--- a/meta/recipes-graphics/cogl/cogl-1.0.inc
+++ b/meta/recipes-graphics/cogl/cogl-1.0.inc
@@ -13,11 +13,12 @@ PACKAGES =+ "${PN}-examples"
13AUTOTOOLS_AUXDIR = "${S}/build" 13AUTOTOOLS_AUXDIR = "${S}/build"
14 14
15# Extra DEPENDS for PACKAGECONFIG 15# Extra DEPENDS for PACKAGECONFIG
16EDEPENDS_GL = "virtual/libgl libdrm" 16EDEPENDS_GL = "virtual/libgl libdrm"
17EDEPENDS_GLES2 = "virtual/libgles2" 17EDEPENDS_GLES2 = "virtual/libgles2"
18EDEPENDS_KMS = "libdrm virtual/egl" 18EDEPENDS_KMS = "libdrm virtual/egl"
19EDEPENDS_EGL = "virtual/egl" 19EDEPENDS_EGL = "virtual/egl"
20EDEPENDS_X11 = "virtual/libx11 libxcomposite libxfixes libxi libxrandr" 20EDEPENDS_X11 = "virtual/libx11 libxcomposite libxfixes libxi libxrandr"
21EDEPENDS_WAYLAND = "wayland"
21 22
22# Extra RDEPENDS for PACKAGECONFIG 23# Extra RDEPENDS for PACKAGECONFIG
23# This has to be explictly listed, because cogl dlopens the backends 24# This has to be explictly listed, because cogl dlopens the backends
@@ -34,15 +35,22 @@ EXTRA_OECONF += "--disable-introspection \
34PACKAGECONFIG[gl] = "--enable-gl,--disable-gl,${EDEPENDS_GL},${ERDEPENDS_GL}" 35PACKAGECONFIG[gl] = "--enable-gl,--disable-gl,${EDEPENDS_GL},${ERDEPENDS_GL}"
35PACKAGECONFIG[gles2] = "--enable-gles2,--disable-gles2,${EDEPENDS_GLES2}, ${ERDEPENDS_GLES2}" 36PACKAGECONFIG[gles2] = "--enable-gles2,--disable-gles2,${EDEPENDS_GLES2}, ${ERDEPENDS_GLES2}"
36 37
37# egl backends 38# EGL backends
38PACKAGECONFIG[egl-kms] = "--enable-kms-egl-platform,--disable-kms-egl-platform,${EDEPENDS_KMS}" 39PACKAGECONFIG[egl-kms] = "--enable-kms-egl-platform,--disable-kms-egl-platform,${EDEPENDS_KMS}"
39PACKAGECONFIG[egl-null] = "--enable-null-egl-platform,--disable-null-egl-platform" 40PACKAGECONFIG[egl-null] = "--enable-null-egl-platform,--disable-null-egl-platform"
40PACKAGECONFIG[egl-x11] = "--enable-xlib-egl-platform,--disable-xlib-egl-platform,${EDEPENDS_X11}" 41PACKAGECONFIG[egl-x11] = "--enable-xlib-egl-platform,--disable-xlib-egl-platform,${EDEPENDS_X11}"
42PACKAGECONFIG[egl-wayland] = "--enable-wayland-egl-platform,--disable-wayland-egl-platform,${EDEPENDS_WAYLAND}"
41 43
42# glx 44# GLX
43PACKAGECONFIG[glx] = "--enable-glx,--disable-glx,${EDEPENDS_GL} ${EDEPENDS_X11}" 45PACKAGECONFIG[glx] = "--enable-glx,--disable-glx,${EDEPENDS_GL} ${EDEPENDS_X11}"
44 46
45# Default to GLX 47# Wayland server-side
46PACKAGECONFIG ??= "gl glx" 48PACKAGECONFIG[wayland-server] = "--enable-wayland-egl-server,--disable-wayland-egl-server,${EDEPENDS_WAYLAND}"
49
50# Respect the DISTRO_FEATURES to pull in GLX or Wayland as appropriate by
51# default.
52PACKAGECONFIG ??= "gl \
53 ${@base_contains('DISTRO_FEATURES', 'wayland', 'egl-wayland', '', d)} \
54 ${@base_contains('DISTRO_FEATURES', 'x11', 'glx', '', d)}"
47 55
48FILES_${PN}-examples = "${bindir}/* ${datadir}/cogl/examples-data/*" 56FILES_${PN}-examples = "${bindir}/* ${datadir}/cogl/examples-data/*"