From 42ecf132021e3abe08d0bedbb8740b8064833aa9 Mon Sep 17 00:00:00 2001
From: aptalca <541623+aptalca@users.noreply.github.com>
Date: Thu, 5 Oct 2023 20:28:29 -0400
Subject: [PATCH 1/3] update various libs

---
 Dockerfile         | 20 ++++++++++----------
 Dockerfile.aarch64 | 12 ++++++------
 readme-vars.yml    |  1 +
 3 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index bcbc0e4..af6158e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,34 +13,34 @@ ENV \
 
 # versions
 ENV \
-  AOM=v3.6.1 \
+  AOM=v3.7.0 \
   FDKAAC=2.0.2 \
   FFMPEG_HARD=6.0 \
   FONTCONFIG=2.14.2 \
-  FREETYPE=2.12.1 \
+  FREETYPE=2.13.2 \
   FRIBIDI=1.0.13 \
-  GMMLIB=22.3.5 \
-  IHD=23.1.6 \
+  GMMLIB=22.3.7 \
+  IHD=23.2.4 \
   KVAZAAR=2.2.0 \
   LAME=3.100 \
   LIBASS=0.17.1 \
-  LIBDRM=2.4.115 \
+  LIBDRM=2.4.116 \
   LIBMFX=22.5.4 \
-  LIBVA=2.18.0 \
+  LIBVA=2.19.0 \
   LIBVDPAU=1.5 \
   LIBVIDSTAB=1.1.1 \
   LIBVMAF=2.3.1 \
-  LIBVPL=2023.3.0 \
+  LIBVPL=2023.3.1 \
   NVCODEC=n12.0.16.0 \
   OGG=1.3.5 \
-  ONEVPL=23.1.5 \
+  ONEVPL=23.2.4 \
   OPENCOREAMR=0.1.6 \
   OPENJPEG=2.5.0 \
   OPUS=1.3.1 \
   THEORA=1.1.1 \
   VORBIS=1.3.7 \
-  VPX=1.13.0 \
-  WEBP=1.3.1 \
+  VPX=1.13.1 \
+  WEBP=1.3.2 \
   X265=3.5 \
   XVID=1.3.7
 
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index d44061a..eea22ce 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -13,16 +13,16 @@ ENV \
 
 # versions
 ENV \
-  AOM=v3.6.1 \
+  AOM=v3.7.0 \
   FDKAAC=2.0.2 \
   FFMPEG_HARD=6.0 \
-  FREETYPE=2.12.1 \
+  FREETYPE=2.13.2 \
   FRIBIDI=1.0.13 \
   KVAZAAR=2.2.0 \
   LAME=3.100 \
   LIBASS=0.17.1 \
-  LIBDRM=2.4.115 \
-  LIBVA=2.18.0 \
+  LIBDRM=2.4.116 \
+  LIBVA=2.19.0 \
   LIBVDPAU=1.5 \
   LIBVIDSTAB=1.1.1 \
   NVCODEC=n12.0.16.0 \
@@ -32,8 +32,8 @@ ENV \
   OPUS=1.3.1 \
   THEORA=1.1.1 \
   VORBIS=1.3.7 \
-  VPX=1.13.0 \
-  WEBP=1.3.1 \
+  VPX=1.13.1 \
+  WEBP=1.3.2 \
   X265=master \
   XVID=1.3.7
 # x265 aarch64 build fixes not in a release yet https://bitbucket.org/multicoreware/x265_git/issues/604/linux-arm-aarch64-build-failing-for-high
diff --git a/readme-vars.yml b/readme-vars.yml
index 07e52c0..87c4700 100644
--- a/readme-vars.yml
+++ b/readme-vars.yml
@@ -155,6 +155,7 @@ full_custom_readme: |
 
   ## Versions
 
+  * **05.10.23:** - Update various libraries.
   * **16.08.23:** - Added support for WebP formats.
   * **11.08.23:** - Add optional i965 driver for gen5+ support.
   * **14.06.23:** - Switch to latest iHD for Intel, add qsv support.

