summaryrefslogtreecommitdiffstats
path: root/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-opencv-allow-compilation-against-4.3.x.patch
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-opencv-allow-compilation-against-4.3.x.patch')
-rw-r--r--recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-opencv-allow-compilation-against-4.3.x.patch34
1 files changed, 0 insertions, 34 deletions
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-opencv-allow-compilation-against-4.3.x.patch b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-opencv-allow-compilation-against-4.3.x.patch
deleted file mode 100644
index a9e1bd00..00000000
--- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-opencv-allow-compilation-against-4.3.x.patch
+++ /dev/null
@@ -1,34 +0,0 @@
1From cfb196925312b3c3d7a19dbb9a3ce64d20d66409 Mon Sep 17 00:00:00 2001
2From: Andrey Zhizhikin <andrey.z@gmail.com>
3Date: Sat, 9 May 2020 19:56:51 +0000
4Subject: [PATCH] opencv: allow compilation against 4.3.x
5
6Backport upstream commit 4cf362e2df0fb809ea0f21dd4a6fbb8b46ca54ef to NXP
7fork of gstreamer1.0-plugins-bad.
8
9Original commit link:
10https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/commit/4cf362e2df0fb809ea0f21dd4a6fbb8b46ca54ef
11
12Upstream-Status: Backport [4cf362e2df0fb809ea0f21dd4a6fbb8b46ca54ef]
13
14Signed-off-by: Andrey Zhizhikin <andrey.z@gmail.com>
15---
16 ext/opencv/meson.build | 2 +-
17 1 file changed, 1 insertion(+), 1 deletion(-)
18
19diff --git a/ext/opencv/meson.build b/ext/opencv/meson.build
20index d0ce1d3ee..05b142edc 100644
21--- a/ext/opencv/meson.build
22+++ b/ext/opencv/meson.build
23@@ -65,7 +65,7 @@ if opencv_found
24 endif
25 endforeach
26 else
27- opencv_dep = dependency('opencv4', version : ['>= 4.0.0', '< 4.1.0'], required : false)
28+ opencv_dep = dependency('opencv4', version : ['>= 4.0.0', '< 4.4.0'], required : false)
29 opencv_found = opencv_dep.found()
30 if opencv_found
31 foreach h : libopencv4_headers
32--
332.17.1
34