Fix meson deprecation warning

sevz17 · Jan 2, 2023 · bb3ed36 · bb3ed36
1 parent 1cd0cba
commit bb3ed36
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/meson.build b/meson.build
@@ -4,7 +4,7 @@ project(
  'cpp',
  version: '0.3.0',
  license: 'MIT',
- meson_version: '>=0.47.0',
+ meson_version: '>=0.54.0',
  default_options: [
  'cpp_std=c++11',
  'c_std=c11',
@@ -24,8 +24,8 @@ conf_data.set('fallback_audio_sample_fmt', get_option('fallback_audio_sample_fmt
 version = '"@0@"'.format(meson.project_version())
 git = find_program('git', native: true, required: false)
 if git.found()
- git_commit = run_command([git, 'rev-parse', '--short', 'HEAD'])
- git_branch = run_command([git, 'rev-parse', '--abbrev-ref', 'HEAD'])
+ git_commit = run_command([git, 'rev-parse', '--short', 'HEAD'], check: true)
+ git_branch = run_command([git, 'rev-parse', '--abbrev-ref', 'HEAD'], check: true)
  if git_commit.returncode() == 0 and git_branch.returncode() == 0
  version = '"@0@-@1@ (" __DATE__ ", branch \'@2@\')"'.format(
  meson.project_version(),

diff --git a/proto/meson.build b/proto/meson.build
@@ -1,4 +1,4 @@
-wl_protocol_dir = wayland_protos.get_pkgconfig_variable('pkgdatadir')
+wl_protocol_dir = wayland_protos.get_variable(pkgconfig: 'pkgdatadir', internal: 'pkgdatadir')
 wayland_scanner = find_program('wayland-scanner')
 
 wayland_scanner_code = generator(