opencv: allow compilation against 3.3.0
authorNicola Murino <nicola.murino@gmail.com>
Mon, 4 Sep 2017 06:30:58 +0000 (08:30 +0200)
committerSebastian Dröge <sebastian@centricular.com>
Mon, 4 Sep 2017 07:10:48 +0000 (10:10 +0300)
https://bugzilla.gnome.org/show_bug.cgi?id=787234

configure.ac
ext/opencv/meson.build

index a6c0abd..3745ed2 100644 (file)
@@ -2791,7 +2791,7 @@ AG_GST_CHECK_FEATURE(OPENCV, [opencv plugins], opencv, [
   dnl a new version and the no-backward-compatibility define. (There doesn't
   dnl seem to be a switch to suppress the warnings the cvcompat.h header
   dnl causes.)
-  PKG_CHECK_MODULES(OPENCV, opencv >= 2.3.0 opencv <= 3.2.0 , [
+  PKG_CHECK_MODULES(OPENCV, opencv >= 2.3.0 opencv <= 3.3.0 , [
     AC_PROG_CXX
     AC_LANG([C++])
     OLD_CPPFLAGS=$CPPFLAGS
index b5f30bb..32aaf5c 100644 (file)
@@ -40,7 +40,7 @@ libopencv3_headers = [
 
 gstopencv_cargs = ['-DGST_HAAR_CASCADES_DIR="@0@"']
 
-opencv_dep = dependency('opencv', version : ['>= 2.3.0', '<= 3.2.0'], required : false)
+opencv_dep = dependency('opencv', version : ['>= 2.3.0', '<= 3.3.0'], required : false)
 opencv_found = opencv_dep.found()
 
 if opencv_found