[meta-freescale] [oe-core PATCH 7/7] xserver-xorg: Add Xwayland initialization support using weston-start

[Otavio Salvador]

The weston-start script now supports loading modules so the Xwayland
support can be loaded optionally. Use this to load Weston accordingly.

Signed-off-by: Otavio Salvador <otavio at ossystems.com.br>
---

 meta/recipes-graphics/xorg-xserver/xserver-xorg.inc      | 9 +++++++--
 meta/recipes-graphics/xorg-xserver/xserver-xorg/xwayland | 6 ++++++
 2 files changed, 13 insertions(+), 2 deletions(-)
 create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg/xwayland

diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
index f4c5469..10f5b69 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
@@ -16,7 +16,8 @@ PE = "2"
 INC_PR = "r8"
 
 XORG_PN = "xorg-server"
-SRC_URI = "${XORG_MIRROR}/individual/xserver/${XORG_PN}-${PV}.tar.bz2"
+SRC_URI = "${XORG_MIRROR}/individual/xserver/${XORG_PN}-${PV}.tar.bz2 \
+           file://xwayland"
 SRC_URI += "file://macro_tweak.patch"
 
 S = "${WORKDIR}/${XORG_PN}-${PV}"
@@ -85,7 +86,7 @@ FILES_${PN}-fbdev = "${bindir}/Xfbdev"
 FILES_${PN}-xvfb = "${bindir}/Xvfb"
 FILES_${PN}-utils = "${bindir}/scanpci ${bindir}/pcitweak ${bindir}/ioport ${bindir}/in[bwl] ${bindir}/out[bwl] ${bindir}/mmap[rw] ${bindir}/gtf ${bindir}/getconfig ${bindir}/getconfig.pl"
 FILES_${PN}-xephyr = "${bindir}/Xephyr"
-FILES_${PN}-xwayland = "${bindir}/Xwayland"
+FILES_${PN}-xwayland = "${bindir}/Xwayland ${datadir}/weston-start"
 FILES_${PN}-multimedia-modules = "${libdir}/xorg/modules/multimedia/*drv*"
 FILES_${PN}-extension-dri = "${libdir}/xorg/modules/extensions/libdri.so"
 FILES_${PN}-extension-dri2 = "${libdir}/xorg/modules/extensions/libdri2.so"
@@ -146,6 +147,10 @@ PACKAGECONFIG[nettle] = "--with-sha1=libnettle,,nettle"
 PACKAGECONFIG[gcrypt] = "--with-sha1=libgcrypt,,libgcrypt"
 
 do_install_append () {
+	if [ "${@bb.utils.contains('PACKAGECONFIG', 'xwayland', 'yes', 'no', d)}" = "yes" ]; then
+	   install -Dm 644 ${WORKDIR}/xwayland ${D}${datadir}/weston-start/xwayland
+	fi
+
 	# Its assumed base-files creates this for us
 	rmdir ${D}${localstatedir}/log/
 }
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/xwayland b/meta/recipes-graphics/xorg-xserver/xserver-xorg/xwayland
new file mode 100644
index 0000000..9499f25
--- /dev/null
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg/xwayland
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+mkdir -p /tmp/.X11-unix
+
+use_launch
+add_weston_argument "--modules=xwayland.so"
-- 
2.8.2