From 72dc42966be7da07f9553f75b825123b81704f0b Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Thu, 1 Dec 2022 12:17:01 -0800 Subject: [PATCH] opencv: Fix build with ffmpeg 5.1+ Backport a relevant patch Signed-off-by: Khem Raj --- ...ng-header-for-LIBAVCODEC_VERSION_INT.patch | 26 +++++++++++++++++++ .../recipes-support/opencv/opencv_4.6.0.bb | 1 + 2 files changed, 27 insertions(+) create mode 100644 meta-oe/recipes-support/opencv/opencv/0001-Add-missing-header-for-LIBAVCODEC_VERSION_INT.patch 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 new file mode 100644 index 0000000000..59da6ab320 --- /dev/null +++ b/meta-oe/recipes-support/opencv/opencv/0001-Add-missing-header-for-LIBAVCODEC_VERSION_INT.patch @@ -0,0 +1,26 @@ +From d6bdd0a91eb0ed57688c0af5ba5088cf0afdc0a0 Mon Sep 17 00:00:00 2001 +From: Jochen Sprickerhof +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 +--- + 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 + #endif + ++#include + #include + + #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.6.0.bb index 4403af1952..a90baddc26 100644 --- a/meta-oe/recipes-support/opencv/opencv_4.6.0.bb +++ b/meta-oe/recipes-support/opencv/opencv_4.6.0.bb @@ -51,6 +51,7 @@ 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 \ " SRC_URI:append:riscv64 = " file://0001-Use-Os-to-compile-tinyxml2.cpp.patch;patchdir=contrib"