Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bump ffmpeg to 7.0, bump other deps #65

Merged
merged 1 commit into from
Apr 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/external_trigger.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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.1-cli)
EXT_RELEASE=$(echo 7.0-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"
Expand Down
12 changes: 6 additions & 6 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ ENV \
ENV \
AOM=v3.8.2 \
FDKAAC=2.0.3 \
FFMPEG_HARD=6.1.1 \
FFMPEG_HARD=7.0 \
FONTCONFIG=2.15.0 \
FREETYPE=2.13.2 \
FRIBIDI=1.0.13 \
Expand All @@ -24,17 +24,17 @@ ENV \
KVAZAAR=2.2.0 \
LAME=3.100 \
LIBASS=0.17.1 \
LIBDOVI=2.1.0 \
LIBDOVI=2.1.1 \
LIBDRM=2.4.120 \
LIBMFX=22.5.4 \
LIBPLACEBO=6.338.2 \
LIBVA=2.20.0 \
LIBVA=2.21.0 \
LIBVDPAU=1.5 \
LIBVIDSTAB=1.1.1 \
LIBVMAF=3.0.0 \
LIBVPL=2.10.1 \
MESA=24.0.3 \
NVCODEC=n12.1.14.0 \
MESA=24.0.4 \
NVCODEC=n12.2.72.0 \
OGG=1.3.5 \
ONEVPL=23.4.3 \
OPENCOREAMR=0.1.6 \
Expand All @@ -46,7 +46,7 @@ ENV \
THEORA=1.1.1 \
VORBIS=1.3.7 \
VPX=1.14.0 \
VULKANSDK=vulkan-sdk-1.3.275.0 \
VULKANSDK=vulkan-sdk-1.3.280.0 \
WEBP=1.3.2 \
X265=3.5 \
XVID=1.3.7 \
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile.aarch64
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@ ENV \
ENV \
AOM=v3.8.2 \
FDKAAC=2.0.3 \
FFMPEG_HARD=6.1.1 \
FFMPEG_HARD=7.0 \
FREETYPE=2.13.2 \
FRIBIDI=1.0.13 \
KVAZAAR=2.2.0 \
LAME=3.100 \
LIBASS=0.17.1 \
LIBDRM=2.4.120 \
LIBVA=2.20.0 \
LIBVA=2.21.0 \
LIBVDPAU=1.5 \
LIBVIDSTAB=1.1.1 \
NVCODEC=n12.1.14.0 \
Expand Down
2 changes: 1 addition & 1 deletion Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ pipeline {
steps{
script{
env.EXT_RELEASE = sh(
script: ''' echo 6.1.1-cli ''',
script: ''' echo 7.0-cli ''',
returnStdout: true).trim()
env.RELEASE_LINK = 'custom_command'
}
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64

## Versions

* **05.04.24:** - Bump ffmpeg to 7.0, bump libdovi, libva, mesa and vulkan-sdk.
* **16.03.24:** - Bump libaom, mesa, openjpeg, opus, shaderc and svtav1.
* **11.02.24:** - Add Zimg support.
* **09.02.24:** - Bump ffmpeg to 6.1.1, bump other deps.
Expand Down
2 changes: 1 addition & 1 deletion jenkins-vars.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# jenkins variables
project_name: docker-ffmpeg
external_type: na
custom_version_command: "echo 6.1.1-cli"
custom_version_command: "echo 7.0-cli"
release_type: stable
release_tag: latest
ls_branch: master
Expand Down
1 change: 1 addition & 0 deletions readme-vars.yml
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,7 @@ full_custom_readme: |

## Versions

* **05.04.24:** - Bump ffmpeg to 7.0, bump libdovi, libva, mesa and vulkan-sdk.
* **16.03.24:** - Bump libaom, mesa, openjpeg, opus, shaderc and svtav1.
* **11.02.24:** - Add Zimg support.
* **09.02.24:** - Bump ffmpeg to 6.1.1, bump other deps.
Expand Down
Loading