meson: bump meson req to 0.56

It's from Oct 2020, and widely available on various distro or backports.

Fix related meson warnings.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>

3 files changed, 12 insertions, 12 deletions

diff --git a/doc/reference/meson.build b/doc/reference/meson.build
index 24e722a..763ead6 100644
--- a/doc/reference/meson.build
+++ b/doc/reference/meson.build
@@ -34,9 +34,9 @@ ignore_headers = [
 
 spice_gtk_doc_dep = declare_dependency(link_with : [spice_client_gtk_lib, spice_client_glib_lib])
 
-glib_prefix = dependency('glib-2.0').get_pkgconfig_variable('prefix')
+glib_prefix = dependency('glib-2.0').get_variable(pkgconfig: 'prefix')
 glib_docpath = glib_prefix / 'share' / 'gtk-doc' / 'html'
-gtk_prefix = dependency('gtk+-3.0').get_pkgconfig_variable('prefix')
+gtk_prefix = dependency('gtk+-3.0').get_variable(pkgconfig: 'prefix')
 gtk_docpath = gtk_prefix / 'share' / 'gtk-doc' / 'html'
 docpath = spice_gtk_datadir / 'gtk-doc' / 'html'
 
@@ -51,9 +51,9 @@ gnome.gtkdoc(meson.project_name(),
                '--deprecated-guards="SPICE_DISABLE_DEPRECATED"',
                '--ignore-decorators="G_GNUC_INTERNAL"',
                '--rebuild-types',
-               meson.build_root() / 'src' / 'spice-version.h'
+               meson.project_build_root() / 'src' / 'spice-version.h'
              ],
-             src_dir : meson.source_root() / 'src',
+             src_dir : meson.project_source_root() / 'src',
              fixxref_args: [
                '--html-dir=@0@'.format(docpath),
                '--extra-dir=@0@'.format(glib_docpath / 'glib'),
diff --git a/meson.build b/meson.build
index 5287029..341f5fb 100644
--- a/meson.build
+++ b/meson.build
@@ -2,13 +2,13 @@
 # project definition
 #
 project('spice-gtk', 'c',
-         version : run_command('build-aux/git-version-gen', '@0@/.tarball-version'.format(meson.source_root()), check : true).stdout().strip(),
+         version : run_command('build-aux/git-version-gen', '@0@/.tarball-version'.format(meson.project_source_root()), check : true).stdout().strip(),
          license : 'LGPLv2.1',
-         meson_version : '>= 0.53',
+         meson_version : '>= 0.56',
          default_options : ['buildtype=debugoptimized',
                             'warning_level=2'])
 
-meson.add_dist_script('build-aux/meson-dist', meson.project_version(), meson.source_root())
+meson.add_dist_script('build-aux/meson-dist', meson.project_version(), meson.project_source_root())
 summary_info = {}
 
 #
@@ -170,9 +170,9 @@ if host_machine.system() != 'windows' and spice_gtk_has_gtk and compiler.has_hea
   summary_info += {'wayland-protocols': d.found()}
   if d.found()
     spice_gtk_config_data.set('HAVE_WAYLAND_PROTOCOLS', '1')
-    dir_wp_base = d.get_pkgconfig_variable('pkgdatadir')
+    dir_wp_base = d.get_variable(pkgconfig: 'pkgdatadir')
     dep_scanner = dependency('wayland-scanner', native: true)
-    prog_scanner = find_program(dep_scanner.get_pkgconfig_variable('wayland_scanner'))
+    prog_scanner = find_program(dep_scanner.get_variable(pkgconfig: 'wayland_scanner'))
 
     wayland_libs_version_required = '1.17.0'
     spice_wayland_deps += dependency('wayland-server', version : '>= @0@'.format(wayland_libs_version_required))
@@ -252,7 +252,7 @@ spice_gtk_has_polkit = false
 d = dependency('polkit-gobject-1', version : '>= 0.101', required : get_option('polkit'))
 summary_info += {'polkit': d.found()}
 if d.found()
-  spice_gtk_policy_dir = d.get_pkgconfig_variable('policydir')
+  spice_gtk_policy_dir = d.get_variable(pkgconfig: 'policydir')
 
   # TODO:  With 'auto', we should just disable polkit support if this is missing.
   if not compiler.has_function('acl_get_file')
@@ -293,7 +293,7 @@ spice_gtk_usb_ids_path = get_option('usb-ids-path')
 if spice_gtk_usb_ids_path.strip() == ''
   usbutils = dependency('usbutils', required : false)
   if usbutils.found()
-    spice_gtk_usb_ids_path = usbutils.get_pkgconfig_variable('usbids')
+    spice_gtk_usb_ids_path = usbutils.get_variable(pkgconfig: 'usbids')
   endif
 endif
 summary_info += {'usb-ids-path': spice_gtk_usb_ids_path}
diff --git a/vapi/meson.build b/vapi/meson.build
index aab2f5a..0542856 100644
--- a/vapi/meson.build
+++ b/vapi/meson.build
@@ -8,7 +8,7 @@ if spice_gtk_has_vala
     gnome.generate_vapi('spice-client-gtk-3.0',
                         install : true,
                         packages : ['gtk+-3.0', 'gstreamer-1.0', spice_glib_vapi],
-                        gir_dirs : meson.build_root() / 'src',
+                        gir_dirs : meson.project_build_root() / 'src',
                         vapi_dirs : meson.current_build_dir(),
                         sources : spice_client_gtk_gir[0])
   endif