mirror of
https://github.com/linuxserver/docker-ffmpeg.git
synced 2026-02-20 04:56:23 +08:00
Compare commits
17 Commits
8.0-cli-ls
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
|
f35f0c9720 | ||
|
|
d424516bec | ||
|
|
7100fa33c6 | ||
|
|
7b414e7bd9 | ||
|
|
118ea9dee1 | ||
|
|
3d3a0f3fdf | ||
|
|
37bfd69cfb | ||
|
|
ab5fede4d2 | ||
|
|
c52f067a11 | ||
|
|
839170000d | ||
|
|
79cbc25e01 | ||
|
|
77ad03e76c | ||
|
|
237805303e | ||
|
|
c01a2f7787 | ||
|
|
5803a9b64f | ||
|
|
c6a0f2b929 | ||
|
|
91b626f2c2 |
2
.github/workflows/external_trigger.yml
vendored
2
.github/workflows/external_trigger.yml
vendored
@ -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-cli)
|
||||
EXT_RELEASE=$(echo 8.0.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
|
||||
|
||||
22
Dockerfile
22
Dockerfile
@ -17,45 +17,45 @@ ENV \
|
||||
ENV \
|
||||
AOM=v3.13.1 \
|
||||
FDKAAC=2.0.3 \
|
||||
FFMPEG_HARD=8.0 \
|
||||
FFMPEG_HARD=8.0.1 \
|
||||
FONTCONFIG=2.16.0 \
|
||||
FREETYPE=2.14.1 \
|
||||
FRIBIDI=1.0.16 \
|
||||
GMMLIB=22.8.2 \
|
||||
HARFBUZZ=12.2.0 \
|
||||
HARFBUZZ=12.3.0 \
|
||||
IHD=25.3.4 \
|
||||
KVAZAAR=2.3.2 \
|
||||
LAME=3.100 \
|
||||
LIBASS=0.17.4 \
|
||||
LIBDAV1D=1.5.2 \
|
||||
LIBDAV1D=1.5.3 \
|
||||
LIBDOVI=2.3.1 \
|
||||
LIBDRM=2.4.129 \
|
||||
LIBDRM=2.4.131 \
|
||||
LIBGL=1.7.0 \
|
||||
LIBLC3=1.1.3 \
|
||||
LIBMFX=22.5.4 \
|
||||
LIBPLACEBO=7.351.0 \
|
||||
LIBPNG=1.6.50 \
|
||||
LIBVA=2.22.0 \
|
||||
LIBPNG=1.6.53 \
|
||||
LIBVA=2.23.0 \
|
||||
LIBVDPAU=1.5 \
|
||||
LIBVIDSTAB=1.1.1 \
|
||||
LIBVMAF=3.0.0 \
|
||||
LIBVPL=2.15.0 \
|
||||
MESA=25.3.0 \
|
||||
LIBVPL=2.16.0 \
|
||||
MESA=25.3.3 \
|
||||
NVCODEC=n13.0.19.0 \
|
||||
OGG=1.3.6 \
|
||||
OPENCOREAMR=0.1.6 \
|
||||
OPENJPEG=2.5.4 \
|
||||
OPUS=1.5.2 \
|
||||
OPUS=1.6 \
|
||||
RAV1E=0.8.1 \
|
||||
RIST=0.2.11 \
|
||||
SHADERC=v2025.4 \
|
||||
SHADERC=v2025.5 \
|
||||
SRT=1.5.4 \
|
||||
SVTAV1=3.1.2 \
|
||||
THEORA=1.2.0 \
|
||||
VORBIS=1.3.7 \
|
||||
VPLGPURT=25.3.4 \
|
||||
VPX=1.15.2 \
|
||||
VULKANSDK=vulkan-sdk-1.4.328.1 \
|
||||
VULKANSDK=vulkan-sdk-1.4.335.0 \
|
||||
VVENC=1.13.1 \
|
||||
WEBP=1.6.0 \
|
||||
X265=4.1 \
|
||||
|
||||
@ -17,28 +17,27 @@ ENV \
|
||||
ENV \
|
||||
AOM=v3.13.1 \
|
||||
FDKAAC=2.0.3 \
|
||||
FFMPEG_HARD=8.0 \
|
||||
FFMPEG_HARD=8.0.1 \
|
||||
FONTCONFIG=2.16.0 \
|
||||
FREETYPE=2.14.1 \
|
||||
FRIBIDI=1.0.16 \
|
||||
HARFBUZZ=12.2.0 \
|
||||
HARFBUZZ=12.3.0 \
|
||||
KVAZAAR=2.3.2 \
|
||||
LAME=3.100 \
|
||||
LIBASS=0.17.4 \
|
||||
LIBDAV1D=1.5.2 \
|
||||
LIBDRM=2.4.129 \
|
||||
LIBDAV1D=1.5.3 \
|
||||
LIBDRM=2.4.131 \
|
||||
LIBLC3=1.1.3 \
|
||||
LIBPNG=1.6.50 \
|
||||
LIBVA=2.22.0 \
|
||||
LIBPNG=1.6.53 \
|
||||
LIBVA=2.23.0 \
|
||||
LIBVDPAU=1.5 \
|
||||
LIBVIDSTAB=1.1.1 \
|
||||
LIBVMAF=3.0.0 \
|
||||
MPP=1.0.11 \
|
||||
NVCODEC=n13.0.19.0 \
|
||||
OGG=1.3.6 \
|
||||
OPENCOREAMR=0.1.6 \
|
||||
OPENJPEG=2.5.4 \
|
||||
OPUS=1.5.2 \
|
||||
OPUS=1.6 \
|
||||
RAV1E=0.8.1 \
|
||||
RIST=0.2.11 \
|
||||
SRT=1.5.4 \
|
||||
@ -323,22 +322,6 @@ RUN \
|
||||
build && \
|
||||
ninja -vC build && \
|
||||
ninja -vC build install
|
||||
RUN \
|
||||
echo "**** grabbing mpp ****" && \
|
||||
mkdir -p /tmp/mpp && \
|
||||
curl -Lf \
|
||||
https://github.com/rockchip-linux/mpp/archive/refs/tags/${MPP}.tar.gz | \
|
||||
tar -zx --strip-components=1 -C /tmp/mpp
|
||||
RUN \
|
||||
echo "**** compiling mpp ****" && \
|
||||
cd /tmp/mpp && \
|
||||
cmake \
|
||||
-DCMAKE_BUILD_TYPE=Release \
|
||||
-DTOOLCHAIN=aarch64-linux-gnu- \
|
||||
-G "Unix Makefiles" \
|
||||
. && \
|
||||
cmake --build . -j && \
|
||||
make install
|
||||
RUN \
|
||||
echo "**** grabbing ogg ****" && \
|
||||
mkdir -p /tmp/ogg && \
|
||||
@ -690,7 +673,6 @@ RUN \
|
||||
--enable-nvdec \
|
||||
--enable-nvenc \
|
||||
--enable-openssl \
|
||||
--enable-rkmpp \
|
||||
--enable-stripping \
|
||||
--enable-version3 \
|
||||
&& \
|
||||
|
||||
4
Jenkinsfile
vendored
4
Jenkinsfile
vendored
@ -140,7 +140,7 @@ pipeline {
|
||||
steps{
|
||||
script{
|
||||
env.EXT_RELEASE = sh(
|
||||
script: ''' echo 8.0-cli ''',
|
||||
script: ''' echo 8.0.1-cli ''',
|
||||
returnStdout: true).trim()
|
||||
env.RELEASE_LINK = 'custom_command'
|
||||
}
|
||||
@ -276,7 +276,7 @@ pipeline {
|
||||
-v ${WORKSPACE}:/mnt \
|
||||
-e AWS_ACCESS_KEY_ID=\"${S3_KEY}\" \
|
||||
-e AWS_SECRET_ACCESS_KEY=\"${S3_SECRET}\" \
|
||||
ghcr.io/linuxserver/baseimage-alpine:3 s6-envdir -fn -- /var/run/s6/container_environment /bin/bash -c "\
|
||||
ghcr.io/linuxserver/baseimage-alpine:3.23 s6-envdir -fn -- /var/run/s6/container_environment /bin/bash -c "\
|
||||
apk add --no-cache python3 && \
|
||||
python3 -m venv /lsiopy && \
|
||||
pip install --no-cache-dir -U pip && \
|
||||
|
||||
@ -183,6 +183,8 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
|
||||
|
||||
## Versions
|
||||
|
||||
* **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.
|
||||
* **19.11.25:** - Bump aom, freetype, harfbuzz, Intel drivers and libs, kvazaar, libdav1d, libdrm, mesa, mpp, openjpeg, shaderc, svt-av1 and vulkan-sdk.
|
||||
* **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.
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
# jenkins variables
|
||||
project_name: docker-ffmpeg
|
||||
external_type: na
|
||||
custom_version_command: "echo 8.0-cli"
|
||||
custom_version_command: "echo 8.0.1-cli"
|
||||
release_type: stable
|
||||
release_tag: latest
|
||||
ls_branch: master
|
||||
|
||||
@ -1,13 +1,13 @@
|
||||
NAME VERSION TYPE
|
||||
adduser 3.137ubuntu1 deb
|
||||
alsa-topology-conf 1.2.5.1-2 deb
|
||||
alsa-ucm-conf 1.2.10-1ubuntu5.7 deb
|
||||
alsa-ucm-conf 1.2.10-1ubuntu5.9 deb
|
||||
apt 2.8.3 deb
|
||||
apt-utils 2.8.3 deb
|
||||
base-files 13ubuntu10.3 deb
|
||||
base-files 13ubuntu10.4 deb
|
||||
base-passwd 3.6.3build1 deb
|
||||
bash 5.2.21-2ubuntu4 deb
|
||||
bsdutils 1:2.39.3-9ubuntu6.3 deb
|
||||
bsdutils 1:2.39.3-9ubuntu6.4 deb
|
||||
ca-certificates 20240203 deb
|
||||
catatonit 0.1.7-1 deb
|
||||
coreutils 9.4-3ubuntu6.1 deb
|
||||
@ -18,26 +18,26 @@ dash 0.5.12-6ubuntu5 deb
|
||||
debconf 1.5.86ubuntu1 deb
|
||||
debianutils 5.17build1 deb
|
||||
diffutils 1:3.10-1build1 deb
|
||||
dirmngr 2.4.4-2ubuntu17.3 deb
|
||||
dirmngr 2.4.4-2ubuntu17.4 deb
|
||||
dpkg 1.22.6ubuntu6.5 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
|
||||
gnupg 2.4.4-2ubuntu17.3 deb
|
||||
gnupg-l10n 2.4.4-2ubuntu17.3 deb
|
||||
gnupg-utils 2.4.4-2ubuntu17.3 deb
|
||||
gpg 2.4.4-2ubuntu17.3 deb
|
||||
gpg-agent 2.4.4-2ubuntu17.3 deb
|
||||
gpg-wks-client 2.4.4-2ubuntu17.3 deb
|
||||
gpgconf 2.4.4-2ubuntu17.3 deb
|
||||
gpgsm 2.4.4-2ubuntu17.3 deb
|
||||
gpgv 2.4.4-2ubuntu17.3 deb
|
||||
gnupg 2.4.4-2ubuntu17.4 deb
|
||||
gnupg-l10n 2.4.4-2ubuntu17.4 deb
|
||||
gnupg-utils 2.4.4-2ubuntu17.4 deb
|
||||
gpg 2.4.4-2ubuntu17.4 deb
|
||||
gpg-agent 2.4.4-2ubuntu17.4 deb
|
||||
gpg-wks-client 2.4.4-2ubuntu17.4 deb
|
||||
gpgconf 2.4.4-2ubuntu17.4 deb
|
||||
gpgsm 2.4.4-2ubuntu17.4 deb
|
||||
gpgv 2.4.4-2ubuntu17.4 deb
|
||||
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-3ubuntu0.24.04.1 deb
|
||||
keyboxd 2.4.4-2ubuntu17.3 deb
|
||||
keyboxd 2.4.4-2ubuntu17.4 deb
|
||||
krb5-locales 1.20.1-6ubuntu2.6 deb
|
||||
libacl1 2.3.2-1build1.1 deb
|
||||
libapt-pkg6.0t64 2.8.3 deb
|
||||
@ -47,12 +47,12 @@ libassuan0 2.5.6-1build1 deb
|
||||
libattr1 1:2.5.2-1build1.1 deb
|
||||
libaudit-common 1:3.1.2-2.1build1.1 deb
|
||||
libaudit1 1:3.1.2-2.1build1.1 deb
|
||||
libblkid1 2.39.3-9ubuntu6.3 deb
|
||||
libblkid1 2.39.3-9ubuntu6.4 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.6 deb
|
||||
libc6 2.39-0ubuntu8.6 deb
|
||||
libc-bin 2.39-0ubuntu8.7 deb
|
||||
libc6 2.39-0ubuntu8.7 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
|
||||
@ -67,8 +67,8 @@ libext2fs2t64 1.47.0-2.4~exp1ubuntu4.1 deb
|
||||
libffi8 3.4.6-1build1 deb
|
||||
libgcc-s1 14.2.0-4ubuntu2~24.04 deb
|
||||
libgcrypt20 1.10.3-2build1 deb
|
||||
libglib2.0-0t64 2.80.0-6ubuntu3.4 deb
|
||||
libglib2.0-data 2.80.0-6ubuntu3.4 deb
|
||||
libglib2.0-0t64 2.80.0-6ubuntu3.8 deb
|
||||
libglib2.0-data 2.80.0-6ubuntu3.8 deb
|
||||
libgmp10 2:6.3.0+dfsg-2ubuntu6.1 deb
|
||||
libgnutls30t64 3.8.3-1.1ubuntu3.4 deb
|
||||
libgomp1 14.2.0-4ubuntu2~24.04 deb
|
||||
@ -85,13 +85,13 @@ libkeyutils1 1.6.3-3build1 deb
|
||||
libkrb5-3 1.20.1-6ubuntu2.6 deb
|
||||
libkrb5support0 1.20.1-6ubuntu2.6 deb
|
||||
libksba8 1.6.6-1build1 deb
|
||||
libldap-common 2.6.7+dfsg-1~exp1ubuntu8.2 deb
|
||||
libldap2 2.6.7+dfsg-1~exp1ubuntu8.2 deb
|
||||
libldap-common 2.6.10+dfsg-0ubuntu0.24.04.1 deb
|
||||
libldap2 2.6.10+dfsg-0ubuntu0.24.04.1 deb
|
||||
libllvm18 1:18.1.3-1ubuntu1 deb
|
||||
liblz4-1 1.9.4-1build1.1 deb
|
||||
liblzma5 5.6.1+really5.4.5-1ubuntu0.2 deb
|
||||
libmd0 1.1.0-2build1.1 deb
|
||||
libmount1 2.39.3-9ubuntu6.3 deb
|
||||
libmount1 2.39.3-9ubuntu6.4 deb
|
||||
libncursesw6 6.4+20240113-1ubuntu2 deb
|
||||
libnettle8t64 3.9.1-2.2build1.1 deb
|
||||
libnghttp2-14 1.59.0-1ubuntu0.2 deb
|
||||
@ -116,18 +116,18 @@ libselinux1 3.5-2ubuntu2.1 deb
|
||||
libsemanage-common 3.5-1build5 deb
|
||||
libsemanage2 3.5-1build5 deb
|
||||
libsepol2 3.5-2build1 deb
|
||||
libsmartcols1 2.39.3-9ubuntu6.3 deb
|
||||
libsmartcols1 2.39.3-9ubuntu6.4 deb
|
||||
libsqlite3-0 3.45.1-1ubuntu2.5 deb
|
||||
libss2 1.47.0-2.4~exp1ubuntu4.1 deb
|
||||
libssh-4 0.10.6-2ubuntu0.2 deb
|
||||
libssl3t64 3.0.13-0ubuntu3.6 deb
|
||||
libssl3t64 3.0.13-0ubuntu3.7 deb
|
||||
libstdc++6 14.2.0-4ubuntu2~24.04 deb
|
||||
libsystemd0 255.4-1ubuntu8.11 deb
|
||||
libtasn1-6 4.19.0-3ubuntu0.24.04.1 deb
|
||||
libsystemd0 255.4-1ubuntu8.12 deb
|
||||
libtasn1-6 4.19.0-3ubuntu0.24.04.2 deb
|
||||
libtinfo6 6.4+20240113-1ubuntu2 deb
|
||||
libudev1 255.4-1ubuntu8.11 deb
|
||||
libudev1 255.4-1ubuntu8.12 deb
|
||||
libunistring5 1.1-2build1.1 deb
|
||||
libuuid1 2.39.3-9ubuntu6.3 deb
|
||||
libuuid1 2.39.3-9ubuntu6.4 deb
|
||||
libv4l-0t64 1.26.1-4build3 deb
|
||||
libv4lconvert0t64 1.26.1-4build3 deb
|
||||
libwayland-client0 1.22.0-2.1build1 deb
|
||||
@ -147,20 +147,20 @@ 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.6 deb
|
||||
libxml2 2.9.14+dfsg-1.3ubuntu3.7 deb
|
||||
libxshmfence1 1.3-1build5 deb
|
||||
libxxhash0 0.8.2-2build1 deb
|
||||
libzstd1 1.5.5+dfsg2-2build1.1 deb
|
||||
locales 2.39-0ubuntu8.6 deb
|
||||
locales 2.39-0ubuntu8.7 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
|
||||
mount 2.39.3-9ubuntu6.3 deb
|
||||
mount 2.39.3-9ubuntu6.4 deb
|
||||
ncurses-base 6.4+20240113-1ubuntu2 deb
|
||||
ncurses-bin 6.4+20240113-1ubuntu2 deb
|
||||
netcat-openbsd 1.226-1ubuntu2 deb
|
||||
ocl-icd-libopencl1 2.3.2-1build1 deb
|
||||
openssl 3.0.13-0ubuntu3.6 deb
|
||||
openssl 3.0.13-0ubuntu3.7 deb
|
||||
passwd 1:4.13+dfsg1-4ubuntu3.2 deb
|
||||
perl-base 5.38.2-3.2ubuntu0.2 deb
|
||||
pinentry-curses 1.2.1-3ubuntu5 deb
|
||||
@ -170,12 +170,12 @@ readline-common 8.2-4build1 deb
|
||||
sed 4.9-2build1 deb
|
||||
sensible-utils 0.0.22 deb
|
||||
shared-mime-info 2.4-4 deb
|
||||
systemd-standalone-sysusers 255.4-1ubuntu8.11 deb
|
||||
systemd-standalone-sysusers 255.4-1ubuntu8.12 deb
|
||||
sysvinit-utils 3.08-6ubuntu3 deb
|
||||
tar 1.35+dfsg-3build1 deb
|
||||
tzdata 2025b-0ubuntu0.24.04.1 deb
|
||||
ubuntu-keyring 2023.11.28.1 deb
|
||||
unminimize 0.2.1 deb
|
||||
util-linux 2.39.3-9ubuntu6.3 deb
|
||||
util-linux 2.39.3-9ubuntu6.4 deb
|
||||
xdg-user-dirs 0.18-1build1 deb
|
||||
zlib1g 1:1.3.dfsg-3.1ubuntu2.1 deb
|
||||
|
||||
@ -190,6 +190,8 @@ full_custom_readme: |
|
||||
|
||||
## Versions
|
||||
|
||||
* **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.
|
||||
* **19.11.25:** - Bump aom, freetype, harfbuzz, Intel drivers and libs, kvazaar, libdav1d, libdrm, mesa, mpp, openjpeg, shaderc, svt-av1 and vulkan-sdk.
|
||||
* **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.
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user