gentoo resync : 02.02.2022

3 files changed, 45 insertions, 1 deletions

diff --git a/media-video/handbrake/Manifest b/media-video/handbrake/Manifest
index 0cd677989578..d6a835567d63 100644
--- a/media-video/handbrake/Manifest
+++ b/media-video/handbrake/Manifest
@@ -2,12 +2,13 @@ AUX handbrake-1.3.0-dont-search-for-python.patch 691 BLAKE2B 623654494bf61cedb53
 AUX handbrake-1.3.3-libhb-fix-audio-encoders-when-linking-to-FFmpeg-4.4.patch 1016 BLAKE2B ffe0a1dc7d693352010eeeafbc61c9d4df43f148ae2a67449c252d71dfc888589161aa88938ee333d9f082aed6873a2d8f2461c0da14d1af388e311a3f8f6058 SHA512 d6237cf24e97a80a6f407209199af281f31f3b2745051db270f9ff2e887a5da98323c6c48be5d7aa3e59a5da17f2691e503b00137c670a6569baed67d8bd39a0
 AUX handbrake-1.3.3-remove-faac-dependency.patch 3697 BLAKE2B b0f7d0a1c4d464d3287ab233b756f5036d6ffa7e9e59a2f98a8ffb2ae59e46d25e56edb3e5bf9c04a16330f3dc50f4c2426f252b35834b7c9c9e6b4904244368 SHA512 9d070e50a9b7d4b8ac25b7d56bd341aca6dc979ba506c84f4b95109909f70020723915cd120bed24e84a8fc242ee3c3a5775f43a78b7995e53cd499444c9f6dc
 AUX handbrake-1.3.3-x265-link.patch 277 BLAKE2B 6e5f7d5f59601ebf3c36116f595040d6e884637c8dc9a900774db9db07d1c0686a1b5c2db9276ca1c14612615e3974a7f9b05cb48c23f8f30ed0851238b92c32 SHA512 a74a2d20972a01b89dbfd7b81c070608d57e646de2ce63d9ae2d2e1486d31ca63e96d5ec803052b52e68bee157d5a1882914e0009ae480d1f8192031d79852eb
+AUX handbrake-1.5.1-ffmpeg-5.0.patch 1338 BLAKE2B b4cd48ac769858779b8870eef7b7a4f66d67cce42d2c3e5c4cbbe7012c9f3f5622eae5b708f88300108539e683218292f395e0d6e32702e5ea3f2039556f9204 SHA512 cec727b44485847f20abb25d2ec6a8d1f59165c984a118f60803bdd70fd42b1b8209b76fe097961a4197e939720443979d5ba92df0857d195d918cd38ba2b733
 AUX handbrake-9999-remove-dvdnav-dup.patch 809 BLAKE2B 16cde838dcf59753e5438df0d2c2b81f45667058bd0687a7368c528f61bd2a2fedc4462894daad58c3acb5c51bdd53df3b30e28adba93a0fb2838416e4226217 SHA512 e2005155adf29e8253f4313d209b2ccc642fb1d7f63256d3bdf675ddd0e6b0e15bc6bffd98e19aa7dab3907e161e29c5268dc5656590ce9254b12a91ac3ff6b0
 AUX handbrake-9999-remove-faac-dependency.patch 4037 BLAKE2B fa3d059198f79334d2b4e8109fd5d39d9f02ded8e46c287009bb8486d9c968b5387813f894fb78ccdd584e4f72fbcc4ee42cd00fc834933f90601c7fb08d0737 SHA512 155b8f5585a66167ae39d568d4c12227ffb7cf327707b556ed28532e6f8adce1a81601ae35403e14d6850e3c9411b1b9142c90dc2af50be1083abe21fa3d68f7
 AUX handbrake-9999-system-tools.patch 1489 BLAKE2B 2a3286dc1cd37d85e1edb1312688a354f000d560a767dc4c4fc23b7874bec46692f21a5b7e2c2b6cc7b6efb221a00084355659ee9d9965a28a23c7012adfbd3d SHA512 eb07b8e675cf6a8b4eee1d0fcb682ae7d61c9ec8423202b6c8672fc94f6b011b1e01a5e9654b2e63d15b66c122e8c2c57b385e36a43d3c68fba69bf144beb508
 DIST handbrake-1.4.2.tar.bz2 15991593 BLAKE2B 966b54d35dd5544800208edc9045eaf26f3253aa470686b9ea29cdf69393af140829b21072133684661fd881eee7f97b90f9c7edfa87f187058dd1b14d1a748b SHA512 ba8ffe01cd813e9991716eabb2844e1ed414e3a2c547154b89588389e96846af9f2dd47f66d735101fdacd5be1928e34e4bab31e6a189779e77001ffdb0b427e
 DIST handbrake-1.5.1.tar.bz2 16137974 BLAKE2B 9ce1f1ae7b2fe514ba1fb6ed30a345d18144829272a6298f2af0831e5ea7533ef2f8b201fd98389269b0ea12bbba15d0b76f09afeff6ed1d9ed313f20cf8f3a1 SHA512 63c5933f77d417a89512abd278a1d844f2b7a36ec9f8ab664c1a1348fd228ee389fc8e349b2df6cbf5d617b912d4634457ebea86490ff5ed4930f39a90dc7568
 EBUILD handbrake-1.4.2-r2.ebuild 4072 BLAKE2B 965d544ea6ebc761306ff09503ca4211f2d6283031d42a9fc5ae29e7bbb9988744dfec15b9549eb8c75f9e892cf64f0430384802d0ff867205c84612d09fbca6 SHA512 18e0e2b7794fcf39af1c1951fb4b0a8b4e046ac0d021af913502ad6fb3335aa184630b68f472a363edf075f2ff7fb9a7ffedcba152d70704595ce4a780c6a95a
