Merge pull request #267 from nyanmisaka/next

Bump version to 6.0-5
jellyfin · Aug 6, 2023 · ea63698 · ea63698
2 parents 19dc2dc + db4f3a6
commit ea63698
Show file tree

Hide file tree

Showing 45 changed files with 1,234 additions and 261 deletions.
diff --git a/build.yaml b/build.yaml
@@ -1,7 +1,7 @@
 ---
 # We just wrap `build` so this is really it
 name: "jellyfin-ffmpeg"
-version: "6.0-4"
+version: "6.0-5"
 packages:
   - buster-amd64
   - buster-armhf

diff --git a/builder/scripts.d/10-mingw-std-threads.sh b/builder/scripts.d/10-mingw-std-threads.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://github.com/meganz/mingw-std-threads.git"
-SCRIPT_COMMIT="6c2061b7da41d6aa1b2162ff4383ec3ece864bc6"
+SCRIPT_COMMIT="c931bac289dd431f1dd30fc4a5d1a7be36668073"
 
 ffbuild_enabled() {
     [[ $TARGET == win* ]] || return -1

diff --git a/builder/scripts.d/20-libxml2.sh b/builder/scripts.d/20-libxml2.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://github.com/GNOME/libxml2.git"
-SCRIPT_COMMIT="884474477284474e0151280aaa275a18e3d7a036"
+SCRIPT_COMMIT="58de9d31da4d0e8cb6bcf7f5e99714f9df2c4411"
 
 ffbuild_enabled() {
     return 0

diff --git a/builder/scripts.d/25-fftw3f.sh b/builder/scripts.d/25-fftw3f.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://github.com/FFTW/fftw3.git"
-SCRIPT_COMMIT="0842f00ae6b6e1f3aade155bc0edd17a7313fa6a"
+SCRIPT_COMMIT="69f6c1a6ebd7ac5af33e7074134fb79fbc729c3d"
 
 ffbuild_enabled() {
     # Dependency of GPL-Only librubberband

diff --git a/builder/scripts.d/25-freetype.sh b/builder/scripts.d/25-freetype.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://gitlab.freedesktop.org/freetype/freetype.git"
-SCRIPT_COMMIT="e4586d960f339cf75e2e0b34aee30a0ed8353c0d"
+SCRIPT_COMMIT="95a872085e5a79cf710acf6389dbd55b6e728aac"
 
 ffbuild_enabled() {
     return 0

diff --git a/builder/scripts.d/25-gmp.sh b/builder/scripts.d/25-gmp.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-SCRIPT_VERSION="6.2.1"
-SCRIPT_SHA512="c99be0950a1d05a0297d65641dd35b75b74466f7bf03c9e8a99895a3b2f9a0856cd17887738fa51cf7499781b65c049769271cbcb77d057d2e9f1ec52e07dd84"
+SCRIPT_VERSION="6.3.0"
+SCRIPT_SHA512="e85a0dab5195889948a3462189f0e0598d331d3457612e2d3350799dba2e244316d256f8161df5219538eb003e4b5343f989aaa00f96321559063ed8c8f29fd2"
 SCRIPT_URL="https://ftp.gnu.org/gnu/gmp/gmp-${SCRIPT_VERSION}.tar.xz"
 
 ffbuild_enabled() {

diff --git a/builder/scripts.d/25-openssl.sh b/builder/scripts.d/25-openssl.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://github.com/openssl/openssl.git"
-SCRIPT_COMMIT="OpenSSL_1_1_1u"
+SCRIPT_COMMIT="OpenSSL_1_1_1v"
 SCRIPT_TAGFILTER="OpenSSL_1_1_1*"
 
 ffbuild_enabled() {

diff --git a/builder/scripts.d/25-xz.sh b/builder/scripts.d/25-xz.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://github.com/xz-mirror/xz.git"
-SCRIPT_COMMIT="dbb3a536ed9873ffa0870321f6873e564c6a9da8"
+SCRIPT_COMMIT="16068f6c30b888cdb873f6285af941d00f95741d"
 
 ffbuild_enabled() {
     return 0

diff --git a/builder/scripts.d/35-fontconfig.sh b/builder/scripts.d/35-fontconfig.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://gitlab.freedesktop.org/fontconfig/fontconfig.git"
-SCRIPT_COMMIT="7e2a1b2577e8d90ea5be3f14091e809ac7742438"
+SCRIPT_COMMIT="2fb3419a92156569bc1ec707401258c922cd0d99"
 
 ffbuild_enabled() {
     return 0

diff --git a/builder/scripts.d/45-harfbuzz.sh b/builder/scripts.d/45-harfbuzz.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://github.com/harfbuzz/harfbuzz.git"
-SCRIPT_COMMIT="d4bbe3f48663944385f25f608438e1eb678fc4b7"
+SCRIPT_COMMIT="1d665c2b521512cdd56964138fc601debd1f1177"
 
 ffbuild_enabled() {
     return 0

diff --git a/builder/scripts.d/45-x11/10-xcbproto.sh b/builder/scripts.d/45-x11/10-xcbproto.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/proto/xcbproto.git"
-SCRIPT_COMMIT="cfcc51836c1f2c174b67073cc8bed92e7e9c9569"
+SCRIPT_COMMIT="b016df100111b56d7c1a2c63ea6791b2287a83e4"
 
 ffbuild_enabled() {
     [[ $TARGET != linux* ]] && return -1

diff --git a/builder/scripts.d/45-x11/10-xproto.sh b/builder/scripts.d/45-x11/10-xproto.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/proto/xorgproto.git"
-SCRIPT_COMMIT="766967322209f2dcb72e6a8edea0c651f586201d"
+SCRIPT_COMMIT="704a75eecdf177a8b18ad7e35813f2f979b0c277"
 
 ffbuild_enabled() {
     [[ $TARGET != linux* ]] && return -1

diff --git a/builder/scripts.d/45-x11/20-libxau.sh b/builder/scripts.d/45-x11/20-libxau.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libxau.git"
-SCRIPT_COMMIT="df1bf4fe528a5a9eef420f78efb225e4696ac467"
+SCRIPT_COMMIT="68e74d37b99f56bbd1a5f2fb8cb4ad6116f27bd3"
 
 ffbuild_enabled() {
     [[ $TARGET != linux* ]] && return -1

diff --git a/builder/scripts.d/45-x11/30-libxcb.sh b/builder/scripts.d/45-x11/30-libxcb.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libxcb.git"
-SCRIPT_COMMIT="8935793f1f3751a6aa9d78955c7d6236177986de"
+SCRIPT_COMMIT="038636786ad1914f3daf3503ae9611f40dffbb8f"
 
 ffbuild_enabled() {
     [[ $TARGET != linux* ]] && return -1

diff --git a/builder/scripts.d/45-x11/40-libx11.sh b/builder/scripts.d/45-x11/40-libx11.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libx11.git"
-SCRIPT_COMMIT="ab0442d3fa835ce16559b29532ac7f674f8557f4"
+SCRIPT_COMMIT="b2c3fb7b4dd4c4c7b9d28c7af7776cccc8e0a98b"
 
 ffbuild_enabled() {
     [[ $TARGET != linux* ]] && return -1

diff --git a/builder/scripts.d/45-x11/60-libxcursor.sh b/builder/scripts.d/45-x11/60-libxcursor.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libxcursor.git"
-SCRIPT_COMMIT="a353f02a7ac4504ad5edb5407278c7a03c507aef"
+SCRIPT_COMMIT="9c1b50ed98d354488329c99bc8bf77d1c6df657c"
 
 ffbuild_enabled() {
     [[ $TARGET != linux* ]] && return -1

diff --git a/builder/scripts.d/50-amf.sh b/builder/scripts.d/50-amf.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://github.com/GPUOpen-LibrariesAndSDKs/AMF.git"
-SCRIPT_COMMIT="bd5db31d3d8ea1fae7002dd903898599bdb7d97a"
+SCRIPT_COMMIT="68f2396f1a55a5b12767f5433411bb4093ea65ed"
 
 ffbuild_enabled() {
     [[ $TARGET == *arm64 ]] && return -1

diff --git a/builder/scripts.d/50-dav1d.sh b/builder/scripts.d/50-dav1d.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://code.videolan.org/videolan/dav1d.git"
-SCRIPT_COMMIT="2373fda303d46489c1ec269dc66369a31663cb25"
+SCRIPT_COMMIT="e58afe4dd9057591882a01c31382c203e8a61c92"
 
 ffbuild_enabled() {
     return 0

diff --git a/builder/scripts.d/50-libass.sh b/builder/scripts.d/50-libass.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://github.com/libass/libass.git"
-SCRIPT_COMMIT="1a599b1db748dfc07df98cd37d8603edb87da2fd"
+SCRIPT_COMMIT="91422bdb9497e8484b3248f5ae7eb50d41e2555d"
 
 ffbuild_enabled() {
     return 0

diff --git a/builder/scripts.d/50-libvpx.sh b/builder/scripts.d/50-libvpx.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://chromium.googlesource.com/webm/libvpx"
-SCRIPT_COMMIT="14e52008edbf2e91386423fdd53310fe49654991"
+SCRIPT_COMMIT="5556ebd894a9a9b07908c3c7fd0a7a87732a7635"
 
 ffbuild_enabled() {
     return 0

diff --git a/builder/scripts.d/50-libwebp.sh b/builder/scripts.d/50-libwebp.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://chromium.googlesource.com/webm/libwebp"
-SCRIPT_COMMIT="08d60d60066eb30ab8e0e3ccfa0cd0b68f8cccc6"
+SCRIPT_COMMIT="dd7364c3cefe0f5c0b3c18c3b1887d353f90fc1f"
 
 ffbuild_enabled() {
     return 0

diff --git a/builder/scripts.d/50-onevpl.sh b/builder/scripts.d/50-onevpl.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://github.com/oneapi-src/oneVPL.git"
-SCRIPT_COMMIT="e12ace9761bb52786409e830f619916b86e87fc5"
+SCRIPT_COMMIT="ca5bbbb057a6e84b103aca807612afb693ad046c"
 
 ffbuild_enabled() {
     [[ $TARGET == *arm64 ]] && return -1

diff --git a/builder/scripts.d/50-openmpt.sh b/builder/scripts.d/50-openmpt.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://source.openmpt.org/svn/openmpt/trunk/OpenMPT"
-SCRIPT_REV="19439"
+SCRIPT_REV="19561"
 
 ffbuild_enabled() {
     return 0

diff --git a/builder/scripts.d/50-srt.sh b/builder/scripts.d/50-srt.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://github.com/Haivision/srt.git"
-SCRIPT_COMMIT="9448e26fcd7602098b4bf9cd7fe535136e89e10b"
+SCRIPT_COMMIT="88ca9ccca4984dbf61a5e1a06ac551b4dead5304"
 
 ffbuild_enabled() {
     return 0

diff --git a/builder/scripts.d/50-svtav1.sh b/builder/scripts.d/50-svtav1.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://gitlab.com/AOMediaCodec/SVT-AV1.git"
-SCRIPT_COMMIT="08c18ba0768ed3dbbff0903adc326fb3a7549bd9"
+SCRIPT_COMMIT="903ff3add82744d586295c37ec1241dc51dab16e"
 
 ffbuild_enabled() {
     [[ $TARGET == win32 ]] && return -1

diff --git a/builder/scripts.d/50-vaapi/30-libpciaccess.sh b/builder/scripts.d/50-vaapi/30-libpciaccess.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libpciaccess.git"
-SCRIPT_COMMIT="8980a39004b10298a7db1f1b0b711a19e8b73aee"
+SCRIPT_COMMIT="03d0b467804bf033c2be259be3f091231f74cff9"
 
 ffbuild_enabled() {
     [[ $TARGET != linux* ]] && return -1

diff --git a/builder/scripts.d/50-vaapi/40-libdrm.sh b/builder/scripts.d/50-vaapi/40-libdrm.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://gitlab.freedesktop.org/mesa/drm.git"
-SCRIPT_COMMIT="98e1db501173303e58ef6a1def94ab7a2d84afc1"
+SCRIPT_COMMIT="c6013245ce9ce287bb86d327f9b6420a320a08e6"
 
 ffbuild_enabled() {
     [[ $TARGET != linux* ]] && return -1

diff --git a/builder/scripts.d/50-vaapi/50-libva.sh b/builder/scripts.d/50-vaapi/50-libva.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://github.com/intel/libva.git"
-SCRIPT_COMMIT="1c58941b93ba5013c68e8370a408efd630275c9c"
+SCRIPT_COMMIT="7d6c7d482b9d2330b1f3a8bac13a6a3205f33382"
 
 ffbuild_enabled() {
     [[ $TARGET != linux* ]] && return -1

diff --git a/builder/scripts.d/50-vulkan/45-vulkan.sh b/builder/scripts.d/50-vulkan/45-vulkan.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://github.com/KhronosGroup/Vulkan-Headers.git"
-SCRIPT_COMMIT="v1.3.246"
+SCRIPT_COMMIT="v1.3.260"
 SCRIPT_TAGFILTER="v?.*.*"
 
 ffbuild_enabled() {

diff --git a/builder/scripts.d/50-vulkan/50-shaderc.sh b/builder/scripts.d/50-vulkan/50-shaderc.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://github.com/google/shaderc.git"
-SCRIPT_COMMIT="e31c4c2e41544d63d90be28c46e4a4793a624240"
+SCRIPT_COMMIT="4d98dac61ee4857ea0691a2b9a48aee44eb409db"
 
 ffbuild_enabled() {
     return 0

diff --git a/builder/scripts.d/50-vulkan/55-spirv-cross.sh b/builder/scripts.d/50-vulkan/55-spirv-cross.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://github.com/KhronosGroup/SPIRV-Cross.git"
-SCRIPT_COMMIT="2d3a152081ca6e6bea7093940d0f81088fe4d01c"
+SCRIPT_COMMIT="bccaa94db814af33d8ef05c153e7c34d8bd4d685"
 
 ffbuild_enabled() {
     return 0

diff --git a/builder/scripts.d/50-x265.sh b/builder/scripts.d/50-x265.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://bitbucket.org/multicoreware/x265_git.git"
-SCRIPT_COMMIT="34532bda12a3a3141880582aa186a59cd4538ae6"
+SCRIPT_COMMIT="8f18e3ad32684eee95e885e718655f93951128c3"
 
 ffbuild_enabled() {
     [[ $VARIANT == lgpl* ]] && return -1

diff --git a/builder/scripts.d/50-zimg.sh b/builder/scripts.d/50-zimg.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://github.com/sekrit-twc/zimg.git"
-SCRIPT_COMMIT="939a78cae6a8207ef778375dfcaa75511162a186"
+SCRIPT_COMMIT="71431815950664f1e11b9ee4e5d4ba23d6d997f1"
 
 ffbuild_enabled() {
     return 0

diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,15 @@
+jellyfin-ffmpeg (6.0-5) unstable; urgency=medium
+
+  * Add VUI info to the seq header of HEVC VA-API encoder
+  * Remove HDR metadata from tonemap_vaapi SDR output
+  * Backport QSV fixes from upstream
+  * Refine VA-API AV1 encoder v3
+  * Fix VA-API import DRM prime2 planar formats
+  * Use contiguous linear Vulkan images for AMD encoder
+  * Update dependencies
+
+ -- nyanmisaka <[email protected]>  Thu, 27 Jul 2023 21:54:12 +0800
+
 jellyfin-ffmpeg (6.0-4) unstable; urgency=medium
 
   * Allow VA-API import DRM prime2 planar formats

diff --git a/debian/patches/0017-add-fixes-for-vaapi-tonemap.patch b/debian/patches/0017-add-fixes-for-vaapi-tonemap.patch
@@ -223,7 +223,7 @@ Index: jellyfin-ffmpeg/libavfilter/vf_tonemap_vaapi.c
 
      err = tonemap_vaapi_set_filter_params(avctx, input_frame);
      if (err < 0)
-@@ -289,6 +408,18 @@ static int tonemap_vaapi_filter_frame(AV
+@@ -289,6 +408,21 @@ static int tonemap_vaapi_filter_frame(AV
      if (ctx->color_matrix != AVCOL_SPC_UNSPECIFIED)
          output_frame->colorspace = ctx->color_matrix;
 
@@ -237,12 +237,15 @@ Index: jellyfin-ffmpeg/libavfilter/vf_tonemap_vaapi.c
 +        out_hdr_metadata.metadata_size = sizeof(VAHdrMetaDataHDR10);
 +
 +        params.output_hdr_metadata = &out_hdr_metadata;
++    } else {
++        av_frame_remove_side_data(output_frame, AV_FRAME_DATA_CONTENT_LIGHT_LEVEL);
++        av_frame_remove_side_data(output_frame, AV_FRAME_DATA_MASTERING_DISPLAY_METADATA);
 +    }
 +
      err = ff_vaapi_vpp_init_params(avctx, &params,
                                     input_frame, output_frame);
      if (err < 0)
-@@ -358,6 +489,60 @@ static av_cold int tonemap_vaapi_init(AV
+@@ -358,6 +492,60 @@ static av_cold int tonemap_vaapi_init(AV
      STRING_OPTION(color_transfer,  color_transfer,  AVCOL_TRC_UNSPECIFIED);
      STRING_OPTION(color_matrix,    color_space,     AVCOL_SPC_UNSPECIFIED);
 
@@ -303,7 +306,7 @@ Index: jellyfin-ffmpeg/libavfilter/vf_tonemap_vaapi.c
      return 0;
  }
 
-@@ -383,10 +568,13 @@ static const AVOption tonemap_vaapi_opti
+@@ -383,10 +571,13 @@ static const AVOption tonemap_vaapi_opti
      { "t",        "Output color transfer characteristics set",
        OFFSET(color_transfer_string),  AV_OPT_TYPE_STRING,
        { .str = NULL }, .flags = FLAGS, "transfer" },