diff options
author | Khem Raj <raj.khem@gmail.com> | 2021-03-02 19:50:43 -0800 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2021-03-03 11:08:29 -0800 |
commit | 75f7473f4b6f0041c9ae466f433e18d506894a91 (patch) | |
tree | 1a118ee027292faf32279abf9fcdeb5f01e2a074 /meta-oe/recipes-support/opencv | |
parent | 6d795ff5116224fdd752edf94a947aa025c2a0cf (diff) | |
download | meta-openembedded-75f7473f4b6f0041c9ae466f433e18d506894a91.tar.gz |
opencv: Upgrade to 4.5.1
Drop upstreamed patch
Add patches to support gcc 11 while here
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Cc: Jose Quaresma <quaresma.jose@gmail.com>
Diffstat (limited to 'meta-oe/recipes-support/opencv')
-rw-r--r-- | meta-oe/recipes-support/opencv/opencv/0001-Add-missing-include.patch | 28 | ||||
-rw-r--r-- | meta-oe/recipes-support/opencv/opencv/0001-Fix-building-opencv-using-gcc-11.x-19244.patch | 28 | ||||
-rw-r--r-- | meta-oe/recipes-support/opencv/opencv/0001-samples-cmake-digits-needs-opencv_dnn-module-to-buil.patch | 28 | ||||
-rw-r--r-- | meta-oe/recipes-support/opencv/opencv_4.5.1.bb (renamed from meta-oe/recipes-support/opencv/opencv_4.5.0.bb) | 7 |
4 files changed, 60 insertions, 31 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 new file mode 100644 index 000000000..432f3c83e --- /dev/null +++ b/meta-oe/recipes-support/opencv/opencv/0001-Add-missing-include.patch | |||
@@ -0,0 +1,28 @@ | |||
1 | From 4d984c65384e7d1f409f7e4cc56548a0924b09aa Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Tue, 2 Mar 2021 21:53:21 -0800 | ||
4 | Subject: [PATCH] Add missing include | ||
5 | |||
6 | this is highlighted by gcc-11 | ||
7 | |||
8 | Upstream-Status: Pending | ||
9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
10 | --- | ||
11 | modules/gapi/test/gapi_async_test.cpp | 1 + | ||
12 | 1 file changed, 1 insertion(+) | ||
13 | |||
14 | diff --git a/modules/gapi/test/gapi_async_test.cpp b/modules/gapi/test/gapi_async_test.cpp | ||
15 | index 66b8be4dd3..aa0c9c7cfb 100644 | ||
16 | --- a/modules/gapi/test/gapi_async_test.cpp | ||
17 | +++ b/modules/gapi/test/gapi_async_test.cpp | ||
18 | @@ -13,6 +13,7 @@ | ||
19 | |||
20 | #include <condition_variable> | ||
21 | #include <stdexcept> | ||
22 | +#include <thread> | ||
23 | |||
24 | namespace opencv_test | ||
25 | { | ||
26 | -- | ||
27 | 2.30.1 | ||
28 | |||
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 new file mode 100644 index 000000000..ce6499bfc --- /dev/null +++ b/meta-oe/recipes-support/opencv/opencv/0001-Fix-building-opencv-using-gcc-11.x-19244.patch | |||
@@ -0,0 +1,28 @@ | |||
1 | From 67e1a5400383543b28fc69eb09c9429cb9d8c026 Mon Sep 17 00:00:00 2001 | ||
2 | From: Your Name <you@example.com> | ||
3 | Date: Sat, 2 Jan 2021 17:43:11 +0000 | ||
4 | Subject: [PATCH] Fix building opencv using gcc 11.x #19244 | ||
5 | |||
6 | Add missing `#include <thread>` in modules/gapi/test/test_precomp.hpp | ||
7 | |||
8 | Upstream-Status: Backport [https://github.com/opencv/opencv/pull/19247] | ||
9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
10 | --- | ||
11 | modules/gapi/test/test_precomp.hpp | 1 + | ||
12 | 1 file changed, 1 insertion(+) | ||
13 | |||
14 | diff --git a/modules/gapi/test/test_precomp.hpp b/modules/gapi/test/test_precomp.hpp | ||
15 | index 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 | -- | ||
27 | 2.30.1 | ||
28 | |||
diff --git a/meta-oe/recipes-support/opencv/opencv/0001-samples-cmake-digits-needs-opencv_dnn-module-to-buil.patch b/meta-oe/recipes-support/opencv/opencv/0001-samples-cmake-digits-needs-opencv_dnn-module-to-buil.patch deleted file mode 100644 index 022680331..000000000 --- a/meta-oe/recipes-support/opencv/opencv/0001-samples-cmake-digits-needs-opencv_dnn-module-to-buil.patch +++ /dev/null | |||
@@ -1,28 +0,0 @@ | |||
1 | From 114af1ca23ff9bf2e521b2969e343e74cdd8eac1 Mon Sep 17 00:00:00 2001 | ||
2 | From: Jose Quaresma <quaresma.jose@gmail.com> | ||
3 | Date: Sun, 1 Nov 2020 12:29:56 +0000 | ||
4 | Subject: [PATCH] samples: cmake: digits needs opencv_dnn module to build | ||
5 | |||
6 | Intrudeced in commit 397ba2d9aafb5312e777ce2f886d7b568109e931: | ||
7 | add OpenCV sample for digit and text recongnition, and provide multiple OCR models. | ||
8 | https://github.com/opencv/opencv/commit/397ba2d9aafb5312e777ce2f886d7b568109e931 | ||
9 | |||
10 | Upstream-Status: Backport [https://github.com/opencv/opencv/commit/79a82013ad2af04269891ce15281c9fdc31d3f66] | ||
11 | |||
12 | Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com> | ||
13 | --- | ||
14 | samples/cpp/CMakeLists.txt | 1 + | ||
15 | 1 file changed, 1 insertion(+) | ||
16 | |||
17 | diff --git a/samples/cpp/CMakeLists.txt b/samples/cpp/CMakeLists.txt | ||
18 | index 617629df2e..14ab6141df 100644 | ||
19 | --- a/samples/cpp/CMakeLists.txt | ||
20 | +++ b/samples/cpp/CMakeLists.txt | ||
21 | @@ -14,6 +14,7 @@ set(OPENCV_CPP_SAMPLES_REQUIRED_DEPS | ||
22 | opencv_features2d | ||
23 | opencv_calib3d | ||
24 | opencv_stitching | ||
25 | + opencv_dnn | ||
26 | ${OPENCV_MODULES_PUBLIC} | ||
27 | ${OpenCV_LIB_COMPONENTS}) | ||
28 | ocv_check_dependencies(${OPENCV_CPP_SAMPLES_REQUIRED_DEPS}) | ||
diff --git a/meta-oe/recipes-support/opencv/opencv_4.5.0.bb b/meta-oe/recipes-support/opencv/opencv_4.5.1.bb index 5263ffc03..a595e788a 100644 --- a/meta-oe/recipes-support/opencv/opencv_4.5.0.bb +++ b/meta-oe/recipes-support/opencv/opencv_4.5.1.bb | |||
@@ -10,8 +10,8 @@ ARM_INSTRUCTION_SET_armv5 = "arm" | |||
10 | 10 | ||
11 | DEPENDS = "libtool swig-native bzip2 zlib glib-2.0 libwebp" | 11 | DEPENDS = "libtool swig-native bzip2 zlib glib-2.0 libwebp" |
12 | 12 | ||
13 | SRCREV_opencv = "d5fd2f0155ffad366f9ac912dfd6d189a7a6a98e" | 13 | SRCREV_opencv = "1363496c1106606684d40447f5d1149b2c66a9f8" |
14 | SRCREV_contrib = "37315babf9984a5b6aa981644a20dd8df1a5ff02" | 14 | SRCREV_contrib = "b91a781cbc1285d441aa682926d93d8c23678b0b" |
15 | SRCREV_ipp = "a56b6ac6f030c312b2dce17430eef13aed9af274" | 15 | SRCREV_ipp = "a56b6ac6f030c312b2dce17430eef13aed9af274" |
16 | SRCREV_boostdesc = "34e4206aef44d50e6bbcd0ab06354b52e7466d26" | 16 | SRCREV_boostdesc = "34e4206aef44d50e6bbcd0ab06354b52e7466d26" |
17 | SRCREV_vgg = "fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d" | 17 | SRCREV_vgg = "fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d" |
@@ -49,7 +49,8 @@ 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-samples-cmake-digits-needs-opencv_dnn-module-to-buil.patch \ | 52 | file://0001-Add-missing-include.patch \ |
53 | file://0001-Fix-building-opencv-using-gcc-11.x-19244.patch \ | ||
53 | " | 54 | " |
54 | SRC_URI_append_riscv64 = " file://0001-Use-Os-to-compile-tinyxml2.cpp.patch;patchdir=../contrib" | 55 | SRC_URI_append_riscv64 = " file://0001-Use-Os-to-compile-tinyxml2.cpp.patch;patchdir=../contrib" |
55 | 56 | ||