Merge pull request #227 from nyanmisaka/next

[6.0] Fix the empty output in webvtt transcoding
jellyfin · Mar 20, 2023 · e7ed6a0 · e7ed6a0
2 parents db2cbf7 + dba214c
commit e7ed6a0
Show file tree

Hide file tree

Showing 41 changed files with 276 additions and 180 deletions.
diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml
@@ -89,15 +89,8 @@ jobs:
             find /srv/repository/releases/server/${{ matrix.arrays.distro }}/versions/jellyfin-ffmpeg/${version} -type f -name "${basename}_*.deb" | while read file; do
               reprepro -b /srv/repository/${{ matrix.arrays.distro }} --export=never --keepunreferencedfiles includedeb ${{ matrix.arrays.codename }} ${file}
             done
-            find /srv/repository/releases/server/${{ matrix.arrays.distro }}/ -type l -name "${basename}_*" -exec rm {} \;
             reprepro -b /srv/repository/${{ matrix.arrays.distro }} deleteunreferenced
             reprepro -b /srv/repository/${{ matrix.arrays.distro }} export
-            rm -f /srv/repository/releases/server/${{ matrix.arrays.distro }}/ffmpeg
-            rm -f /srv/repository/releases/server/${{ matrix.arrays.distro }}/{stable,stable-pre,unstable}/ffmpeg
-            ln -fs /srv/repository/releases/server/${{ matrix.arrays.distro }}/versions/jellyfin-ffmpeg/${version} /srv/repository/releases/server/${{ matrix.arrays.distro }}/ffmpeg
-            ln -fs /srv/repository/releases/server/${{ matrix.arrays.distro }}/versions/jellyfin-ffmpeg/${version} /srv/repository/releases/server/${{ matrix.arrays.distro }}/stable/ffmpeg
-            ln -fs /srv/repository/releases/server/${{ matrix.arrays.distro }}/versions/jellyfin-ffmpeg/${version} /srv/repository/releases/server/${{ matrix.arrays.distro }}/stable-pre/ffmpeg
-            ln -fs /srv/repository/releases/server/${{ matrix.arrays.distro }}/versions/jellyfin-ffmpeg/${version} /srv/repository/releases/server/${{ matrix.arrays.distro }}/unstable/ffmpeg
 
   maintain_repository_portable:
     name: Maintain Repository (Portable)
@@ -124,16 +117,8 @@ jobs:
             set -o xtrace
             tag="${{ github.event.release.tag_name }}"
             version="${tag#v}"
-            find /srv/repository/releases/server/${{ matrix.arrays.distro }}/ -type l -name "jellyfin-ffmpeg*_*" -exec rm {} \;
             if [ "${{ matrix.arrays.distro }}" == "windows" ]; then
               mkdir -p /srv/repository/releases/server/${{ matrix.arrays.distro }}/versions/jellyfin-ffmpeg/${version}
