[gnome-continuous-yocto/gnomeostree-3.28-rocko: 453/8267] weston-init: Use weston-launch when starting weston as the first windowing system

[Emmanuele Bassi <ebassi src gnome org>]

commit 5fb0c1edcee0b267cb4f5191002898f70675baa0
Author: Tom Hochstein <tom hochstein nxp com>
Date:   Wed May 18 13:40:47 2016 -0300

    weston-init: Use weston-launch when starting weston as the first windowing system
    
    When  weston is started as the first windowing system (i.e. not under X
    nor under another Wayland server), it should be done with  the  command
    weston-launch to set up proper privileged access to devices.
    
    (From OE-Core rev: 76ed534267ed16677eeb86b85670338a1064a733)
    
    Signed-off-by: Tom Hochstein <tom hochstein nxp com>
    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>

 .../wayland/weston-init/weston-start               |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)
---
diff --git a/meta/recipes-graphics/wayland/weston-init/weston-start 
b/meta/recipes-graphics/wayland/weston-init/weston-start
index 4aa7c66..72ba4b7 100755
--- a/meta/recipes-graphics/wayland/weston-init/weston-start
+++ b/meta/recipes-graphics/wayland/weston-init/weston-start
@@ -31,6 +31,11 @@ if [ -n "$WAYLAND_DISPLAY" ]; then
        echo "ERROR: A Wayland compositor is already running, nested Weston instance is not supported yet."
        exit 1
 fi
+if [ -n "$DISPLAY" ]; then
+       launcher="weston"
+else
+       launcher="weston-launch --"
+fi
 
 openvt_args=""
 while [ -n "$1" ]; do
@@ -64,4 +69,4 @@ if test -z "$XDG_RUNTIME_DIR"; then
     chmod 0700 $XDG_RUNTIME_DIR
 fi
 
-exec openvt $openvt_args -- weston $weston_args --log=/var/log/weston.log
+exec openvt $openvt_args -- $launcher $weston_args --log=/var/log/weston.log