Skip to contentSkip to conversation

weston: change to use meson build system

PATCH New [email protected] 1 participant 1 message Aug 2, 2019

lore
Share & tools
lore
#0 lore raw

PATCH v3 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.
- Default to headless backend if neither x11 nor wayland is in DISTRO_FEATURES.

To be noticed, the packages built from meson would not be identical with those built from autotools, for instance, libz dependency has been dropped from meson build, and systemd-notify is always built in meson when systemd packageconfig is enabled, which in autotools, it's optional, and so on, it's not easy to list all the differences, but you could get them by comparing the pkgdata directories built by meson and autotools.

---
 .../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      | 49 ++++++------
 3 files changed, 102 insertions(+), 74 deletions(-)
meta/recipes-graphics/wayland/weston/0001-make-error-portable.patch +18 -16
index 0eb3d95..acea9db 100644
@@ -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 +26 -23

96 lines not on this page · raw message

Signature · 1 line
2.7.4