From 5ff16e4038b4fc7278644d53a7f8ba4f6e87e3e8 Mon Sep 17 00:00:00 2001
From: aptalca <541623+aptalca@users.noreply.github.com>
Date: Fri, 5 Apr 2024 11:07:45 -0400
Subject: [PATCH] bump ffmpeg to 7.0, bump other deps

---
 .github/workflows/external_trigger.yml |  2 +-
 Dockerfile                             | 12 ++++++------
 Dockerfile.aarch64                     |  4 ++--
 Jenkinsfile                            |  2 +-
 README.md                              |  1 +
 jenkins-vars.yml                       |  2 +-
 readme-vars.yml                        |  1 +
 7 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/external_trigger.yml b/.github/workflows/external_trigger.yml
index cda62e3..a994a2f 100755
--- a/.github/workflows/external_trigger.yml
+++ b/.github/workflows/external_trigger.yml
@@ -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"
diff --git a/Dockerfile b/Dockerfile
index ae0a999..579a195 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -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 \
@@ -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 \
@@ -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 \
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index a586d9b..6219426 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -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 \
diff --git a/Jenkinsfile b/Jenkinsfile
index 8f06796..ca9c2a1 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -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'
         }
diff --git a/README.md b/README.md
index 1d8910c..a383c52 100644
--- a/README.md
+++ b/README.md
@@ -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.
diff --git a/jenkins-vars.yml b/jenkins-vars.yml
index 8f9fb27..0af828d 100644
--- a/jenkins-vars.yml
+++ b/jenkins-vars.yml
@@ -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
diff --git a/readme-vars.yml b/readme-vars.yml
index f5700aa..b10742c 100644
--- a/readme-vars.yml
+++ b/readme-vars.yml
@@ -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.