diff options
| author | Ross Burton <ross.burton@intel.com> | 2013-06-20 15:42:58 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-06-25 17:30:31 +0100 |
| commit | 84ffd212f9ca083301d19b9c7a9720d05c733e5c (patch) | |
| tree | a8dd927453f4fc61a16be2c130479e46b2db7420 | |
| parent | 2d1e8b554e10173377bfe231d5999561adb62321 (diff) | |
| download | openembedded-core-84ffd212f9ca083301d19b9c7a9720d05c733e5c.tar.gz openembedded-core-84ffd212f9ca083301d19b9c7a9720d05c733e5c.tar.bz2 openembedded-core-84ffd212f9ca083301d19b9c7a9720d05c733e5c.zip | |
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.
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
| -rw-r--r-- | meta/recipes-graphics/cogl/cogl-1.0.inc | 24 |
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" AUTOTOOLS_AUXDIR = "${S}/build" # Extra DEPENDS for PACKAGECONFIG -EDEPENDS_GL = "virtual/libgl libdrm" +EDEPENDS_GL = "virtual/libgl libdrm" EDEPENDS_GLES2 = "virtual/libgles2" -EDEPENDS_KMS = "libdrm virtual/egl" -EDEPENDS_EGL = "virtual/egl" -EDEPENDS_X11 = "virtual/libx11 libxcomposite libxfixes libxi libxrandr" +EDEPENDS_KMS = "libdrm virtual/egl" +EDEPENDS_EGL = "virtual/egl" +EDEPENDS_X11 = "virtual/libx11 libxcomposite libxfixes libxi libxrandr" +EDEPENDS_WAYLAND = "wayland" # Extra RDEPENDS for PACKAGECONFIG # This has to be explictly listed, because cogl dlopens the backends @@ -34,15 +35,22 @@ EXTRA_OECONF += "--disable-introspection \ PACKAGECONFIG[gl] = "--enable-gl,--disable-gl,${EDEPENDS_GL},${ERDEPENDS_GL}" PACKAGECONFIG[gles2] = "--enable-gles2,--disable-gles2,${EDEPENDS_GLES2}, ${ERDEPENDS_GLES2}" -# egl backends +# 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-wayland] = "--enable-wayland-egl-platform,--disable-wayland-egl-platform,${EDEPENDS_WAYLAND}" -# glx +# GLX PACKAGECONFIG[glx] = "--enable-glx,--disable-glx,${EDEPENDS_GL} ${EDEPENDS_X11}" -# Default to GLX -PACKAGECONFIG ??= "gl glx" +# Wayland server-side +PACKAGECONFIG[wayland-server] = "--enable-wayland-egl-server,--disable-wayland-egl-server,${EDEPENDS_WAYLAND}" + +# Respect the DISTRO_FEATURES to pull in GLX or Wayland as appropriate by +# default. +PACKAGECONFIG ??= "gl \ + ${@base_contains('DISTRO_FEATURES', 'wayland', 'egl-wayland', '', d)} \ + ${@base_contains('DISTRO_FEATURES', 'x11', 'glx', '', d)}" FILES_${PN}-examples = "${bindir}/* ${datadir}/cogl/examples-data/*" |