From a8a4ede0bdf0aa1125a72f30d467cf06d887faf6 Mon Sep 17 00:00:00 2001 From: aptalca <541623+aptalca@users.noreply.github.com> Date: Sat, 2 May 2026 12:12:25 -0400 Subject: [PATCH 1/2] Bump ffmpeg to 8.1. Also bump various drivers and libs --- .github/workflows/external_trigger.yml | 2 +- Dockerfile | 36 +++++++++++++------------- Dockerfile.aarch64 | 22 ++++++++-------- Jenkinsfile | 2 +- README.md | 1 + jenkins-vars.yml | 2 +- readme-vars.yml | 1 + 7 files changed, 34 insertions(+), 32 deletions(-) diff --git a/.github/workflows/external_trigger.yml b/.github/workflows/external_trigger.yml index 7384a9e..23633a3 100644 --- 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 8.0.1-cli) + EXT_RELEASE=$(echo 8.1-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 diff --git a/Dockerfile b/Dockerfile index 939d23b..24f0176 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,51 +15,51 @@ ENV \ # versions ENV \ - AOM=v3.13.1 \ + AOM=v3.13.3 \ FDKAAC=2.0.3 \ - FFMPEG_HARD=8.0.1 \ + FFMPEG_HARD=8.1 \ FONTCONFIG=2.16.0 \ - FREETYPE=2.14.2 \ + FREETYPE=2.14.3 \ FRIBIDI=1.0.16 \ - GMMLIB=22.9.0 \ - HARFBUZZ=13.0.0 \ - IHD=25.4.6 \ + GMMLIB=22.10.0 \ + HARFBUZZ=14.2.0 \ + IHD=26.1.5 \ KVAZAAR=2.3.2 \ LAME=3.100 \ LIBASS=0.17.4 \ LIBDAV1D=1.5.3 \ - LIBDOVI=2.3.1 \ - LIBDRM=2.4.131 \ + LIBDOVI=2.3.2 \ + LIBDRM=2.4.133 \ LIBGL=1.7.0 \ LIBLC3=1.1.3 \ LIBMFX=22.5.4 \ - LIBPLACEBO=7.360.0 \ - LIBPNG=1.6.55 \ + LIBPLACEBO=7.360.1 \ + LIBPNG=1.6.58 \ LIBVA=2.23.0 \ LIBVDPAU=1.5 \ LIBVIDSTAB=1.1.1 \ - LIBVMAF=3.0.0 \ + LIBVMAF=3.1.0 \ LIBVPL=2.16.0 \ - MESA=26.0.1 \ + MESA=26.0.6 \ NVCODEC=n13.0.19.0 \ OGG=1.3.6 \ OPENCOREAMR=0.1.6 \ OPENJPEG=2.5.4 \ OPUS=1.6 \ RAV1E=0.8.1 \ - RIST=0.2.11 \ - SHADERC=v2026.1 \ + RIST=0.2.14 \ + SHADERC=v2026.2 \ SOXR=0.1.3 \ - SRT=1.5.4 \ - SVTAV1=4.0.1 \ + SRT=1.5.5 \ + SVTAV1=4.1.0 \ THEORA=1.2.0 \ VORBIS=1.3.7 \ - VPLGPURT=25.4.6 \ + VPLGPURT=26.1.5 \ VPX=1.16.0 \ VULKANSDK=vulkan-sdk-1.4.341.0 \ VVENC=1.14.0 \ WEBP=1.6.0 \ - X265=4.1 \ + X265=4.2 \ XVID=1.3.7 \ ZIMG=3.0.6 \ ZMQ=v4.3.5 diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 383c4ac..38184d3 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -15,40 +15,40 @@ ENV \ # versions ENV \ - AOM=v3.13.1 \ + AOM=v3.13.3 \ FDKAAC=2.0.3 \ - FFMPEG_HARD=8.0.1 \ + FFMPEG_HARD=8.1 \ FONTCONFIG=2.16.0 \ - FREETYPE=2.14.2 \ + FREETYPE=2.14.3 \ FRIBIDI=1.0.16 \ - HARFBUZZ=13.0.0 \ + HARFBUZZ=14.2.0 \ KVAZAAR=2.3.2 \ LAME=3.100 \ LIBASS=0.17.4 \ LIBDAV1D=1.5.3 \ - LIBDRM=2.4.131 \ + LIBDRM=2.4.133 \ LIBLC3=1.1.3 \ - LIBPNG=1.6.55 \ + LIBPNG=1.6.58 \ LIBVA=2.23.0 \ LIBVDPAU=1.5 \ LIBVIDSTAB=1.1.1 \ - LIBVMAF=3.0.0 \ + LIBVMAF=3.1.0 \ NVCODEC=n13.0.19.0 \ OGG=1.3.6 \ OPENCOREAMR=0.1.6 \ OPENJPEG=2.5.4 \ OPUS=1.6 \ RAV1E=0.8.1 \ - RIST=0.2.11 \ + RIST=0.2.14 \ SOXR=0.1.3 \ - SRT=1.5.4 \ - SVTAV1=4.0.1 \ + SRT=1.5.5 \ + SVTAV1=4.1.0 \ THEORA=1.2.0 \ VORBIS=1.3.7 \ VPX=1.16.0 \ VVENC=1.14.0 \ WEBP=1.6.0 \ - X265=4.1 \ + X265=4.2 \ XVID=1.3.7 \ ZIMG=3.0.6 \ ZMQ=v4.3.5 diff --git a/Jenkinsfile b/Jenkinsfile index b99d2d9..9cb92a9 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -141,7 +141,7 @@ pipeline { steps{ script{ env.EXT_RELEASE = sh( - script: ''' echo 8.0.1-cli ''', + script: ''' echo 8.1-cli ''', returnStdout: true).trim() env.RELEASE_LINK = 'custom_command' } diff --git a/README.md b/README.md index 0c5c32a..cfcd267 100644 --- a/README.md +++ b/README.md @@ -183,6 +183,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **02.05.26:** - Bump ffmpeg to 8.1. Also bump aom, freetype, harfbuzz, Intel drivers and libs, libdovi, libdrm, libplacebo, libpng, mesa, rist, shaderc, srt, svtav1 and x265. * **06.03.26:** - Add support for SoX Resampler. Bump freetype, harfbuzz, Intel drivers and libs, libplacebo, libpng, mesa, shaderc, svtav1, vpx, vulkan-sdk and vvenc. * **06.01.26:** - Remove mpp from aarch64 build due to upstream DMCA removal. Bump harfbuzz, libdav1d, libdrm, libpng, libva, libvpl, mesa, opus, shaderc and vulkan-sdk. * **01.12.25:** - Bump ffmpeg to 8.0.1. diff --git a/jenkins-vars.yml b/jenkins-vars.yml index afd7713..6ab48f8 100644 --- a/jenkins-vars.yml +++ b/jenkins-vars.yml @@ -3,7 +3,7 @@ # jenkins variables project_name: docker-ffmpeg external_type: na -custom_version_command: "echo 8.0.1-cli" +custom_version_command: "echo 8.1-cli" release_type: stable release_tag: latest ls_branch: master diff --git a/readme-vars.yml b/readme-vars.yml index 8ed82ca..98c4164 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -190,6 +190,7 @@ full_custom_readme: | ## Versions + * **02.05.26:** - Bump ffmpeg to 8.1. Also bump aom, freetype, harfbuzz, Intel drivers and libs, libdovi, libdrm, libplacebo, libpng, mesa, rist, shaderc, srt, svtav1 and x265. * **06.03.26:** - Add support for SoX Resampler. Bump freetype, harfbuzz, Intel drivers and libs, libplacebo, libpng, mesa, shaderc, svtav1, vpx, vulkan-sdk and vvenc. * **06.01.26:** - Remove mpp from aarch64 build due to upstream DMCA removal. Bump harfbuzz, libdav1d, libdrm, libpng, libva, libvpl, mesa, opus, shaderc and vulkan-sdk. * **01.12.25:** - Bump ffmpeg to 8.0.1. From 71e17aa1e62674f5d84566d87b767b2cfb5e2e93 Mon Sep 17 00:00:00 2001 From: aptalca <541623+aptalca@users.noreply.github.com> Date: Sat, 2 May 2026 13:03:17 -0400 Subject: [PATCH 2/2] remove obsolete patch --- Dockerfile | 1 - Dockerfile.aarch64 | 1 - 2 files changed, 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 24f0176..bca227a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -911,7 +911,6 @@ RUN \ RUN \ echo "**** compiling ffmpeg ****" && \ cd /tmp/ffmpeg && \ - curl -fSsL https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/21567.patch | patch -p1 && \ ./configure \ --disable-debug \ --disable-doc \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 38184d3..3b55535 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -645,7 +645,6 @@ RUN \ RUN \ echo "**** compiling ffmpeg ****" && \ cd /tmp/ffmpeg && \ - curl -fSsL https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/21567.patch | patch -p1 && \ ./configure \ --disable-debug \ --disable-doc \