diff options
-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 @@ | |||
1 | From d6bdd0a91eb0ed57688c0af5ba5088cf0afdc0a0 Mon Sep 17 00:00:00 2001 | ||
2 | From: Jochen Sprickerhof <jspricke@debian.org> | ||
3 | Date: Mon, 8 Aug 2022 21:10:13 +0200 | ||
4 | Subject: [PATCH] Add missing header for LIBAVCODEC_VERSION_INT | ||
5 | |||
6 | Upstream-Status: Backport [https://github.com/opencv/opencv/pull/22357] | ||
7 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
8 | --- | ||
9 | modules/videoio/src/ffmpeg_codecs.hpp | 1 + | ||
10 | 1 file changed, 1 insertion(+) | ||
11 | |||
12 | diff --git a/modules/videoio/src/ffmpeg_codecs.hpp b/modules/videoio/src/ffmpeg_codecs.hpp | ||
13 | index 61788e0345..faad2596ed 100644 | ||
14 | --- a/modules/videoio/src/ffmpeg_codecs.hpp | ||
15 | +++ b/modules/videoio/src/ffmpeg_codecs.hpp | ||
16 | @@ -60,6 +60,7 @@ extern "C" { | ||
17 | #include <errno.h> | ||
18 | #endif | ||
19 | |||
20 | +#include <libavcodec/version.h> | ||
21 | #include <libavformat/avformat.h> | ||
22 | |||
23 | #ifdef __cplusplus | ||
24 | -- | ||
25 | 2.38.1 | ||
26 | |||
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" | |||
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 = "b0dc474160e389b9c9045da5db49d03ae17c6a6b" | 13 | SRCREV_opencv = "725e440d278aca07d35a5e8963ef990572b07316" |
14 | SRCREV_contrib = "7b77c355a8fdc97667b3fa1e7a0d37e4973fc868" | 14 | SRCREV_contrib = "e247b680a6bd396f110274b6c214406a93171350" |
15 | SRCREV_boostdesc = "34e4206aef44d50e6bbcd0ab06354b52e7466d26" | 15 | SRCREV_boostdesc = "34e4206aef44d50e6bbcd0ab06354b52e7466d26" |
16 | SRCREV_vgg = "fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d" | 16 | SRCREV_vgg = "fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d" |
17 | SRCREV_face = "8afa57abc8229d611c4937165d20e2a2d9fc5a12" | 17 | SRCREV_face = "8afa57abc8229d611c4937165d20e2a2d9fc5a12" |
@@ -30,7 +30,6 @@ SRC_URI = "git://github.com/opencv/opencv.git;name=opencv;branch=master;protocol | |||
30 | file://0001-Dont-use-isystem.patch \ | 30 | file://0001-Dont-use-isystem.patch \ |
31 | file://download.patch \ | 31 | file://download.patch \ |
32 | file://0001-Make-ts-module-external.patch \ | 32 | file://0001-Make-ts-module-external.patch \ |
33 | file://0001-Add-missing-header-for-LIBAVCODEC_VERSION_INT.patch \ | ||
34 | file://0008-Do-not-embed-build-directory-in-binaries.patch \ | 33 | file://0008-Do-not-embed-build-directory-in-binaries.patch \ |
35 | " | 34 | " |
36 | SRC_URI:append:riscv64 = " file://0001-Use-Os-to-compile-tinyxml2.cpp.patch;patchdir=contrib" | 35 | SRC_URI:append:riscv64 = " file://0001-Use-Os-to-compile-tinyxml2.cpp.patch;patchdir=contrib" |