summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-oe/recipes-support/opencv/opencv/0001-Fix-building-opencv-using-gcc-11.x-19244.patch28
-rw-r--r--meta-oe/recipes-support/opencv/opencv_4.5.2.bb (renamed from meta-oe/recipes-support/opencv/opencv_4.5.1.bb)5
2 files changed, 2 insertions, 31 deletions
diff --git a/meta-oe/recipes-support/opencv/opencv/0001-Fix-building-opencv-using-gcc-11.x-19244.patch b/meta-oe/recipes-support/opencv/opencv/0001-Fix-building-opencv-using-gcc-11.x-19244.patch
deleted file mode 100644
index ce6499bfce..0000000000
--- a/meta-oe/recipes-support/opencv/opencv/0001-Fix-building-opencv-using-gcc-11.x-19244.patch
+++ /dev/null
@@ -1,28 +0,0 @@
1From 67e1a5400383543b28fc69eb09c9429cb9d8c026 Mon Sep 17 00:00:00 2001
2From: Your Name <you@example.com>
3Date: Sat, 2 Jan 2021 17:43:11 +0000
4Subject: [PATCH] Fix building opencv using gcc 11.x #19244
5
6Add missing `#include <thread>` in modules/gapi/test/test_precomp.hpp
7
8Upstream-Status: Backport [https://github.com/opencv/opencv/pull/19247]
9Signed-off-by: Khem Raj <raj.khem@gmail.com>
10---
11 modules/gapi/test/test_precomp.hpp | 1 +
12 1 file changed, 1 insertion(+)
13
14diff --git a/modules/gapi/test/test_precomp.hpp b/modules/gapi/test/test_precomp.hpp
15index 7b3c695443..e92b1d03bf 100644
16--- a/modules/gapi/test/test_precomp.hpp
17+++ b/modules/gapi/test/test_precomp.hpp
18@@ -11,6 +11,7 @@
19 #define __OPENCV_GAPI_TEST_PRECOMP_HPP__
20
21 #include <cstdint>
22+#include <thread>
23 #include <vector>
24
25 #include <opencv2/ts.hpp>
26--
272.30.1
28
diff --git a/meta-oe/recipes-support/opencv/opencv_4.5.1.bb b/meta-oe/recipes-support/opencv/opencv_4.5.2.bb
index d87e140ba7..553fb4e08a 100644
--- a/meta-oe/recipes-support/opencv/opencv_4.5.1.bb
+++ b/meta-oe/recipes-support/opencv/opencv_4.5.2.bb
@@ -10,8 +10,8 @@ ARM_INSTRUCTION_SET_armv5 = "arm"
10 10
11DEPENDS = "libtool swig-native bzip2 zlib glib-2.0 libwebp" 11DEPENDS = "libtool swig-native bzip2 zlib glib-2.0 libwebp"
12 12
13SRCREV_opencv = "1363496c1106606684d40447f5d1149b2c66a9f8" 13SRCREV_opencv = "69357b1e88680658a07cffde7678a4d697469f03"
14SRCREV_contrib = "b91a781cbc1285d441aa682926d93d8c23678b0b" 14SRCREV_contrib = "f5d7f6712d4ff229ba4f45cf79dfd11c557d56fd"
15SRCREV_ipp = "a56b6ac6f030c312b2dce17430eef13aed9af274" 15SRCREV_ipp = "a56b6ac6f030c312b2dce17430eef13aed9af274"
16SRCREV_boostdesc = "34e4206aef44d50e6bbcd0ab06354b52e7466d26" 16SRCREV_boostdesc = "34e4206aef44d50e6bbcd0ab06354b52e7466d26"
17SRCREV_vgg = "fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d" 17SRCREV_vgg = "fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d"
@@ -49,7 +49,6 @@ SRC_URI = "git://github.com/opencv/opencv.git;name=opencv \
49 file://0001-Dont-use-isystem.patch \ 49 file://0001-Dont-use-isystem.patch \
50 file://download.patch \ 50 file://download.patch \
51 file://0001-Make-ts-module-external.patch \ 51 file://0001-Make-ts-module-external.patch \
52 file://0001-Fix-building-opencv-using-gcc-11.x-19244.patch \
53 " 52 "
54SRC_URI_append_riscv64 = " file://0001-Use-Os-to-compile-tinyxml2.cpp.patch;patchdir=../contrib" 53SRC_URI_append_riscv64 = " file://0001-Use-Os-to-compile-tinyxml2.cpp.patch;patchdir=../contrib"
55 54