mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-26 19:51:11 +00:00
Code Issues 1 Projects Releases Wiki Activity

meson: make version numbers ints and fix int/string comparison

Browse source 
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.
This commit is contained in:
Tim-Philipp Müller 2018-02-08 17:17:51 +00:00
parent 992fb96843
commit 5b970a75fa
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
meson.build
View file

@ -6,11 +6,11 @@ project('gst-plugins-base', 'c',
gst_version = meson.project_version() gst_version = meson.project_version()
version_arr = gst_version.split('.') version_arr = gst_version.split('.')
gst_version_major = version_arr[0] gst_version_major = version_arr[0].to_int()
gst_version_minor = version_arr[1] gst_version_minor = version_arr[1].to_int()
gst_version_micro = version_arr[2] gst_version_micro = version_arr[2].to_int()
if version_arr.length() == 4 if version_arr.length() == 4
gst_version_nano = version_arr[3] gst_version_nano = version_arr[3].to_int()
else else
gst_version_nano = 0 gst_version_nano = 0
endif endif
@ -26,7 +26,7 @@ soversion = 0
# maintaining compatibility with the previous libtool versioning # maintaining compatibility with the previous libtool versioning
# current = minor * 100 + micro # current = minor * 100 + micro
# FIXME: should be able to convert string to int somehow so we can just do maths # FIXME: should be able to convert string to int somehow so we can just do maths
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')) plugins_install_dir = '@0@/gstreamer-1.0'.format(get_option('libdir'))