[meta-freescale] [meta-fsl-arm][PATCH 10/10] weston: Modify recipe to support sololite.

[Neena Busireddy]

Since sololite does not support 3D, remove gles flags from
compilation.

Signed-off-by: Neena Busireddy <neena.busireddy at freescale.com>
---
 recipes-graphics/wayland/weston_%.bbappend |   27 +++++++++++++++++++++------
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/recipes-graphics/wayland/weston_%.bbappend b/recipes-graphics/wayland/weston_%.bbappend
index 06aaed8..d60152c 100644
--- a/recipes-graphics/wayland/weston_%.bbappend
+++ b/recipes-graphics/wayland/weston_%.bbappend
@@ -2,22 +2,37 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
 SRC_URI_append_mx6 = " \
     file://0001-ENGR00314805-1-Add-Vivante-EGL-support.patch \
-    file://0002-ENGR00314805-2-Add-Vivante-GAL2D-support.patch"
-
-PACKAGECONFIG_mx6 = "fbdev egl cairo-glesv2"
+    file://0002-ENGR00314805-2-Add-Vivante-GAL2D-support.patch \
+    file://0003-Distorted-line-and-shadow-if-use-2d-com.patch \
+    file://0004-Desktop-shell-Don-t-assume-there-is-a-pointer.patch \
+    file://0005-Enable-GAL2D-compositor-in-SoloLite.patch \
+    file://0006-Change-GAL2D-compositor-to-be-default-i.patch \
+  "
+PACKAGECONFIG_mx6 = "fbdev"
+PACKAGECONFIG_append_mx6q = " egl cairo-glesv2"
+PACKAGECONFIG_append_mx6dl = " egl cairo-glesv2"
 
 EXTRA_OECONF_append_mx6 = " \
     --disable-libunwind \
     --disable-xwayland-test \
     WESTON_NATIVE_BACKEND=fbdev-backend.so \
 "
-
 EXTRA_OEMAKE_append_mx6 = " \
-    COMPOSITOR_LIBS="-lGLESv2 -lEGL -lGAL -lwayland-server -lxkbcommon -lpixman-1" \
     COMPOSITOR_CFLAGS="-I ${STAGING_INCDIR}/pixman-1 -DLINUX=1 -DEGL_API_FB -DEGL_API_WL" \
     FB_COMPOSITOR_CFLAGS="-DLINUX=1 -DEGL_API_FB -DEGL_API_WL" \
-    FB_COMPOSITOR_LIBS="-lGLESv2 -lEGL -lwayland-server -lxkbcommon" \
     SIMPLE_EGL_CLIENT_CFLAGS="-DLINUX -DEGL_API_FB -DEGL_API_WL" \
     EGL_TESTS_CFLAGS="-DLINUX -DEGL_API_FB -DEGL_API_WL" \
     CLIENT_CFLAGS="-I ${STAGING_INCDIR}/cairo -I ${STAGING_INCDIR}/pixman-1 -DLINUX -DEGL_API_FB -DEGL_API_WL" \
 "
+EXTRA_OEMAKE_append_mx6sl = " \
+    COMPOSITOR_LIBS="-lGAL -lwayland-server -lxkbcommon -lpixman-1" \
+    FB_COMPOSITOR_LIBS="-lwayland-server -lxkbcommon" \
+"
+EXTRA_OEMAKE_append_mx6q = " \
+    COMPOSITOR_LIBS="-lGLESv2 -lEGL -lGAL -lwayland-server -lxkbcommon -lpixman-1" \
+    FB_COMPOSITOR_LIBS="-lGLESv2 -lEGL -lwayland-server -lxkbcommon" \
+"
+EXTRA_OEMAKE_append_mx6dl = " \
+    COMPOSITOR_LIBS="-lGLESv2 -lEGL -lGAL -lwayland-server -lxkbcommon -lpixman-1" \
+    FB_COMPOSITOR_LIBS="-lGLESv2 -lEGL -lwayland-server -lxkbcommon" \
+"
-- 
1.7.9.5