[prev in list] [next in list] [prev in thread] [next in thread] 

List:       openembedded-core
Subject:    [OE-core] [PATCH 6/7] weston: clean up and add comments
From:       ross.burton () intel ! com (Ross Burton)
Date:       2013-05-31 15:08:09
Message-ID: 0b99026d90a164f45173a6a2fa2a5b49fb61e2f4.1370012830.git.ross.burton () intel ! com
[Download RAW message or body]

Signed-off-by: Ross Burton <ross.burton at intel.com>
---
 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


[prev in list] [next in list] [prev in thread] [next in thread]