From 79a5961a526e1d939a6ef1ee82be39c17fd5604f Mon Sep 17 00:00:00 2001
From: aptalca <541623+aptalca@users.noreply.github.com>
Date: Thu, 5 Oct 2023 21:28:11 -0400
Subject: [PATCH 2/3] Add support for SVT-AV1

---
 Dockerfile         | 16 +++++++++++++++-
 Dockerfile.aarch64 | 16 +++++++++++++++-
 readme-vars.yml    |  2 +-
 3 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index af6158e..d4319d6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -37,6 +37,7 @@ ENV \
   OPENCOREAMR=0.1.6 \
   OPENJPEG=2.5.0 \
   OPUS=1.3.1 \
+  SVTAV1=1.7.0 \
   THEORA=1.1.1 \
   VORBIS=1.3.7 \
   VPX=1.13.1 \
@@ -145,7 +146,7 @@ RUN \
 RUN \
   echo "**** grabbing freetype ****" && \
   mkdir -p /tmp/freetype && \
-  curl -Lf \
+  curl -Lf --retry 10 --retry-max-time 60 --retry-connrefused \
     https://download.savannah.gnu.org/releases/freetype/freetype-${FREETYPE}.tar.gz | \
     tar -zx --strip-components=1 -C /tmp/freetype
 RUN \
@@ -453,6 +454,18 @@ RUN \
     --enable-shared && \
   make && \
   make install
+RUN \
+  echo "**** grabbing SVT-AV1 ****" && \
+  mkdir -p /tmp/svt-av1 && \
+  curl -Lf \
+    https://gitlab.com/AOMediaCodec/SVT-AV1/-/archive/v${SVTAV1}/SVT-AV1-v${SVTAV1}.tar.gz | \
+    tar -zx --strip-components=1 -C /tmp/svt-av1
+RUN \
+  echo "**** compiling SVT-AV1 ****" && \
+  cd /tmp/svt-av1/Build && \
+  cmake .. -G"Unix Makefiles" -DCMAKE_BUILD_TYPE=Release && \
+  make && \
+  make install
 RUN \
   echo "**** grabbing theora ****" && \
   mkdir -p /tmp/theora && \
@@ -613,6 +626,7 @@ RUN \
     --enable-libopencore-amrwb \
     --enable-libopenjpeg \
     --enable-libopus \
+    --enable-libsvtav1 \
     --enable-libtheora \
     --enable-libv4l2 \
     --enable-libvidstab \
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index eea22ce..2433962 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -30,6 +30,7 @@ ENV \
   OPENCOREAMR=0.1.6 \
   OPENJPEG=2.5.0 \
   OPUS=1.3.1 \
+  SVTAV1=1.7.0 \
   THEORA=1.1.1 \
   VORBIS=1.3.7 \
   VPX=1.13.1 \
@@ -119,7 +120,7 @@ RUN \
 RUN \
   echo "**** grabbing freetype ****" && \
   mkdir -p /tmp/freetype && \
-  curl -Lf \
+  curl -Lf --retry 10 --retry-max-time 60 --retry-connrefused \
     https://download.savannah.gnu.org/releases/freetype/freetype-${FREETYPE}.tar.gz | \
     tar -zx --strip-components=1 -C /tmp/freetype
 RUN \
@@ -259,6 +260,18 @@ RUN \
     --enable-shared && \
   make && \
   make install
+RUN \
+  echo "**** grabbing SVT-AV1 ****" && \
+  mkdir -p /tmp/svt-av1 && \
+  curl -Lf \
+    https://gitlab.com/AOMediaCodec/SVT-AV1/-/archive/v${SVTAV1}/SVT-AV1-v${SVTAV1}.tar.gz | \
+    tar -zx --strip-components=1 -C /tmp/svt-av1
+RUN \
+  echo "**** compiling SVT-AV1 ****" && \
+  cd /tmp/svt-av1/Build && \
+  cmake .. -G"Unix Makefiles" -DCMAKE_BUILD_TYPE=Release && \
+  make && \
+  make install
 RUN \
   echo "**** grabbing theora ****" && \
   mkdir -p /tmp/theora && \
