[tracker-miners/tracker-miners-2.1] build: Fix minimum dep checks to allow the specified version too
- From: Carlos Garnacho <carlosg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [tracker-miners/tracker-miners-2.1] build: Fix minimum dep checks to allow the specified version too
- Date: Thu, 21 Feb 2019 10:34:13 +0000 (UTC)
commit b395127d490007c1b7a89845dbe4ed1c03c33579
Author: Mart Raudsepp <leio gentoo org>
Date: Fri Feb 15 00:18:09 2019 +0200
build: Fix minimum dep checks to allow the specified version too
Many of the minimum deps were expressed as "> x.y", but were meant to
allow x.y itself as well. Change all to ">= x.y". This seems to be
what was intended and was the case with autotools.
(cherry-picked from 65424da4f9f5b169412672192d67a564a31078a0)
meson.build | 44 ++++++++++++++++++++++----------------------
1 file changed, 22 insertions(+), 22 deletions(-)
---
diff --git a/meson.build b/meson.build
index 21e3b8001..eb40761a4 100644
--- a/meson.build
+++ b/meson.build
@@ -56,38 +56,38 @@ endif
avcodec = dependency('libavcodec', version: '>= 0.8.4', required: false)
avformat = dependency('libavformat', version: '>= 0.8.4', required: false)
avutil = dependency('libavutil', version: '>= 0.8.4', required: false)
-dbus = dependency('dbus-1', version: '> 1.3.1')
-exempi = dependency('exempi-2.0', version: '> 2.1.0', required: get_option('xmp'))
-flac = dependency('flac', version: '> 1.2.1', required: get_option('flac'))
+dbus = dependency('dbus-1', version: '>= 1.3.1')
+exempi = dependency('exempi-2.0', version: '>= 2.1.0', required: get_option('xmp'))
+flac = dependency('flac', version: '>= 1.2.1', required: get_option('flac'))
gexiv2 = dependency('gexiv2', required: get_option('raw'))
-gio = dependency('gio-2.0', version: '>' + glib_required)
-gio_unix = dependency('gio-unix-2.0', version: '>' + glib_required)
-glib = dependency('glib-2.0', version: '>' + glib_required)
-gmodule = dependency('gmodule-2.0', version: '>' + glib_required)
-gobject = dependency('gobject-2.0', version: '>' + glib_required)
+gio = dependency('gio-2.0', version: '>=' + glib_required)
+gio_unix = dependency('gio-unix-2.0', version: '>=' + glib_required)
+glib = dependency('glib-2.0', version: '>=' + glib_required)
+gmodule = dependency('gmodule-2.0', version: '>=' + glib_required)
+gobject = dependency('gobject-2.0', version: '>=' + glib_required)
gstreamer = dependency('gstreamer-1.0', required: false)
gstreamer_pbutils = dependency('gstreamer-pbutils-1.0', required: false)
gstreamer_tag = dependency('gstreamer-tag-1.0', required: false)
-gupnp_dlna = dependency('gupnp-dlna-2.0', version: '> 0.9.4', required: false)
-gupnp_dlna_gst = dependency('gupnp-dlna-gst-2.0', version: '> 0.9.4', required: false)
-icu_i18n = dependency('icu-i18n', version: '> 4.8.1.1', required: false)
-icu_uc = dependency('icu-uc', version: '> 4.8.1.1', required: false)
+gupnp_dlna = dependency('gupnp-dlna-2.0', version: '>= 0.9.4', required: false)
+gupnp_dlna_gst = dependency('gupnp-dlna-gst-2.0', version: '>= 0.9.4', required: false)
+icu_i18n = dependency('icu-i18n', version: '>= 4.8.1.1', required: false)
+icu_uc = dependency('icu-uc', version: '>= 4.8.1.1', required: false)
libcue = dependency('libcue', required: get_option('cue'))
-libexif = dependency('libexif', version: '> 0.6', required: get_option('exif'))
-libgsf = dependency('libgsf-1', version: '> 1.14.24', required: get_option('gsf'))
+libexif = dependency('libexif', version: '>= 0.6', required: get_option('exif'))
+libgsf = dependency('libgsf-1', version: '>= 1.14.24', required: get_option('gsf'))
libgxps = dependency('libgxps', required: get_option('xps'))
libiptcdata = dependency('libiptcdata', required: get_option('iptc'))
libjpeg = dependency('libjpeg', required: get_option('jpeg'))
-libosinfo = dependency('libosinfo-1.0', version: '> 0.2.9', required: get_option('iso'))
-libpng = dependency('libpng', version: '> 0.89', required: get_option('png'))
+libosinfo = dependency('libosinfo-1.0', version: '>= 0.2.9', required: get_option('iso'))
+libpng = dependency('libpng', version: '>= 0.89', required: get_option('png'))
libseccomp = dependency('libseccomp', version: '>= 2.0', required: false)
libtiff = dependency('libtiff-4', required: get_option('tiff'))
-libxml2 = dependency('libxml-2.0', version: '> 2.6', required: get_option('xml'))
-libvorbis = dependency('vorbisfile', version: '> 0.22', required: get_option('vorbis'))
-poppler = dependency('poppler-glib', version: '> 0.16.0', required: get_option('pdf'))
-taglib = dependency('taglib_c', version: '> 1.6', required: get_option('taglib'))
+libxml2 = dependency('libxml-2.0', version: '>= 2.6', required: get_option('xml'))
+libvorbis = dependency('vorbisfile', version: '>= 0.22', required: get_option('vorbis'))
+poppler = dependency('poppler-glib', version: '>= 0.16.0', required: get_option('pdf'))
+taglib = dependency('taglib_c', version: '>= 1.6', required: get_option('taglib'))
totem_plparser = dependency('totem-plparser', required: get_option('playlist'))
-upower = dependency('upower-glib', version: '> 0.9.0', required: false)
+upower = dependency('upower-glib', version: '>= 0.9.0', required: false)
zlib = dependency('zlib')
libgif = cc.find_library('gif', required: get_option('gif'))
@@ -141,7 +141,7 @@ elif get_option('battery_detection') == 'upower'
endif
if battery_detection_library_name == ''
- hal = dependency('hal', version: '> 0.5', required: false)
+ hal = dependency('hal', version: '>= 0.5', required: false)
if hal.found()
battery_detection_library = hal
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]