diff --git a/.github/workflows/external_trigger.yml b/.github/workflows/external_trigger.yml index fcc95ba..3e7380a 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 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 diff --git a/Dockerfile b/Dockerfile index 32ad4a9..a3b70a8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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.0.2 \ + 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 \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 39f89b1..8887f3d 100644 --- 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.0.2 \ + 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 \ diff --git a/Jenkinsfile b/Jenkinsfile index 0999df3..9b83e78 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -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' } diff --git a/README.md b/README.md index 1b315c6..26b2e10 100644 --- a/README.md +++ b/README.md @@ -183,6 +183,8 @@ 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. * **21.04.25:** - Bump aom, Intel drivers and libs, harfbuzz, mesa, svt-av1, libvpx, libtheora, vulkan-sdk and vvenc. diff --git a/ffmpeg_n7_fix.patch b/ffmpeg_n7_fix.patch deleted file mode 100644 index 1c876a5..0000000 --- a/ffmpeg_n7_fix.patch +++ /dev/null @@ -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"); - } diff --git a/jenkins-vars.yml b/jenkins-vars.yml index 73f1fff..2c670da 100644 --- 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' diff --git a/package_versions.txt b/package_versions.txt index de47f95..eed2196 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -4,13 +4,13 @@ alsa-topology-conf 1.2.5.1-2 deb alsa-ucm-conf 1.2.10-1ubuntu5.7 deb apt 2.8.3 deb apt-utils 2.8.3 deb -base-files 13ubuntu10.2 deb +base-files 13ubuntu10.3 deb base-passwd 3.6.3build1 deb bash 5.2.21-2ubuntu4 deb bsdutils 1:2.39.3-9ubuntu6.3 deb ca-certificates 20240203 deb catatonit 0.1.7-1 deb -coreutils 9.4-3ubuntu6 deb +coreutils 9.4-3ubuntu6.1 deb cron 3.0pl1-184ubuntu2 deb cron-daemon-common 3.0pl1-184ubuntu2 deb curl 8.5.0-2ubuntu10.6 deb @@ -19,7 +19,7 @@ debconf 1.5.86ubuntu1 deb debianutils 5.17build1 deb diffutils 1:3.10-1build1 deb dirmngr 2.4.4-2ubuntu17.3 deb -dpkg 1.22.6ubuntu6.1 deb +dpkg 1.22.6ubuntu6.2 deb e2fsprogs 1.47.0-2.4~exp1ubuntu4.1 deb findutils 4.9.0-5build1 deb gcc-14-base 14.2.0-4ubuntu2~24.04 deb @@ -36,7 +36,7 @@ grep 3.11-4build1 deb gzip 1.12-1ubuntu3.1 deb hostname 3.23+nmu2ubuntu2 deb init-system-helpers 1.66ubuntu1 deb -jq 1.7.1-3build1 deb +jq 1.7.1-3ubuntu0.24.04.1 deb keyboxd 2.4.4-2ubuntu17.3 deb krb5-locales 1.20.1-6ubuntu2.6 deb libacl1 2.3.2-1build1.1 deb @@ -51,8 +51,8 @@ libblkid1 2.39.3-9ubuntu6.3 deb libbrotli1 1.1.0-2build2 deb libbsd0 0.12.1-1build1.1 deb libbz2-1.0 1.0.8-5.1build0.1 deb -libc-bin 2.39-0ubuntu8.5 deb -libc6 2.39-0ubuntu8.5 deb +libc-bin 2.39-0ubuntu8.6 deb +libc6 2.39-0ubuntu8.6 deb libcap-ng0 0.8.4-2build2 deb libcap2 1:2.66-5ubuntu2.2 deb libcom-err2 1.47.0-2.4~exp1ubuntu4.1 deb @@ -79,7 +79,7 @@ libicu74 74.2-1ubuntu3.1 deb libidn2-0 2.3.7-2build1.1 deb libjpeg-turbo8 2.1.5-2ubuntu2 deb libjpeg8 8c-2ubuntu11 deb -libjq1 1.7.1-3build1 deb +libjq1 1.7.1-3ubuntu0.24.04.1 deb libk5crypto3 1.20.1-6ubuntu2.6 deb libkeyutils1 1.6.3-3build1 deb libkrb5-3 1.20.1-6ubuntu2.6 deb @@ -98,10 +98,10 @@ libnghttp2-14 1.59.0-1ubuntu0.2 deb libnpth0t64 1.6-3.1build1 deb libonig5 6.9.9-1build1 deb libp11-kit0 0.25.3-4ubuntu2.1 deb -libpam-modules 1.5.3-5ubuntu5.4 deb -libpam-modules-bin 1.5.3-5ubuntu5.4 deb -libpam-runtime 1.5.3-5ubuntu5.4 deb -libpam0g 1.5.3-5ubuntu5.4 deb +libpam-modules 1.5.3-5ubuntu5.5 deb +libpam-modules-bin 1.5.3-5ubuntu5.5 deb +libpam-runtime 1.5.3-5ubuntu5.5 deb +libpam0g 1.5.3-5ubuntu5.5 deb libpciaccess0 0.17-3ubuntu0.24.04.2 deb libpcre2-8-0 10.42-4ubuntu2.1 deb libproc2-0 2:4.0.4-4ubuntu3.2 deb @@ -117,7 +117,7 @@ libsemanage-common 3.5-1build5 deb libsemanage2 3.5-1build5 deb libsepol2 3.5-2build1 deb libsmartcols1 2.39.3-9ubuntu6.3 deb -libsqlite3-0 3.45.1-1ubuntu2.3 deb +libsqlite3-0 3.45.1-1ubuntu2.5 deb libss2 1.47.0-2.4~exp1ubuntu4.1 deb libssh-4 0.10.6-2ubuntu0.1 deb libssl3t64 3.0.13-0ubuntu3.5 deb @@ -147,11 +147,11 @@ libxcb1 1.15-1ubuntu2 deb libxdmcp6 1:1.1.3-0ubuntu6 deb libxext6 2:1.3.4-1build2 deb libxfixes3 1:6.0.0-2build1 deb -libxml2 2.9.14+dfsg-1.3ubuntu3.3 deb +libxml2 2.9.14+dfsg-1.3ubuntu3.5 deb libxshmfence1 1.3-1build5 deb libxxhash0 0.8.2-2build1 deb libzstd1 1.5.5+dfsg2-2build1.1 deb -locales 2.39-0ubuntu8.5 deb +locales 2.39-0ubuntu8.6 deb login 1:4.13+dfsg1-4ubuntu3.2 deb logsave 1.47.0-2.4~exp1ubuntu4.1 deb mawk 1.3.4.20240123-1build1 deb @@ -162,7 +162,7 @@ netcat-openbsd 1.226-1ubuntu2 deb ocl-icd-libopencl1 2.3.2-1build1 deb openssl 3.0.13-0ubuntu3.5 deb passwd 1:4.13+dfsg1-4ubuntu3.2 deb -perl-base 5.38.2-3.2ubuntu0.1 deb +perl-base 5.38.2-3.2ubuntu0.2 deb pinentry-curses 1.2.1-3ubuntu5 deb procps 2:4.0.4-4ubuntu3.2 deb publicsuffix 20231001.0357-0.1 deb diff --git a/readme-vars.yml b/readme-vars.yml index e90c7a6..95c4a98 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -190,6 +190,8 @@ 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. * **21.04.25:** - Bump aom, Intel drivers and libs, harfbuzz, mesa, svt-av1, libvpx, libtheora, vulkan-sdk and vvenc.