-EBUILD handbrake-1.5.1.ebuild 4073 BLAKE2B 67d8825b04fe1ee55254e5b602a8f8c9c1e7c4818eaa9ffd90729ae9f2b9897af50dc30c093c64d85b3cc7470dc09f001e1d58f53ec678767d27375e6aa4d549 SHA512 34e63623fe7e6bf8c0bcde6b4308130ef97214aab742cdbd20d1704084c4707023edf30cc9c99fe7fccb303b222874800188654767dc8664977b85d1fa2cd8ac
+EBUILD handbrake-1.5.1.ebuild 4155 BLAKE2B 1aaf12dd8fa6f6f74655f860c9fd50d7bb4e2ca23d86d413f7bd4966fbce4d62238beda0b127c3654e80906dce185ccb8a7c65b7dafb7867c10fd547d473e92f SHA512 ebc2c2885b711c014df56dbc8a132f6fed4c3b92b718420225817f61e5e6912feb4edfeb10360f0090ce965a84c13db7506ed2f57a62bd2d3aaae084fa0210f8
 EBUILD handbrake-9999.ebuild 4073 BLAKE2B 8b2d6db78de39f0d96a3ebd2f5c1a2a68c683f59a7e0bcbc26e62f9c75c81d7f16f371e6d468b4295e5a1bd13d580ddb4681c5ce8becc38f0e6bcb72ce4735e3 SHA512 aefa37c8343d79e4bf283f7198a096356665f72c1387458f17ed905ff61b32c52c076eebcc265062edc808a555489bc8284bb39fee7c4f9eda7e16dc0bbef525
 MISC metadata.xml 1111 BLAKE2B af0af39468b2c04ae8e9f4005ee813eec2c707fe0e39f28df0b18d7836f7b6c2b46cbe9a790ca5ff2d67e15548707dc080b2fb5a4028ebed711b92f0df09ad41 SHA512 e6adea6ce757118935546923c6073b6764e8ad93e2ed6cc96789f3fc0236c762f461f31fbf94cc49b4e191ec99ac903070b1496adff79fe3af91082dbc5bc4d1
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 <timo.gurr@gmail.com>
+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() {