CaROS/meta-openembedded
3
1
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-01-04 16:10:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

opencv: Fix build with ffmpeg 5.1+

Browse Source 
Backport a relevant patch

Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Khem Raj 2022-12-01 12:17:01 -08:00
parent 01996cbe10
commit 72dc42966b
2 changed files with 27 additions and 0 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 Normal file
View File

@ -0,0 +1,26 @@
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

1
meta-oe/recipes-support/opencv/opencv_4.6.0.bb
View File

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