diff options
| author |   Mingli Yu <mingli.yu@windriver.com> | 2023-03-07 16:10:12 +0800 |
|---|---|---|
| committer |   Khem Raj <raj.khem@gmail.com> | 2023-03-07 15:00:10 -0800 |
| commit | 36a0a6874bbf667e9d18b396122226b6a1187ca9 (patch) | |
| tree | db1d6eaf6ff5e0513b29e0d59ed804a93b5a3014 /meta-oe/recipes-support | |
| parent | efc7e272c02d025598cd3a0eeafa0b87c2fabe95 (diff) | |
| download | meta-openembedded-contrib-36a0a6874bbf667e9d18b396122226b6a1187ca9.tar.gz | |
opencv: Upgrade to 4.7.0
Upgrade opencv to 4.7.0 [1] and remove backported patch.
[1] https://github.com/opencv/opencv/wiki/ChangeLog#version470
Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-support')
| -rw-r--r-- | meta-oe/recipes-support/opencv/opencv/0001-Add-missing-header-for-LIBAVCODEC_VERSION_INT.patch | 26 | ||||
| -rw-r--r-- | meta-oe/recipes-support/opencv/opencv_4.7.0.bb (renamed from meta-oe/recipes-support/opencv/opencv_4.6.0.bb) | 5 |
2 files changed, 2 insertions, 29 deletions
diff --git a/meta-oe/recipes-support/opencv/opencv/0001-Add-missing-header-for-LIBAVCODEC_VERSION_INT.patch b/meta-oe/recipes-support/opencv/opencv/0001-Add-missing-header-for-LIBAVCODEC_VERSION_INT.patch deleted file mode 100644 index 59da6ab320..0000000000 --- a/meta-oe/recipes-support/opencv/opencv/0001-Add-missing-header-for-LIBAVCODEC_VERSION_INT.patch +++ /dev/null @@ -1,26 +0,0 @@ -From d6bdd0a91eb0ed57688c0af5ba5088cf0afdc0a0 Mon Sep 17 00:00:00 2001 -From: Jochen Sprickerhof <jspricke@debian.org> -Date: Mon, 8 Aug 2022 21:10:13 +0200 -Subject: [PATCH] Add missing header for LIBAVCODEC_VERSION_INT - -Upstream-Status: Backport [https://github.com/opencv/opencv/pull/22357] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - modules/videoio/src/ffmpeg_codecs.hpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/modules/videoio/src/ffmpeg_codecs.hpp b/modules/videoio/src/ffmpeg_codecs.hpp -index 61788e0345..faad2596ed 100644 ---- a/modules/videoio/src/ffmpeg_codecs.hpp -+++ b/modules/videoio/src/ffmpeg_codecs.hpp -@@ -60,6 +60,7 @@ extern "C" { - #include <errno.h> - #endif - -+#include <libavcodec/version.h> - #include <libavformat/avformat.h> - - #ifdef __cplusplus --- -2.38.1 - diff --git a/meta-oe/recipes-support/opencv/opencv_4.6.0.bb b/meta-oe/recipes-support/opencv/opencv_4.7.0.bb index 1e4c3545be..eef2e66ca8 100644 --- a/meta-oe/recipes-support/opencv/opencv_4.6.0.bb +++ b/meta-oe/recipes-support/opencv/opencv_4.7.0.bb @@ -10,8 +10,8 @@ ARM_INSTRUCTION_SET:armv5 = "arm" DEPENDS = "libtool swig-native bzip2 zlib glib-2.0 libwebp" -SRCREV_opencv = "b0dc474160e389b9c9045da5db49d03ae17c6a6b" -SRCREV_contrib = "7b77c355a8fdc97667b3fa1e7a0d37e4973fc868" +SRCREV_opencv = "725e440d278aca07d35a5e8963ef990572b07316" +SRCREV_contrib = "e247b680a6bd396f110274b6c214406a93171350" SRCREV_boostdesc = "34e4206aef44d50e6bbcd0ab06354b52e7466d26" SRCREV_vgg = "fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d" SRCREV_face = "8afa57abc8229d611c4937165d20e2a2d9fc5a12" @@ -30,7 +30,6 @@ SRC_URI = "git://github.com/opencv/opencv.git;name=opencv;branch=master;protocol file://0001-Dont-use-isystem.patch \ file://download.patch \ file://0001-Make-ts-module-external.patch \ - file://0001-Add-missing-header-for-LIBAVCODEC_VERSION_INT.patch \ file://0008-Do-not-embed-build-directory-in-binaries.patch \ " SRC_URI:append:riscv64 = " file://0001-Use-Os-to-compile-tinyxml2.cpp.patch;patchdir=contrib" |