OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

meson: work around meson 0.62 issue

Browse Source 
Ubuntu 22.04 LTS has Meson 0.62, but recent versions of mesa fails to
build there due to an issue with using wayland-protocols from wrapdb,
that wasn't fixed until Meson 0.63. Luckily the problem is easy to
work around, so let's just do that.

Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/10232
Fixes: 5fe5c3e223 ("meson: add wayland-protocols from meson wrapdb")
Tested-by: Eero Tamminen <eero.t.tamminen@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26446>
(cherry picked from commit d8d49ad034)
This commit is contained in:
Erik Faye-Lund
2023-12-01 13:23:10 +01:00
committed by Eric Engestrom
parent d4626797bf
commit 7515018c22
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.pick_status.json
View File

@@ -174,7 +174,7 @@
"description": "meson: work around meson 0.62 issue", "description": "meson: work around meson 0.62 issue",
"nominated": true, "nominated": true,
"nomination_type": 1, "nomination_type": 1,
"resolution": 0, "resolution": 1,
"main_sha": null, "main_sha": null,
"because_sha": "5fe5c3e2231b58da7c3ce92d4f3cf0fd0d5f216b", "because_sha": "5fe5c3e2231b58da7c3ce92d4f3cf0fd0d5f216b",
"notes": null "notes": null

4
src/egl/wayland/wayland-drm/meson.build
View File

@@ -67,13 +67,13 @@ wp_files = {}
foreach name, xml : wp_protos foreach name, xml : wp_protos
code = custom_target( code = custom_target(
name + '-protocol.c', name + '-protocol.c',
input : join_paths(wp_dir, xml), input : files(join_paths(wp_dir, xml)),
output : name + '-protocol.c', output : name + '-protocol.c',
command : [prog_wl_scanner, wl_scanner_arg, '@INPUT@', '@OUTPUT@'], command : [prog_wl_scanner, wl_scanner_arg, '@INPUT@', '@OUTPUT@'],
) )
header = custom_target( header = custom_target(
name + '-client-protocol.h', name + '-client-protocol.h',
input : join_paths(wp_dir, xml), input : files(join_paths(wp_dir, xml)),
output : name + '-client-protocol.h', output : name + '-client-protocol.h',
command : [prog_wl_scanner, 'client-header', '@INPUT@', '@OUTPUT@'], command : [prog_wl_scanner, 'client-header', '@INPUT@', '@OUTPUT@'],
) )