diff options
| author | Tim-Philipp Müller <tim@centricular.com> | 2018-02-08 19:22:17 +0000 |
|---|---|---|
| committer | Tim-Philipp Müller <tim@centricular.com> | 2018-02-08 19:22:17 +0000 |
| commit | 7e28f455507fd2c418393142f46a6ab83a98c6ff (patch) | |
| tree | 7ad7b76fbd7665c455e5f5297fbadf9abb3a76be | |
| parent | 448105578bd6b31d8c3992f137389a56132bd551 (diff) | |
meson: make version numbers ints and fix int/string comparison
WARNING: Trying to compare values of different types (str, int).
The result of this is undefined and will become a hard error
in a future Meson release.
| -rw-r--r-- | meson.build | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/meson.build b/meson.build index e1700eca8e..e22b075705 100644 --- a/meson.build +++ b/meson.build @@ -6,11 +6,11 @@ project('gstreamer-vaapi', 'c', gst_version = meson.project_version() version_arr = gst_version.split('.') -gst_version_major = version_arr[0] -gst_version_minor = version_arr[1] -gst_version_micro = version_arr[2] -if version_arr.length() == 4 - gst_version_nano = version_arr[3] +gst_version_major = version_arr[0].to_int() +gst_version_minor = version_arr[1].to_int() +gst_version_micro = version_arr[2].to_int() + if version_arr.length() == 4 + gst_version_nano = version_arr[3].to_int() else gst_version_nano = 0 endif @@ -156,7 +156,7 @@ api_version = '1.0' soversion = 0 # maintaining compatibility with the previous libtool versioning # current = minor * 100 + micro -libversion = '@0@.@1@.0'.format(soversion, gst_version_minor.to_int() * 100 + gst_version_micro.to_int()) +libversion = '@0@.@1@.0'.format(soversion, gst_version_minor * 100 + gst_version_micro) plugins_install_dir = '@0@/gstreamer-1.0'.format(get_option('libdir')) |