Merge pull request #76 from linuxserver/bump

bump ffmpeg and other libs
This commit is contained in:
aptalca 2024-06-12 11:52:25 -04:00 committed by GitHub
commit 5bb7b704c2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 14 additions and 12 deletions

View File

@ -20,7 +20,7 @@ jobs:
echo "**** External trigger running off of master branch. To disable this trigger, set a Github secret named \"PAUSE_EXTERNAL_TRIGGER_FFMPEG_MASTER\". ****"
echo "External trigger running off of master branch. To disable this trigger, set a Github secret named \`PAUSE_EXTERNAL_TRIGGER_FFMPEG_MASTER\`" >> $GITHUB_STEP_SUMMARY
echo "**** Retrieving external version ****"
EXT_RELEASE=$(echo 7.0-cli)
EXT_RELEASE=$(echo 7.0.1-cli)
if [ -z "${EXT_RELEASE}" ] || [ "${EXT_RELEASE}" == "null" ]; then
echo "**** Can't retrieve external version, exiting ****"
FAILURE_REASON="Can't retrieve external version for ffmpeg branch master"

View File

@ -16,10 +16,10 @@ ENV \
ENV \
AOM=v3.9.0 \
FDKAAC=2.0.3 \
FFMPEG_HARD=7.0 \
FFMPEG_HARD=7.0.1 \
FONTCONFIG=2.15.0 \
FREETYPE=2.13.2 \
FRIBIDI=1.0.14 \
FRIBIDI=1.0.15 \
GMMLIB=22.3.18 \
HARFBUZZ=8.5.0 \
IHD=24.1.5 \
@ -27,7 +27,7 @@ ENV \
LAME=3.100 \
LIBASS=0.17.2 \
LIBDOVI=2.1.1 \
LIBDRM=2.4.120 \
LIBDRM=2.4.121 \
LIBGL=1.7.0 \
LIBMFX=22.5.4 \
LIBPLACEBO=6.338.2 \
@ -37,7 +37,7 @@ ENV \
LIBVIDSTAB=1.1.1 \
LIBVMAF=3.0.0 \
LIBVPL=2.11.0 \
MESA=24.1.0 \
MESA=24.1.1 \
NVCODEC=n12.2.72.0 \
OGG=1.3.5 \
OPENCOREAMR=0.1.6 \
@ -49,7 +49,7 @@ ENV \
THEORA=1.1.1 \
VORBIS=1.3.7 \
VPLGPURT=24.1.5 \
VPX=1.14.0 \
VPX=1.14.1 \
VULKANSDK=vulkan-sdk-1.3.283.0 \
WEBP=1.4.0 \
X265=3.6 \

View File

@ -16,15 +16,15 @@ ENV \
ENV \
AOM=v3.9.0 \
FDKAAC=2.0.3 \
FFMPEG_HARD=7.0 \
FFMPEG_HARD=7.0.1 \
FONTCONFIG=2.15.0 \
FREETYPE=2.13.2 \
FRIBIDI=1.0.14 \
FRIBIDI=1.0.15 \
HARFBUZZ=8.5.0 \
KVAZAAR=2.3.1 \
LAME=3.100 \
LIBASS=0.17.2 \
LIBDRM=2.4.120 \
LIBDRM=2.4.121 \
LIBPNG=1.6.43 \
LIBVA=2.21.0 \
LIBVDPAU=1.5 \
@ -38,7 +38,7 @@ ENV \
SVTAV1=2.1.0 \
THEORA=1.1.1 \
VORBIS=1.3.7 \
VPX=1.14.0 \
VPX=1.14.1 \
WEBP=1.4.0 \
X265=3.6 \
XVID=1.3.7 \

2
Jenkinsfile vendored
View File

@ -108,7 +108,7 @@ pipeline {
steps{
script{
env.EXT_RELEASE = sh(
script: ''' echo 7.0-cli ''',
script: ''' echo 7.0.1-cli ''',
returnStdout: true).trim()
env.RELEASE_LINK = 'custom_command'
}

View File

@ -174,6 +174,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
## Versions
* **08.06.24:** - Bump ffmpeg, fribidi, libdrm, mesa and vpx.
* **26.05.24:** - Rebase to Ubuntu Noble. Bump libass, libharfbuzz and vulkan-sdk.
* **22.05.24:** - Bump Mesa to 24.1.0.
* **20.05.24:** - Bump libsvtav1.

View File

@ -3,7 +3,7 @@
# jenkins variables
project_name: docker-ffmpeg
external_type: na
custom_version_command: "echo 7.0-cli"
custom_version_command: "echo 7.0.1-cli"
release_type: stable
release_tag: latest
ls_branch: master

View File

@ -178,6 +178,7 @@ full_custom_readme: |
## Versions
* **08.06.24:** - Bump ffmpeg, fribidi, libdrm, mesa and vpx.
* **26.05.24:** - Rebase to Ubuntu Noble. Bump libass, libharfbuzz and vulkan-sdk.
* **22.05.24:** - Bump Mesa to 24.1.0.
* **20.05.24:** - Bump libsvtav1.