aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2021-03-04 10:54:05 -0800
committerKhem Raj <raj.khem@gmail.com>2021-03-04 10:57:59 -0800
commit98175fd0cc6eefe4db9484131bb98f0516c0d1a5 (patch)
treecfc81c56bb0db54058324acbc0239a11df355670
parentcbd15ecde5f8fca1e6966d5cca4f13217b09b612 (diff)
downloadmeta-openembedded-contrib-jansa/master.tar.gz
meta-openembedded-contrib-jansa/master.tar.bz2
meta-openembedded-contrib-jansa/master.zip
opencv: Remove duplicate patchjansa/master
<thread> include is already taken care with 0001-Fix-building-opencv-using-gcc-11.x-19244.patch Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--meta-oe/recipes-support/opencv/opencv/0001-Add-missing-include.patch28
-rw-r--r--meta-oe/recipes-support/opencv/opencv_4.5.1.bb1
2 files changed, 0 insertions, 29 deletions
diff --git a/meta-oe/recipes-support/opencv/opencv/0001-Add-missing-include.patch b/meta-oe/recipes-support/opencv/opencv/0001-Add-missing-include.patch
deleted file mode 100644
index 432f3c83ee..0000000000
--- a/meta-oe/recipes-support/opencv/opencv/0001-Add-missing-include.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 4d984c65384e7d1f409f7e4cc56548a0924b09aa Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Tue, 2 Mar 2021 21:53:21 -0800
-Subject: [PATCH] Add missing include
-
-this is highlighted by gcc-11
-
-Upstream-Status: Pending
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- modules/gapi/test/gapi_async_test.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/modules/gapi/test/gapi_async_test.cpp b/modules/gapi/test/gapi_async_test.cpp
-index 66b8be4dd3..aa0c9c7cfb 100644
---- a/modules/gapi/test/gapi_async_test.cpp
-+++ b/modules/gapi/test/gapi_async_test.cpp
-@@ -13,6 +13,7 @@
-
- #include <condition_variable>
- #include <stdexcept>
-+#include <thread>
-
- namespace opencv_test
- {
---
-2.30.1
-
diff --git a/meta-oe/recipes-support/opencv/opencv_4.5.1.bb b/meta-oe/recipes-support/opencv/opencv_4.5.1.bb
index d6652a01d9..d87e140ba7 100644
--- a/meta-oe/recipes-support/opencv/opencv_4.5.1.bb
+++ b/meta-oe/recipes-support/opencv/opencv_4.5.1.bb
@@ -49,7 +49,6 @@ SRC_URI = "git://github.com/opencv/opencv.git;name=opencv \
file://0001-Dont-use-isystem.patch \
file://download.patch \
file://0001-Make-ts-module-external.patch \
- file://0001-Add-missing-include.patch \
file://0001-Fix-building-opencv-using-gcc-11.x-19244.patch \
"
SRC_URI_append_riscv64 = " file://0001-Use-Os-to-compile-tinyxml2.cpp.patch;patchdir=../contrib"