Signed-off-by: Ross Burton <[email protected]>
---
meta/recipes-graphics/wayland/weston_1.0.6.bb | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-graphics/wayland/weston_1.0.6.bb
b/meta/recipes-graphics/wayland/weston_1.0.6.bb
index 07811f2..9d5d626 100644
--- a/meta/recipes-graphics/wayland/weston_1.0.6.bb
+++ b/meta/recipes-graphics/wayland/weston_1.0.6.bb
@@ -17,14 +17,21 @@ inherit autotools pkgconfig useradd
DEPENDS = "libxkbcommon gdk-pixbuf pixman cairo glib-2.0 mtdev jpeg"
DEPENDS += "wayland mesa virtual/egl"
-EXTRA_OECONF = "--disable-android-compositor --enable-setuid-install"
-EXTRA_OECONF += "--disable-tablet-shell --disable-xwayland"
-EXTRA_OECONF += "--enable-simple-clients --enable-clients
--disable-simple-egl-clients"
+EXTRA_OECONF = "--disable-android-compositor \
+ --enable-setuid-install \
+ --disable-tablet-shell \
+ --disable-xwayland \
+ --enable-simple-clients \
+ --enable-clients \
+ --disable-simple-egl-clients"
PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'wayland', 'kms
wayland', '', d)} \
${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \
${@base_contains('DISTRO_FEATURES', 'opengles2', 'gles',
'', d)} \
"
+#
+# Compositor choices
+#
# Weston on KMS
PACKAGECONFIG[kms] = "--enable-drm-compositor
--enable-weston-launch,--disable-drm-compositor --disable-weston-launch,drm
udev mesa libpam"
# Weston on Wayland (nested Weston)
@@ -32,6 +39,7 @@ PACKAGECONFIG[wayland] =
"--enable-wayland-compositor,--disable-wayland-composit
# Weston on X11
PACKAGECONFIG[x11] =
"--enable-x11-compositor,--disable-x11-compositor,virtual/libx11 libxcb libxcb
libxcursor cairo"
+# Use cairo-gl or cairo-glesv2
PACKAGECONFIG[gles] = "--with-cairo-glesv2,,virtual/libgles2"
do_install_append() {
--
1.7.10.4
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core
