weston: change to use meson build system
PATCH v2 1/1 weston: change to use meson build system
From: Ming Liu <[email protected]>
The changes include:
- Drop all autotools related patches.
- Move weston-launch setuid-install to do_install task since it's not supported yet by meson build.
- Drop cairo-glesv2 package config, it's not supported by meson build, the recommended value is hard-coded to cairo-image for now in weston source.
- Introduce remoting package config, to give this option a explicit value, or else the build would run into gstreamer missing error since it defaults to be true but gstreamer is not in depends list.
--- .../wayland/weston/0001-make-error-portable.patch | 34 ++++---- ...ch-Provide-a-default-version-that-doesn-t.patch | 93 ++++++++++++++-------- meta/recipes-graphics/wayland/weston_6.0.1.bb | 48 +++++------ 3 files changed, 101 insertions(+), 74 deletions(-)
meta/recipes-graphics/wayland/weston/0001-make-error-portable.patch +18 -16
@@ -9,27 +9,14 @@ kind of systemsi e.g. musl. Upstream-Status: Submitted Signed-off-by: Khem Raj <[email protected]> - +Signed-off-by: Ming Liu <[email protected]> --- - configure.ac | 2 ++ libweston/weston-error.h | 20 ++++++++++++++++++++ libweston/weston-launch.c | 2 +- - 3 files changed, 23 insertions(+), 1 deletion(-) + meson.build | 1 + + 3 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 libweston/weston-error.h -diff --git a/configure.ac b/configure.ac -index c05ad01..6da6e04 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 0000000..2089d02
@@ -76,3 +63,18 @@ index bf73e0d..9064439 100644 #define DRM_MAJOR 226 +diff --git a/meson.build b/meson.build +index 2155b7b..baa52d9 100644 +--- a/meson.build ++++ b/meson.build +@@ -94,6 +94,7 @@ foreach func : optional_libc_funcs + endforeach + + optional_system_headers = [ ++ 'error.h', + 'linux/sync_file.h' + ] + foreach hdr : optional_system_headers +-- +2.7.4 +
meta/recipes-graphics/wayland/weston/0001-weston-launch-Provide-a-default-version-that-doesn-t.patch +58 -35
105 lines not on this page · raw message
meta/recipes-graphics/wayland/weston_6.0.1.bb +25 -23
93 lines not on this page · raw message
Signature · 1 line
2.7.4
Quoted 10 lines · On Sun, 28 Jul 2019 at 03:50, <[email protected]> wrote:
The changes include:
- Drop all autotools related patches.
- Move weston-launch setuid-install todo_installtask since it's not supported yet by meson build.
- Drop cairo-glesv2 package config, it's not supported by meson build, the recommended value is hard-coded to cairo-image for now in weston source.
- Introduce remoting package config, to give this option a explicit value, or else the build would run into gstreamer missing error since it defaults to be true but gstreamer is not in depends list.
There's more undocumented changes:
packages/corei7-64-poky-linux/weston/weston-dbg: RRECOMMENDS: removed "zlib-intel-dbg libxcb-shape-dbg" packages/corei7-64-poky-linux/weston/weston-dev: FILELIST: removed "/usr/include/libweston-6/compositor-headless.h /usr/include/libweston-6/compositor-rdp.h" packages/corei7-64-poky-linux/weston/weston-dev: RRECOMMENDS: removed "zlib-intel-dev libxcb-shape-dev" packages/corei7-64-poky-linux/weston/weston-src: FILELIST: added "/usr/src/debug/weston/6.0.1-r0/weston-6.0.1/compositor/systemd-notify.c /usr/src/debug/weston/6.0.1-r0/weston-6.0.1/compositor/screen-share.c" packages/corei7-64-poky-linux/weston/weston-xwayland: RDEPENDS:
removed "glib-2.0 (['>= 2.60.5']) libxkbcommon (['>= 0.8.4']) zlib-intel (['>= 1.2.11.1']) libxcb-shape (['>= 1.13.1']) libinput (['>= 1.13.4'])" packages/corei7-64-poky-linux/weston/weston: FILELIST: directory renamed /usr/share/weston/protocols -> /usr/share/libweston/protocols, added "/usr/lib/weston/systemd-notify.so /usr/lib/weston/screen-share.so"
Some bits have been turned off, others turned on.
Ross
Hi, Ross:
thanks for the review, will double check them and make a V3.
//Ming LIu
Quoted 36 lines · On Sun, 28 Jul 2019 at 03:50, <[email protected]> wrote:
Quoted 10 lines
The changes include:
- Drop all autotools related patches.
- Move weston-launch setuid-install todo_installtask since it's not supported yet by meson build.
- Drop cairo-glesv2 package config, it's not supported by meson build, the recommended value is hard-coded to cairo-image for now in weston source.
- Introduce remoting package config, to give this option a explicit value, or else the build would run into gstreamer missing error since it defaults to be true but gstreamer is not in depends list.There's more undocumented changes:
packages/corei7-64-poky-linux/weston/weston-dbg: RRECOMMENDS: removed "zlib-intel-dbg libxcb-shape-dbg" packages/corei7-64-poky-linux/weston/weston-dev: FILELIST: removed "
/usr/include/libweston-6/compositor-headless.h/usr/include/libweston-6/compositor-rdp.h" packages/corei7-64-poky-linux/weston/weston-dev: RRECOMMENDS: removed "zlib-intel-dev libxcb-shape-dev" packages/corei7-64-poky-linux/weston/weston-src: FILELIST: added "/usr/src/debug/weston/6.0.1-r0/weston-6.0.1/compositor/systemd-notify.c/usr/src/debug/weston/6.0.1-r0/weston-6.0.1/compositor/screen-share.c" packages/corei7-64-poky-linux/weston/weston-xwayland: RDEPENDS:
removed "glib-2.0 (['>= 2.60.5']) libxkbcommon (['>= 0.8.4']) zlib-intel (['>= 1.2.11.1']) libxcb-shape (['>= 1.13.1']) libinput (['>= 1.13.4'])" packages/corei7-64-poky-linux/weston/weston: FILELIST: directory renamed/usr/share/weston/protocols->/usr/share/libweston/protocols, added "/usr/lib/weston/systemd-notify.so/usr/lib/weston/screen-share.so"Some bits have been turned off, others turned on.
Ross