Merge pull request #114 from linuxserver/8.0

Ffmpeg 8.0
2026-02-20 04:56:23 +08:00 · 2025-08-24 07:58:58 -04:00 · 2025-08-24 07:58:58 -04:00 · 4759516f0f
commit 4759516f0f
parent 7dfa233d6d ae0f517118
8 changed files with 31 additions and 51 deletions
--- a/.github/workflows/external_trigger.yml
+++ b/.github/workflows/external_trigger.yml
@ -29,7 +29,7 @@ jobs:
          echo "> [!NOTE]" >> $GITHUB_STEP_SUMMARY
          echo "> External trigger running off of master branch. To disable this trigger, add \`ffmpeg_master\` into the Github organizational variable \`SKIP_EXTERNAL_TRIGGER\`." >> $GITHUB_STEP_SUMMARY
          printf "\n## Retrieving external version\n\n" >> $GITHUB_STEP_SUMMARY
-          EXT_RELEASE=$(echo 7.1.1-cli)
+          EXT_RELEASE=$(echo 8.0-cli)
          echo "Type is \`custom_version_command\`" >> $GITHUB_STEP_SUMMARY
          if grep -q "^ffmpeg_master_${EXT_RELEASE}" <<< "${SKIP_EXTERNAL_TRIGGER}"; then
            echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
--- a/38
+++ b/38
@ -17,50 +17,50 @@ ENV \
 ENV \
  AOM=v3.12.1 \
  FDKAAC=2.0.3 \
-  FFMPEG_HARD=7.1.1 \
+  FFMPEG_HARD=8.0 \
  FONTCONFIG=2.16.0 \
  FREETYPE=2.13.3 \
  FRIBIDI=1.0.16 \
-  GMMLIB=22.7.1 \
-  HARFBUZZ=11.2.1 \
-  IHD=25.1.4 \
+  GMMLIB=22.8.0 \
+  HARFBUZZ=11.4.3 \
+  IHD=25.2.6 \
  KVAZAAR=2.3.1 \
  LAME=3.100 \
  LIBASS=0.17.4 \
  LIBDAV1D=1.5.1 \
-  LIBDOVI=2.3.0 \
-  LIBDRM=2.4.124 \
+  LIBDOVI=2.3.1 \
+  LIBDRM=2.4.125 \
  LIBGL=1.7.0 \
  LIBLC3=1.1.3 \
  LIBMFX=22.5.4 \
  LIBPLACEBO=7.351.0 \
-  LIBPNG=1.6.48 \
+  LIBPNG=1.6.50 \
  LIBVA=2.22.0 \
  LIBVDPAU=1.5 \
  LIBVIDSTAB=1.1.1 \
  LIBVMAF=3.0.0 \
  LIBVPL=2.15.0 \
-  MESA=25.1.3 \
+  MESA=25.2.1 \
  NVCODEC=n13.0.19.0 \
-  OGG=1.3.5 \
+  OGG=1.3.6 \
  OPENCOREAMR=0.1.6 \
  OPENJPEG=2.5.3 \
  OPUS=1.5.2 \
-  RAV1E=0.8.0 \
+  RAV1E=0.8.1 \
  RIST=0.2.11 \
-  SHADERC=v2025.2 \
+  SHADERC=v2025.3 \
  SRT=1.5.4 \
-  SVTAV1=3.1.0 \
+  SVTAV1=3.1.1 \
  THEORA=1.2.0 \
  VORBIS=1.3.7 \
-  VPLGPURT=25.1.4 \
+  VPLGPURT=25.2.6 \
  VPX=1.15.2 \
-  VULKANSDK=vulkan-sdk-1.4.313.0 \
+  VULKANSDK=vulkan-sdk-1.4.321.0 \
  VVENC=1.13.1 \
-  WEBP=1.5.0 \
+  WEBP=1.6.0 \
  X265=4.1 \
  XVID=1.3.7 \
-  ZIMG=3.0.5 \
+  ZIMG=3.0.6 \
  ZMQ=v4.3.5

 RUN \
@ -132,7 +132,7 @@ RUN \
  tar xf /tmp/rust.tar.gz -C /tmp/rust --strip-components=1 && \
  cd /tmp/rust && \
  ./install.sh && \
-  cargo install cargo-c cbindgen --locked && \
+  cargo install bindgen-cli cargo-c cbindgen --locked && \
  python3 -m venv /lsiopy && \
  pip install -U --no-cache-dir \
    pip \
@ -890,13 +890,9 @@ RUN \
    https://ffmpeg.org/releases/ffmpeg-${FFMPEG}.tar.bz2 | \
    tar -jx --strip-components=1 -C /tmp/ffmpeg

-# Apply patch for svt-av1: https://gitlab.com/AOMediaCodec/SVT-AV1/-/issues/2249#note_2361478864
-COPY /ffmpeg_n7_fix.patch /tmp/ffmpeg/
-
 RUN \
  echo "**** compiling ffmpeg ****" && \
  cd /tmp/ffmpeg && \
-  patch -p1 < ffmpeg_n7_fix.patch && \
  ./configure \
    --disable-debug \
    --disable-doc \
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@ -17,40 +17,40 @@ ENV \
 ENV \
  AOM=v3.12.1 \
  FDKAAC=2.0.3 \
-  FFMPEG_HARD=7.1.1 \
+  FFMPEG_HARD=8.0 \
  FONTCONFIG=2.16.0 \
  FREETYPE=2.13.3 \
  FRIBIDI=1.0.16 \
