From: Nicola Murino <nicola.murino@gmail.com>
Date: Mon, 4 Sep 2017 06:30:58 +0000 (+0200)
Subject: opencv: allow compilation against 3.3.0
X-Git-Tag: 1.19.3~507^2~4899
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6ef65f550b5fed24e4f8592a82b901140c0cf342;p=platform%2Fupstream%2Fgstreamer.git

opencv: allow compilation against 3.3.0

https://bugzilla.gnome.org/show_bug.cgi?id=787234
---

diff --git a/configure.ac b/configure.ac
index a6c0abd..3745ed2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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
diff --git a/ext/opencv/meson.build b/ext/opencv/meson.build
index b5f30bb..32aaf5c 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.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