On 03/26/2014 11:07 PM, Otavio Salvador wrote:
From: Prabhu Sundararaj <[email protected]>

Signed-off-by: Prabhu Sundararaj <[email protected]>
Signed-off-by: Otavio Salvador <[email protected]>
---
  meta/recipes-graphics/wayland/weston_1.4.0.bb | 7 +++++--
  1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-graphics/wayland/weston_1.4.0.bb 
b/meta/recipes-graphics/wayland/weston_1.4.0.bb
index e0c354d..a41b5cd 100644
--- a/meta/recipes-graphics/wayland/weston_1.4.0.bb
+++ b/meta/recipes-graphics/wayland/weston_1.4.0.bb
@@ -23,7 +23,6 @@ EXTRA_OECONF = "--enable-setuid-install \
                  --enable-simple-clients \
                  --enable-clients \
                  --enable-demo-clients-install \
-                --disable-simple-egl-clients \
                  --disable-libunwind \
                  --disable-rpi-compositor \
                  --disable-rdp-compositor"
@@ -39,7 +38,7 @@ PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 
'wayland', 'kms fbdev way
  # Weston on KMS
  PACKAGECONFIG[kms] = "--enable-drm-compositor,--disable-drm-compositor,drm udev 
virtual/mesa mtdev"
  # Weston on Wayland (nested Weston)
-PACKAGECONFIG[wayland] = "--enable-wayland-compositor,--disable-egl 
--disable-wayland-compositor,virtual/mesa"

We need --disable-egl if wayland is not in DISTRO_FEATURES. See bug:
https://bugzilla.yoctoproject.org/show_bug.cgi?id=5867
+PACKAGECONFIG[wayland] = 
"--enable-wayland-compositor,--disable-wayland-compositor,virtual/mesa"
  # Weston on X11
  PACKAGECONFIG[x11] = 
"--enable-x11-compositor,--disable-x11-compositor,virtual/libx11 libxcb libxcb 
libxcursor cairo"
  # Headless Weston
@@ -50,6 +49,10 @@ PACKAGECONFIG[fbdev] = 
"--enable-fbdev-compositor,--disable-fbdev-compositor,ude
  PACKAGECONFIG[launch] = "--enable-weston-launch,--disable-weston-launch,libpam 
drm"
  # VA-API desktop recorder
  PACKAGECONFIG[vaapi] = 
"--enable-vaapi-recorder,--disable-vaapi-recorder,libva"
+# Weston with EGL support
+PACKAGECONFIG[egl] = "--enable-egl --enable-simple-egl-clients,--disable-egl 
--disable-simple-egl-clients,virtual/egl"
+# Weston with cairo glesv2 support
+PACKAGECONFIG[cairo-glesv2] = "--with-cairo-glesv2,--with-cairo=image,cairo"
do_install_append() {
        # Weston doesn't need the .la files to load modules, so wipe them

--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Reply via email to