commit: 0ad18e0ac69d1dc63a3bef23a81ae347a396d279 Author: James Beddek <telans <AT> posteo <DOT> de> AuthorDate: Sun Jan 16 03:47:00 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Wed Jan 19 01:15:28 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ad18e0a
media-video/handbrake: add ffmpeg 5.0 patch Signed-off-by: James Beddek <telans <AT> posteo.de> Signed-off-by: Sam James <sam <AT> gentoo.org> .../files/handbrake-1.5.1-ffmpeg-5.0.patch | 40 ++++++++++++++++++++++ media-video/handbrake/handbrake-1.5.1.ebuild | 3 ++ 2 files changed, 43 insertions(+) diff --git a/media-video/handbrake/files/handbrake-1.5.1-ffmpeg-5.0.patch b/media-video/handbrake/files/handbrake-1.5.1-ffmpeg-5.0.patch new file mode 100644 index 000000000000..643605076294 --- /dev/null +++ b/media-video/handbrake/files/handbrake-1.5.1-ffmpeg-5.0.patch @@ -0,0 +1,40 @@ +# https://git.exherbo.org/media.git/commit/?id=b7a022928103184b7528d0e40ad0a4edcfbbd7a4 + +From 8a9d11e96b771422247c458ae6b07f3a13848f3a Mon Sep 17 00:00:00 2001 +From: Timo Gurr <[email protected]> +Date: Sat, 15 Jan 2022 20:44:53 +0100 +Subject: [PATCH] FFmpeg deprecations fixes for FFmpeg >= 5 + +avcodec.h stopped including bsf.h per FFmpeg commit +57b5ec6ba7df [1]. Fixes compilation error against +FFmpeg later than the mentioned commit. +[1] https://github.com/FFmpeg/FFmpeg/commit/57b5ec6ba7df442caebc401c4a7ef3ebc066b519 +--- + libhb/decavcodec.c | 1 + + libhb/muxavformat.c | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/libhb/decavcodec.c b/libhb/decavcodec.c +index 372f86f82cf..e7a63289c0f 100644 +--- a/libhb/decavcodec.c ++++ b/libhb/decavcodec.c +@@ -41,6 +41,7 @@ + #include "handbrake/handbrake.h" + #include "handbrake/hbffmpeg.h" + #include "handbrake/hbavfilter.h" ++#include "libavcodec/bsf.h" + #include "libavfilter/avfilter.h" + #include "libavfilter/buffersrc.h" + #include "libavfilter/buffersink.h" +diff --git a/libhb/muxavformat.c b/libhb/muxavformat.c +index 232edd0942a..ad8e2a1d8fa 100644 +--- a/libhb/muxavformat.c ++++ b/libhb/muxavformat.c +@@ -8,6 +8,7 @@ + */ + + #include <ogg/ogg.h> ++#include "libavcodec/bsf.h" + #include "libavformat/avformat.h" + #include "libavutil/avstring.h" + #include "libavutil/intreadwrite.h" diff --git a/media-video/handbrake/handbrake-1.5.1.ebuild b/media-video/handbrake/handbrake-1.5.1.ebuild index e8bee8b1fe39..c5f8eebf74a2 100644 --- a/media-video/handbrake/handbrake-1.5.1.ebuild +++ b/media-video/handbrake/handbrake-1.5.1.ebuild @@ -96,6 +96,9 @@ PATCHES=( # Fix x265 linkage... again again #730034 "${FILESDIR}/${PN}-1.3.3-x265-link.patch" + + # Fix compatability with ffmpeg-5.0 + "${FILESDIR}/${PN}-1.5.1-ffmpeg-5.0.patch" ) src_prepare() {
