From dab28158eea42ba438ee885f3dca31503b975f93 Mon Sep 17 00:00:00 2001 From: dudemanguy Date: Thu, 19 Sep 2019 15:37:00 -0500 Subject: [PATCH] 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. --- waftools/generators/sources.py | 2 +- 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']), diff --git a/wscript b/wscript index 0fa0480f55..1f70bb7106 100644 --- a/wscript +++ b/wscript @@ -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',