diff options
| author |   Khem Raj <raj.khem@gmail.com> | 2021-04-07 08:45:40 -0700 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2021-04-08 09:25:54 -0700 |
| commit | ae4dd366014a87e7a196f5b2e168666cdda5a43f (patch) | |
| tree | 73f76f468ea83e816ba89fd82e2fa9e8cac5fd79 | |
| parent | 643af3ee2cf61d12123374ba915ce71c4a56410b (diff) | |
| download | meta-openembedded-contrib-ae4dd366014a87e7a196f5b2e168666cdda5a43f.tar.gz | |
opencv: Upgrade to 5.4.2
Drop patch which is already in 5.4.2 release
Signed-off-by: Khem Raj <raj.khem@gmail.com>
| -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_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 @@ -From 67e1a5400383543b28fc69eb09c9429cb9d8c026 Mon Sep 17 00:00:00 2001 -From: Your Name <you@example.com> -Date: Sat, 2 Jan 2021 17:43:11 +0000 -Subject: [PATCH] Fix building opencv using gcc 11.x #19244 - -Add missing `#include <thread>` in modules/gapi/test/test_precomp.hpp - -Upstream-Status: Backport [https://github.com/opencv/opencv/pull/19247] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - modules/gapi/test/test_precomp.hpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/modules/gapi/test/test_precomp.hpp b/modules/gapi/test/test_precomp.hpp -index 7b3c695443..e92b1d03bf 100644 ---- a/modules/gapi/test/test_precomp.hpp -+++ b/modules/gapi/test/test_precomp.hpp -@@ -11,6 +11,7 @@ - #define __OPENCV_GAPI_TEST_PRECOMP_HPP__ - - #include <cstdint> -+#include <thread> - #include <vector> - - #include <opencv2/ts.hpp> --- -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.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" DEPENDS = "libtool swig-native bzip2 zlib glib-2.0 libwebp" -SRCREV_opencv = "1363496c1106606684d40447f5d1149b2c66a9f8" -SRCREV_contrib = "b91a781cbc1285d441aa682926d93d8c23678b0b" +SRCREV_opencv = "69357b1e88680658a07cffde7678a4d697469f03" +SRCREV_contrib = "f5d7f6712d4ff229ba4f45cf79dfd11c557d56fd" SRCREV_ipp = "a56b6ac6f030c312b2dce17430eef13aed9af274" SRCREV_boostdesc = "34e4206aef44d50e6bbcd0ab06354b52e7466d26" SRCREV_vgg = "fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d" @@ -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-Fix-building-opencv-using-gcc-11.x-19244.patch \ " SRC_URI_append_riscv64 = " file://0001-Use-Os-to-compile-tinyxml2.cpp.patch;patchdir=../contrib" |