From b1d11cb8d62e86d3333bfe07cd532e103fe79e122c3cae4afc411f6ee2194e42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20Br=C3=BCns?= Date: Fri, 26 Aug 2022 13:30:56 +0000 Subject: [PATCH] Accepting request 998805 from home:cgiboudeaux:branches:home:dimstar:ffmpeg5 - Add upstream change to fix include issue with FFmpeg 5: * opencv-ffmpeg5.patch OBS-URL: https://build.opensuse.org/request/show/998805 OBS-URL: https://build.opensuse.org/package/show/science/opencv?expand=0&rev=34 --- opencv-ffmpeg5.patch | 21 +++++++++++++++++++++ opencv.changes | 6 ++++++ opencv.spec | 2 ++ 3 files changed, 29 insertions(+) create mode 100644 opencv-ffmpeg5.patch diff --git a/opencv-ffmpeg5.patch b/opencv-ffmpeg5.patch new file mode 100644 index 0000000..93646cc --- /dev/null +++ b/opencv-ffmpeg5.patch @@ -0,0 +1,21 @@ +From 496eed950f6d0e7fd92619d47e3cec8f06e96ace 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 + +--- + 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 61788e0345a6..faad2596edc5 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 diff --git a/opencv.changes b/opencv.changes index 26ac2c3..aaca5fd 100644 --- a/opencv.changes +++ b/opencv.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Aug 23 11:22:38 UTC 2022 - Christophe Giboudeaux + +- Add upstream change to fix include issue with FFmpeg 5: + * opencv-ffmpeg5.patch + ------------------------------------------------------------------- Sun Jun 19 13:25:26 UTC 2022 - Stefan BrĂ¼ns diff --git a/opencv.spec b/opencv.spec index b6b98d8..9c7ef7f 100644 --- a/opencv.spec +++ b/opencv.spec @@ -40,6 +40,8 @@ URL: https://opencv.org/ Source0: https://github.com/opencv/opencv/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz # Several modules from the opencv_contrib package Source1: https://github.com/opencv/opencv_contrib/archive/%{version}.tar.gz#/opencv_contrib-%{version}.tar.gz +# PATCH-FIX-UPSTREAM FFmpeg 5 include fix +Patch0: opencv-ffmpeg5.patch BuildRequires: cmake BuildRequires: fdupes BuildRequires: libeigen3-devel