helium-3rd-party/meta-openembedded
1
0
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-09-30 20:12:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

opencv: Upgrade to 4.7.0

Browse Source 
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>
This commit is contained in:
Mingli Yu 2023-03-07 16:10:12 +08:00 committed by Khem Raj
parent efc7e272c0
commit 36a0a6874b
2 changed files with 2 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
meta-oe/recipes-support/opencv/opencv/0001-Add-missing-header-for-LIBAVCODEC_VERSION_INT.patch
View File

@ -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

5
meta-oe/recipes-support/opencv/opencv_4.6.0.bb → meta-oe/recipes-support/opencv/opencv_4.7.0.bb
View File

@ -10,8 +10,8 @@ ARM_INSTRUCTION_SET:armv5 = "arm"
DEPENDS = "libtool swig-native bzip2 zlib glib-2.0 libwebp" DEPENDS = "libtool swig-native bzip2 zlib glib-2.0 libwebp"
SRCREV_opencv = "b0dc474160e389b9c9045da5db49d03ae17c6a6b" SRCREV_opencv = "725e440d278aca07d35a5e8963ef990572b07316"
SRCREV_contrib = "7b77c355a8fdc97667b3fa1e7a0d37e4973fc868" SRCREV_contrib = "e247b680a6bd396f110274b6c214406a93171350"
SRCREV_boostdesc = "34e4206aef44d50e6bbcd0ab06354b52e7466d26" SRCREV_boostdesc = "34e4206aef44d50e6bbcd0ab06354b52e7466d26"
SRCREV_vgg = "fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d" SRCREV_vgg = "fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d"
SRCREV_face = "8afa57abc8229d611c4937165d20e2a2d9fc5a12" 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://0001-Dont-use-isystem.patch \
file://download.patch \ file://download.patch \
file://0001-Make-ts-module-external.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 \ 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" SRC_URI:append:riscv64 = " file://0001-Use-Os-to-compile-tinyxml2.cpp.patch;patchdir=contrib"