Merge pull request linuxserver#61 from linuxserver/6.1.1

aptalca · web-flow · commit e57589ced439 · 2024-02-09T14:21:43.000-05:00
bump ffmpeg to 6.1.1, bump other deps
diff --git 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
@@ -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 \
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
@@ -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 \
diff --git 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
@@ -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
@@ -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
@@ -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.

Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@ pipeline {`
`108`	`108`	`steps{`
`109`	`109`	`script{`
`110`	`110`	`env.EXT_RELEASE = sh(`
`111`		`- script: ''' echo 6.1-cli ''',`
	`111`	`+ script: ''' echo 6.1.1-cli ''',`
`112`	`112`	`returnStdout: true).trim()`
`113`	`113`	`env.RELEASE_LINK = 'custom_command'`
`114`	`114`	`}`