From fa15e895b0ba215125d81b7192474d23f2ac8276 Mon Sep 17 00:00:00 2001
From: aptalca <541623+aptalca@users.noreply.github.com>
Date: Thu, 9 May 2024 20:37:54 -0400
Subject: [PATCH 1/5] Bump various libs

---
 Dockerfile         | 39 ++++++++++++++++++++-------------------
 Dockerfile.aarch64 | 16 ++++++++--------
 README.md          |  2 ++
 readme-vars.yml    |  2 ++
 4 files changed, 32 insertions(+), 27 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 7e77bb5..f9d36b2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,43 +13,44 @@ ENV \
 
 # versions
 ENV \
-  AOM=v3.8.2 \
+  AOM=v3.9.0 \
   FDKAAC=2.0.3 \
   FFMPEG_HARD=7.0 \
   FONTCONFIG=2.15.0 \
   FREETYPE=2.13.2 \
-  FRIBIDI=1.0.13 \
-  GMMLIB=22.3.15 \
+  FRIBIDI=1.0.14 \
+  GMMLIB=22.3.18 \
   HARFBUZZ=8.4.0 \
-  IHD=23.4.3 \
-  KVAZAAR=2.2.0 \
+  IHD=24.1.5 \
+  KVAZAAR=2.3.1 \
   LAME=3.100 \
   LIBASS=0.17.1 \
   LIBDOVI=2.1.1 \
   LIBDRM=2.4.120 \
   LIBMFX=22.5.4 \
   LIBPLACEBO=6.338.2 \
+  LIBPNG=1.6.43 \
   LIBVA=2.21.0 \
   LIBVDPAU=1.5 \
   LIBVIDSTAB=1.1.1 \
   LIBVMAF=3.0.0 \
-  LIBVPL=2.10.1 \
-  MESA=24.0.4 \
+  LIBVPL=2.11.0 \
+  MESA=24.0.7 \
   NVCODEC=n12.2.72.0 \
   OGG=1.3.5 \
-  ONEVPL=23.4.3 \
   OPENCOREAMR=0.1.6 \
   OPENJPEG=2.5.2 \
-  OPUS=1.5.1 \
+  OPUS=1.5.2 \
   RAV1E=0.7.1 \
-  SHADERC=v2024.0 \
+  SHADERC=v2024.1 \
   SVTAV1=2.0.0 \
   THEORA=1.1.1 \
   VORBIS=1.3.7 \
+  VPLGPURT=24.1.5 \
   VPX=1.14.0 \
   VULKANSDK=vulkan-sdk-1.3.280.0 \
-  WEBP=1.3.2 \
-  X265=3.5 \
+  WEBP=1.4.0 \
+  X265=3.6 \
   XVID=1.3.7 \
   ZIMG=3.0.5
 
@@ -392,15 +393,15 @@ RUN \
   cmake --build . --config Release --target install && \
   strip -d /usr/local/lib/libvpl.so
 RUN \
-  echo "**** grabbing onevpl ****" && \
-  mkdir -p /tmp/onevpl && \
+  echo "**** grabbing vpl-gpu-rt ****" && \
+  mkdir -p /tmp/vpl-gpu-rt && \
   curl -Lf \
-    https://github.com/oneapi-src/oneVPL-intel-gpu/archive/refs/tags/intel-onevpl-${ONEVPL}.tar.gz | \
-    tar -zx --strip-components=1 -C /tmp/onevpl
+    https://github.com/intel/vpl-gpu-rt/archive/refs/tags/intel-onevpl-${ONEVPL}.tar.gz | \
+    tar -zx --strip-components=1 -C /tmp/vpl-gpu-rt
 RUN \
   echo "**** compiling onevpl ****" && \
-  mkdir -p /tmp/onevpl/build && \
-  cd /tmp/onevpl/build && \
+  mkdir -p /tmp/vpl-gpu-rt/build && \
+  cd /tmp/vpl-gpu-rt/build && \
   cmake \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_INSTALL_LIBDIR=/usr/local/lib \
