gentoo auto-resync : 26:07:2023 - 10:30:48

3 files changed, 107 insertions, 2 deletions

diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index 5a3b4f556530..5e452857232d 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -9,6 +9,7 @@ AUX ffmpeg-5.1.2-get_cabac_inline_x86-32-bit.patch 999 BLAKE2B 736a85e60d3ee9b48
 AUX ffmpeg-5.1.3-fix-build-svt-av1-1.5.0.patch 3500 BLAKE2B 1098c0ebc5d4db6198edf1928f6821a7e4c891145905fee16c945eba80a6c3647c9ad9402790465c3487d9926e394c592e1e7b87d06b7f6e558579d93a1ff92e SHA512 b4dfde5a84f96de80988f4fce25d947865568f6a2dd0b14219c38b9239aaa14636839a218e46e6d38ea33bf0f1bfb91d603f8317eb2fa71833ebe5852f557e77
 AUX ffmpeg-5.1.3-svt-av1.patch 3092 BLAKE2B 3c41b361fd19f87fa252e7385e917fdbc5821bd365851544a190aa711db96b89cee58b21de00354a69f12a40815cb7811e7558548c841ec183ed5695ee3aa86b SHA512 18889a141d8cba1781447ccc965d408706698af2b4b6c0f91cac70bfd0c27be346461e6545043988825a3b5ec9c196af3b4b408ce575f37135d2cc19ab95163c
 AUX ffmpeg-6.0-DECLARE_ALIGNED.patch 1006 BLAKE2B 10bf1b3f618e0fad2dfb33b42fcec611329181d5481f79c42cbfda7054e2ce5f53e5b2ce439965a1beadc346492ac06c6a91a56d979a73bd72ce8952a15b2dd8 SHA512 e2d3e915a6d9ebae11e000b908bd5346de0d7731407dc783088a6d10a8e36de045a90225d16a01366ed1ad3af16fdb3b87803c03833883e7f31b93e7cdea44f7
+AUX ffmpeg-6.0-libplacebo-remove-deprecated-field.patch 4733 BLAKE2B eba46b33bdbb387b90f89491aa638cb941e7fb72d522945394e540fdfadaf83efc6837a13eefedc285b6bce3ef4443ef32f2c04754209c4a47c4d2216574d597 SHA512 0673dab6043466eecf79048f1da8879d89a014b207910bfd6ec6ebf151fe77edf35460035583f803133969d90ab202ce31aaddf322501ac4e34e1270a66f09fe
 AUX ffmpeg-6.0-wint-conversion-vulkan.patch 1647 BLAKE2B 3d0f0de065a615f199cd3a3074f5038bf6652f41afa8f8754ade5f0112327f069d4cf8eddf3bc25139122d258caceb102dad7c2825b99f35c273e993caae817d SHA512 1fa7506eb393e44ba98ebaea1e98831912279d365ef8909f247913b912973f7782cb0ad869da4244b6a09b91f5cbb5a5207cbc5a4de8ec61fc313714ea663a80
 AUX vmaf-models-default-path.patch 1126 BLAKE2B 71f83765dc89b85e929af393f9d1415d119e71a91aaf45e8a32fd4fff270a129ca797c3b383a6074bea32fb582816660022a59d33bb6f557514df038baaf0271 SHA512 4d21f4b1622d8e47d2821ecac6b893847ada74d75db7d8aaac70efc7e6e7a6607c011b6fb2d015cb0c5e05f6a56e4feed43eca7d35b0f686a68261e6d9981b6a
 DIST ffmpeg-4.2.2-ppc64-altivec.patch.gz 7171 BLAKE2B 6676dadb22d2ab4b0f5c19b418448c5b9b54fd8c803c3f0ab517c6fa7990be08098dd6f6a2b1b3e77a1bed31a069c702366aba79ef9141ff9e23cd8c1b6e2885 SHA512 6653975017de3f7bde420860419fbdddb50ae41dbb811b819f4b5b13807bf885a4c01736f05a684515f97b0d63bd8896d5951a3276af90cc74abfe32dc2e2407
