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 <ota...@ossystems.com.br> --- Changes in v4: None Changes in v3: None Changes in v2: - Move weston-start module to weston package - Stop using weston-launch meta/recipes-graphics/wayland/weston/xwayland.weston-start | 7 +++++++ meta/recipes-graphics/wayland/weston_1.9.0.bb | 7 ++++++- 2 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-graphics/wayland/weston/xwayland.weston-start diff --git a/meta/recipes-graphics/wayland/weston/xwayland.weston-start b/meta/recipes-graphics/wayland/weston/xwayland.weston-start new file mode 100644 index 0000000..b483c97 --- /dev/null +++ b/meta/recipes-graphics/wayland/weston/xwayland.weston-start @@ -0,0 +1,7 @@ +#!/bin/sh + +if type Xwayland >/dev/null 2>/dev/null; then + mkdir -p /tmp/.X11-unix + + add_weston_argument "--modules=xwayland.so" +fi diff --git a/meta/recipes-graphics/wayland/weston_1.9.0.bb b/meta/recipes-graphics/wayland/weston_1.9.0.bb index 618d7e4..6cd390c 100644 --- a/meta/recipes-graphics/wayland/weston_1.9.0.bb +++ b/meta/recipes-graphics/wayland/weston_1.9.0.bb @@ -13,6 +13,7 @@ SRC_URI = "http://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ file://0001-make-error-portable.patch \ file://libsystemd.patch \ file://explicit-enable-disable-systemd.patch \ + file://xwayland.weston-start \ " SRC_URI[md5sum] = "66bbba12f546570b4d97f676bc79a28e" SRC_URI[sha256sum] = "9c1b03f3184fa0b0dfdf67e215048085156e1a2ca344af6613fed36794ac48cf" @@ -88,7 +89,11 @@ do_install_append() { install -d ${D}${datadir}/icons/hicolor/48x48/apps install ${WORKDIR}/weston.png ${D}${datadir}/icons/hicolor/48x48/apps - fi + fi + + if [ "${@bb.utils.contains('PACKAGECONFIG', 'xwayland', 'yes', 'no', d)}" = "yes" ]; then + install -Dm 644 ${WORKDIR}/xwayland.weston-start ${D}${datadir}/weston-start/xwayland + fi } PACKAGES += "${PN}-examples" -- 2.8.2 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
