mesa: update to version 21.3.0
[feed/video.git] / libs / mesa / patches / 001-fix-wayland-scanner-detect.patch
1 --- a/meson.build
2 +++ b/meson.build
3 @@ -1973,12 +1973,17 @@ endif
4 # TODO: symbol mangling
5
6 if with_platform_wayland
7 - dep_wl_scanner = dependency('wayland-scanner', native: true)
8 - prog_wl_scanner = find_program(dep_wl_scanner.get_pkgconfig_variable('wayland_scanner'))
9 - if dep_wl_scanner.version().version_compare('>= 1.15')
10 - wl_scanner_arg = 'private-code'
11 + if (get_option('scanner_bin') == '')
12 + dep_wl_scanner = dependency('wayland-scanner', native: true)
13 + prog_wl_scanner = find_program(dep_wl_scanner.get_pkgconfig_variable('wayland_scanner'))
14 + if dep_wl_scanner.version().version_compare('>= 1.15')
15 + wl_scanner_arg = 'private-code'
16 + else
17 + wl_scanner_arg = 'code'
18 + endif
19 else
20 - wl_scanner_arg = 'code'
21 + prog_wl_scanner = get_option('scanner_bin')
22 + wl_scanner_arg = 'private-code'
23 endif
24 dep_wl_protocols = dependency('wayland-protocols', version : '>= 1.8')
25 dep_wayland_client = dependency('wayland-client', version : '>=1.18')
26 --- a/meson_options.txt
27 +++ b/meson_options.txt
28 @@ -486,6 +486,11 @@ option(
29 value : 25,
30 description : 'Android Platform SDK version. Default: Nougat version.'
31 )
32 +option('scanner_bin',
33 + description: 'Path to wayland-scanner binary',
34 + type: 'string',
35 + value: ''
36 +)
37 option(
38 'zstd',
39 type : 'combo',