mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-25 17:50:36 +00:00
Code Issues 1 Projects Releases Wiki Activity

opencv: allow compilation against 4.1.x

Browse source
This commit is contained in:
Nicola Murino 2019-04-23 09:06:13 +02:00
parent 7aba64e19d
commit 49a2baebf5
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

@ -1845,7 +1845,7 @@ AG_GST_CHECK_FEATURE(OPENCV, [opencv plugins], opencv, [
HAVE_OPENCV="yes" HAVE_OPENCV="yes"
fi fi
], [ ], [
PKG_CHECK_MODULES([OPENCV], [opencv4 >= 4.0.0 opencv4 < 4.1.0] , [ PKG_CHECK_MODULES([OPENCV], [opencv4 >= 4.0.0 opencv4 < 4.2.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

@ -65,7 +65,7 @@ if opencv_found
endif endif
endforeach endforeach
else else
opencv_dep = dependency('opencv4', version : ['>= 4.0.0', '< 4.1.0'], required : false) opencv_dep = dependency('opencv4', version : ['>= 4.0.0', '< 4.2.0'], required : false)
opencv_found = opencv_dep.found() opencv_found = opencv_dep.found()
if opencv_found if opencv_found
foreach h : libopencv4_headers foreach h : libopencv4_headers