FaSTTUBe/GST-Tensordecoder-ov_ep
37
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

opencv: allow compilation against 3.4.x

Browse Source 
https://bugzilla.gnome.org/show_bug.cgi?id=792114
This commit is contained in:
Nicola Murino 2018-01-02 10:12:11 +01:00 committed by Tim-Philipp Müller
parent 13363f2388
commit a30247a4ff
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -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 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 seem to be a switch to suppress the warnings the cvcompat.h header
dnl causes.) 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_PROG_CXX
AC_LANG([C++]) AC_LANG([C++])
OLD_CPPFLAGS=$CPPFLAGS OLD_CPPFLAGS=$CPPFLAGS

2
ext/opencv/meson.build
View File

@ -40,7 +40,7 @@ libopencv3_headers = [
gstopencv_cargs = ['-DGST_HAAR_CASCADES_DIR="@0@"'] 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() opencv_found = opencv_dep.found()
if opencv_found if opencv_found