diff options
| author | dudemanguy <random342@airmail.cc> | 2019-09-19 15:37:00 -0500 |
|---|---|---|
| committer | Jan Ekström <jeebjp@gmail.com> | 2019-09-21 23:02:48 +0300 |
| commit | dab28158eea42ba438ee885f3dca31503b975f93 (patch) | |
| tree | 865b5ffec4303902d4c4b0a19572009449588c13 | |
| parent | 5858e3cdbd6fbae3ed80366912dd5df0af4fa126 (diff) | |
| download | mpv-dab28158eea42ba438ee885f3dca31503b975f93.tar.bz2 mpv-dab28158eea42ba438ee885f3dca31503b975f93.tar.xz | |
waf: fix wayland-scanner deprecation warning
Use `private-code` instead of `code` here. Also this bumps up the
required wayland-client/wayland-cursor version to 1.15 which is still
pretty old anyway.
| -rw-r--r-- | waftools/generators/sources.py | 2 | ||||
| -rw-r--r-- | wscript | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/waftools/generators/sources.py b/waftools/generators/sources.py index 96c8331701..a807ca00bb 100644 --- a/waftools/generators/sources.py +++ b/waftools/generators/sources.py @@ -66,7 +66,7 @@ def __wayland_protocol_code__(ctx, **kwargs): kwargs['source'] = '{}/{}'.format(kwargs['proto_dir'], file_name) ctx( - rule = __wayland_scanner_cmd__(ctx, 'code', kwargs['proto_dir'], + rule = __wayland_scanner_cmd__(ctx, 'private-code', kwargs['proto_dir'], file_name, protocol_is_vendored), name = os.path.basename(kwargs['target']), @@ -576,8 +576,8 @@ video_output_features = [ 'name': '--wayland', 'desc': 'Wayland', 'deps': 'wayland-protocols && wayland-scanner', - 'func': check_pkg_config('wayland-client', '>= 1.6.0', - 'wayland-cursor', '>= 1.6.0', + 'func': check_pkg_config('wayland-client', '>= 1.15.0', + 'wayland-cursor', '>= 1.15.0', 'xkbcommon', '>= 0.3.0'), } , { 'name': '--x11', |