LAB-linuxserver/docker-ffmpeg
1
0
Fork 0
mirror of https://github.com/linuxserver/docker-ffmpeg.git synced 2026-02-20 04:56:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #61 from linuxserver/6.1.1

Browse Source 
bump ffmpeg to 6.1.1, bump other deps
This commit is contained in:
aptalca 2024-02-09 14:21:43 -05:00 committed by GitHub
commit e57589ced4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/external_trigger.yml vendored
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 6.1-cli)
EXT_RELEASE=$(echo 6.1.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"

8
Dockerfile
View File

@ -13,10 +13,10 @@ ENV \
# versions
ENV \
AOM=v3.8.0 \
AOM=v3.8.1 \
FDKAAC=2.0.3 \
FFMPEG_HARD=6.1 \
FONTCONFIG=2.14.2 \
FFMPEG_HARD=6.1.1 \
FONTCONFIG=2.15.0 \
FREETYPE=2.13.2 \
FRIBIDI=1.0.13 \
GMMLIB=22.3.15 \
@ -27,7 +27,7 @@ ENV \
LIBDOVI=2.1.0 \
LIBDRM=2.4.120 \
LIBMFX=22.5.4 \
LIBPLACEBO=6.338.1 \
LIBPLACEBO=6.338.2 \
LIBVA=2.20.0 \
LIBVDPAU=1.5 \
LIBVIDSTAB=1.1.1 \

4
Dockerfile.aarch64
View File

@ -13,9 +13,9 @@ ENV \
# versions
ENV \
AOM=v3.8.0 \
AOM=v3.8.1 \
FDKAAC=2.0.3 \
FFMPEG_HARD=6.1 \
FFMPEG_HARD=6.1.1 \
FREETYPE=2.13.2 \
FRIBIDI=1.0.13 \
KVAZAAR=2.2.0 \

2
Jenkinsfile vendored
View File

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

1
README.md
View File

@ -173,6 +173,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
## Versions
* **09.02.24:** - Bump ffmpeg to 6.1.1, bump other deps.
* **08.02.24:** - Enable cuda-llvm, clean up rustc.
* **01.02.24:** - Bump Mesa to v24.
* **21.01.24:** - Add alsa support.

2
jenkins-vars.yml
View File

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

1
readme-vars.yml
View File

@ -177,6 +177,7 @@ full_custom_readme: |
## Versions
* **09.02.24:** - Bump ffmpeg to 6.1.1, bump other deps.
* **08.02.24:** - Enable cuda-llvm, clean up rustc.
* **01.02.24:** - Bump Mesa to v24.
* **21.01.24:** - Add alsa support.