From 566f9c0df5adaa726be11d0df3e174cfc0634ddc Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Thu, 20 Jun 2013 15:43:05 +0100 Subject: 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 Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/recipes-graphics/clutter/clutter-1.0.inc | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'meta/recipes-graphics/clutter') 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" 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" -- cgit 1.2.3-korg