-  HARFBUZZ=11.2.1 \
+  HARFBUZZ=11.4.3 \
  KVAZAAR=2.3.1 \
  LAME=3.100 \
  LIBASS=0.17.4 \
  LIBDAV1D=1.5.1 \
-  LIBDRM=2.4.124 \
+  LIBDRM=2.4.125 \
  LIBLC3=1.1.3 \
-  LIBPNG=1.6.48 \
+  LIBPNG=1.6.50 \
  LIBVA=2.22.0 \
  LIBVDPAU=1.5 \
  LIBVIDSTAB=1.1.1 \
  LIBVMAF=3.0.0 \
  MPP=1.0.9 \
  NVCODEC=n13.0.19.0 \
-  OGG=1.3.5 \
+  OGG=1.3.6 \
  OPENCOREAMR=0.1.6 \
  OPENJPEG=2.5.3 \
  OPUS=1.5.2 \
-  RAV1E=0.8.0 \
+  RAV1E=0.8.1 \
  RIST=0.2.11 \
  SRT=1.5.4 \
-  SVTAV1=3.1.0 \
+  SVTAV1=3.1.1 \
  THEORA=1.2.0 \
  VORBIS=1.3.7 \
  VPX=1.15.2 \
  VVENC=1.13.1 \
-  WEBP=1.5.0 \
+  WEBP=1.6.0 \
  X265=4.1 \
  XVID=1.3.7 \
-  ZIMG=3.0.5 \
+  ZIMG=3.0.6 \
  ZMQ=v4.3.5

 RUN \
@ -640,14 +640,10 @@ RUN \
  curl -Lf \
    https://ffmpeg.org/releases/ffmpeg-${FFMPEG}.tar.bz2 | \
    tar -jx --strip-components=1 -C /tmp/ffmpeg
-
-  # Apply patch for svt-av1: https://gitlab.com/AOMediaCodec/SVT-AV1/-/issues/2249#note_2361478864
-  COPY /ffmpeg_n7_fix.patch /tmp/ffmpeg/
  
  RUN \
    echo "**** compiling ffmpeg ****" && \
    cd /tmp/ffmpeg && \
-    patch -p1 < ffmpeg_n7_fix.patch && \
    ./configure \
    --disable-debug \
    --disable-doc \
--- a/2
+++ b/2
@ -140,7 +140,7 @@ pipeline {
      steps{
        script{
          env.EXT_RELEASE = sh(
-            script: ''' echo 7.1.1-cli ''',
+            script: ''' echo 8.0-cli ''',
            returnStdout: true).trim()
            env.RELEASE_LINK = 'custom_command'
        }
--- a/README.md
+++ b/README.md
@ -183,6 +183,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64

 ## Versions

+* **23.08.25:** - Bump ffmpeg to 8.0. Bump harfbuzz, Intel drivers and libs, libdovi, libdrm, libpng, mesa, ogg, rav1e, shaderc, svt-av1, vulkan-sdk, webp and zimg.
 * **06.08.25:** - Bump svt-av1.
 * **07.06.25:** - Bump harfbuzz, libass, libdovi, libplacebo, libpng, mesa, rav1e, shaderc, libvpx and vulkan-sdk.
 * **04.06.25:** - Add libdrm and rkmpp to arm64 image.
--- a/ffmpeg_n7_fix.patch
+++ b/ffmpeg_n7_fix.patch
@ -1,13 +0,0 @@
-diff --git a/libavcodec/libsvtav1.c b/libavcodec/libsvtav1.c
-index 8fa42d590b..e99c656c5d 100644
--- a/libavcodec/libsvtav1.c
-+++ b/libavcodec/libsvtav1.c
-@@ -430,7 +430,7 @@ static av_cold int eb_enc_init(AVCodecContext *avctx)
- 
-     svt_enc->eos_flag = EOS_NOT_REACHED;
- 
-    svt_ret = svt_av1_enc_init_handle(&svt_enc->svt_handle, svt_enc, &svt_enc->enc_params);
-+    svt_ret = svt_av1_enc_init_handle(&svt_enc->svt_handle, &svt_enc->enc_params);
-     if (svt_ret != EB_ErrorNone) {
-         return svt_print_error(avctx, svt_ret, "Error initializing encoder handle");
-     }
--- a/jenkins-vars.yml
+++ b/jenkins-vars.yml
@ -3,11 +3,10 @@
 # jenkins variables
 project_name: docker-ffmpeg
 external_type: na
-custom_version_command: "echo 7.1.1-cli"
+custom_version_command: "echo 8.0-cli"
 release_type: stable
 release_tag: latest
 ls_branch: master
-build_armhf: false
 repo_vars:
  - BUILD_VERSION_ARG = 'FFMPEG_VERSION'
  - LS_USER = 'linuxserver'
--- a/readme-vars.yml
+++ b/readme-vars.yml
@ -190,6 +190,7 @@ full_custom_readme: |

  ## Versions

+  * **23.08.25:** - Bump ffmpeg to 8.0. Bump harfbuzz, Intel drivers and libs, libdovi, libdrm, libpng, mesa, ogg, rav1e, shaderc, svt-av1, vulkan-sdk, webp and zimg.
  * **06.08.25:** - Bump svt-av1.
  * **07.06.25:** - Bump harfbuzz, libass, libdovi, libplacebo, libpng, mesa, rav1e, shaderc, libvpx and vulkan-sdk.
  * **04.06.25:** - Add libdrm and rkmpp to arm64 image.