gentoo auto-resync : 24:11:2024 - 03:02:54

4 files changed, 0 insertions, 243 deletions

diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index a47d01f65167..988d5afdf07b 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -10,12 +10,9 @@ AUX ffmpeg-4.4.4-opencl-parallel-gmake-fix.patch 362 BLAKE2B 709a5a79aea78125899
 AUX ffmpeg-4.4.4-wint-conversion-vulkan.patch 1066 BLAKE2B 1409c97a31ae59500df944ced7efc064486e325e1658ac8f30d74ac926c63de51b610eebb5be9951adcd8ad02c8c143429c6eff57ce789a1c187e0b24221aa6d SHA512 58e33b2f0e94e75ef7acebb221332dc4d618846f8a968011da370743ce80a4ab688112411d3f2a5320d144c25db567780c870a0eb4045152b73957e2d7fe747e
 AUX ffmpeg-4.4.5-incmptbl-pntr-types.patch 502 BLAKE2B 2c4d4416b112d1b4b0c985be7765e18e5d52586252834dd47052e13caa8554fd28dcbc88b37013f36134d5dba06b0c917f485f42a8e12d5cda37a6b13dd48827 SHA512 d3e9730467d52cb75999fa2494996e2b1515cdfb22d134be50240308f2c1167569033c7aaa821efe10dc0ee252863ff3c8826b58fbf2a727639c1bee652edc14
 AUX ffmpeg-5.0-backport-ranlib-build-fix.patch 2224 BLAKE2B 1af6c5eee3f2c69c0630a73ec3885b9302cb045a03623ff138939348d6ba7e7deef1bb07c33c5bef5834040c4f6abcd7d22af8b0b849b28efde3d5753b776108 SHA512 e82cd400488ba86e5d039f088e3798b5a66245a8753d275d608284081f4b260fb7a4d8d1310f43acdf81258cc507943c8f07e431c497411744a62ba98c88c5bb
-AUX ffmpeg-5.1.2-get_cabac_inline_x86-32-bit.patch 999 BLAKE2B 736a85e60d3ee9b48346e1d7795bd8e075e8bcc2556695ec9db0a48a8d7356d20795ed31e1d6dcda7615e5ad3ff9faf7edf7563ba6e1f822a99d3cd442bd8a72 SHA512 f16c7185a3265710b6638e35322895590b58dffaffcb8fb436b08f945e19c44a1b66a17902b73e89fd53cf5e4cd9e7f2256bef4df4c82be16a807eb6bf663f5a
 AUX ffmpeg-5.1.3-binutils-2.41.patch 2217 BLAKE2B f013c5df1cc3495830d101e551e42dfd07b016913c7cfed82920e85e69d857fb8081e19503d7f0306ca2e0313683d00e3b20293fc8ddab491eb10ffdd3a92b1a SHA512 2db666d4e5f3e9e4f32b6a34e537b5af2229c744eebdbc6680e883b88e5d937ab59f8a0fd7da812a28d9d0a3955853cb594ac5352d31a9655da95b735bbc46c0
 AUX ffmpeg-6.0-fix-lto-type-mismatch.patch 1782 BLAKE2B 4cafd0244136c645e8da072b21c906fba97579f667e57f678b450410759fddc834e5a2428b7d0f078130cfc7ab267cad82a46d369951efddcfc5853dd2118837 SHA512 170114d57af0a0b5fc5da71ae76f4725b8cf1a604b5eca10e60761ef22fb0cdb35a166d1dd5ebc4ef990c383e1d1331f8ef2ceccb8dc7bf4adcc7e9ebb2ba899
