diff options
| author | Dylan Baker <dylan.c.baker@intel.com> | 2025-06-30 18:06:17 +0000 |
|---|---|---|
| committer | Marge Bot <marge-bot@fdo.invalid> | 2025-09-22 16:35:26 +0000 |
| commit | 0c11a9cfb35595e404913691241a2a2a0f0a8f03 (patch) | |
| tree | 955e41e86189f073deb2f37655f3ace9c1871724 /meson.build | |
| parent | 943ac082804413a2f11d7330082095aa94def6c2 (diff) | |
meson: use the wayland module
This module has existed, unchanged, since Meson 0.64, and is now marked
as API stable in 1.8. It provides a number of helpers that reduce the
amount of code we need (including fiddly code about finding
wayland-scanner) by a bit, as well as some nice helpers for finding
external XML files.
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/35839>
Diffstat (limited to 'meson.build')
| -rw-r--r-- | meson.build | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/meson.build b/meson.build index 67f54ec5e42..117ec90b27b 100644 --- a/meson.build +++ b/meson.build @@ -1999,13 +1999,6 @@ endif with_wayland_bind_display = with_platform_wayland and get_option('legacy-wayland').contains('bind-wayland-display') if with_platform_wayland - dep_wl_scanner = dependency('wayland-scanner', native: true) - prog_wl_scanner = find_program(dep_wl_scanner.get_variable(pkgconfig : 'wayland_scanner')) - if dep_wl_scanner.version().version_compare('>= 1.15') - wl_scanner_arg = 'private-code' - else - wl_scanner_arg = 'code' - endif dep_wl_protocols = dependency('wayland-protocols', version : '>= 1.41', default_options: [ 'tests=false' ]) dep_wayland_client = dependency('wayland-client', version : '>=1.18') dep_wayland_server = dependency('wayland-server', version : '>=1.18') @@ -2026,6 +2019,8 @@ if with_platform_wayland dependencies: dep_wayland_client) pre_args += ['-DHAVE_WL_CREATE_QUEUE_WITH_NAME'] endif + # This can be renamed just `wayland` when we require at least 1.8 + mod_wl = import('unstable-wayland') endif # Even if we find OpenMP, Gitlab CI fails to link with gcc/i386 and clang/anyarch. |