1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
|
From eb404fd917fa3ab7ffa9433c9975ee49cfc9c41f Mon Sep 17 00:00:00 2001
From: Nicola Murino <nicola.murino@gmail.com>
Date: Tue, 23 Apr 2019 09:06:13 +0200
Subject: [PATCH 1/2] opencv: allow compilation against 4.1.x
Upstream-Status: Backport [https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/commit/49a2baebf58d9288f75964fc40a547fde510a840]
(cherry picked from commit 49a2baebf58d9288f75964fc40a547fde510a840)
Signed-off-by: Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com>
---
configure.ac | 2 +-
ext/opencv/meson.build | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac
index 26f72eb0d..9e12d39a0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1852,7 +1852,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
diff --git a/ext/opencv/meson.build b/ext/opencv/meson.build
index d0ce1d3ee..f38b55dfe 100644
--- a/ext/opencv/meson.build
+++ b/ext/opencv/meson.build
@@ -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
--
2.17.1
|