@@ -421,6 +434,7 @@ RUN \
     --enable-libopencore-amrwb \
     --enable-libopenjpeg \
     --enable-libopus \
+    --enable-libsvtav1 \
     --enable-libtheora \
     --enable-libv4l2 \
     --enable-libvidstab \
diff --git a/readme-vars.yml b/readme-vars.yml
index 87c4700..ab0f34d 100644
--- a/readme-vars.yml
+++ b/readme-vars.yml
@@ -155,7 +155,7 @@ full_custom_readme: |
 
   ## Versions
 
-  * **05.10.23:** - Update various libraries.
+  * **05.10.23:** - Add support for SVT-AV1. Update various libraries.
   * **16.08.23:** - Added support for WebP formats.
   * **11.08.23:** - Add optional i965 driver for gen5+ support.
   * **14.06.23:** - Switch to latest iHD for Intel, add qsv support.

From ced90f84f28deacf6d58b4ccfe585b7bb068689d Mon Sep 17 00:00:00 2001
From: aptalca <541623+aptalca@users.noreply.github.com>
Date: Fri, 6 Oct 2023 10:07:25 -0400
Subject: [PATCH 3/3] use sourceforge for freetype, fix link for lame

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

diff --git a/Dockerfile b/Dockerfile
index d4319d6..39bcd32 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -146,8 +146,8 @@ RUN \
 RUN \
   echo "**** grabbing freetype ****" && \
   mkdir -p /tmp/freetype && \
-  curl -Lf --retry 10 --retry-max-time 60 --retry-connrefused \
-    https://download.savannah.gnu.org/releases/freetype/freetype-${FREETYPE}.tar.gz | \
+  curl -Lf \
+    https://downloads.sourceforge.net/project/freetype/freetype2/${FREETYPE}/freetype-${FREETYPE}.tar.gz | \
     tar -zx --strip-components=1 -C /tmp/freetype
 RUN \
   echo "**** compiling freetype ****" && \
@@ -205,7 +205,7 @@ RUN \
   echo "**** grabbing lame ****" && \
   mkdir -p /tmp/lame && \
   curl -Lf \
-    http://downloads.sourceforge.net/project/lame/lame/3.100/lame-${LAME}.tar.gz | \
+    http://downloads.sourceforge.net/project/lame/lame/${LAME}/lame-${LAME}.tar.gz | \
     tar -zx --strip-components=1 -C /tmp/lame
 RUN \
   echo "**** compiling lame ****" && \
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index 2433962..13ed015 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -120,8 +120,8 @@ RUN \
 RUN \
   echo "**** grabbing freetype ****" && \
   mkdir -p /tmp/freetype && \
-  curl -Lf --retry 10 --retry-max-time 60 --retry-connrefused \
-    https://download.savannah.gnu.org/releases/freetype/freetype-${FREETYPE}.tar.gz | \
+  curl -Lf \
+    https://downloads.sourceforge.net/project/freetype/freetype2/${FREETYPE}/freetype-${FREETYPE}.tar.gz | \
     tar -zx --strip-components=1 -C /tmp/freetype
 RUN \
   echo "**** compiling freetype ****" && \
@@ -165,7 +165,7 @@ RUN \
   echo "**** grabbing lame ****" && \
   mkdir -p /tmp/lame && \
   curl -Lf \
-    http://downloads.sourceforge.net/project/lame/lame/3.100/lame-${LAME}.tar.gz | \
+    http://downloads.sourceforge.net/project/lame/lame/${LAME}/lame-${LAME}.tar.gz | \
     tar -zx --strip-components=1 -C /tmp/lame
 RUN \
   echo "**** compiling lame ****" && \