From: Tim-Philipp Müller Date: Thu, 8 Feb 2018 19:15:10 +0000 (+0000) Subject: meson: make version numbers ints and fix int/string comparison X-Git-Tag: 1.19.3~495^2~330 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=cd962024657154a76755dd68a203d7305d45371f;p=platform%2Fupstream%2Fgstreamer.git 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. --- diff --git a/meson.build b/meson.build index 1e860a4..7dad698 100644 --- a/meson.build +++ b/meson.build @@ -5,11 +5,11 @@ project('gst-rtsp-server', '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 @@ -21,7 +21,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'))