lineage-rockchip/android_external_mesa3d_panfrost
1
0
Fork 0
Code Activity Actions

meson: use the wayland module

Browse source 
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>
This commit is contained in:
Dylan Baker 2025-06-30 18:06:17 +00:00 • committed by Marge Bot
parent 943ac08280
commit 0c11a9cfb3
3 changed files with 14 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

9
meson.build
View file

@ -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.