From 66d3f3d8c984a21a7fed16e34541d1eee43e1398 Mon Sep 17 00:00:00 2001
From: aptalca <541623+aptalca@users.noreply.github.com>
Date: Fri, 9 Feb 2024 10:00:03 -0500
Subject: [PATCH 1/2] bump ffmpeg to 6.1.1, bump other deps

---
 .github/workflows/external_trigger.yml |  2 +-
 Dockerfile                             | 10 +++++-----
 Dockerfile.aarch64                     |  6 +++---
 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 35dd57b..962088a 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-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"
diff --git a/Dockerfile b/Dockerfile
index 02111ec..72c3c70 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,21 +13,21 @@ 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 \
   IHD=23.4.3 \
-  KVAZAAR=2.2.0 \
+  KVAZAAR=2.3.0 \
   LAME=3.100 \
   LIBASS=0.17.1 \
   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 \
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index 6cb340f..917f438 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -13,12 +13,12 @@ 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 \
+  KVAZAAR=2.3.0 \
   LAME=3.100 \
   LIBASS=0.17.1 \
   LIBDRM=2.4.120 \
diff --git a/Jenkinsfile b/Jenkinsfile
index e5428ec..48fc0cb 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -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'
         }
diff --git a/README.md b/README.md
index 6b3a92d..b4a3b6d 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
 
+* **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.
diff --git a/jenkins-vars.yml b/jenkins-vars.yml
index 1cbaee9..8f9fb27 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-cli"
+custom_version_command: "echo 6.1.1-cli"
 release_type: stable
 release_tag: latest
 ls_branch: master
diff --git a/readme-vars.yml b/readme-vars.yml
index e00b060..8618195 100644
--- a/readme-vars.yml
+++ b/readme-vars.yml
@@ -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.

From 2cbd3772a3deb1a662dd1ac892b1558065be968c Mon Sep 17 00:00:00 2001
From: aptalca <541623+aptalca@users.noreply.github.com>
Date: Fri, 9 Feb 2024 11:17:15 -0500
Subject: [PATCH 2/2] Revert kvazaar until 2.3.1 is released
 https://github.com/ultravideo/kvazaar/issues/381

---
 Dockerfile         | 2 +-
 Dockerfile.aarch64 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 72c3c70..22d553a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -21,7 +21,7 @@ ENV \
   FRIBIDI=1.0.13 \
   GMMLIB=22.3.15 \
   IHD=23.4.3 \
-  KVAZAAR=2.3.0 \
+  KVAZAAR=2.2.0 \
   LAME=3.100 \
   LIBASS=0.17.1 \
   LIBDOVI=2.1.0 \
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index 917f438..6eab333 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -18,7 +18,7 @@ ENV \
   FFMPEG_HARD=6.1.1 \
   FREETYPE=2.13.2 \
   FRIBIDI=1.0.13 \
-  KVAZAAR=2.3.0 \
+  KVAZAAR=2.2.0 \
   LAME=3.100 \
   LIBASS=0.17.1 \
   LIBDRM=2.4.120 \