mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-07-13 09:56:24 +00:00
Code Issues 1 Projects Releases Wiki Activity

opencv: allow all future 3.4.x versions

Browse source 
Fix-up for previous patch which I modified incorrectly.

https://bugzilla.gnome.org/show_bug.cgi?id=792114
This commit is contained in:
Tim-Philipp Müller 2018-01-02 11:43:39 +00:00
parent a30247a4ff
commit e6fe51a3ac
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 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.5.0 , [
AC_PROG_CXX
AC_LANG([C++])
OLD_CPPFLAGS=$CPPFLAGS

2
ext/opencv/meson.build
View file

@ -40,7 +40,7 @@ libopencv3_headers = [
gstopencv_cargs = ['-DGST_HAAR_CASCADES_DIR="@0@"']
opencv_dep = dependency('opencv', version : ['>= 2.3.0', '<= 3.4.0'], required : false)
opencv_dep = dependency('opencv', version : ['>= 2.3.0', '< 3.5.0'], required : false)
opencv_found = opencv_dep.found()
if opencv_found