summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2016-05-18 13:40:39 -0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-05-21 22:24:55 +0100
commit9b5abe20101cb1f37fe19af3f35884f49950bbf3 (patch)
tree021ff123770c2144789d37702b297e7ea31c8212
parentecd8d8835dbaffae46e5ed67eb3664633fa9b283 (diff)
downloadpoky-9b5abe20101cb1f37fe19af3f35884f49950bbf3.tar.gz
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. (From OE-Core rev: b9a484b05e1901c5f612d23a006ee6f887ee2f17) Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/wayland/weston_1.10.0.bb5
1 files changed, 5 insertions, 0 deletions
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 = "\
38 " 38 "
39PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'kms fbdev wayland egl', '', d)} \ 39PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'kms fbdev wayland egl', '', d)} \
40 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \ 40 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \
41 ${@bb.utils.contains('DISTRO_FEATURES', 'x11 wayland', 'xwayland', '', d)} \
41 ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'launch', '', d)} \ 42 ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'launch', '', d)} \
42 ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \ 43 ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \
43 clients" 44 clients"
@@ -91,11 +92,15 @@ do_install_append() {
91 fi 92 fi
92} 93}
93 94
95PACKAGE_BEFORE_PN += "${PN}-xwayland"
94PACKAGES += "${PN}-examples" 96PACKAGES += "${PN}-examples"
95 97
96FILES_${PN} = "${bindir}/weston ${bindir}/weston-terminal ${bindir}/weston-info ${bindir}/weston-launch ${bindir}/wcap-decode ${libexecdir} ${libdir}/${BPN}/*.so ${datadir}" 98FILES_${PN} = "${bindir}/weston ${bindir}/weston-terminal ${bindir}/weston-info ${bindir}/weston-launch ${bindir}/wcap-decode ${libexecdir} ${libdir}/${BPN}/*.so ${datadir}"
97FILES_${PN}-examples = "${bindir}/*" 99FILES_${PN}-examples = "${bindir}/*"
98 100
101FILES_${PN}-xwayland = "${libdir}/${BPN}/xwayland.so"
102RDEPENDS_${PN}-xwayland += "${@bb.utils.contains('PACKAGECONFIG', 'xwayland', 'xserver-xorg-xwayland', '', d)}"
103
99RDEPENDS_${PN} += "xkeyboard-config" 104RDEPENDS_${PN} += "xkeyboard-config"
100RRECOMMENDS_${PN} = "liberation-fonts" 105RRECOMMENDS_${PN} = "liberation-fonts"
101RRECOMMENDS_${PN}-dev += "wayland-protocols" 106RRECOMMENDS_${PN}-dev += "wayland-protocols"