diff --git a/meson.build b/meson.build index fa0b2f2ed..b60cb41c3 100644 --- a/meson.build +++ b/meson.build @@ -1,7 +1,7 @@ project( 'intel-vaapi-driver', 'c', version : '2.4.0.1', - meson_version : '>= 0.43.0', + meson_version : '>= 0.47.0', default_options : [ 'warning_level=1', 'buildtype=debugoptimized' ]) diff --git a/src/meson.build b/src/meson.build index 32dab83d5..1164a98f4 100644 --- a/src/meson.build +++ b/src/meson.build @@ -20,13 +20,14 @@ config_file = configure_file( output : 'config.h', configuration : config_cfg) +intel_driver_git_version = intel_vaapi_driver_version if git.found() git_version = run_command( git, '--git-dir', join_paths(meson.source_root(), '.git'), - 'describe', '--tags') - intel_driver_git_version = git_version.stdout().strip() -else - intel_driver_git_version = intel_vaapi_driver_version + 'describe', '--tags', check: false) + if git_version.returncode() == 0 + intel_driver_git_version = git_version.stdout().strip() + endif endif version_cfg = configuration_data()