From 548a2dc7640ff08776bf9da0fb2a712bb93a92b0 Mon Sep 17 00:00:00 2001
From: aptalca <541623+aptalca@users.noreply.github.com>
Date: Sat, 17 Aug 2024 13:47:49 -0400
Subject: [PATCH] Bump ffMPeg, freetype, libdovi and mesa

---
 .github/workflows/external_trigger.yml |  2 +-
 Dockerfile                             | 16 +++++++++-------
 Dockerfile.aarch64                     | 10 ++++++----
 Jenkinsfile                            |  2 +-
 README.md                              |  2 ++
 jenkins-vars.yml                       |  2 +-
 readme-vars.yml                        |  1 +
 7 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/external_trigger.yml b/.github/workflows/external_trigger.yml
index c9b7a00..eea8db1 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 7.0.1-cli)
+          EXT_RELEASE=$(echo 7.0.2-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 137680d..e6379a0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -16,9 +16,9 @@ ENV \
 ENV \
   AOM=v3.9.1 \
   FDKAAC=2.0.3 \
-  FFMPEG_HARD=7.0.1 \
+  FFMPEG_HARD=7.0.2 \
   FONTCONFIG=2.15.0 \
-  FREETYPE=2.13.2 \
+  FREETYPE=2.13.3 \
   FRIBIDI=1.0.15 \
   GMMLIB=22.3.20 \
   HARFBUZZ=9.0.0 \
@@ -27,7 +27,7 @@ ENV \
   LAME=3.100 \
   LIBASS=0.17.3 \
   LIBDAV1D=1.4.3 \
-  LIBDOVI=2.1.1 \
+  LIBDOVI=2.1.2 \
   LIBDRM=2.4.122 \
   LIBGL=1.7.0 \
   LIBMFX=22.5.4 \
@@ -38,7 +38,7 @@ ENV \
   LIBVIDSTAB=1.1.1 \
   LIBVMAF=3.0.0 \
   LIBVPL=2.12.0 \
-  MESA=24.1.5 \
+  MESA=24.2.0 \
   NVCODEC=n12.2.72.0 \
   OGG=1.3.5 \
   OPENCOREAMR=0.1.6 \
@@ -631,10 +631,11 @@ RUN \
   mkdir -p \
     rist_build && \
   cd rist_build && \
-  meson \
+  meson setup \
     --default-library=shared .. && \
   ninja && \
-  ninja install
+  ninja install && \
+  strip -d /usr/local/lib/librist.so
 RUN \
   echo "**** grabbing srt ****" && \
   mkdir -p /tmp/srt && \
@@ -651,7 +652,8 @@ RUN \
   cmake \
     -DBUILD_SHARED_LIBS:BOOL=on .. && \
   make && \
-  make install
+  make install && \
+  strip -d /usr/local/lib/libsrt.so
 RUN \
   echo "**** grabbing SVT-AV1 ****" && \
   mkdir -p /tmp/svt-av1 && \
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index ee5ed99..ea06e56 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -16,9 +16,9 @@ ENV \
 ENV \
   AOM=v3.9.1 \
   FDKAAC=2.0.3 \
-  FFMPEG_HARD=7.0.1 \
+  FFMPEG_HARD=7.0.2 \
   FONTCONFIG=2.15.0 \
-  FREETYPE=2.13.2 \
+  FREETYPE=2.13.3 \
   FRIBIDI=1.0.15 \
   HARFBUZZ=9.0.0 \
   KVAZAAR=2.3.1 \
@@ -351,7 +351,8 @@ RUN \
   meson \
     --default-library=shared .. && \
   ninja && \
-  ninja install
+  ninja install && \
+  strip -d /usr/local/lib/librist.so
 RUN \
   echo "**** grabbing srt ****" && \
   mkdir -p /tmp/srt && \
@@ -368,7 +369,8 @@ RUN \
   cmake \
     -DBUILD_SHARED_LIBS:BOOL=on .. && \
   make && \
-  make install
+  make install && \
+  strip -d /usr/local/lib/libsrt.so
 RUN \
   echo "**** grabbing SVT-AV1 ****" && \
   mkdir -p /tmp/svt-av1 && \
diff --git a/Jenkinsfile b/Jenkinsfile
index d3da8fc..6700d19 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -108,7 +108,7 @@ pipeline {
       steps{
         script{
           env.EXT_RELEASE = sh(
-            script: ''' echo 7.0.1-cli ''',
+            script: ''' echo 7.0.2-cli ''',
             returnStdout: true).trim()
             env.RELEASE_LINK = 'custom_command'
         }
diff --git a/README.md b/README.md
index 00ed3e0..3f1e50e 100644
--- a/README.md
+++ b/README.md
@@ -174,6 +174,8 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **14.08.24:** - Bump ffmpeg, freetype, libdovi and mesa.
+* **14.08.24:** - Add SRT and libRIST.
 * **01.08.24:** - Add libdav1d. Bump libharfbuzz, various Intel drivers and libs, libass, libdrm, libplacebo, libva, mesa, svtav1, and vulkan sdk.
 * **21.06.24:** - Bump mesa and libaom. Update lib path for rav1e.
 * **08.06.24:** - Bump ffmpeg, fribidi, libdrm, mesa and vpx.
diff --git a/jenkins-vars.yml b/jenkins-vars.yml
index f95bdff..34cafd3 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 7.0.1-cli"
+custom_version_command: "echo 7.0.2-cli"
 release_type: stable
 release_tag: latest
 ls_branch: master
diff --git a/readme-vars.yml b/readme-vars.yml
index e480b3d..57c0a68 100644
--- a/readme-vars.yml
+++ b/readme-vars.yml
@@ -178,6 +178,7 @@ full_custom_readme: |
 
   ## Versions
 
+  * **14.08.24:** - Bump ffmpeg, freetype, libdovi and mesa.
   * **14.08.24:** - Add SRT and libRIST.
   * **01.08.24:** - Add libdav1d. Bump libharfbuzz, various Intel drivers and libs, libass, libdrm, libplacebo, libva, mesa, svtav1, and vulkan sdk.
   * **21.06.24:** - Bump mesa and libaom. Update lib path for rav1e.