cherrypicked patch for "avcodec/libjxlenc: avoid hard failure with unspecified primaries" error

2 files changed, 23 insertions, 2 deletions

diff --git a/PKGBUILD b/PKGBUILD
index c77d4ac330d4..cdeded34cf2d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,7 +11,7 @@
 # https://bugs.archlinux.org/task/76106
 # https://bugs.archlinux.org/task/76277
 #
-# in some cases with some cheerleading from other another package maintainer:
+# in some cases with some cheerleading from another package maintainer:
 #
 # https://bugs.archlinux.org/task/76643
 #
@@ -120,13 +120,16 @@ conflicts=('ffmpeg')
 source=(
   "https://ffmpeg.org/releases/ffmpeg-${pkgver}.tar.xz"
   add-av_stream_get_first_dts-for-chromium.patch
+  ffmpeg-libjxl-primary.patch
 )
 b2sums=('SKIP'
-        '555274228e09a233d92beb365d413ff5c718a782008075552cafb2130a3783cf976b51dfe4513c15777fb6e8397a34122d475080f2c4483e8feea5c0d878e6de')
+        'SKIP'
+        'SKIP')
 
 prepare() {
   cd "ffmpeg-${pkgver}"
   patch -Np1 -i ../add-av_stream_get_first_dts-for-chromium.patch # https://crbug.com/1251779
+  patch -Np1 -i ../ffmpeg-libjxl-primary.patch # https://github.com/mpv-player/mpv/issues/10349, https://github.com/FFmpeg/FFmpeg/commit/05d6157aab34bc49f23284645a8f34ece870f44d
 }
 
 build() {
diff --git a/ffmpeg-libjxl-primary.patch b/ffmpeg-libjxl-primary.patch
new file mode 100644
index 000000000000..c5ce566440a0
--- /dev/null
+++ b/ffmpeg-libjxl-primary.patch
@@ -0,0 +1,18 @@
+diff --git a/libavcodec/libjxlenc.c b/libavcodec/libjxlenc.c
+index 6a948cc3ae..d6d25fe970 100644
+--- a/libavcodec/libjxlenc.c
++++ b/libavcodec/libjxlenc.c
+@@ -343,8 +343,11 @@  static int libjxl_encode_frame(AVCodecContext *avctx, AVPacket *pkt, const AVFra
+     ret = libjxl_populate_primaries(&jxl_color,
+             frame->color_primaries && frame->color_primaries != AVCOL_PRI_UNSPECIFIED
+             ? frame->color_primaries : avctx->color_primaries);
+-    if (ret < 0)
+-        return ret;
++    if (ret < 0) {
++        av_log(avctx, AV_LOG_WARNING, "Unknown primaries, assuming BT.709/sRGB. Colors may be wrong.\n");
++        jxl_color.primaries = JXL_PRIMARIES_SRGB;
++        jxl_color.white_point = JXL_WHITE_POINT_D65;
++    }
+
+     sd = av_frame_get_side_data(frame, AV_FRAME_DATA_ICC_PROFILE);
+     if (sd && sd->size && JxlEncoderSetICCProfile(ctx->encoder, sd->data, sd->size) != JXL_ENC_SUCCESS)