summaryrefslogtreecommitdiffstats
path: root/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0002-opencv-Fix-build-with-opencv-3.4.5.patch
diff options
context:
space:
mode:
authorCristinel Panfir <cristinel.panfir@nxp.com>2019-12-20 13:43:18 +0200
committerOtavio Salvador <otavio@ossystems.com.br>2019-12-20 16:54:20 -0300
commit56042bd177935b167043dd49e38f1ad857cd9afb (patch)
treee901414b0d4a8efbddd26d9bfa8a9aebaa2bae58 /recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0002-opencv-Fix-build-with-opencv-3.4.5.patch
parent01e8eb43bdc2c971a82920dedb341a88b83c845f (diff)
downloadmeta-freescale-56042bd177935b167043dd49e38f1ad857cd9afb.tar.gz
gstreamer1.0, imx-gst1.0-plugin: Cleanup patch files
Remove unused patches Signed-off-by: Cristinel Panfir <cristinel.panfir@nxp.com>
Diffstat (limited to 'recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0002-opencv-Fix-build-with-opencv-3.4.5.patch')
-rw-r--r--recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0002-opencv-Fix-build-with-opencv-3.4.5.patch40
1 files changed, 0 insertions, 40 deletions
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0002-opencv-Fix-build-with-opencv-3.4.5.patch b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0002-opencv-Fix-build-with-opencv-3.4.5.patch
deleted file mode 100644
index 4c9cba61..00000000
--- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0002-opencv-Fix-build-with-opencv-3.4.5.patch
+++ /dev/null
@@ -1,40 +0,0 @@
1From 70661ec35ba7655b52f4043ee7362202bc632472 Mon Sep 17 00:00:00 2001
2From: Vincent Dehors <vincent.dehors@smile.fr>
3Date: Mon, 4 Mar 2019 09:01:37 +0100
4Subject: [PATCH] opencv: Fix build with opencv >= 3.4.5
5
6Including C header imgproc_c.h leads to a compilation error : several
7conflicting declartions for cvMoments(). Including the HPP fixes this error
8as it is done in other CPP files in the same directory.
9
10Upstream-Status: Inappropriate, code ported to C++ in more recent version
11Signed-off-by: Vincent DEHORS <vincent.dehors@smile.fr>
12
13---
14 ext/opencv/gstgrabcut.cpp | 9 +++++----
15 1 file changed, 5 insertions(+), 4 deletions(-)
16
17diff --git a/ext/opencv/gstgrabcut.cpp b/ext/opencv/gstgrabcut.cpp
18index 4cbc706d5..65b508f20 100644
19--- a/ext/opencv/gstgrabcut.cpp
20+++ b/ext/opencv/gstgrabcut.cpp
21@@ -85,11 +85,12 @@
22 #endif
23
24 #include "gstgrabcut.h"
25-extern "C"
26-{
27+
28+#if (CV_MAJOR_VERSION >= 3)
29+#include <opencv2/imgproc.hpp>
30+#endif
31 #include <opencv2/imgproc/imgproc_c.h>
32-}
33-#include <opencv2/imgproc/imgproc.hpp>
34+
35 GST_DEBUG_CATEGORY_STATIC (gst_grabcut_debug);
36 #define GST_CAT_DEFAULT gst_grabcut_debug
37
38--
392.20.1
40