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.bur...@intel.com>
---
meta/recipes-graphics/clutter/clutter-1.0.inc | 8 +++++---
1 file 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 68cb22b..f51c740 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"
EDEPENDS_X11 = "virtual/libx11 libxi libxfixes"
EDEPENDS_GLX = "virtual/libgl"
EDEPENDS_EGL = "virtual/egl"
+EDEPENDS_WAYLAND = "wayland libxkbcommon gdk-pixbuf"
EDEPENDS_EVDEV = "libxkbcommon"
ERDEPENDS_EVDEV = "xkeyboard-config"
@@ -22,8 +23,6 @@ EXTRA_OECONF += "--disable-introspection \
--disable-quartz-backend \
--disable-win32-backend \
--disable-gdk-backend \
- --disable-wayland-backend \
- --disable-wayland-compositor \
--disable-cex100-backend \
--disable-tslib-input \
"
@@ -32,9 +31,12 @@ PACKAGECONFIG[x11] =
"--enable-x11-backend,--disable-x11-backend,${EDEPENDS_X11}
PACKAGECONFIG[glx] = ",,${EDEPENDS_X11} ${EDEPENDS_GLX}"
PACKAGECONFIG[egl] =
"--enable-egl-backend,--disable-egl-backend,${EDEPENDS_EGL}"
PACKAGECONFIG[evdev] =
"--enable-evdev-input,--disable-evdev-input,${EDEPENDS_EVDEV},${ERDEPENDS_EVDEV}"
+PACKAGECONFIG[wayland] =
"--enable-wayland-backend,--disable-wayland-backend,${EDEPENDS_WAYLAND}"
+PACKAGECONFIG[wayland-compositor] =
"--enable-wayland-compositor,--disable-wayland-compositor,wayland"
# Default configuration, distros might want to override
-PACKAGECONFIG ??= "x11 glx"
+PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'wayland', 'wayland',
'', d)} \
+ ${@base_contains('DISTRO_FEATURES', 'x11', 'glx x11', '',
d)}"
FILES_${PN}-examples = "${bindir}/test-* ${pkgdatadir}/redhand.png"
--
1.7.10.4
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