-              ln -fs /srv/repository/releases/ffmpeg/${version}/*.zip /srv/repository/releases/ffmpeg/${version}/jellyfin-ffmpeg-portable_win64.zip
               ln -fs /srv/repository/releases/ffmpeg/${version}/*.zip /srv/repository/releases/server/${{ matrix.arrays.distro }}/versions/jellyfin-ffmpeg/${version}/
               ln -fs /srv/repository/releases/ffmpeg/${version}/*.zip.sha265sum /srv/repository/releases/server/${{ matrix.arrays.distro }}/versions/jellyfin-ffmpeg/${version}/
             fi
-            rm -f /srv/repository/releases/server/${{ matrix.arrays.distro }}/ffmpeg
-            rm -f /srv/repository/releases/server/${{ matrix.arrays.distro }}/{stable,stable-pre,unstable}/ffmpeg
-            ln -fs /srv/repository/releases/ffmpeg/${version} /srv/repository/releases/server/${{ matrix.arrays.distro }}/ffmpeg
-            ln -fs /srv/repository/releases/ffmpeg/${version} /srv/repository/releases/server/${{ matrix.arrays.distro }}/stable/ffmpeg
-            ln -fs /srv/repository/releases/ffmpeg/${version} /srv/repository/releases/server/${{ matrix.arrays.distro }}/stable-pre/ffmpeg
-            ln -fs /srv/repository/releases/ffmpeg/${version} /srv/repository/releases/server/${{ matrix.arrays.distro }}/unstable/ffmpeg
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://github.com/mirror/mingw-w64.git"
-SCRIPT_COMMIT="166b83cc85eb515a49764480600dca10862b6d55"
+SCRIPT_COMMIT="0f2264e7b8fedbe225921367e82aeb97ddfed46b"
 
 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="f560065f4d6bd970be3bab81477abaa75cdd36fa"
+SCRIPT_COMMIT="b1319c902f6e44d08f8cb33f1fc28847f2bc8aeb"
 
 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="9426cd59106ffddde1f55131c07fa9c562fa2f8e"
+SCRIPT_COMMIT="c277d55689eef1616fa622b3bf6794af3a58e960"
 
 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="e8931f8c56104786479de38adbe2c8bb7f49c822"
+SCRIPT_COMMIT="4f0a55d15ed1c9af267ed8223cc2f04307a3d656"
 
 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="a6a169572204dd86f4ab462ef505d98fdfd82d76"
+SCRIPT_COMMIT="04546f18768e1ce57c24743035118b3eabbd4181"
 
 ffbuild_enabled() {
     return 0
@@ -22,7 +22,13 @@ ffbuild_dockerbuild() {
         --enable-static
     )
 
-    if [[ $TARGET == win* || $TARGET == linux* ]]; then
+    if [[ $TARGET == linux* ]]; then
+        myconf+=(
+            --sysconfdir=/etc
+            --localstatedir=/var
+            --host="$FFBUILD_TOOLCHAIN"
+        )
+    elif [[ $TARGET == win* ]]; then
         myconf+=(
             --host="$FFBUILD_TOOLCHAIN"
         )

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="e8f94f9e1249fd1374fa282685ae93aba3b8fcdd"
+SCRIPT_COMMIT="79233a149209e3da199bb4e2f74271668502c574"
 
 ffbuild_enabled() {
     return 0

diff --git a/builder/scripts.d/45-opencl.sh b/builder/scripts.d/45-opencl.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://github.com/KhronosGroup/OpenCL-Headers.git"
-SCRIPT_COMMIT="1080743ea047d6467bc609f979a21f00e06ac928"
+SCRIPT_COMMIT="e3e85862d6905eba9f4b5ed02c52effe673721d3"
 
 SCRIPT_REPO2="https://github.com/KhronosGroup/OpenCL-ICD-Loader.git"
 SCRIPT_COMMIT2="ece91448a958099b9c277f050fca9df96a2ea718"

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="423098656f145afeb72cbf21aaa0b3a3f9bc36bb"
+SCRIPT_COMMIT="cf35a91fe57d4721a173d2bc428dd07dcc4674f9"
 
 ffbuild_enabled() {
     [[ $TARGET != linux* ]] && 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="c761c6505d49e8381a3eae94f2e5e118cbdf6487"
+SCRIPT_COMMIT="9d77996f9f972da63c06099fd8c0f0529159b98f"
 
 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="fd04ab24a5e99d53874789439d3ffb0eb82574f7"
+SCRIPT_COMMIT="18e109d755c5ce18157fdabb6de8ee6845b348ff"
 
 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="53bf8584e8d7d5d4a4a8114bff26a6f631c7fac1"
+SCRIPT_COMMIT="ca99e338a9b8aad300933b1336f9e3c091392213"
 
 ffbuild_enabled() {
     [[ $TARGET != linux* ]] && return -1

diff --git a/builder/scripts.d/45-x11/50-libxext.sh b/builder/scripts.d/45-x11/50-libxext.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libxext.git"
-SCRIPT_COMMIT="50cac0209f96469d3a332a59a9c8d6d658edaf5f"
+SCRIPT_COMMIT="de2ebd62c1eb8fe16c11aceac4a6981bda124cf4"
 
 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="08431d0684f9a1edf199f6c6060d2bef1ac78399"
+SCRIPT_COMMIT="826215af0cc46b19555063b8894de6781d4c5993"
 
 ffbuild_enabled() {
     [[ $TARGET != linux* ]] && return -1

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

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

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

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

diff --git a/builder/scripts.d/45-x11/60-libglvnd.sh b/builder/scripts.d/45-x11/60-libglvnd.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://gitlab.freedesktop.org/glvnd/libglvnd.git"
-SCRIPT_COMMIT="dba80d0158b587de91640fae5c0b420c23599d1e"
+SCRIPT_COMMIT="056feac0780220822e71a2fd38a83353102e5b36"
 
 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="87a30b1758b7757dd74d0a70e871d7af1cac3a44"
+SCRIPT_COMMIT="81dc4a481b64499ab7c355ee43c91e4fe0767545"
 
 ffbuild_enabled() {
     [[ $TARGET != linux* ]] && return -1

diff --git a/builder/scripts.d/45-x11/60-libxrandr.sh b/builder/scripts.d/45-x11/60-libxrandr.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libxrandr.git"
-SCRIPT_COMMIT="3387129532899eaeee3477a2d92fa662d7292a84"
+SCRIPT_COMMIT="5b96863cf2a34ee9e72ffc4ec6415bc59b6121fc"
 
 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="d419928942dbf1897c9627475aa4a2828a81240f"
+SCRIPT_COMMIT="b022c9cf7004fe6f794c4c00dd519a2e4c74eca0"
 
 ffbuild_enabled() {
     [[ $TARGET != linux* ]] && 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="d426d1c91075b9c552b12dd052af1cd0368f05a2"
+SCRIPT_COMMIT="16c943484e63da7ed8a8a8d85af88995369f23cd"
 
 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="0e7804ca30c367eefb17594a0c5096f2f26de732"
+SCRIPT_COMMIT="6788c75055899796c13787ed44cc6f1cc45e09d7"
 
 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="d64e6d7d9d1e91d99e07de5e17afa0134d87f4ab"
+SCRIPT_COMMIT="0825faa4c10d622f2747c5b2752e7b6a6848bf3f"
 
 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="6ca7a09c4b5b2c1ae6b52d73bc44c334ab66adbc"
+SCRIPT_COMMIT="4cdf44ccaa605460499c52f39eff5517da2fc3c8"
 
 ffbuild_enabled() {
     [[ $TARGET == *arm64 ]] && return -1

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="1cffd2f2abad1782d1218f2c2b893f26bf4bbfce"
+SCRIPT_COMMIT="39822840c506d72cef5a742d28f32ea28e144345"
 
 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="f2b4b2d8729d0f9afabaf85ff0dd9741e24b57fd"
+SCRIPT_COMMIT="72fd3d479b315fbf6bd1d7e80dec7afe42037819"
 
 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="332809f3ee19f07abc03b62d5892fae51b9d9902"
+SCRIPT_COMMIT="d1681af05471176215ad3d437249c38768dc959f"
 
 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="97cbc87c94351c62a47d87e776488a9317ad398b"
+SCRIPT_COMMIT="0fa448dd00c509f08cf53b9a95a55922ff09d5cf"
 
 ffbuild_enabled() {
     [[ $TARGET != linux* ]] && return -1

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="dde14deee743b1ae4ec8ad541f3cd268941051bb"
+SCRIPT_COMMIT="f1268e6d36cfdcd647d5c7032a6c61a0aad8487b"
 
 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="7512345f61e5f9b543ebb87df678f3fe7735587b"
+SCRIPT_COMMIT="d26c233e1c2629fec1ae1b6fdf538958e5d52bff"
 
 ffbuild_enabled() {
     return 0

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="5a5397c2b149fc9e5cb898973121de6edea77c70"
+SCRIPT_COMMIT="71394bd10d833ac48faa255f085c3e702a42921d"
 
 ffbuild_enabled() {
     return 0

diff --git a/debian/changelog b/debian/changelog
@@ -5,6 +5,7 @@ jellyfin-ffmpeg (6.0-1) unstable; urgency=medium
   * Update build scripts and dependencies
   * Drop the EOL Ubuntu bionic
   * Enable Debian bookworm and Ubuntu lunar
+  * Fix the empty output in webvtt transcoding
 
  -- nyanmisaka <nst799610810@gmail.com>  Tue, 28 Feb 2023 19:50:24 +0800
 

diff --git a/debian/patches/0008-add-bt2390-eetf-and-code-refactor-to-opencl-tonemap.patch b/debian/patches/0008-add-bt2390-eetf-and-code-refactor-to-opencl-tonemap.patch
@@ -7,7 +7,7 @@ Index: jellyfin-ffmpeg/libavfilter/opencl.c
 
      cle = clBuildProgram(ctx->program, 1, &ctx->hwctx->device_id,
 -                         NULL, NULL, NULL);
-+                         "-cl-fast-relaxed-math -cl-mad-enable", NULL, NULL);
++                         "-cl-finite-math-only -cl-unsafe-math-optimizations", NULL, NULL);
      if (cle != CL_SUCCESS) {
          av_log(avctx, AV_LOG_ERROR, "Failed to build program: %d.\n", cle);