Skip to content

GitLab

gst-plugins-bad
gst-plugins-bad
Commit 49a2baeb authored by Nicola Murino's avatar Nicola Murino
1 Browse files
Options

opencv: allow compilation against 4.1.x

parent 7aba64e1
Pipeline #32541 passed with stages
              in 53 minutes and 40 seconds
              Hide whitespace changes
              Inline Side-by-side
              Showing with 2 additions and 2 deletions
              configure.ac
              View file @ 49a2baeb
              ......@@ -1845,7 +1845,7 @@ AG_GST_CHECK_FEATURE(OPENCV, [opencv plugins], opencv, [
              HAVE_OPENCV="yes"
              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_LANG([C++])
              OLD_CPPFLAGS=$CPPFLAGS
              ......
              ext/opencv/meson.build
              View file @ 49a2baeb
              ......@@ -65,7 +65,7 @@ if opencv_found
              endif
              endforeach
              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()
              if opencv_found
              foreach h : libopencv4_headers
              ......
              Markdown is supported
              0% or .
              You are about to add 0 people to the discussion. Proceed with caution.
              Finish editing this message first!
              Please register or to comment