diff options
| author | Tim-Philipp Müller <tim@centricular.com> | 2018-02-08 19:18:59 +0000 |
|---|---|---|
| committer | Tim-Philipp Müller <tim@centricular.com> | 2018-02-08 19:20:20 +0000 |
| commit | 8a981ceeee82fd40f41b4f1191f451419cf8cbfa (patch) | |
| tree | 1343d792c9654548ac580d2864f26f92ffd21593 | |
| parent | ab181a4335777f1a888512099be52dd6be731190 (diff) | |
| download | gst-omx-8a981ceeee82fd40f41b4f1191f451419cf8cbfa.tar.gz | |
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.
Also remove unused libversion/soversion.
| -rw-r--r-- | meson.build | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/meson.build b/meson.build index 9275eaf..16823c4 100644 --- a/meson.build +++ b/meson.build @@ -6,11 +6,11 @@ project('gst-omx', '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 @@ -19,10 +19,6 @@ glib_req = '>= 2.40.0' gst_req = '>= @0@.@1@.0'.format(gst_version_major, gst_version_minor) tizil_req = '>= 0.1.0' 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()) plugins_install_dir = '@0@/gstreamer-1.0'.format(get_option('libdir')) |