summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/clutter/clutter-1.0.inc
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2013-06-20 15:43:05 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-06-25 17:44:54 +0100
commit566f9c0df5adaa726be11d0df3e174cfc0634ddc (patch)
treeb0fae071a36715b90525948afcc0547849fc51f2 /meta/recipes-graphics/clutter/clutter-1.0.inc
parent40ce8cf89b41084c27981a1e3705f2681b56e135 (diff)
downloadpoky-566f9c0df5adaa726be11d0df3e174cfc0634ddc.tar.gz
clutter: 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: aa01a4a2c74ee2ee9f629ea07a71b06bc2fdda99) 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/recipes-graphics/clutter/clutter-1.0.inc')
-rw-r--r--meta/recipes-graphics/clutter/clutter-1.0.inc8
1 files changed, 5 insertions, 3 deletions
diff --git a/meta/recipes-graphics/clutter/clutter-1.0.inc b/meta/recipes-graphics/clutter/clutter-1.0.inc
index 68cb22bf1d..f51c7401eb 100644
--- a/meta/recipes-graphics/clutter/clutter-1.0.inc
+++ b/meta/recipes-graphics/clutter/clutter-1.0.inc
@@ -13,6 +13,7 @@ AUTOTOOLS_AUXDIR = "${S}/build"
13EDEPENDS_X11 = "virtual/libx11 libxi libxfixes" 13EDEPENDS_X11 = "virtual/libx11 libxi libxfixes"
14EDEPENDS_GLX = "virtual/libgl" 14EDEPENDS_GLX = "virtual/libgl"
15EDEPENDS_EGL = "virtual/egl" 15EDEPENDS_EGL = "virtual/egl"
16EDEPENDS_WAYLAND = "wayland libxkbcommon gdk-pixbuf"
16 17
17EDEPENDS_EVDEV = "libxkbcommon" 18EDEPENDS_EVDEV = "libxkbcommon"
18ERDEPENDS_EVDEV = "xkeyboard-config" 19ERDEPENDS_EVDEV = "xkeyboard-config"
@@ -22,8 +23,6 @@ EXTRA_OECONF += "--disable-introspection \
22 --disable-quartz-backend \ 23 --disable-quartz-backend \
23 --disable-win32-backend \ 24 --disable-win32-backend \
24 --disable-gdk-backend \ 25 --disable-gdk-backend \
25 --disable-wayland-backend \
26 --disable-wayland-compositor \
27 --disable-cex100-backend \ 26 --disable-cex100-backend \
28 --disable-tslib-input \ 27 --disable-tslib-input \
29 " 28 "
@@ -32,9 +31,12 @@ PACKAGECONFIG[x11] = "--enable-x11-backend,--disable-x11-backend,${EDEPENDS_X11}
32PACKAGECONFIG[glx] = ",,${EDEPENDS_X11} ${EDEPENDS_GLX}" 31PACKAGECONFIG[glx] = ",,${EDEPENDS_X11} ${EDEPENDS_GLX}"
33PACKAGECONFIG[egl] = "--enable-egl-backend,--disable-egl-backend,${EDEPENDS_EGL}" 32PACKAGECONFIG[egl] = "--enable-egl-backend,--disable-egl-backend,${EDEPENDS_EGL}"
34PACKAGECONFIG[evdev] = "--enable-evdev-input,--disable-evdev-input,${EDEPENDS_EVDEV},${ERDEPENDS_EVDEV}" 33PACKAGECONFIG[evdev] = "--enable-evdev-input,--disable-evdev-input,${EDEPENDS_EVDEV},${ERDEPENDS_EVDEV}"
34PACKAGECONFIG[wayland] = "--enable-wayland-backend,--disable-wayland-backend,${EDEPENDS_WAYLAND}"
35PACKAGECONFIG[wayland-compositor] = "--enable-wayland-compositor,--disable-wayland-compositor,wayland"
35 36
36# Default configuration, distros might want to override 37# Default configuration, distros might want to override
37PACKAGECONFIG ??= "x11 glx" 38PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)} \
39 ${@base_contains('DISTRO_FEATURES', 'x11', 'glx x11', '', d)}"
38 40
39FILES_${PN}-examples = "${bindir}/test-* ${pkgdatadir}/redhand.png" 41FILES_${PN}-examples = "${bindir}/test-* ${pkgdatadir}/redhand.png"
40 42