summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Dufresne <nicolas.dufresne@collabora.com>2017-05-09 15:13:10 -0400
committerSebastian Dröge <sebastian@centricular.com>2017-09-07 12:46:17 +0300
commit58808ba2c9101bd67365f6ae196746fd8ed61f0b (patch)
tree216412a15020bcfe82f2f7bfdda71b315dd27a48
parent31d09ac2d7534fa3c92947f00c3dd573c04bcd24 (diff)
downloadgstreamer-plugins-bad-58808ba2c9101bd67365f6ae196746fd8ed61f0b.tar.gz
opencv/meson: Allow 3.2.0
This was already added and tested in autoconf.
-rw-r--r--ext/opencv/meson.build6
1 files changed, 3 insertions, 3 deletions
diff --git a/ext/opencv/meson.build b/ext/opencv/meson.build
index aa55d1433..8ef847e50 100644
--- a/ext/opencv/meson.build
+++ b/ext/opencv/meson.build
@@ -42,14 +42,14 @@ gstopencv_cargs = ['-DGST_HAAR_CASCADES_DIR="@0@"']
# First, check for the upper version limit and ensure it isn't found
# FIXME: When 0.37.0 is released, change this to use many-version-conditions
-opencv3_1_dep = dependency('opencv', version : '>3.1.0', required : false)
+opencv3_2_dep = dependency('opencv', version : '>3.2.0', required : false)
# Then, check if the lower version limit is found
opencv2_dep = dependency('opencv', version : '>=2.3.0', required : false)
opencv3_dep = dependency('opencv', version : '>= 3.0 ', required : false)
opencv2_found = false
-if opencv3_1_dep.found()
- message('OpenCV version is too new: \'' + opencv3_1_dep.version() + '\' (need <= 3.1.0)')
+if opencv3_2_dep.found()
+ message('OpenCV version is too new: \'' + opencv3_2_dep.version() + '\' (need < 3.2.0)')
elif opencv2_dep.found()
message('OpenCV found, version is \'' + opencv2_dep.version() + '\'')
opencv2_found = true