-AUX ffmpeg-6.0-libplacebo-remove-deprecated-field.patch 4733 BLAKE2B eba46b33bdbb387b90f89491aa638cb941e7fb72d522945394e540fdfadaf83efc6837a13eefedc285b6bce3ef4443ef32f2c04754209c4a47c4d2216574d597 SHA512 0673dab6043466eecf79048f1da8879d89a014b207910bfd6ec6ebf151fe77edf35460035583f803133969d90ab202ce31aaddf322501ac4e34e1270a66f09fe
 AUX ffmpeg-6.0.1-alignment.patch 5048 BLAKE2B 9a9345b84b68442c97258a71b49ed773e40d985ea8f2525a8749a7562d787634ff0b0e5e1d257e94f7cf68fab81790ca2f0b64cfcb27453e1e6912de30c560e9 SHA512 575b71b2d69b0c7b4e0498b9375dad55945adc7178c72ed5fd12addeae3ffb0081ab59d743a2a6da1a3b67d84642c7dd3d04e2fdb9ae2d992968ba52aa1aee41
-AUX ffmpeg-6.0.1-libjxl-0.9.patch 5209 BLAKE2B 52c393c8e9b15382dbaf06f0c4651927f9dd87ac5437eb333f84689fafea841aeccf6ce9a43a522e2d4a1ec7e56074b8ee394f8c4b12c521cd48f293d36530f1 SHA512 bd114c62a4692fce9d625acb519900bee48fb604b0b7d7a2dba0a8f6648511be2019612ea8bafde95fa3b115bc9b527ab3267477327ce6e41d34b816f24a2654
 AUX ffmpeg-6.1-gcc-14.patch 523 BLAKE2B b82fc06a7eee0c7ab68ef78f3ac205f45a68a7799dc241f0a574afa48e4dbd477c0d67f7c5a7ff46971adc821ef1507f4957156200167a2c59f8c7f7867ac048 SHA512 092cd9bad652ab82c3b160a37c0c92b561577d56b33776e30b79b7abf487fffeb1ef1273b950c4d4eff62d3cd7fec2a6dc2c294285b0b32eda364e47834a4ff9
 AUX ffmpeg-6.1-opencl-parallel-gmake-fix.patch 370 BLAKE2B 46afba747d26105e5520389016aa8cc73ebc1425095e7818e0c2e23ff66b822a5428fec8253a6b545456bd94d0e746ed24bc014a7fa25d97b6fc4acf753341d4 SHA512 82b16798e63736dc67ad03e62eb31c7d3653d2e53a775a0a4456e01985da2336ebde587d3acd2272065c5ce82be528ebc051cd6c121832829d7cd0ed2aba3fdd
 AUX ffmpeg-6.1-wint-conversion.patch 3514 BLAKE2B fcb65b882af964a8f45f71ea3f885fc016e3f89c3d6f0bd6d661d489715c0f746e763a86c6ade1515e212b01559d90ea9c2a97c965e0c0f9087b8396cdd58414 SHA512 7e09fc1a811a21aee9eef0370e57a37817652229a6b0e58cd2e8723e8336124396fe40f6a7c6c5f860046410596027d27d900371ff86609b86ef94dd0633977f
