Skip to content

Commit 4759516

Browse files
authored
Merge pull request #114 from linuxserver/8.0
Ffmpeg 8.0
2 parents 7dfa233 + ae0f517 commit 4759516

File tree

8 files changed

+31
-51
lines changed

8 files changed

+31
-51
lines changed

.github/workflows/external_trigger.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
echo "> [!NOTE]" >> $GITHUB_STEP_SUMMARY
3030
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
3131
printf "\n## Retrieving external version\n\n" >> $GITHUB_STEP_SUMMARY
32-
EXT_RELEASE=$(echo 7.1.1-cli)
32+
EXT_RELEASE=$(echo 8.0-cli)
3333
echo "Type is \`custom_version_command\`" >> $GITHUB_STEP_SUMMARY
3434
if grep -q "^ffmpeg_master_${EXT_RELEASE}" <<< "${SKIP_EXTERNAL_TRIGGER}"; then
3535
echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY

Dockerfile

Lines changed: 17 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -17,50 +17,50 @@ ENV \
1717
ENV \
1818
AOM=v3.12.1 \
1919
FDKAAC=2.0.3 \
20-
FFMPEG_HARD=7.1.1 \
20+
FFMPEG_HARD=8.0 \
2121
FONTCONFIG=2.16.0 \
2222
FREETYPE=2.13.3 \
2323
FRIBIDI=1.0.16 \
24-
GMMLIB=22.7.1 \
25-
HARFBUZZ=11.2.1 \
26-
IHD=25.1.4 \
24+
GMMLIB=22.8.0 \
25+
HARFBUZZ=11.4.3 \
26+
IHD=25.2.6 \
2727
KVAZAAR=2.3.1 \
2828
LAME=3.100 \
2929
LIBASS=0.17.4 \
3030
LIBDAV1D=1.5.1 \
31-
LIBDOVI=2.3.0 \
32-
LIBDRM=2.4.124 \
31+
LIBDOVI=2.3.1 \
32+
LIBDRM=2.4.125 \
3333
LIBGL=1.7.0 \
3434
LIBLC3=1.1.3 \
3535
LIBMFX=22.5.4 \
3636
LIBPLACEBO=7.351.0 \
37-
LIBPNG=1.6.48 \
37+
LIBPNG=1.6.50 \
3838
LIBVA=2.22.0 \
3939
LIBVDPAU=1.5 \
4040
LIBVIDSTAB=1.1.1 \
4141
LIBVMAF=3.0.0 \
4242
LIBVPL=2.15.0 \
43-
MESA=25.1.3 \
43+
MESA=25.2.1 \
4444
NVCODEC=n13.0.19.0 \
45-
OGG=1.3.5 \
45+
OGG=1.3.6 \
4646
OPENCOREAMR=0.1.6 \
4747
OPENJPEG=2.5.3 \
4848
OPUS=1.5.2 \
49-
RAV1E=0.8.0 \
49+
RAV1E=0.8.1 \
5050
RIST=0.2.11 \
51-
SHADERC=v2025.2 \
51+
SHADERC=v2025.3 \
5252
SRT=1.5.4 \
53-
SVTAV1=3.1.0 \
53+
SVTAV1=3.1.1 \
5454
THEORA=1.2.0 \
5555
VORBIS=1.3.7 \
56-
VPLGPURT=25.1.4 \
56+
VPLGPURT=25.2.6 \
5757
VPX=1.15.2 \
58-
VULKANSDK=vulkan-sdk-1.4.313.0 \
58+
VULKANSDK=vulkan-sdk-1.4.321.0 \
5959
VVENC=1.13.1 \
60-
WEBP=1.5.0 \
60+
WEBP=1.6.0 \
6161
X265=4.1 \
6262
XVID=1.3.7 \
63-
ZIMG=3.0.5 \
63+
ZIMG=3.0.6 \
6464
ZMQ=v4.3.5
6565

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

893-
# Apply patch for svt-av1: https://gitlab.com/AOMediaCodec/SVT-AV1/-/issues/2249#note_2361478864
894-
COPY /ffmpeg_n7_fix.patch /tmp/ffmpeg/
895-
896893
RUN \
897894
echo "**** compiling ffmpeg ****" && \
898895
cd /tmp/ffmpeg && \
899-
patch -p1 < ffmpeg_n7_fix.patch && \
900896
./configure \
901897
--disable-debug \
902898
--disable-doc \

