[mutter/bilelmoussaoui/wayland-server-subproject: 2/2] build: Add a wayland subproject
- From: Bilal Elmoussaoui <bilelmoussaoui src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter/bilelmoussaoui/wayland-server-subproject: 2/2] build: Add a wayland subproject
- Date: Wed, 27 Jul 2022 12:47:53 +0000 (UTC)
commit d6886fe3944be49bf038da7b6bd5b379f70e42d2
Author: Bilal Elmoussaoui <belmouss redhat com>
Date: Wed Jul 27 14:47:36 2022 +0200
build: Add a wayland subproject
It allows building mutter even if the installed wayland-server / client
is older than the required one
meson.build | 9 +++++++--
subprojects/wayland.wrap | 5 +++++
2 files changed, 12 insertions(+), 2 deletions(-)
---
diff --git a/meson.build b/meson.build
index 60936dd68b..03dd1c376d 100644
--- a/meson.build
+++ b/meson.build
@@ -197,8 +197,13 @@ if have_gles2
endif
if have_wayland
- wayland_server_dep = dependency('wayland-server', version: wayland_server_req)
- wayland_client_dep = dependency('wayland-client', version: wayland_server_req)
+ wayland_build_options = ['dtd_validation=false', 'tests=false', 'documentation=false']
+ wayland_server_dep = dependency('wayland-server', version: wayland_server_req,
+ fallback: ['wayland', 'wayland_server_dep'],
+ default_options: wayland_build_options)
+ wayland_client_dep = dependency('wayland-client', version: wayland_server_req,
+ fallback: ['wayland', 'wayland_client_dep'],
+ default_options: wayland_build_options)
wayland_protocols_dep = dependency('wayland-protocols',
version: wayland_protocols_req)
wayland_egl_dep = dependency('wayland-egl')
diff --git a/subprojects/wayland.wrap b/subprojects/wayland.wrap
new file mode 100644
index 0000000000..57ea88e585
--- /dev/null
+++ b/subprojects/wayland.wrap
@@ -0,0 +1,5 @@
+[wrap-git]
+directory=wayland
+url=https://gitlab.freedesktop.org/wayland/wayland.git
+revision=main
+depth=1
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]