From 3f1410baea9de0cc135bb26afe7e2fdd0896328d Mon Sep 17 00:00:00 2001
From: aptalca <541623+aptalca@users.noreply.github.com>
Date: Thu, 1 Aug 2024 10:41:58 -0400
Subject: [PATCH] Add libdav1d, bump various libs

---
 Dockerfile         | 39 +++++++++++++++++++++++++++------------
 Dockerfile.aarch64 | 25 ++++++++++++++++++++-----
 README.md          |  1 +
 readme-vars.yml    |  1 +
 4 files changed, 49 insertions(+), 17 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 2ac525f..37530d0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -20,24 +20,25 @@ ENV \
   FONTCONFIG=2.15.0 \
   FREETYPE=2.13.2 \
   FRIBIDI=1.0.15 \
-  GMMLIB=22.3.18 \
-  HARFBUZZ=8.5.0 \
-  IHD=24.1.5 \
+  GMMLIB=22.3.20 \
+  HARFBUZZ=9.0.0 \
+  IHD=24.2.5 \
   KVAZAAR=2.3.1 \
   LAME=3.100 \
-  LIBASS=0.17.2 \
+  LIBASS=0.17.3 \
+  LIBDAV1D=1.4.3 \
   LIBDOVI=2.1.1 \
-  LIBDRM=2.4.121 \
+  LIBDRM=2.4.122 \
   LIBGL=1.7.0 \
   LIBMFX=22.5.4 \
-  LIBPLACEBO=6.338.2 \
+  LIBPLACEBO=7.339.0 \
   LIBPNG=1.6.43 \
-  LIBVA=2.21.0 \
+  LIBVA=2.22.0 \
   LIBVDPAU=1.5 \
   LIBVIDSTAB=1.1.1 \
   LIBVMAF=3.0.0 \
-  LIBVPL=2.11.0 \
-  MESA=24.1.2 \
+  LIBVPL=2.12.0 \
+  MESA=24.1.5 \
   NVCODEC=n12.2.72.0 \
   OGG=1.3.5 \
   OPENCOREAMR=0.1.6 \
@@ -45,12 +46,12 @@ ENV \
   OPUS=1.5.2 \
   RAV1E=0.7.1 \
   SHADERC=v2024.1 \
-  SVTAV1=2.1.0 \
+  SVTAV1=2.1.2 \
   THEORA=1.1.1 \
   VORBIS=1.3.7 \
-  VPLGPURT=24.1.5 \
+  VPLGPURT=24.2.5 \
   VPX=1.14.1 \
-  VULKANSDK=vulkan-sdk-1.3.283.0 \
+  VULKANSDK=vulkan-sdk-1.3.290.0 \
   WEBP=1.4.0 \
   X265=3.6 \
   XVID=1.3.7 \
@@ -293,6 +294,19 @@ RUN \
   make && \
   make install && \
   strip -d /usr/local/lib/libass.so
+RUN \
+  echo "**** grabbing libdav1d ****" && \
+  mkdir -p /tmp/libdav1d && \
+  git clone \
+    --branch ${LIBDAV1D} \
+    https://code.videolan.org/videolan/dav1d \
+    /tmp/libdav1d
+RUN \
+  echo "**** compiling libdav1d ****" && \
+  mkdir -p /tmp/libdav1d/build && \
+  cd /tmp/libdav1d/build && \
+  meson setup .. && \
+  ninja install
 RUN \
   echo "**** grabbing libgl ****" && \
   mkdir -p /tmp/libgl && \
@@ -815,6 +829,7 @@ RUN \
     --enable-gpl \
     --enable-libaom \
     --enable-libass \
+    --enable-libdav1d \
     --enable-libfdk_aac \
     --enable-libfontconfig \
     --enable-libfreetype \
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index 264b982..69a75bb 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -20,13 +20,14 @@ ENV \
   FONTCONFIG=2.15.0 \
   FREETYPE=2.13.2 \
   FRIBIDI=1.0.15 \
-  HARFBUZZ=8.5.0 \
+  HARFBUZZ=9.0.0 \
   KVAZAAR=2.3.1 \
   LAME=3.100 \
-  LIBASS=0.17.2 \
-  LIBDRM=2.4.121 \
+  LIBASS=0.17.3 \
+  LIBDAV1D=1.4.3 \
+  LIBDRM=2.4.122 \
   LIBPNG=1.6.43 \
-  LIBVA=2.21.0 \
+  LIBVA=2.22.0 \
   LIBVDPAU=1.5 \
   LIBVIDSTAB=1.1.1 \
   NVCODEC=n12.1.14.0 \
@@ -35,7 +36,7 @@ ENV \
   OPENJPEG=2.5.2 \
   OPUS=1.5.2 \
   RAV1E=0.7.1 \
-  SVTAV1=2.1.0 \
+  SVTAV1=2.1.2 \
   THEORA=1.1.1 \
   VORBIS=1.3.7 \
   VPX=1.14.1 \
@@ -243,6 +244,19 @@ RUN \
   make && \
   make install && \
   strip -d /usr/local/lib/libass.so
+RUN \
+  echo "**** grabbing libdav1d ****" && \
+  mkdir -p /tmp/libdav1d && \
+  git clone \
+    --branch ${LIBDAV1D} \
+    https://code.videolan.org/videolan/dav1d \
+    /tmp/libdav1d
+RUN \
+  echo "**** compiling libdav1d ****" && \
+  mkdir -p /tmp/libdav1d/build && \
+  cd /tmp/libdav1d/build && \
+  meson setup .. && \
+  ninja install
 RUN \
   echo "**** grabbing ogg ****" && \
   mkdir -p /tmp/ogg && \
@@ -503,6 +517,7 @@ RUN \
     --enable-gpl \
     --enable-libaom \
     --enable-libass \
+    --enable-libdav1d \
     --enable-libfdk_aac \
     --enable-libfontconfig \
     --enable-libfreetype \
diff --git a/README.md b/README.md
index 1b5e23e..00ed3e0 100644
--- a/README.md
+++ b/README.md
@@ -174,6 +174,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **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.
 * **26.05.24:** - Rebase to Ubuntu Noble. Bump libass, libharfbuzz and vulkan-sdk.
diff --git a/readme-vars.yml b/readme-vars.yml
index 05050fe..f6d5ffe 100644
--- a/readme-vars.yml
+++ b/readme-vars.yml
@@ -178,6 +178,7 @@ full_custom_readme: |
 
   ## Versions
 
+  * **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.
   * **26.05.24:** - Rebase to Ubuntu Noble. Bump libass, libharfbuzz and vulkan-sdk.