diff --git a/media-video/ffmpeg/files/ffmpeg-5.1.2-get_cabac_inline_x86-32-bit.patch b/media-video/ffmpeg/files/ffmpeg-5.1.2-get_cabac_inline_x86-32-bit.patch
deleted file mode 100644
index 40db3304b564..000000000000
--- a/media-video/ffmpeg/files/ffmpeg-5.1.2-get_cabac_inline_x86-32-bit.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-https://bugs.gentoo.org/901099 and partly https://bugs.gentoo.org/900937.
-
-Newer compilers may optimise such that < 7 registers are free on 32-bit x86
-and then we get an "invalid asm" error. This is https://bugs.gentoo.org/901099
-and https://trac.ffmpeg.org/ticket/8903.
-
-Making matters worse, GCC sometimes hangs on invalid asm, so this also
-mitigates a hang with e.g. -O3 -march=znver1. See https://bugs.gentoo.org/900937
-and https://gcc.gnu.org/bugzilla/show_bug.cgi?id=109137.
-
-In future, we may want to adjust the definition of HAVE_7REGS to just exclude
-32-bit x86, but that's a big sledgehammer, so let's avoid it for now until we have
-a reply on the upstream ffmpeg bug.
---- a/libavcodec/x86/cabac.h
-+++ b/libavcodec/x86/cabac.h
-@@ -175,7 +175,7 @@
-
- #endif /* BROKEN_RELOCATIONS */
-
--#if HAVE_7REGS && !BROKEN_COMPILER
-+#if HAVE_7REGS && !BROKEN_COMPILER && !ARCH_X86_32
- #define get_cabac_inline get_cabac_inline_x86
- static
- #if defined(_WIN32) && !defined(_WIN64) && defined(__clang__)
-
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
deleted file mode 100644
index ca05c1c56ea4..000000000000
--- a/media-video/ffmpeg/files/ffmpeg-6.0-libplacebo-remove-deprecated-field.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-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 },
diff --git a/media-video/ffmpeg/files/ffmpeg-6.0.1-libjxl-0.9.patch b/media-video/ffmpeg/files/ffmpeg-6.0.1-libjxl-0.9.patch
deleted file mode 100644
index 10c216ec4c88..000000000000
--- a/media-video/ffmpeg/files/ffmpeg-6.0.1-libjxl-0.9.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-https://bugs.gentoo.org/924431
-https://git.videolan.org/?p=ffmpeg.git;a=commit;h=75b1a555a70c178a9166629e43ec2f6250219eb2
-https://git.videolan.org/?p=ffmpeg.git;a=commit;h=ac06190a5a11f2b170e7719d769d7c0d65bff3e0
-
-From 75b1a555a70c178a9166629e43ec2f6250219eb2 Mon Sep 17 00:00:00 2001
-From: Leo Izen <leo.izen@gmail.com>
-Date: Sat, 8 Jul 2023 14:43:31 -0400
-Subject: [PATCH] avcodec/libjxldec: build against libjxl 0.9
-
-Git master libjxl changed several function signatures, so this commit
-adds some #ifdefs to handle the new signatures without breaking old
-releases. Do note that old git master development versions of libjxl
-will be broken, but no releases will be.
-
-Signed-off-by: Leo Izen <leo.izen@gmail.com>
---- a/libavcodec/libjxldec.c
-+++ b/libavcodec/libjxldec.c
-@@ -210,14 +210,22 @@ static int libjxl_get_icc(AVCodecContext *avctx)
-     JxlDecoderStatus jret;
-     /* an ICC profile is present, and we can meaningfully get it,
-      * because the pixel data is not XYB-encoded */
-+#if JPEGXL_NUMERIC_VERSION < JPEGXL_COMPUTE_NUMERIC_VERSION(0, 9, 0)
-     jret = JxlDecoderGetICCProfileSize(ctx->decoder, &ctx->jxl_pixfmt, JXL_COLOR_PROFILE_TARGET_DATA, &icc_len);
-+#else
-+    jret = JxlDecoderGetICCProfileSize(ctx->decoder, JXL_COLOR_PROFILE_TARGET_DATA, &icc_len);
-+#endif
-     if (jret == JXL_DEC_SUCCESS && icc_len > 0) {
-         av_buffer_unref(&ctx->iccp);
-         ctx->iccp = av_buffer_alloc(icc_len);
-         if (!ctx->iccp)
-             return AVERROR(ENOMEM);
-+#if JPEGXL_NUMERIC_VERSION < JPEGXL_COMPUTE_NUMERIC_VERSION(0, 9, 0)
-         jret = JxlDecoderGetColorAsICCProfile(ctx->decoder, &ctx->jxl_pixfmt, JXL_COLOR_PROFILE_TARGET_DATA,
--                                                ctx->iccp->data, icc_len);
-+                                              ctx->iccp->data, icc_len);
-+#else
-+        jret = JxlDecoderGetColorAsICCProfile(ctx->decoder, JXL_COLOR_PROFILE_TARGET_DATA, ctx->iccp->data, icc_len);
-+#endif
-         if (jret != JXL_DEC_SUCCESS) {
-             av_log(avctx, AV_LOG_WARNING, "Unable to obtain ICC Profile\n");
-             av_buffer_unref(&ctx->iccp);
-@@ -253,12 +261,21 @@ static int libjxl_color_encoding_event(AVCodecContext *avctx, AVFrame *frame)
-     /* set this flag if we need to fall back on wide gamut */
-     int fallback = 0;
- 
-+#if JPEGXL_NUMERIC_VERSION < JPEGXL_COMPUTE_NUMERIC_VERSION(0, 9, 0)
-     jret = JxlDecoderGetColorAsEncodedProfile(ctx->decoder, NULL, JXL_COLOR_PROFILE_TARGET_ORIGINAL, &jxl_color);
-+#else
-+    jret = JxlDecoderGetColorAsEncodedProfile(ctx->decoder, JXL_COLOR_PROFILE_TARGET_ORIGINAL, &jxl_color);
-+#endif
-     if (jret == JXL_DEC_SUCCESS) {
-         /* enum values describe the colors of this image */
-         jret = JxlDecoderSetPreferredColorProfile(ctx->decoder, &jxl_color);
-         if (jret == JXL_DEC_SUCCESS)
--            jret = JxlDecoderGetColorAsEncodedProfile(ctx->decoder, &ctx->jxl_pixfmt, JXL_COLOR_PROFILE_TARGET_DATA, &jxl_color);
-+#if JPEGXL_NUMERIC_VERSION < JPEGXL_COMPUTE_NUMERIC_VERSION(0, 9, 0)
-+            jret = JxlDecoderGetColorAsEncodedProfile(ctx->decoder, &ctx->jxl_pixfmt,
-+                                                      JXL_COLOR_PROFILE_TARGET_DATA, &jxl_color);
-+#else
-+            jret = JxlDecoderGetColorAsEncodedProfile(ctx->decoder, JXL_COLOR_PROFILE_TARGET_DATA, &jxl_color);
-+#endif
-         /* if we couldn't successfully request the pixel data space, we fall back on wide gamut */
-         /* this code path is very unlikely to happen in practice */
-         if (jret != JXL_DEC_SUCCESS)
--- 
-2.30.2
-
-From ac06190a5a11f2b170e7719d769d7c0d65bff3e0 Mon Sep 17 00:00:00 2001
-From: Leo Izen <leo.izen@gmail.com>
-Date: Tue, 23 Jan 2024 17:29:14 -0500
-Subject: [PATCH] avcodec/libjxl.h: include version.h
-
-This file has been exported since our minimum required version (0.7.0),
-but it wasn't documented. Instead it was transitively included by
-<jxl/decode.h> (but not jxl/encode.h), which ffmpeg relied on.
-
-libjxl broke its API in libjxl/libjxl@66b959239355aef5255 by removing
-the transitive include of version.h, and they do not plan on adding
-it back. Instead they are choosing to leave the API backwards-
-incompatible with downstream callers written for some fairly recent
-versions of their API.
-
-As a result, we include <jxl/version.h> to continue to build against
-more recent versions of libjxl. The version macros removed are also
-present in that file, so we no longer need to redefine them.
-
-Signed-off-by: Leo Izen <leo.izen@gmail.com>
---- a/libavcodec/libjxl.h
-+++ b/libavcodec/libjxl.h
-@@ -27,19 +27,8 @@
- #ifndef AVCODEC_LIBJXL_H
- #define AVCODEC_LIBJXL_H
- 
--#include <jxl/decode.h>
- #include <jxl/memory_manager.h>
--
--/*
-- * libjxl version 0.7.0 and earlier doesn't contain these macros at all
-- * so to detect version 0.7.0 versus 0.8.0 we need to define them ourselves
-- */
--#ifndef JPEGXL_COMPUTE_NUMERIC_VERSION
--    #define JPEGXL_COMPUTE_NUMERIC_VERSION(major,minor,patch) ((major<<24) | (minor<<16) | (patch<<8) | 0)
--#endif
--#ifndef JPEGXL_NUMERIC_VERSION
--    #define JPEGXL_NUMERIC_VERSION JPEGXL_COMPUTE_NUMERIC_VERSION(0, 7, 0)
--#endif
-+#include <jxl/version.h>
- 
- /**
-  * Transform threadcount in ffmpeg to one used by libjxl.
--- 
-2.30.2