Release 1.19.3

[platform/upstream/gstreamer.git] / meson.build

diff --git a/meson.build b/meson.build
index af130e9..5b1ff6f 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
-project('All GStreamer modules', 'c',
-  version : '1.19.2.1',
+project('gstreamer-full', 'c',
+  version : '1.19.3',
   meson_version : '>= 0.59',
   default_options : ['buildtype=debugoptimized',
                      # Needed due to https://github.com/mesonbuild/meson/issues/1889,
@@ -40,10 +40,10 @@ ensure_no_strawberry_perl = '''
 import os
 assert(r'Strawberry\perl\bin' not in os.environ['PATH'])
 '''
-if build_system == 'windows'
+if build_system == 'windows' and meson.version().version_compare('<0.60.0')
   cmdres = run_command(python3, '-c', ensure_no_strawberry_perl)
   if cmdres.returncode() != 0
-    error('You have Strawberry Perl in PATH which is known to cause build issues with gst-build. Please remove it from PATH or uninstall it.')
+    error('You have Strawberry Perl in PATH which is known to cause build issues with Meson < 0.60.0. Please remove it from PATH, uninstall it, or upgrade Meson.')
   endif
 endif
 
@@ -384,12 +384,12 @@ endforeach
 message('Building subprojects: ' + ', '.join(subprojects_names))
 
 setenv = find_program('gst-env.py')
-devenv_cmd = [setenv, '--builddir=@0@'.format(meson.build_root()),
+devenv_cmd = [setenv, '--builddir=@0@'.format(meson.project_build_root()),
               '--gstbuilddir=@0@'.format(meson.current_build_dir()),
-              '--srcdir=@0@'.format(meson.source_root())]
+              '--srcdir=@0@'.format(meson.project_source_root())]
 
 subdir('tests')
-if meson.has_exe_wrapper() and build_machine.system() == 'linux' and host_machine.system() == 'windows'
+if meson.can_run_host_binaries() and build_machine.system() == 'linux' and host_machine.system() == 'windows'
   # FIXME: Ideally we could get the wrapper directly from meson
   devenv_cmd += ['--wine', host_machine.cpu_family() == 'x86_64' ? 'wine64' : 'wine32']
   sysroot = meson.get_cross_property('sys_root')