commit: 2df30a8bd2f70b44639ed94b5ff8b1680944dae1 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sat Oct 15 00:44:35 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sat Oct 15 00:44:47 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2df30a8b
media-libs/opencv: fix build with ffmpeg 5 Closes: https://bugs.gentoo.org/876748 Signed-off-by: Sam James <sam <AT> gentoo.org> .../opencv/files/opencv-4.6.0-fix-ffmpeg-5.patch | 19 +++++++++++++++++++ media-libs/opencv/opencv-4.6.0-r2.ebuild | 1 + 2 files changed, 20 insertions(+) diff --git a/media-libs/opencv/files/opencv-4.6.0-fix-ffmpeg-5.patch b/media-libs/opencv/files/opencv-4.6.0-fix-ffmpeg-5.patch new file mode 100644 index 000000000000..557576a8747a --- /dev/null +++ b/media-libs/opencv/files/opencv-4.6.0-fix-ffmpeg-5.patch @@ -0,0 +1,19 @@ +https://github.com/opencv/opencv/issues/22418 +https://github.com/opencv/opencv/commit/496eed950f6d0e7fd92619d47e3cec8f06e96ace +https://bugs.gentoo.org/876748 + +From: Jochen Sprickerhof <[email protected]> +Date: Mon, 8 Aug 2022 21:10:13 +0200 +Subject: [PATCH] Add missing header for LIBAVCODEC_VERSION_INT + +--- 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 + diff --git a/media-libs/opencv/opencv-4.6.0-r2.ebuild b/media-libs/opencv/opencv-4.6.0-r2.ebuild index a02ff7760364..4f475dc6f45e 100644 --- a/media-libs/opencv/opencv-4.6.0-r2.ebuild +++ b/media-libs/opencv/opencv-4.6.0-r2.ebuild @@ -291,6 +291,7 @@ PATCHES=( "${FILESDIR}"/${PN}-4.4.0-disable-native-cpuflag-detect.patch "${FILESDIR}"/${PN}-4.5.0-link-with-cblas-for-lapack.patch "${FILESDIR}"/${P}-fix-build-examples.patch # bug 830163, pending upstream PR #22245 + "${FILESDIR}"/${P}-fix-ffmpeg-5.patch ) pkg_pretend() {
