summaryrefslogtreecommitdiff
path: root/meta
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2013-05-31 14:36:05 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-06-04 15:53:46 +0100
commit46159f632513de1f14d03e425799a0c193532298 (patch)
treeb54b657bc99748e50dca2e775c696b3a721b22ce /meta
parent02e486ec9321fd3d7769c70979207335847a8f92 (diff)
downloadopenembedded-core-46159f632513de1f14d03e425799a0c193532298.tar.gz
openembedded-core-46159f632513de1f14d03e425799a0c193532298.tar.bz2
openembedded-core-46159f632513de1f14d03e425799a0c193532298.zip
weston: clean up and add comments
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')
-rw-r--r--meta/recipes-graphics/wayland/weston_1.0.6.bb14
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 07811f2831..9d5d626a86 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() {