@@ -487,7 +488,7 @@ RUN \
   rm -Rf \
     thirdparty/libpng/* && \
   curl -Lf \
-    https://download.sourceforge.net/libpng/libpng-1.6.37.tar.gz | \
+    https://download.sourceforge.net/libpng/libpng-${LIBPNG}.tar.gz | \
     tar -zx --strip-components=1 -C thirdparty/libpng/ && \
   cmake \
     -DBUILD_STATIC_LIBS=0 \
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index 46c2e73..0361ecb 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -13,17 +13,18 @@ ENV \
 
 # versions
 ENV \
-  AOM=v3.8.2 \
+  AOM=v3.9.0 \
   FDKAAC=2.0.3 \
   FFMPEG_HARD=7.0 \
   FONTCONFIG=2.15.0 \
   FREETYPE=2.13.2 \
-  FRIBIDI=1.0.13 \
+  FRIBIDI=1.0.14 \
   HARFBUZZ=8.4.0 \
-  KVAZAAR=2.2.0 \
+  KVAZAAR=2.3.1 \
   LAME=3.100 \
   LIBASS=0.17.1 \
   LIBDRM=2.4.120 \
+  LIBPNG=1.6.43 \
   LIBVA=2.21.0 \
   LIBVDPAU=1.5 \
   LIBVIDSTAB=1.1.1 \
@@ -31,17 +32,16 @@ ENV \
   OGG=1.3.5 \
   OPENCOREAMR=0.1.6 \
   OPENJPEG=2.5.2 \
-  OPUS=1.5.1 \
+  OPUS=1.5.2 \
   RAV1E=0.7.1 \
   SVTAV1=2.0.0 \
   THEORA=1.1.1 \
   VORBIS=1.3.7 \
   VPX=1.14.0 \
-  WEBP=1.3.2 \
-  X265=master \
+  WEBP=1.4.0 \
+  X265=3.6.5 \
   XVID=1.3.7 \
   ZIMG=3.0.5
-# x265 aarch64 build fixes not in a release yet https://bitbucket.org/multicoreware/x265_git/issues/604/linux-arm-aarch64-build-failing-for-high
 
 RUN \
   echo "**** install build packages ****" && \
@@ -284,7 +284,7 @@ RUN \
   rm -Rf \
     thirdparty/libpng/* && \
   curl -Lf \
-    https://download.sourceforge.net/libpng/libpng-1.6.37.tar.gz | \
+    https://download.sourceforge.net/libpng/libpng-${LIBPNG}.tar.gz | \
     tar -zx --strip-components=1 -C thirdparty/libpng/ && \
   cmake \
     -DBUILD_STATIC_LIBS=0 \
diff --git a/README.md b/README.md
index 7893971..0de372b 100644
--- a/README.md
+++ b/README.md
@@ -115,6 +115,7 @@ docker run --rm -it \
 ```
 
 ### Nvidia Hardware accelerated ([click for more info](https://trac.ffmpeg.org/wiki/HWAccelIntro#CUDANVENCNVDEC))
+*Nvidia support requires [Nvidia container toolkit](https://github.com/NVIDIA/nvidia-container-toolkit) and the Nvidia drivers installed on the host*
 
 ```
 docker run --rm -it \
@@ -173,6 +174,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **09.05.24:** - Bump libaom, fribidi, kvazaar, various Intel drivers and libs, Mesa, opus, shaderc, webp and x265.
 * **11.04.24:** - Explicitly disable libdrm on aarch64, add new lib `libxcb-shm0`. Add quick test at the end of build.
 * **10.04.24:** - Compile ffmpeg with `libfribidi`, `libharfbuzz` and `libfontconfig`, compile libharfbuzz.
 * **05.04.24:** - Bump ffmpeg to 7.0, bump libdovi, libva, mesa and vulkan-sdk.
diff --git a/readme-vars.yml b/readme-vars.yml
index 1540e22..99ba0ee 100644
--- a/readme-vars.yml
+++ b/readme-vars.yml
@@ -119,6 +119,7 @@ full_custom_readme: |
   ```
 
   ### Nvidia Hardware accelerated ([click for more info](https://trac.ffmpeg.org/wiki/HWAccelIntro#CUDANVENCNVDEC))
+  *Nvidia support requires [Nvidia container toolkit](https://github.com/NVIDIA/nvidia-container-toolkit) and the Nvidia drivers installed on the host*
 
   ```
   docker run --rm -it \
@@ -177,6 +178,7 @@ full_custom_readme: |
 
   ## Versions
 
+  * **09.05.24:** - Bump libaom, fribidi, kvazaar, various Intel drivers and libs, Mesa, opus, shaderc, webp and x265.
   * **11.04.24:** - Explicitly disable libdrm on aarch64, add new lib `libxcb-shm0`. Add quick test at the end of build.
   * **10.04.24:** - Compile ffmpeg with `libfribidi`, `libharfbuzz` and `libfontconfig`, compile libharfbuzz.
   * **05.04.24:** - Bump ffmpeg to 7.0, bump libdovi, libva, mesa and vulkan-sdk.

From f5eee658fa6691842436c65ed409ac9d3828e1a4 Mon Sep 17 00:00:00 2001
From: aptalca <541623+aptalca@users.noreply.github.com>
Date: Thu, 9 May 2024 21:13:58 -0400
Subject: [PATCH 2/5] pull x265 tarball on aarch64

---
 Dockerfile.aarch64 | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index 0361ecb..239db48 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -438,10 +438,9 @@ RUN \
 RUN \
   echo "**** grabbing x265 ****" && \
   mkdir -p /tmp/x265 && \
-  git clone \
-    --branch ${X265} \
-    https://bitbucket.org/multicoreware/x265_git.git \
-    /tmp/x265
+  curl -Lf \
+    https://bitbucket.org/multicoreware/x265_git/downloads/x265_${X265}.tar.gz | \
+    tar -zx --strip-components=1 -C /tmp/x265
 RUN \
   echo "**** compiling x265 ****" && \
   cd /tmp/x265/build/linux && \

From d95a5e50f8308a81eec7b1071ce743d2e85c36fd Mon Sep 17 00:00:00 2001
From: aptalca <541623+aptalca@users.noreply.github.com>
Date: Thu, 9 May 2024 21:56:08 -0400
Subject: [PATCH 3/5] fix typo

---
 Dockerfile.aarch64 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index 239db48..592e21a 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -39,7 +39,7 @@ ENV \
   VORBIS=1.3.7 \
   VPX=1.14.0 \
   WEBP=1.4.0 \
-  X265=3.6.5 \
+  X265=3.6 \
   XVID=1.3.7 \
   ZIMG=3.0.5
 

From 9ba830f3b9ec3e6ef8c4594ad23cbaeb2abbb217 Mon Sep 17 00:00:00 2001
From: aptalca <541623+aptalca@users.noreply.github.com>
Date: Thu, 9 May 2024 22:24:26 -0400
Subject: [PATCH 4/5] Update libvpl repo and fix another typo

---
 Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index f9d36b2..4b1066c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -382,7 +382,7 @@ RUN \
   echo "**** grabbing libvpl ****" && \
   mkdir -p /tmp/libvpl && \
   curl -Lf \
-    https://github.com/oneapi-src/oneVPL/archive/refs/tags/v${LIBVPL}.tar.gz | \
+    https://github.com/intel/libvpl/archive/refs/tags/v${LIBVPL}.tar.gz | \
     tar -zx --strip-components=1 -C /tmp/libvpl
 RUN \
   echo "**** compiling libvpl ****" && \
@@ -396,7 +396,7 @@ RUN \
   echo "**** grabbing vpl-gpu-rt ****" && \
   mkdir -p /tmp/vpl-gpu-rt && \
   curl -Lf \
-    https://github.com/intel/vpl-gpu-rt/archive/refs/tags/intel-onevpl-${ONEVPL}.tar.gz | \
+    https://github.com/intel/vpl-gpu-rt/archive/refs/tags/intel-onevpl-${VPLGPURT}.tar.gz | \
     tar -zx --strip-components=1 -C /tmp/vpl-gpu-rt
 RUN \
   echo "**** compiling onevpl ****" && \

From 9c14a476aaf2306428c10af20aa4db368ff3c257 Mon Sep 17 00:00:00 2001
From: aptalca <541623+aptalca@users.noreply.github.com>
Date: Fri, 10 May 2024 00:02:43 -0400
Subject: [PATCH 5/5] remove obsolete lib path

---
 Dockerfile | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 4b1066c..6125713 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -399,7 +399,7 @@ RUN \
     https://github.com/intel/vpl-gpu-rt/archive/refs/tags/intel-onevpl-${VPLGPURT}.tar.gz | \
     tar -zx --strip-components=1 -C /tmp/vpl-gpu-rt
 RUN \
-  echo "**** compiling onevpl ****" && \
+  echo "**** compiling vpl-gpu-rt ****" && \
   mkdir -p /tmp/vpl-gpu-rt/build && \
   cd /tmp/vpl-gpu-rt/build && \
   cmake \
@@ -828,7 +828,6 @@ RUN \
     /buildout/usr/local/etc/fonts \
     /buildout/usr/local/lib/libmfx-gen \
     /buildout/usr/local/lib/mfx \
-    /buildout/usr/local/lib/vpl \
     /buildout/usr/local/lib/x86_64-linux-gnu/dri \
     /buildout/usr/local/lib/x86_64-linux-gnu/vdpau \
     /buildout/usr/local/share/vulkan \
@@ -853,9 +852,6 @@ RUN \
   cp -a \
     /usr/local/lib/mfx/*.so \
     /buildout/usr/local/lib/mfx/ && \
-  cp -a \
-    /usr/local/lib/vpl/*.so \
-    /buildout/usr/local/lib/vpl/ && \
   cp -a \
     /usr/local/lib/x86_64-linux-gnu/lib*so* \
     /buildout/usr/local/lib/x86_64-linux-gnu/ && \