weston: upgrade recipe to version 8.0.0 from NXP

Upgrade weston recipe version 6.0.1 -> 8.0.0 with following
modifications performed:

- Transition build system to meson, replace autotools references with
  meson options;
- Align recipe with the latest version from oe-core, include all
  configuration changes done upstream into this recipe;
- Drop patches applied upstream and those related to autotools;

Signed-off-by: Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com>

4 files changed, 112 insertions, 202 deletions

diff --git a/recipes-graphics/wayland/weston/0001-make-error-portable.patch b/recipes-graphics/wayland/weston/0001-make-error-portable.patch
deleted file mode 100644
index 4132d871..00000000
--- a/recipes-graphics/wayland/weston/0001-make-error-portable.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From 74469d3a5965560a83f1d51c50d3cd1fa4e96fe6 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Fri, 29 May 2015 20:56:00 -0700
-Subject: [PATCH] make error() portable
-
-error() is not posix but gnu extension so may not be available on all
-kind of systemsi e.g. musl.
-
-Upstream-Status: Submitted
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-
----
- configure.ac              |  2 ++
- libweston/weston-error.h  | 20 ++++++++++++++++++++
- libweston/weston-launch.c |  2 +-
- 3 files changed, 23 insertions(+), 1 deletion(-)
- create mode 100644 libweston/weston-error.h
-
-diff --git a/configure.ac b/configure.ac
-index cdd0a87f..2396cba5 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -126,6 +126,8 @@ AC_CHECK_DECL(CLOCK_MONOTONIC,[],
-              [AC_MSG_ERROR("CLOCK_MONOTONIC is needed to compile weston")],
-              [[#include <time.h>]])
- 
-+AC_CHECK_HEADERS([error.h])
-+
- AC_CHECK_FUNCS([mkostemp strchrnul initgroups posix_fallocate])
- 
- # check for libdrm as a build-time dependency only
-diff --git a/libweston/weston-error.h b/libweston/weston-error.h
-new file mode 100644
-index 00000000..2089d02c
---- /dev/null
-+++ b/libweston/weston-error.h
-@@ -0,0 +1,20 @@
-+#ifndef _WESTON_ERROR_H
-+#define _WESTON_ERROR_H
-+
-+#if defined(HAVE_ERROR_H)
-+#include <error.h>
-+#else
-+#include <err.h>
-+#include <string.h>
-+#define _weston_error(S, E, F, ...) do { \
-+       if (E) \
-+               err(S, F ": %s", ##__VA_ARGS__, strerror(E)); \
-+       else \
-+               err(S, F, ##__VA_ARGS__); \
-+} while(0)
-+
-+#define error _weston_error
-+#endif
-+
-+#endif
-+
-diff --git a/libweston/weston-launch.c b/libweston/weston-launch.c
-index dff83cca..bd0015e6 100644
---- a/libweston/weston-launch.c
-+++ b/libweston/weston-launch.c
-@@ -33,7 +33,6 @@
- #include <poll.h>
- #include <errno.h>
- 
--#include <error.h>
- #include <getopt.h>
- 
- #include <sys/types.h>
-@@ -59,6 +58,7 @@
- #endif
- 
- #include "weston-launch.h"
-+#include "weston-error.h"
- 
- #define DRM_MAJOR 226
- 
diff --git a/recipes-graphics/wayland/weston/0001-weston-launch-Provide-a-default-version-that-doesn-t.patch b/recipes-graphics/wayland/weston/0001-weston-launch-Provide-a-default-version-that-doesn-t.patch
index 70f9fbd2..62b864c1 100644
--- a/recipes-graphics/wayland/weston/0001-weston-launch-Provide-a-default-version-that-doesn-t.patch
+++ b/recipes-graphics/wayland/weston/0001-weston-launch-Provide-a-default-version-that-doesn-t.patch
@@ -1,4 +1,4 @@
-From 124cdabedd4aa0836480942537f6eea67347e80e Mon Sep 17 00:00:00 2001
+From 5f2d71998eb77068cbaee2d468cbb296a42d5739 Mon Sep 17 00:00:00 2001
 From: Tom Hochstein <tom.hochstein@nxp.com>
 Date: Wed, 22 Feb 2017 15:53:30 +0200
 Subject: [PATCH] weston-launch: Provide a default version that doesn't require
@@ -15,46 +15,49 @@ Upstream-Status: Pending
 Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
 Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
 Signed-off-by: Denys Dmytriyenko <denys@ti.com>
+Signed-off-by: Ming Liu <ming.liu@toradex.com>
 
 ---
- configure.ac              |  9 +++++++--
- libweston/weston-launch.c | 20 ++++++++++++++++++++
- 2 files changed, 27 insertions(+), 2 deletions(-)
+ libweston/meson.build     | 16 ++++++++++++----
+ libweston/weston-launch.c | 21 +++++++++++++++++++++
+ meson_options.txt         |  7 +++++++
+ 3 files changed, 40 insertions(+), 4 deletions(-)
 
-diff --git a/configure.ac b/configure.ac
-index 2396cba5..1f1242bb 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -539,13 +539,17 @@ AC_ARG_ENABLE(resize-optimization,
- AS_IF([test "x$enable_resize_optimization" = "xyes"],
-       [AC_DEFINE([USE_RESIZE_POOL], [1], [Use resize memory pool as a performance optimization])])
- 
-+AC_ARG_WITH(pam,
-+            AS_HELP_STRING([--with-pam], [Use PAM]),
-+            [use_pam=$withval], [use_pam=yes])
- AC_ARG_ENABLE(weston-launch, [  --enable-weston-launch],, enable_weston_launch=yes)
- AM_CONDITIONAL(BUILD_WESTON_LAUNCH, test x$enable_weston_launch = xyes)
--if test x$enable_weston_launch = xyes; then
-+if test x$enable_weston_launch = xyes -a x$use_pam = xyes; then
-   WESTON_SEARCH_LIBS([PAM], [pam], [pam_open_session], [have_pam=yes], [have_pam=no])
-   if test x$have_pam = xno; then
--    AC_ERROR([weston-launch requires pam])
-+    AC_ERROR([PAM support is explicitly requested, but libpam couldn't be found])
-   fi
-+  AC_DEFINE([HAVE_PAM], [1], [Define if PAM is available])
- fi
- 
- AM_CONDITIONAL(HAVE_PANGO, test "x$have_pango" = "xyes")
-@@ -794,6 +798,7 @@ AC_MSG_RESULT([
-        Enable developer documentation  ${enable_devdocs}
- 
-        weston-launch utility           ${enable_weston_launch}
-+       PAM support                     ${use_pam}
-        systemd-login support           ${have_systemd_login}
-        systemd notify support          ${enable_systemd_notify}
- 
+diff --git a/libweston/meson.build b/libweston/meson.build
+index 08d23ec..cb9fd3f 100644
+--- a/libweston/meson.build
++++ b/libweston/meson.build
+@@ -216,16 +216,24 @@ dep_vertex_clipping = declare_dependency(
+ )
+ 
+ if get_option('weston-launch')
+-       dep_pam = cc.find_library('pam')
++       deps_weston_launch = [systemd_dep, dep_libdrm]
+ 
+-       if not cc.has_function('pam_open_session', dependencies: dep_pam)
+-               error('pam_open_session not found for weston-launch')
++       if get_option('pam')
++               dep_pam = cc.find_library('pam')
++               if not cc.has_function('pam_open_session', dependencies: dep_pam)
++                       error('pam_open_session not found for weston-launch')
++               endif
++
++               if dep_pam.found()
++                       deps_weston_launch += dep_pam
++                       config_h.set('HAVE_PAM', '1')
++               endif
+        endif
+ 
+        executable(
+                'weston-launch',
+                'weston-launch.c',
+-               dependencies: [dep_pam, systemd_dep, dep_libdrm],
++               dependencies: deps_weston_launch,
+                include_directories: common_inc,
+                install: true
+        )
 diff --git a/libweston/weston-launch.c b/libweston/weston-launch.c
-index bd0015e6..706b80fd 100644
+index 8a711b4..54c567a 100644
 --- a/libweston/weston-launch.c
 +++ b/libweston/weston-launch.c
 @@ -51,7 +51,9 @@
@@ -67,7 +70,7 @@ index bd0015e6..706b80fd 100644
  
  #ifdef HAVE_SYSTEMD_LOGIN
  #include <systemd/sd-login.h>
-@@ -101,8 +103,10 @@ drmSetMaster(int drm_fd)
+@@ -100,8 +102,10 @@ drmSetMaster(int drm_fd)
  #endif
  
  struct weston_launch {
@@ -78,7 +81,7 @@ index bd0015e6..706b80fd 100644
         int tty;
         int ttynr;
         int sock[2];
-@@ -193,6 +197,7 @@ weston_launch_allowed(struct weston_launch *wl)
+@@ -192,6 +196,7 @@ weston_launch_allowed(struct weston_launch *wl)
         return false;
  }
  
@@ -86,7 +89,7 @@ index bd0015e6..706b80fd 100644
  static int
  pam_conversation_fn(int msg_count,
                     const struct pam_message **messages,
-@@ -233,6 +238,7 @@ setup_pam(struct weston_launch *wl)
+@@ -232,6 +237,7 @@ setup_pam(struct weston_launch *wl)
  
         return 0;
  }
@@ -94,7 +97,7 @@ index bd0015e6..706b80fd 100644
  
  static int
  setup_launcher_socket(struct weston_launch *wl)
-@@ -426,6 +432,7 @@ quit(struct weston_launch *wl, int status)
+@@ -431,6 +437,7 @@ quit(struct weston_launch *wl, int status)
         close(wl->signalfd);
         close(wl->sock[0]);
  
@@ -102,7 +105,7 @@ index bd0015e6..706b80fd 100644
         if (wl->new_user) {
                 err = pam_close_session(wl->ph, 0);
                 if (err)
-@@ -433,6 +440,7 @@ quit(struct weston_launch *wl, int status)
+@@ -438,6 +445,7 @@ quit(struct weston_launch *wl, int status)
                                 err, pam_strerror(wl->ph, err));
                 pam_end(wl->ph, err);
         }
@@ -110,7 +113,7 @@ index bd0015e6..706b80fd 100644
  
         if (ioctl(wl->tty, KDSKBMUTE, 0) &&
             ioctl(wl->tty, KDSKBMODE, wl->kb_mode))
-@@ -614,6 +622,7 @@ setup_session(struct weston_launch *wl, char **child_argv)
+@@ -666,6 +674,7 @@ setup_session(struct weston_launch *wl, char **child_argv)
         setenv("HOME", wl->pw->pw_dir, 1);
         setenv("SHELL", wl->pw->pw_shell, 1);
  
@@ -118,7 +121,7 @@ index bd0015e6..706b80fd 100644
         env = pam_getenvlist(wl->ph);
         if (env) {
                 for (i = 0; env[i]; ++i) {
-@@ -622,6 +631,7 @@ setup_session(struct weston_launch *wl, char **child_argv)
+@@ -674,6 +683,7 @@ setup_session(struct weston_launch *wl, char **child_argv)
                 }
                 free(env);
         }
@@ -126,7 +129,7 @@ index bd0015e6..706b80fd 100644
  
         /*
          * We open a new session, so it makes sense
-@@ -689,8 +699,10 @@ static void
+@@ -745,8 +755,10 @@ static void
  help(const char *name)
  {
         fprintf(stderr, "Usage: %s [args...] [-- [weston args..]]\n", name);
@@ -137,7 +140,7 @@ index bd0015e6..706b80fd 100644
         fprintf(stderr, "  -t, --tty       Start session on alternative tty,\n"
                         "                  e.g. -t /dev/tty4, requires -u option.\n");
         fprintf(stderr, "  -v, --verbose   Be verbose\n");
-@@ -704,7 +716,9 @@ main(int argc, char *argv[])
+@@ -760,7 +772,9 @@ main(int argc, char *argv[])
         int i, c;
         char *tty = NULL;
         struct option opts[] = {
@@ -147,21 +150,24 @@ index bd0015e6..706b80fd 100644
                 { "tty",     required_argument, NULL, 't' },
                 { "verbose", no_argument,       NULL, 'v' },
                 { "help",    no_argument,       NULL, 'h' },
-@@ -716,9 +730,13 @@ main(int argc, char *argv[])
+@@ -772,11 +786,16 @@ main(int argc, char *argv[])
         while ((c = getopt_long(argc, argv, "u:t:vh", opts, &i)) != -1) {
                 switch (c) {
                 case 'u':
 +#ifdef HAVE_PAM
                         wl.new_user = optarg;
-                        if (getuid() != 0)
-                                error(1, 0, "Permission denied. -u allowed for root only");
+                        if (getuid() != 0) {
+                                fprintf(stderr, "weston: Permission denied. -u allowed for root only\n");
+                                exit(EXIT_FAILURE);
+                        }
 +#else
-+                       error(1, 0, "-u is unsupported in this weston-launch build");
++                       fprintf(stderr, "weston: -u is unsupported in this weston-launch build\n");
++                       exit(EXIT_FAILURE);
 +#endif
                         break;
                 case 't':
                         tty = optarg;
-@@ -759,8 +777,10 @@ main(int argc, char *argv[])
+@@ -828,8 +847,10 @@ main(int argc, char *argv[])
         if (setup_tty(&wl, tty) < 0)
                 exit(EXIT_FAILURE);
  
@@ -172,3 +178,21 @@ index bd0015e6..706b80fd 100644
  
         if (setup_launcher_socket(&wl) < 0)
                 exit(EXIT_FAILURE);
+diff --git a/meson_options.txt b/meson_options.txt
+index c862ecc..73ef2c3 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -73,6 +73,13 @@ option(
+ )
+ 
+ option(
++       'pam',
++       type: 'boolean',
++       value: true,
++       description: 'Define if PAM is available'
++)
++
++option(
+        'xwayland',
+        type: 'boolean',
+        value: true,
diff --git a/recipes-graphics/wayland/weston/0003-weston-touch-calibrator-Advertise-the-touchscreen-ca.patch b/recipes-graphics/wayland/weston/0003-weston-touch-calibrator-Advertise-the-touchscreen-ca.patch
deleted file mode 100644
index 46c6ec17..00000000
--- a/recipes-graphics/wayland/weston/0003-weston-touch-calibrator-Advertise-the-touchscreen-ca.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 1e848706739d3155e7cec07bf5af6ff4c3ff810c Mon Sep 17 00:00:00 2001
-From: Jun Zhu <junzhu@nxp.com>
-Date: Sun, 30 Sep 2018 15:31:26 +0800
-Subject: [PATCH] weston-touch-calibrator: Advertise the touchscreen calibrator
- interface to all clients. [YOCIMX-2963]
-
-Set touchscreen_calibrator to true in the section "libinput" of the configure file
- /etc/xdg/weston/weston.ini.
-Otherwise, it will report that the new-added interface "weston-touch-calibration" cannot be found.
-
-Signed-off-by: Jun Zhu <junzhu@nxp.com>
-
----
- weston.ini.in | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/weston.ini.in b/weston.ini.in
-index aa8666e1..9e8bde4d 100644
---- a/weston.ini.in
-+++ b/weston.ini.in
-@@ -8,6 +8,9 @@ idle-time=0
- #[shell]
- #size=1920x1080
- 
-+[libinput]
-+touchscreen_calibrator=true
-+
- #[output]
- #name=HDMI-A-1
- #mode=1920x1080@60
diff --git a/recipes-graphics/wayland/weston_6.0.1.imx.bb b/recipes-graphics/wayland/weston_8.0.0.imx.bb
index a8d11196..c56bef61 100644
--- a/recipes-graphics/wayland/weston_6.0.1.imx.bb
+++ b/recipes-graphics/wayland/weston_8.0.0.imx.bb
@@ -7,21 +7,19 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d79ee9e66bb0f95d3386a7acae780b70 \
 
 DEFAULT_PREFERENCE = "-1"
 
-SRCBRANCH = "weston-imx-6.0.1"
+SRCBRANCH = "weston-imx-8.0"
 SRC_URI = "git://source.codeaurora.org/external/imx/weston-imx.git;protocol=https;branch=${SRCBRANCH} \
            file://weston.png \
            file://weston.desktop \
-           file://0001-make-error-portable.patch \
            file://xwayland.weston-start \
            file://0001-weston-launch-Provide-a-default-version-that-doesn-t.patch \
-           file://0003-weston-touch-calibrator-Advertise-the-touchscreen-ca.patch \
 "
-SRCREV = "4ee0a1da010053b35495e82ad30aa5a8b1c34e6c"
+SRCREV = "f6a7d35650121fbe7c20d4cbe0eaac730fab3b2a"
 S = "${WORKDIR}/git"
 
 UPSTREAM_CHECK_URI = "https://wayland.freedesktop.org/releases.html"
 
-inherit autotools pkgconfig useradd features_check
+inherit meson pkgconfig useradd features_check
 
 # Disable OpenGL for parts with GPU support for 2D but not 3D
 REQUIRED_DISTRO_FEATURES          = "opengl"
@@ -36,68 +34,59 @@ DEPENDS += "wayland wayland-protocols libinput virtual/egl pango wayland-native"
 
 WESTON_MAJOR_VERSION = "${@'.'.join(d.getVar('PV').split('.')[0:1])}"
 
-EXTRA_OECONF = "--enable-setuid-install \
-                --disable-rdp-compositor \
-                --enable-autotools \
-                "
-EXTRA_OECONF_append_qemux86 = " \
-                WESTON_NATIVE_BACKEND=fbdev-backend.so \
-                "
-EXTRA_OECONF_append_qemux86-64 = " \
-                WESTON_NATIVE_BACKEND=fbdev-backend.so \
-                "
-EXTRA_OECONF_append_imxfbdev = " \
-                WESTON_NATIVE_BACKEND=fbdev-backend.so \
-                "
-PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'kms fbdev wayland egl', '', d)} \
+EXTRA_OEMESON += "-Dbackend-default=auto -Dbackend-rdp=false -Dpipewire=false"
+
+PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'kms fbdev wayland egl clients', '', d)} \
                    ${@bb.utils.contains('DISTRO_FEATURES', 'x11 wayland', 'xwayland', '', d)} \
                    ${@bb.utils.filter('DISTRO_FEATURES', '${PACKAGECONFIG_OPENGL} pam systemd x11', d)} \
-                   clients launch"
+                   ${@bb.utils.contains_any('DISTRO_FEATURES', 'wayland x11', '', 'headless', d)} \
+                   launch"
+
 PACKAGECONFIG_remove_imxfbdev = "kms"
+PACKAGECONFIG_append_imxfbdev = " fbdev"
 PACKAGECONFIG_append_imxgpu   = " imxgpu"
 PACKAGECONFIG_append_imxgpu2d = " imxg2d"
-PACKAGECONFIG_append_imxgpu3d = " cairo-glesv2"
 #
 # Compositor choices
 #
 # Weston on KMS
-PACKAGECONFIG[kms] = "--enable-drm-compositor,--disable-drm-compositor,drm udev virtual/mesa mtdev"
+PACKAGECONFIG[kms] = "-Dbackend-drm=true,-Dbackend-drm=false,drm udev virtual/egl virtual/libgles2 virtual/libgbm mtdev"
 # Weston on Wayland (nested Weston)
-PACKAGECONFIG[wayland] = "--enable-wayland-compositor,--disable-wayland-compositor,virtual/mesa"
+PACKAGECONFIG[wayland] = "-Dbackend-wayland=true,-Dbackend-wayland=false,virtual/egl virtual/libgles2"
 # Weston on X11
-PACKAGECONFIG[x11] = "--enable-x11-compositor,--disable-x11-compositor,virtual/libx11 libxcb libxcb libxcursor cairo"
+PACKAGECONFIG[x11] = "-Dbackend-x11=true,-Dbackend-x11=false,virtual/libx11 libxcb libxcb libxcursor cairo"
 # Headless Weston
-PACKAGECONFIG[headless] = "--enable-headless-compositor,--disable-headless-compositor"
+PACKAGECONFIG[headless] = "-Dbackend-headless=true,-Dbackend-headless=false"
 # Weston on framebuffer
-PACKAGECONFIG[fbdev] = "--enable-fbdev-compositor,--disable-fbdev-compositor,udev mtdev"
+PACKAGECONFIG[fbdev] = "-Dbackend-fbdev=true,-Dbackend-fbdev=false,udev mtdev"
 # weston-launch
-PACKAGECONFIG[launch] = "--enable-weston-launch,--disable-weston-launch,drm"
+PACKAGECONFIG[launch] = "-Dweston-launch=true,-Dweston-launch=false,drm"
 # VA-API desktop recorder
-PACKAGECONFIG[vaapi] = "--enable-vaapi-recorder,--disable-vaapi-recorder,libva"
+PACKAGECONFIG[vaapi] = "-Dbackend-drm-screencast-vaapi=true,-Dbackend-drm-screencast-vaapi=false,libva"
 # Weston with EGL support
-PACKAGECONFIG[egl] = "--enable-egl --enable-simple-egl-clients,--disable-egl --disable-simple-egl-clients,virtual/egl"
-# Weston with cairo glesv2 support
-PACKAGECONFIG[cairo-glesv2] = "--with-cairo-glesv2,--with-cairo=image,cairo"
+PACKAGECONFIG[egl] = "-Drenderer-gl=true,-Drenderer-gl=false,virtual/egl"
 # Weston with lcms support
-PACKAGECONFIG[lcms] = "--enable-lcms,--disable-lcms,lcms"
+PACKAGECONFIG[lcms] = "-Dcolor-management-lcms=true,-Dcolor-management-lcms=false,lcms"
 # Weston with webp support
-PACKAGECONFIG[webp] = "--with-webp,--without-webp,libwebp"
+PACKAGECONFIG[webp] = "-Dimage-webp=true,-Dimage-webp=false,libwebp"
 # Weston with systemd-login support
-PACKAGECONFIG[systemd] = "--enable-systemd-login,--disable-systemd-login,systemd dbus"
+PACKAGECONFIG[systemd] = "-Dsystemd=true -Dlauncher-logind=true,-Dsystemd=false -Dlauncher-logind=false,systemd dbus"
 # Weston with Xwayland support (requires X11 and Wayland)
-PACKAGECONFIG[xwayland] = "--enable-xwayland,--disable-xwayland"
+PACKAGECONFIG[xwayland] = "-Dxwayland=true,-Dxwayland=false"
 # colord CMS support
-PACKAGECONFIG[colord] = "--enable-colord,--disable-colord,colord"
+PACKAGECONFIG[colord] = "-Dcolor-management-colord=true,-Dcolor-management-colord=false,colord"
 # Clients support
-PACKAGECONFIG[clients] = "--enable-clients --enable-simple-clients --enable-demo-clients-install,--disable-clients --disable-simple-clients"
+PACKAGECONFIG[clients] = "-Dsimple-clients=all -Ddemo-clients=true,-Dsimple-clients= -Ddemo-clients=false"
+# Virtual remote output with GStreamer on DRM backend
+PACKAGECONFIG[remoting] = "-Dremoting=true,-Dremoting=false,gstreamer-1.0"
 # Weston with PAM support
-PACKAGECONFIG[pam] = "--with-pam,--without-pam,libpam"
+PACKAGECONFIG[pam] = "-Dpam=true,-Dpam=false,libpam"
 # Weston with i.MX GPU support
-PACKAGECONFIG[imxgpu] = "--enable-imxgpu,--disable-imxgpu"
+PACKAGECONFIG[imxgpu] = "-Dimxgpu=true,-Dimxgpu=false,virtual/egl"
 # Weston with i.MX G2D renderer
-PACKAGECONFIG[imxg2d] = "--enable-imxg2d,--disable-imxg2d,virtual/libg2d"
+PACKAGECONFIG[imxg2d] = "-Drenderer-g2d=true,-Drenderer-g2d=false,virtual/libg2d"
 # Weston with OpenGL support
-PACKAGECONFIG[opengl] = "--enable-opengl,--disable-opengl"
+PACKAGECONFIG[opengl] = "-Dopengl=true,--Dopengl=false"
 
 do_install_append() {
         # Weston doesn't need the .la files to load modules, so wipe them
@@ -115,12 +104,17 @@ do_install_append() {
         if [ "${@bb.utils.contains('PACKAGECONFIG', 'xwayland', 'yes', 'no', d)}" = "yes" ]; then
                 install -Dm 644 ${WORKDIR}/xwayland.weston-start ${D}${datadir}/weston-start/xwayland
         fi
+
+        if [ "${@bb.utils.contains('PACKAGECONFIG', 'launch', 'yes', 'no', d)}" = "yes" ]; then
+                chmod u+s ${D}${bindir}/weston-launch
+        fi
 }
 
 PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'xwayland', '${PN}-xwayland', '', d)} \
              libweston-${WESTON_MAJOR_VERSION} ${PN}-examples"
 
-FILES_${PN} = "${bindir}/weston ${bindir}/weston-terminal ${bindir}/weston-info ${bindir}/weston-launch ${bindir}/wcap-decode ${libexecdir} ${libdir}/${BPN}/*.so ${datadir} ${sysconfdir}/xdg/weston"
+FILES_${PN}-dev += "${libdir}/${BPN}/libexec_weston.so"
+FILES_${PN} = "${bindir}/weston ${bindir}/weston-terminal ${bindir}/weston-info ${bindir}/weston-launch ${bindir}/wcap-decode ${libexecdir} ${libdir}/${BPN}/*.so* ${datadir} ${sysconfdir}/xdg/weston"
 
 FILES_libweston-${WESTON_MAJOR_VERSION} = "${libdir}/lib*${SOLIBS} ${libdir}/libweston-${WESTON_MAJOR_VERSION}/*.so"
 SUMMARY_libweston-${WESTON_MAJOR_VERSION} = "Helper library for implementing 'wayland window managers'."
@@ -131,7 +125,7 @@ FILES_${PN}-xwayland = "${libdir}/libweston-${WESTON_MAJOR_VERSION}/xwayland.so"
 RDEPENDS_${PN}-xwayland += "xserver-xorg-xwayland"
 
 RDEPENDS_${PN} += "xkeyboard-config"
-RRECOMMENDS_${PN} = "liberation-fonts"
+RRECOMMENDS_${PN} = "weston-init liberation-fonts"
 RRECOMMENDS_${PN}-dev += "wayland-protocols"
 
 USERADD_PACKAGES = "${PN}"