opencv: allow compilation against 4.1.x
authorNicola Murino <nicola.murino@gmail.com>
Tue, 23 Apr 2019 07:06:13 +0000 (09:06 +0200)
committerTim-Philipp Müller <tim@centricular.com>
Tue, 6 Aug 2019 15:50:09 +0000 (16:50 +0100)
configure.ac
ext/opencv/meson.build

index 160123d..64b6f94 100644 (file)
@@ -1845,7 +1845,7 @@ AG_GST_CHECK_FEATURE(OPENCV, [opencv plugins], opencv, [
       HAVE_OPENCV="yes"
     fi
   ], [
-    PKG_CHECK_MODULES([OPENCV], [opencv4 >= 4.0.0 opencv4 < 4.1.0] , [
+    PKG_CHECK_MODULES([OPENCV], [opencv4 >= 4.0.0 opencv4 < 4.2.0] , [
     AC_PROG_CXX
     AC_LANG([C++])
     OLD_CPPFLAGS=$CPPFLAGS
index d0ce1d3..f38b55d 100644 (file)
@@ -65,7 +65,7 @@ if opencv_found
     endif
   endforeach
 else
-  opencv_dep = dependency('opencv4', version : ['>= 4.0.0', '< 4.1.0'], required : false)
+  opencv_dep = dependency('opencv4', version : ['>= 4.0.0', '< 4.2.0'], required : false)
   opencv_found = opencv_dep.found()
   if opencv_found
     foreach h : libopencv4_headers