@@ -24,6 +25,6 @@ EBUILD ffmpeg-4.2.9.ebuild 17833 BLAKE2B 9c54f0f4be49eb443b49e1a203a638aae07e0a5
 EBUILD ffmpeg-4.4.4-r2.ebuild 19722 BLAKE2B 28ced02686a1d6a140da6c60d6ebf0e446436b2ac0629420759d817ec80b006e9e9a052e374770ad944678da5ddc7ac86ffe73e57c65323f4ad75207dacb1555 SHA512 307341e26c1bb44b47538d748f038b7ab78afc4a7c544ec26a6e143a93a15b808e054e9da3c3d747777db6800f3d4eb3661be1d272d8e0718aa7df8be2cc985d
 EBUILD ffmpeg-5.1.3-r2.ebuild 19786 BLAKE2B febbb7478c689999d4c58787adb685bb29fadfd7e768844bb2131d8293de52687c0d7f9bc4598e911d8a55b09e20148bc017d33973ffa60f4e3218f4bdf6b3f6 SHA512 826128e75cac2cf3fa251c636012a8d5ece1ef0f3abe542d2db2df9caac390842425b4c63a5a98e2df3f949556795f191a0b1425a5b5ac66353ac86dba8e1991
 EBUILD ffmpeg-6.0-r2.ebuild 19736 BLAKE2B 68dfc156c7a92bc62a26d01c841512ae1972314c41b3a416fe985c6a964f9ed3c374639dcb4d0794b10d9f8ff2ae44e6a4466e989424337b295e8f87bcd17a44 SHA512 0e8bb3b78f400a8cb3c03a0c77841f73dab184af4f99faffd5d1b6bcef706638cbdbeb283c8f3d855e1fcfe23799f5588004881b51389a3ecc6734cdf08df55e
-EBUILD ffmpeg-6.0-r3.ebuild 19785 BLAKE2B af85bbfa02c9d34bf623c4e83dff6c0fcae692b9c5ef134cffe0c9768c5620327e6d5092b017aac0f8b81b7aa35e9155d8407e17f0cdffc574227346454c3617 SHA512 569c0ddeddf6410e15e1090c86a852341625cadbb9a8a6ca39d35cf2b4cfc7a92e4e50b0d220ee03c43cb2145c7994ae14465c61aa10b9efed330b116a0614d1
+EBUILD ffmpeg-6.0-r4.ebuild 19855 BLAKE2B 1a09aa5423e6086a34f6a89b38ee69e2ea82b47a75603b0e270d35799159775e1b57cde73724b80be91a844c774fd00281b0c67b6181d8d428a8abad4ffb80c9 SHA512 bc643f7563b12c1bb63d179c686fbadf8ef86083d1891bd689b61153348c4b5b1eaed2d0ca4bf868b1f622cecd740028284752d7c63ba4e87882fb02e760a0a1
 EBUILD ffmpeg-9999.ebuild 19621 BLAKE2B f2626bdc5c5c3d08a1b84271499bac4ae28ec93438fdfb6df21bfe2847120d408d80337ef92b98e0995f8b4cab4a2db57f4cc1962df2470b5b8b5e25291b9aa1 SHA512 0cebfd2d88262810ba4d497e79dd130de6093bd8eec429f7007580e08ee123b44f03672e78e63e0d2ba1f34ccd54f5580d6caf384752134182190e2bc4e5a953
 MISC metadata.xml 7426 BLAKE2B 68fd0b4c5ff7cd08635421bab3b3257f06ad139212d44055f60e7f9e69c36d4e24e8d29ebf1662235269caefd388576d05c798ee67cf4b2871fab54362c405ba SHA512 c4bc329ce8903649a4eaeae01b7c0083a192e09701194c5867b651cc0650260bb12df740b68ffa85e49aadea133458a279070d320aa28195a9f71a99de4eaca8
