diff options
| author | Nicola Murino <nicola.murino@gmail.com> | 2019-04-23 09:06:13 +0200 |
|---|---|---|
| committer | Tim-Philipp Müller <tim@centricular.com> | 2019-08-06 16:50:09 +0100 |
| commit | a4750dae8dc327d2f1bfe4e06f776ca5c955b8f2 (patch) | |
| tree | 459230cce2d2780b8032fe6627fbbb923f00c2d1 | |
| parent | 905682f1bf8c76ac38ee76cf96c3d2006452bc88 (diff) | |
| download | gstreamer-plugins-bad-a4750dae8dc327d2f1bfe4e06f776ca5c955b8f2.tar.gz | |
opencv: allow compilation against 4.1.x
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | ext/opencv/meson.build | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 160123d1e..64b6f942f 100644 --- a/configure.ac +++ b/configure.ac @@ -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 diff --git a/ext/opencv/meson.build b/ext/opencv/meson.build index d0ce1d3ee..f38b55dfe 100644 --- a/ext/opencv/meson.build +++ b/ext/opencv/meson.build @@ -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 |