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

@@ -0,0 +1,21 @@
+From 496eed950f6d0e7fd92619d47e3cec8f06e96ace 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
+
+---
+ 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 <errno.h>
+ #endif
+ 
++#include <libavcodec/version.h>
+ #include <libavformat/avformat.h>
+ 
+ #ifdef __cplusplus

opencv.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Aug 23 11:22:38 UTC 2022 - Christophe Giboudeaux <christophe@krop.fr>
+
+- Add upstream change to fix include issue with FFmpeg 5:
+  * opencv-ffmpeg5.patch
+
 -------------------------------------------------------------------
 Sun Jun 19 13:25:26 UTC 2022 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
 

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