From b9a484b05e1901c5f612d23a006ee6f887ee2f17 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Wed, 18 May 2016 13:40:39 -0300 Subject: weston: Enable XWayland when X11 and Wayland support are available When the DISTRO has X11 and Wayland support enabled, XWayland ought to be enabled by default. Signed-off-by: Otavio Salvador Signed-off-by: Ross Burton --- meta/recipes-graphics/wayland/weston_1.10.0.bb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/meta/recipes-graphics/wayland/weston_1.10.0.bb b/meta/recipes-graphics/wayland/weston_1.10.0.bb index 16e961de3f..98a5fbadec 100644 --- a/meta/recipes-graphics/wayland/weston_1.10.0.bb +++ b/meta/recipes-graphics/wayland/weston_1.10.0.bb @@ -38,6 +38,7 @@ EXTRA_OECONF_append_qemux86-64 = "\ " PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'kms fbdev wayland egl', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'x11 wayland', 'xwayland', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'launch', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \ clients" @@ -91,11 +92,15 @@ do_install_append() { fi } +PACKAGE_BEFORE_PN += "${PN}-xwayland" PACKAGES += "${PN}-examples" FILES_${PN} = "${bindir}/weston ${bindir}/weston-terminal ${bindir}/weston-info ${bindir}/weston-launch ${bindir}/wcap-decode ${libexecdir} ${libdir}/${BPN}/*.so ${datadir}" FILES_${PN}-examples = "${bindir}/*" +FILES_${PN}-xwayland = "${libdir}/${BPN}/xwayland.so" +RDEPENDS_${PN}-xwayland += "${@bb.utils.contains('PACKAGECONFIG', 'xwayland', 'xserver-xorg-xwayland', '', d)}" + RDEPENDS_${PN} += "xkeyboard-config" RRECOMMENDS_${PN} = "liberation-fonts" RRECOMMENDS_${PN}-dev += "wayland-protocols" -- cgit 1.2.3-korg