[gnome-continuous-yocto/gnomeostree-3.28-rocko: 818/8267] weston: Fix bug causing the xwayland package to always be included

[Emmanuele Bassi <ebassi src gnome org>]

commit cfac89004801d36ec268a94103b4f9c77749cf62
Author: Tom Hochstein <tom hochstein nxp com>
Date:   Thu Jun 9 18:09:19 2016 -0500

    weston: Fix bug causing the xwayland package to always be included
    
    The xwayland package was always being built due to its inclusion in
    PACKAGE_BEFORE_PN. The effect was masked by making the RDEPENDS conditional.
    
    Now we make the PACKAGE_BEFORE_PN inclusion conditional and restore
    the xwayland RDEPENDS to unconditional.
    
    (From OE-Core rev: 918ef140dbcfb8dd6e5774a1ce57162de814661c)
    
    Signed-off-by: Tom Hochstein <tom hochstein nxp com>
    Signed-off-by: Ross Burton <ross burton intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/recipes-graphics/wayland/weston_1.10.0.bb |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/meta/recipes-graphics/wayland/weston_1.10.0.bb b/meta/recipes-graphics/wayland/weston_1.10.0.bb
index 37a4839..6b934e2 100644
--- a/meta/recipes-graphics/wayland/weston_1.10.0.bb
+++ b/meta/recipes-graphics/wayland/weston_1.10.0.bb
@@ -100,14 +100,14 @@ do_install_append() {
        fi
 }
 
-PACKAGE_BEFORE_PN += "${PN}-xwayland"
+PACKAGE_BEFORE_PN += "${@bb.utils.contains('PACKAGECONFIG', 'xwayland', '${PN}-xwayland', '', d)}"
 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}-xwayland += "xserver-xorg-xwayland"
 
 RDEPENDS_${PN} += "xkeyboard-config"
 RRECOMMENDS_${PN} = "liberation-fonts"