From 2a739ad148d8a6ea531488e8495877d84acd5c12 Mon Sep 17 00:00:00 2001
From: Ross Burton <ross.burton@intel.com>
Date: Fri, 31 May 2013 15:57:35 +0100
Subject: [PATCH] weston: update to 1.1.0

Upgrade to 1.1.0, and disable the RaspberryPi and RDP compositors.  Hopefully
the RPi community can send a patch to add a PACKAGECONFIG for them.

(From OE-Core rev: 2e8e31a6812368688138b53c0aa92982354f832f)

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>
---
 .../wayland/{weston_1.0.6.bb => weston_1.1.0.bb}  | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)
 rename meta/recipes-graphics/wayland/{weston_1.0.6.bb => weston_1.1.0.bb} (82%)

diff --git a/meta/recipes-graphics/wayland/weston_1.0.6.bb b/meta/recipes-graphics/wayland/weston_1.1.0.bb
similarity index 82%
rename from meta/recipes-graphics/wayland/weston_1.0.6.bb
rename to meta/recipes-graphics/wayland/weston_1.1.0.bb
index 9d5d626a86..026f13666b 100644
--- a/meta/recipes-graphics/wayland/weston_1.0.6.bb
+++ b/meta/recipes-graphics/wayland/weston_1.1.0.bb
@@ -9,8 +9,9 @@ SRC_URI = "http://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \
            file://install-examples.patch \
            file://weston.png \
            file://weston.desktop"
-SRC_URI[md5sum] = "63202129d66d5514e572814da5dfa1f7"
-SRC_URI[sha256sum] = "c833bc4dc8667561d2639b57220541531c039aa9332ce2a7022a3c466eb894f1"
+SRC_URI[md5sum] = "dd9f3043fc5228c6bc4e99873fae2254"
+SRC_URI[sha256sum] = "e7715d2c731f77a729c994a599ffdaebac1307b2dd9336136706869fa53618b4"
+
 
 inherit autotools pkgconfig useradd
 
@@ -23,7 +24,11 @@ EXTRA_OECONF = "--disable-android-compositor \
                 --disable-xwayland \
                 --enable-simple-clients \
                 --enable-clients \
-                --disable-simple-egl-clients"
+                --disable-simple-egl-clients \
+                --disable-libunwind \
+                --disable-rpi-compositor \
+                --disable-rdp-compositor"
+
 
 PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'wayland', 'kms wayland', '', d)} \
                    ${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \
@@ -38,6 +43,10 @@ PACKAGECONFIG[kms] = "--enable-drm-compositor --enable-weston-launch,--disable-d
 PACKAGECONFIG[wayland] = "--enable-wayland-compositor,--disable-wayland-compositor,mesa"
 # Weston on X11
 PACKAGECONFIG[x11] = "--enable-x11-compositor,--disable-x11-compositor,virtual/libx11 libxcb libxcb libxcursor cairo"
+# Headless Weston
+PACKAGECONFIG[headless] = "--enable-headless-compositor,--disable-headless-compositor"
+# Weston on framebuffer
+PACKAGECONFIG[fbdev] = "--enable-fbdev-compositor,--disable-fbdev-compositor,udev mtdev"
 
 # Use cairo-gl or cairo-glesv2
 PACKAGECONFIG[gles] = "--with-cairo-glesv2,,virtual/libgles2"