diff --git a/media-video/ffmpeg/ffmpeg-6.0-r3.ebuild b/media-video/ffmpeg/ffmpeg-6.0-r4.ebuild
index fe431b8716e8..e4b90e3a7bf4 100644
--- a/media-video/ffmpeg/ffmpeg-6.0-r3.ebuild
+++ b/media-video/ffmpeg/ffmpeg-6.0-r4.ebuild
@@ -296,7 +296,7 @@ RDEPEND="${RDEPEND}
 "
 
 DEPEND="${RDEPEND}
-	amf? ( media-libs/amf-headers )
+	amf? ( >=media-libs/amf-headers-1.4.28 )
 	ladspa? ( >=media-libs/ladspa-sdk-1.13-r2[${MULTILIB_USEDEP}] )
 	v4l? ( sys-kernel/linux-headers )
 "
@@ -344,6 +344,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-DECLARE_ALIGNED.patch
 	"${FILESDIR}"/${PN}-5.1.2-get_cabac_inline_x86-32-bit.patch
 	"${FILESDIR}"/${P}-wint-conversion-vulkan.patch
+	"${FILESDIR}"/${P}-libplacebo-remove-deprecated-field.patch
 )
 
 MULTILIB_WRAPPED_HEADERS=(
diff --git a/media-video/ffmpeg/files/ffmpeg-6.0-libplacebo-remove-deprecated-field.patch b/media-video/ffmpeg/files/ffmpeg-6.0-libplacebo-remove-deprecated-field.patch
new file mode 100644
index 000000000000..ca05c1c56ea4
--- /dev/null
+++ b/media-video/ffmpeg/files/ffmpeg-6.0-libplacebo-remove-deprecated-field.patch
@@ -0,0 +1,103 @@
+Bug: https://bugs.gentoo.org/910406
+
+Backports the following two commits:
+  https://github.com/FFmpeg/FFmpeg/commit/11eca6018c40f5ebe6af93cbc4b4dce447d8b3bc
+  https://github.com/FFmpeg/FFmpeg/commit/1231003c3c6d4839a9e838d06f8e16ee7690958f
+
+--- a/doc/filters.texi
++++ b/doc/filters.texi
+@@ -16242,9 +16242,6 @@
+ @item disable_builtin
+ Disable built-in GPU sampling (forces LUT).
+ 
+-@item force_icc_lut
+-Force the use of a full ICC 3DLUT for gamut mapping.
+-
+ @item disable_fbos
+ Forcibly disable FBOs, resulting in loss of almost all functionality, but
+ offering the maximum possible speed.
+--- a/libavfilter/version_major.h
++++ b/libavfilter/version_major.h
+@@ -35,4 +35,6 @@
+  * the public API and may change, break or disappear at any time.
+  */
+ 
++#define FF_API_LIBPLACEBO_OPTS (LIBAVFILTER_VERSION_MAJOR < 10)
++
+ #endif /* AVFILTER_VERSION_MAJOR_H */
+--- a/libavfilter/vf_libplacebo.c
++++ b/libavfilter/vf_libplacebo.c
+@@ -97,7 +97,6 @@
+     float polar_cutoff;
+     int disable_linear;
+     int disable_builtin;
+-    int force_icc_lut;
+     int force_dither;
+     int disable_fbos;
+ 
+@@ -132,11 +131,15 @@
+     int inverse_tonemapping;
+     float crosstalk;
+     int tonemapping_lut_size;
++
++#if FF_API_LIBPLACEBO_OPTS
+     /* for backwards compatibility */
+     float desat_str;
+     float desat_exp;
+     int gamut_warning;
+     int gamut_clipping;
++    int force_icc_lut;
++#endif
+ 
+      /* pl_dither_params */
+     int dithering;
+@@ -380,6 +383,7 @@
+         pl_rect2df_aspect_set(&target.crop, aspect, s->pad_crop_ratio);
+     }
+ 
++#if FF_API_LIBPLACEBO_OPTS
+     /* backwards compatibility with older API */
+     if (!tonemapping_mode && (s->desat_str >= 0.0f || s->desat_exp >= 0.0f)) {
+         float str = s->desat_str < 0.0f ? 0.9f : s->desat_str;
+@@ -397,6 +401,7 @@
+         gamut_mode = PL_GAMUT_WARN;
+     if (s->gamut_clipping)
+         gamut_mode = PL_GAMUT_DESATURATE;
++#endif
+ 
+     /* Update render params */
+     params = (struct pl_render_params) {
+@@ -458,7 +463,6 @@
+         .polar_cutoff = s->polar_cutoff,
+         .disable_linear_scaling = s->disable_linear,
+         .disable_builtin_scalers = s->disable_builtin,
+-        .force_icc_lut = s->force_icc_lut,
+         .force_dither = s->force_dither,
+         .disable_fbos = s->disable_fbos,
+     };
+@@ -818,11 +822,14 @@
+     { "inverse_tonemapping", "Inverse tone mapping (range expansion)", OFFSET(inverse_tonemapping), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, DYNAMIC },
+     { "tonemapping_crosstalk", "Crosstalk factor for tone-mapping", OFFSET(crosstalk), AV_OPT_TYPE_FLOAT, {.dbl = 0.04}, 0.0, 0.30, DYNAMIC },
+     { "tonemapping_lut_size", "Tone-mapping LUT size", OFFSET(tonemapping_lut_size), AV_OPT_TYPE_INT, {.i64 = 256}, 2, 1024, DYNAMIC },
++
++#if FF_API_LIBPLACEBO_OPTS
+     /* deprecated options for backwards compatibility, defaulting to -1 to not override the new defaults */
+     { "desaturation_strength", "Desaturation strength", OFFSET(desat_str), AV_OPT_TYPE_FLOAT, {.dbl = -1.0}, -1.0, 1.0, DYNAMIC | AV_OPT_FLAG_DEPRECATED },
+     { "desaturation_exponent", "Desaturation exponent", OFFSET(desat_exp), AV_OPT_TYPE_FLOAT, {.dbl = -1.0}, -1.0, 10.0, DYNAMIC | AV_OPT_FLAG_DEPRECATED },
+     { "gamut_warning", "Highlight out-of-gamut colors", OFFSET(gamut_warning), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, DYNAMIC | AV_OPT_FLAG_DEPRECATED },
+     { "gamut_clipping", "Enable colorimetric gamut clipping", OFFSET(gamut_clipping), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, DYNAMIC | AV_OPT_FLAG_DEPRECATED },
++#endif
+ 
+     { "dithering", "Dither method to use", OFFSET(dithering), AV_OPT_TYPE_INT, {.i64 = PL_DITHER_BLUE_NOISE}, -1, PL_DITHER_METHOD_COUNT - 1, DYNAMIC, "dither" },
+         { "none", "Disable dithering", 0, AV_OPT_TYPE_CONST, {.i64 = -1}, 0, 0, STATIC, "dither" },
+@@ -847,7 +854,9 @@
+     { "polar_cutoff", "Polar LUT cutoff", OFFSET(polar_cutoff), AV_OPT_TYPE_FLOAT, {.dbl = 0}, 0.0, 1.0, DYNAMIC },
+     { "disable_linear", "Disable linear scaling", OFFSET(disable_linear), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, DYNAMIC },
+     { "disable_builtin", "Disable built-in scalers", OFFSET(disable_builtin), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, DYNAMIC },
+-    { "force_icc_lut", "Force the use of a full ICC 3DLUT for color mapping", OFFSET(force_icc_lut), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, DYNAMIC },
++#if FF_API_LIBPLACEBO_OPTS
++    { "force_icc_lut", "Deprecated, does nothing", OFFSET(force_icc_lut), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, DYNAMIC | AV_OPT_FLAG_DEPRECATED },
++#endif
+     { "force_dither", "Force dithering", OFFSET(force_dither), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, DYNAMIC },
+     { "disable_fbos", "Force-disable FBOs", OFFSET(disable_fbos), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, DYNAMIC },
+     { NULL },