Merge pull request #527 from nyanmisaka/fix-vaapi-csc-i420

Fix a race condition in VAAPI CSC to YUV420P
jellyfin · Jan 21, 2025 · 5222ba3 · 5222ba3
2 parents 53c3cdd + 1753ec5
commit 5222ba3
Show file tree

Hide file tree

Showing 73 changed files with 302 additions and 510 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: "7.0.2-8"
+version: "7.0.2-9"
 packages:
   - bullseye-amd64
   - bullseye-armhf

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="b45bcc136eaa697b5bde3a5949b45f3c91b4a1ff"
+SCRIPT_COMMIT="be91da60c4ae62a76099279500810c8ffbef4da1"
 
 ffbuild_enabled() {
     [[ $TARGET == win* ]] || return -1

diff --git a/builder/scripts.d/20-libiconv.sh b/builder/scripts.d/20-libiconv.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://skia.googlesource.com/third_party/libiconv"
-SCRIPT_COMMIT="v1.17"
+SCRIPT_COMMIT="v1.18"
 SCRIPT_TAGFILTER="v?.*"
 
 ffbuild_enabled() {
@@ -22,7 +22,12 @@ ffbuild_dockerbuild() {
 EOF
 
     ./gitsub.sh pull
-    ./gitsub.sh checkout gnulib d4ec02b3cc70cddaaa5183cc5a45814e0afb2292 # tag v1.0
+    ./gitsub.sh checkout gnulib e9c1d94f58eaacee919bb2015da490b980a5eedf
+
+    # No automake 1.17 packaged anywhere yet.
+    sed -i 's/-1.17/-1.16/' Makefile.devel
+
+    (unset CC CFLAGS GMAKE && ./autogen.sh)
 
     local myconf=(
         --prefix="$FFBUILD_PREFIX"
@@ -41,7 +46,6 @@ EOF
         return -1
     fi
 
-    ./autogen.sh
     ./configure "${myconf[@]}"
     make -j$(nproc)
     make install

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="59320b2d3c2584ac01914ed0deff64bcc8fb23b2"
+SCRIPT_COMMIT="ad7dce7751298e3d65752c5149f08892ff79bcb0"
 
 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="169857ad264e51d9b34d7119d2e2e006e35e60c2"
+SCRIPT_COMMIT="1c82bca6bd23d0f0858d7fc228ec3a91fda3e0e2"
 
 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="f9c546ff3e4040a34a0ac27210d3cbdc64c367b5"
+SCRIPT_COMMIT="127bb4dbfca7ba669eb40212ffcf24dd8f30351b"
 
 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="c8050b3872d012adf0a64b5b39d9c67e7f4dfc94"
+SCRIPT_COMMIT="3a7ebc320d0038ebf61c60531979a6f9bca7c26b"
 
 ffbuild_enabled() {
     return 0

diff --git a/builder/scripts.d/45-libNE10.sh b/builder/scripts.d/45-libNE10.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://github.com/gnattu/Ne10.git"
-SCRIPT_COMMIT="545f4f18014cdbf9fb5fb1a9f5d24000200dfa8b"
+SCRIPT_COMMIT="502bbc4ab65fe83114d618363510fd4ffb7a8c46"
 
 ffbuild_enabled() {
     [[ $TARGET == win* ]] && return -1

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="e58ae2d27f7baee28319faa02b77cdc344e2f0ca"
+SCRIPT_COMMIT="02415310dd4997b4a7943814381c0b52d91eb8de"
 
 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="622152ee42a310876f10602601206954b8d0613e"
+SCRIPT_COMMIT="daf2c5397607c32c3814f02831b9c1158fd1e52c"
 
 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="5a7d94e07fc7e4a10d6399f5e44793fa0c896af6"
+SCRIPT_COMMIT="4665733565eda7ae32302c3abf1aaf5075b8abde"
 
 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="8e271daf1d6991337a87dec9355a2f11994d7292"
+SCRIPT_COMMIT="681af0dcfc8b88d8c6634f259e2f9e60a54f5a42"
 
 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="d242c47b437c950b545e96e7872aa914edc50be5"
+SCRIPT_COMMIT="40ff2a12515e60853fb11da67ab04cdb5a08dea5"
 
 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="7d8e335b094f00c57fb557b01e93b60a17e63434"
+SCRIPT_COMMIT="4d6e9ef3077fb279cab051cc00b216c5f08efb34"
 
 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="5f6bd8a1e753c8f63a3fd8b36894d6968b808a6d"
+SCRIPT_COMMIT="025d43d086a3e663184cb49febe86152bf05409f"
 
 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="6f0c446c7b88d384a1c09caf33ec132e7ee24aea"
+SCRIPT_COMMIT="05fb2057b00d01cda1ac0d979eaf60ba87c8416e"
 
 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="e4f7a9f0c7c9fbfae1568bc7fa5c94b989b50872"
+SCRIPT_COMMIT="f8f241071001e1a3807f34a26a03a742ea843458"
 
 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="22538"
+SCRIPT_REV="22856"
 
 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="d109e6296989600cadd7b18acd0dbf3be73c33d4"
+SCRIPT_COMMIT="fda5a02e8f88e79ef110e7912c20326a1fea51fb"
 SCRIPT_BRANCH="jellyfin-mpp"
 
 ffbuild_enabled() {

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="f109fb1354d6b31ba7cc6b6e72d75bc761a9cd31"
+SCRIPT_COMMIT="8a89a3abbf4d3a2f7869d535349a474607ea0214"
 
 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="8f1f1b0dc52b063264838b51bc2299a5e44e31d5"
+SCRIPT_COMMIT="6e69def4ec283fe0b71195671245c3b768bebdef"
 
 ffbuild_enabled() {
     [[ $TARGET == win32 ]] && 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.4.303"
+SCRIPT_COMMIT="v1.4.305"
 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="6173e24b31f09a0c3217103a130e74c4ddec14a6"
+SCRIPT_COMMIT="5e7db829a37787e096a7bfbdbdf317cd6cbe5897"
 
 ffbuild_enabled() {
     [[ $TARGET == mac* ]] && return -1

diff --git a/builder/scripts.d/50-x264.sh b/builder/scripts.d/50-x264.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://code.videolan.org/videolan/x264.git"
-SCRIPT_COMMIT="da14df5535fd46776fb1c9da3130973295c87aca"
+SCRIPT_COMMIT="373697b467f7cd0af88f1e9e32d4f10540df4687"
 
 ffbuild_enabled() {
     [[ $VARIANT == lgpl* ]] && return -1

diff --git a/builder/scripts.d/50-zvbi.sh b/builder/scripts.d/50-zvbi.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://github.com/zapping-vbi/zvbi.git"
-SCRIPT_COMMIT="66a1c9bdf3a7f105a5c02070cc6de0d949513c58"
+SCRIPT_COMMIT="af8b9f7bff9c2cf0be844ff993797930c53466f4"
 
 ffbuild_enabled() {
     return 0

diff --git a/builder/util/update_scripts.sh b/builder/util/update_scripts.sh
@@ -41,6 +41,7 @@ echo "Processing ${scr}"
         if [[ -n "${CUR_REV}" ]]; then # SVN
             echo "Checking svn rev for ${CUR_REPO}..."
             NEW_REV="$(svn info --password="" "${CUR_REPO}" | grep ^Revision: | cut -d" " -f2 | xargs)"
+            NEW_REV="$(svn --non-interactive info --username "anonymous" --password="" "${CUR_REPO}" | grep ^Revision: | cut -d" " -f2 | xargs)"
             echo "Got ${NEW_REV} (current: ${CUR_REV})"
 
             if [[ "${NEW_REV}" != "${CUR_REV}" ]]; then

diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,13 @@
+jellyfin-ffmpeg (7.0.2-9) unstable; urgency=medium
+
+  * avfilter/tonemapx: add dovi to hdr10 support
+  * Add NE10 to enable more neon optimization for libopus
+  * Fix Opus AVX2 auto detection and DG1 upstream support
+  * lavc/bsf/hevc_metadata: always remove dovi at the end of au
+  * Fix a race condition in VAAPI CSC to YUV420P
+
+ -- nyanmisaka <[email protected]>  Sun, 19 Jan 2025 21:34:53 +0800
+
 jellyfin-ffmpeg (7.0.2-8) unstable; urgency=medium
 
   * avcodec/videotoolbox: backport AV1 hardware acceleration