[oe-commits] Ross Burton : weston: clean up and add comments
git at git.openembedded.org
git at git.openembedded.org
Tue Jun 4 10:48:46 UTC 2013
Module: openembedded-core.git
Branch: master-next
Commit: 45acbb3c528b619d8af2ebc050bab74f4ce85ae0
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=45acbb3c528b619d8af2ebc050bab74f4ce85ae0
Author: Ross Burton <ross.burton at intel.com>
Date: Fri May 31 14:36:05 2013 +0000
weston: clean up and add comments
Signed-off-by: Ross Burton <ross.burton at intel.com>
Signed-off-by: Saul Wold <sgw at linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
meta/recipes-graphics/wayland/weston_1.0.6.bb | 14 +++++++++++---
1 files 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() {
More information about the Openembedded-commits
mailing list