From a30247a4ff276ccecc724ceb9f6512d698e8edc9 Mon Sep 17 00:00:00 2001 From: Nicola Murino Date: Tue, 2 Jan 2018 10:12:11 +0100 Subject: [PATCH] opencv: allow compilation against 3.4.x https://bugzilla.gnome.org/show_bug.cgi?id=792114 --- configure.ac | 2 +- ext/opencv/meson.build | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 89b39b3c86..d3b60ab798 100644 --- a/configure.ac +++ b/configure.ac @@ -1801,7 +1801,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.4.0 , [ + PKG_CHECK_MODULES(OPENCV, opencv >= 2.3.0 opencv <= 3.4.0 , [ AC_PROG_CXX AC_LANG([C++]) OLD_CPPFLAGS=$CPPFLAGS diff --git a/ext/opencv/meson.build b/ext/opencv/meson.build index 32aaf5c2ab..c7014309fa 100644 --- a/ext/opencv/meson.build +++ b/ext/opencv/meson.build @@ -40,7 +40,7 @@ libopencv3_headers = [ gstopencv_cargs = ['-DGST_HAAR_CASCADES_DIR="@0@"'] -opencv_dep = dependency('opencv', version : ['>= 2.3.0', '<= 3.3.0'], required : false) +opencv_dep = dependency('opencv', version : ['>= 2.3.0', '<= 3.4.0'], required : false) opencv_found = opencv_dep.found() if opencv_found