Dockerfile.aarch64

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -17,40 +17,40 @@ ENV \
1717
ENV \
1818
AOM=v3.12.1 \
1919
FDKAAC=2.0.3 \
20-
FFMPEG_HARD=7.1.1 \
20+
FFMPEG_HARD=8.0 \
2121
FONTCONFIG=2.16.0 \
2222
FREETYPE=2.13.3 \
2323
FRIBIDI=1.0.16 \
24-
HARFBUZZ=11.2.1 \
24+
HARFBUZZ=11.4.3 \
2525
KVAZAAR=2.3.1 \
2626
LAME=3.100 \
2727
LIBASS=0.17.4 \
2828
LIBDAV1D=1.5.1 \
29-
LIBDRM=2.4.124 \
29+
LIBDRM=2.4.125 \
3030
LIBLC3=1.1.3 \
31-
LIBPNG=1.6.48 \
31+
LIBPNG=1.6.50 \
3232
LIBVA=2.22.0 \
3333
LIBVDPAU=1.5 \
3434
LIBVIDSTAB=1.1.1 \
3535
LIBVMAF=3.0.0 \
3636
MPP=1.0.9 \
3737
NVCODEC=n13.0.19.0 \
38-
OGG=1.3.5 \
38+
OGG=1.3.6 \
3939
OPENCOREAMR=0.1.6 \
4040
OPENJPEG=2.5.3 \
4141
OPUS=1.5.2 \
42-
RAV1E=0.8.0 \
42+
RAV1E=0.8.1 \
4343
RIST=0.2.11 \
4444
SRT=1.5.4 \
45-
SVTAV1=3.1.0 \
45+
SVTAV1=3.1.1 \
4646
THEORA=1.2.0 \
4747
VORBIS=1.3.7 \
4848
VPX=1.15.2 \
4949
VVENC=1.13.1 \
50-
WEBP=1.5.0 \
50+
WEBP=1.6.0 \
5151
X265=4.1 \
5252
XVID=1.3.7 \
53-
ZIMG=3.0.5 \
53+
ZIMG=3.0.6 \
5454
ZMQ=v4.3.5
5555

5656
RUN \
@@ -640,14 +640,10 @@ RUN \
640640
curl -Lf \
641641
https://ffmpeg.org/releases/ffmpeg-${FFMPEG}.tar.bz2 | \
642642
tar -jx --strip-components=1 -C /tmp/ffmpeg
643-
644-
# Apply patch for svt-av1: https://gitlab.com/AOMediaCodec/SVT-AV1/-/issues/2249#note_2361478864
645-
COPY /ffmpeg_n7_fix.patch /tmp/ffmpeg/
646643

647644
RUN \
648645
echo "**** compiling ffmpeg ****" && \
649646
cd /tmp/ffmpeg && \
650-
patch -p1 < ffmpeg_n7_fix.patch && \
651647
./configure \
652648
--disable-debug \
653649
--disable-doc \

Jenkinsfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ pipeline {
140140
steps{
141141
script{
142142
env.EXT_RELEASE = sh(
143-
script: ''' echo 7.1.1-cli ''',
143+
script: ''' echo 8.0-cli ''',
144144
returnStdout: true).trim()
145145
env.RELEASE_LINK = 'custom_command'
146146
}

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
183183

184184
## Versions
185185

186+
* **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.
186187
* **06.08.25:** - Bump svt-av1.
187188
* **07.06.25:** - Bump harfbuzz, libass, libdovi, libplacebo, libpng, mesa, rav1e, shaderc, libvpx and vulkan-sdk.
188189
* **04.06.25:** - Add libdrm and rkmpp to arm64 image.

ffmpeg_n7_fix.patch

Lines changed: 0 additions & 13 deletions
This file was deleted.

jenkins-vars.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,10 @@
33
# jenkins variables
44
project_name: docker-ffmpeg
55
external_type: na
6-
custom_version_command: "echo 7.1.1-cli"
6+
custom_version_command: "echo 8.0-cli"
77
release_type: stable
88
release_tag: latest
99
ls_branch: master
10-
build_armhf: false
1110
repo_vars:
1211
- BUILD_VERSION_ARG = 'FFMPEG_VERSION'
1312
- LS_USER = 'linuxserver'

readme-vars.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -190,6 +190,7 @@ full_custom_readme: |
190190
191191
## Versions
192192
193+
* **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.
193194
* **06.08.25:** - Bump svt-av1.
194195
* **07.06.25:** - Bump harfbuzz, libass, libdovi, libplacebo, libpng, mesa, rav1e, shaderc, libvpx and vulkan-sdk.
195196
* **04.06.25:** - Add libdrm and rkmpp to arm64 image.

0 commit comments

Comments
 (0)