diff options
| author | Nicolas Dufresne <nicolas.dufresne@collabora.com> | 2018-08-02 10:39:14 -0400 |
|---|---|---|
| committer | Nicolas Dufresne <nicolas.dufresne@collabora.com> | 2018-08-02 11:31:34 -0400 |
| commit | cabf8750984afb662d4401b4316ea96d0bc1ecc8 (patch) | |
| tree | ec515ab20a0a2dfdd54acc558a1f149743b4c69f /configure.ac | |
| parent | f028f817e33a895ec64e089062abedc8e373f343 (diff) | |
opencv: Bump requirement to 3.0.0+
And removes all the ifdef code to support the 2.X APIs.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac index d470287bd..db1f3cb7d 100644 --- a/configure.ac +++ b/configure.ac @@ -1885,7 +1885,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.5.0 , [ + PKG_CHECK_MODULES(OPENCV, opencv >= 3.0.0 opencv < 3.5.0 , [ AC_PROG_CXX AC_LANG([C++]) OLD_CPPFLAGS=$CPPFLAGS @@ -1897,13 +1897,8 @@ AG_GST_CHECK_FEATURE(OPENCV, [opencv plugins], opencv, [ opencv2/imgproc/imgproc.hpp \ opencv2/imgproc/imgproc_c.h \ opencv2/objdetect/objdetect.hpp \ - opencv2/video/background_segm.hpp], [], [something_not_found=yes]) - - dnl Only required for OpenCV >= 3, we have compat code for older versions - PKG_CHECK_MODULES(OPENCV_3, opencv >= 3, [ - dnl check opencv_contrib headers (not always present in opencv distributions) - AC_CHECK_HEADERS([opencv2/bgsegm.hpp], [], [something_not_found=yes])], - [NOT_A_PROBLEM=yes]) + opencv2/video/background_segm.hpp \ + opencv2/bgsegm.hpp], [], [something_not_found=yes]) CPPFLAGS=$OLD_CPPFLAGS AC_LANG([C]) |