Merge pull request #448 from nyanmisaka/vk-va-interop

Update vulkan patches for 7.0.2
jellyfin · Sep 4, 2024 · 0b01ff1 · 0b01ff1
2 parents 3b82de4 + de8e89a
commit 0b01ff1
Show file tree

Hide file tree

Showing 49 changed files with 4,207 additions and 118 deletions.
diff --git a/builder/scripts.d/10-mingw.sh b/builder/scripts.d/10-mingw.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://git.code.sf.net/p/mingw-w64/mingw-w64.git"
-SCRIPT_COMMIT="f1075a71a0027febccc19a1db0244e98f9ae0102"
+SCRIPT_COMMIT="1b554dec06f8d3c26b856a7d1575f396d8ffa403"
 
 ffbuild_enabled() {
  [[ $TARGET == win* ]] || return -1

diff --git a/builder/scripts.d/20-zlib.sh b/builder/scripts.d/20-zlib.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://github.com/madler/zlib.git"
-SCRIPT_COMMIT="ceadaf28dfa48dbf238a0ddb884d4c543b4170e8"
+SCRIPT_COMMIT="d476828316d05d54c6fd6a068b121b30c147b5cd"
 
 ffbuild_enabled() {
  return 0

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="1452355de99d22b0cba6ccc17bf5cdf3682ef61e"
+SCRIPT_COMMIT="d2612e1c3ff839595fbf67c8263a07d6bac3aaf5"
 
 ffbuild_enabled() {
  return 0

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

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-3.1.6"
+SCRIPT_COMMIT="openssl-3.1.7"
 SCRIPT_TAGFILTER="openssl-3.1.*"
 
 ffbuild_enabled() {

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="70b60ca46107fc4774d163773febe974c76b2ee7"
+SCRIPT_COMMIT="bd83c04aa6f3cb864ba60dc5eaf2b41c4c269c63"
 
 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="fe7dc0c3cfbdda5d064a8f5de9f0256a2df8dfed"
+SCRIPT_COMMIT="a070f9ebbe88dc71b248af9731dd49ec93f4e6e6"
 
 ffbuild_enabled() {
  return 0

diff --git a/builder/scripts.d/45-x11/10-xtrans.sh b/builder/scripts.d/45-x11/10-xtrans.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libxtrans.git"
-SCRIPT_COMMIT="edd3f51328df9c621277168c9dd77b1e80ccfd7c"
+SCRIPT_COMMIT="0f153064bfa4bb69e86f3f2383f2f421f2360319"
 
 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="89429bb36de409b204ef105e8b73126a639ccb03"
+SCRIPT_COMMIT="6b2e9a63d8306282a2b384762bea004c19f301a1"
 
 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="92014b39634e0b0aa52d4bff955a7aac3ed0a915"
+SCRIPT_COMMIT="19b2f5c2d0935cbf9c17ecf30604f80592807b59"
 
 ffbuild_enabled() {
  [[ $TARGET != linux* ]] && return -1

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

diff --git a/builder/scripts.d/45-x11/60-libxv.sh b/builder/scripts.d/45-x11/60-libxv.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libxv.git"
-SCRIPT_COMMIT="b022c9cf7004fe6f794c4c00dd519a2e4c74eca0"
+SCRIPT_COMMIT="fba7bf352678db2938f5a7b173d2a8823595ef3b"
 
 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="6d7bec0469961e2891c6e1aaa5122b76ed82e1db"
+SCRIPT_COMMIT="a6fca4a3bb5585bd0bca4d1a531c40e39f5f572b"
 
 ffbuild_enabled() {
  [[ $TARGET == mac* ]] && 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="2355eeb8f254a1c34dbb0241be5c70cdf6ed46d1"
+SCRIPT_COMMIT="bdef29970a5848dc1bfc706146253931cde0b3f6"
 
 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="c131a95c443f894bd95a05dfa3d0a8dc67a22d5e"
+SCRIPT_COMMIT="3a7a9b99e75fb094f243d4b086b414556a0d9947"
 
 ffbuild_enabled() {
  return 0

diff --git a/builder/scripts.d/50-libopus.sh b/builder/scripts.d/50-libopus.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://github.com/xiph/opus.git"
-SCRIPT_COMMIT="2554a89e02c7fc30a980b4f7e635ceae1ecba5d6"
+SCRIPT_COMMIT="5854a9f7de06ab3505b8fe6e8943db581c2cbe70"
 
 ffbuild_enabled() {
  return 0

diff --git a/builder/scripts.d/50-libvpl.sh b/builder/scripts.d/50-libvpl.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://github.com/intel/libvpl.git"
-SCRIPT_COMMIT="0c13c410095764799afea0cf645bd896378579b8"
+SCRIPT_COMMIT="5f6bd8a1e753c8f63a3fd8b36894d6968b808a6d"
 
 ffbuild_enabled() {
  [[ $TARGET == mac* ]] && return -1

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="3fb0e5d75dc07890113ddbdecb88e34853e058de"
+SCRIPT_COMMIT="fbf63dff1f528d44f24bd662abb89fd01a4a1c25"
 
 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="0c01db7c3ceb3f2c941fc8bba8b3d38878021a79"
+SCRIPT_COMMIT="2e81017c7a345f687223086cbc177a8459a18b52"
 
 ffbuild_enabled() {
  return 0

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="21268"
+SCRIPT_REV="21571"
 
 ffbuild_enabled() {
  return 0

diff --git a/builder/scripts.d/50-rkmpp.sh b/builder/scripts.d/50-rkmpp.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://github.com/nyanmisaka/mpp.git"
-SCRIPT_COMMIT="19611f16d515cd3725bac67e5dd87df096869b40"
+SCRIPT_COMMIT="4ded78b9510145fa79bcd51beb1591450c872277"
 
 ffbuild_enabled() {
  [[ $TARGET == linux* ]] && [[ $TARGET == *arm64 ]] && 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="84d18ec9d1ef9e1bb37133d07151d59e92b4295e"
+SCRIPT_COMMIT="9c7206f0190c0c800a5ee1e71ee61ec0d4c7e216"
 
 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="21a1154add74504aa86d782a3cf662d3d7deb815"
+SCRIPT_COMMIT="55a01def732bb9e7016d23cc512384f7a88d6e86"
 
 ffbuild_enabled() {
  [[ $TARGET == win32 ]] && 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="11cafdd8d64e2fcb0b170a2a1df11a896231de67"
+SCRIPT_COMMIT="25dec5b91fe4d2638787d033a0b22b6c1dc145e0"
 
 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.290"
+SCRIPT_COMMIT="v1.3.295"
 SCRIPT_TAGFILTER="v?.*.*"
 
 ffbuild_enabled() {

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="68d401117c85219ee6b2aba9a0cded314c55798f"
+SCRIPT_COMMIT="6a1fb66eef1bdca14acf7d0a51a3f883499d79f0"
 
 ffbuild_enabled() {
  [[ $TARGET == mac* ]] && return -1

diff --git a/builder/scripts.d/50-vulkan/60-libplacebo.sh b/builder/scripts.d/50-vulkan/60-libplacebo.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://code.videolan.org/videolan/libplacebo.git"
-SCRIPT_COMMIT="64c1954570f1cd57f8570a57e51fb0249b57bb90"
+SCRIPT_COMMIT="1fd3c7bde7b943fe8985c893310b5269a09b46c5"
 
 ffbuild_enabled() {
  [[ $TARGET == mac* ]] && return -1

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="dd594f59d95198c6d8e4133b6002c18e47e7d6fe"
+SCRIPT_COMMIT="f6735953b90e4ff74849e20156a520f5bfd410fc"
 
 ffbuild_enabled() {
  [[ $VARIANT == lgpl* ]] && return -1

diff --git a/debian/changelog b/debian/changelog
@@ -3,6 +3,9 @@ jellyfin-ffmpeg (7.0.2-1) unstable; urgency=medium
  * New upstream version 7.0.2
  * Rename package to jellyin-ffmpeg7
  * Update build scripts and dependencies
+ * Add ICtCp based tonemap method to vt/cuda/ocl tonemap
+ * Add ACES Reference Gamut Compression to vt/cuda/ocl tonemap
+ * Add DoVi reshaping support to software tonemapx
 
  -- nyanmisaka <nst799610810@gmail.com> Thu, 1 Aug 2024 22:10:36 +0800
 

diff --git a/debian/patches/0004-add-cuda-tonemap-impl.patch b/debian/patches/0004-add-cuda-tonemap-impl.patch
@@ -2750,10 +2750,10 @@ Index: FFmpeg/libavfilter/vf_tonemap_cuda.c
 + s->in_range = in->color_range;
 + s->in_chroma_loc = in->chroma_location;
 +
-+ s->out_trc = s->trc;
-+ s->out_spc = s->spc;
-+ s->out_pri = s->pri;
-+ s->out_range = s->range;
++ s->out_trc = s->trc == -1 ? AVCOL_TRC_UNSPECIFIED : s->trc;
++ s->out_spc = s->spc == -1 ? AVCOL_SPC_UNSPECIFIED : s->spc;
++ s->out_pri = s->pri == -1 ? AVCOL_PRI_UNSPECIFIED : s->pri;
++ s->out_range = s->range == -1 ? s->in_range : s->range;
 + s->out_chroma_loc = s->in_chroma_loc;
 +
 + if ((ret = compile(link)) < 0)