[meta-freescale] [meta-fsl-arm][PATCH 2/6] weston: Add xwayland changes

Neena Busireddy neena.busireddy at freescale.com
Fri Oct 16 09:18:05 PDT 2015


- Configure weston to support XWayland backend.
- weston.ini needs to be installed to enable xwayland module.

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

diff --git a/recipes-graphics/wayland/weston_%.bbappend b/recipes-graphics/wayland/weston_%.bbappend
index a7496da..9e08292 100644
--- a/recipes-graphics/wayland/weston_%.bbappend
+++ b/recipes-graphics/wayland/weston_%.bbappend
@@ -11,6 +11,7 @@ EXTRA_OECONF_append_mx6 = " \
     --disable-libunwind \
     --disable-xwayland-test \
     WESTON_NATIVE_BACKEND=fbdev-backend.so \
+   ${@base_contains('DISTRO_FEATURES', 'x11','--enable-xwayland', '--disable-xwayland', d)} \
 "
 EXTRA_OEMAKE_append_mx6 = " \
     COMPOSITOR_CFLAGS="-I ${STAGING_INCDIR}/pixman-1 -DLINUX=1 -DEGL_API_FB -DEGL_API_WL" \
@@ -35,3 +36,13 @@ EXTRA_OEMAKE_append_mx6sl = " \
     COMPOSITOR_LIBS="-lEGL -lGAL -lwayland-server -lxkbcommon -lpixman-1" \
     FB_COMPOSITOR_LIBS="-lEGL -lwayland-server -lxkbcommon" \
 "
+do_install_append_mx6() {
+
+    if [ "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" = "x11" ]; then
+        install -d ${D}/${sysconfdir}
+        install ${WORKDIR}/build/weston.ini ${D}/${sysconfdir}
+        sed -i 's/#modules=xwayland.so,cms-colord.so/modules=xwayland.so/' ${D}${sysconfdir}/weston.ini
+    fi
+}
+
+FILES_${PN}_append = " ${sysconfdir}/weston.ini"
-- 
1.7.9.5



More information about the meta-freescale mailing list