From 01dd1521c0fd134ce30db9982ec7693bc18c123b Mon Sep 17 00:00:00 2001
From: Tercio Gaudencio Filho <terciofilho@gmail.com>
Date: Wed, 16 Aug 2023 19:59:35 -0300
Subject: [PATCH] Added support for WebP format from sources.

---
 Dockerfile         | 19 ++++++++++++++-----
 Dockerfile.aarch64 | 21 +++++++++++++++------
 README.md          |  3 ++-
 readme-vars.yml    |  1 +
 4 files changed, 32 insertions(+), 12 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 746c35b..92ad4fa 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -41,7 +41,8 @@ ENV \
   VORBIS=1.3.7 \
   VPX=1.13.0 \
   X265=3.5 \
-  XVID=1.3.7 
+  XVID=1.3.7 \
+  WEBP=1.3.1
 
 RUN \
   echo "**** install build packages ****" && \
@@ -74,7 +75,6 @@ RUN \
     libxcb-dri3-dev \
     libxcb-present-dev \
     libxml2-dev \
-    libwebp-dev \
     make \
     nasm \
     ninja-build \
@@ -566,6 +566,18 @@ RUN \
   ./configure && \ 
   make && \
   make install
+RUN \
+  echo "**** grabbing webp ****" && \
+  mkdir -p /tmp/webp && \
+  curl -Lf \
+    https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP}.tar.gz | \
+    tar -zx --strip-components=1 -C /tmp/webp
+RUN \
+  echo "**** compiling webp ****" && \
+  cd /tmp/webp && \
+  ./configure && \
+  make && \
+  make install
 
 # main ffmpeg build
 RUN \
@@ -704,9 +716,6 @@ RUN \
     libxext6 \
     libxfixes3 \
     libxml2 \
-    libwebp7 \
-    libwebpmux3 \
-    libwebpdemux2 \
     ocl-icd-libopencl1 && \
   echo "**** clean up ****" && \
   rm -rf \
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index 40f5fa3..e397964 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -34,7 +34,8 @@ ENV \
   VORBIS=1.3.7 \
   VPX=1.13.0 \
   X265=master \
-  XVID=1.3.7 
+  XVID=1.3.7 \
+  WEBP=1.3.1
 # 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 \
@@ -62,7 +63,6 @@ RUN \
     libv4l-dev \
     libx11-dev \
     libxml2-dev \
-    libwebp-dev \
     make \
     nasm \
     perl \
@@ -375,6 +375,18 @@ RUN \
   ./configure && \ 
   make && \
   make install
+RUN \
+  echo "**** grabbing webp ****" && \
+  mkdir -p /tmp/webp && \
+  curl -Lf \
+    https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP}.tar.gz | \
+    tar -zx --strip-components=1 -C /tmp/webp
+RUN \
+  echo "**** compiling webp ****" && \
+  cd /tmp/webp && \
+  ./configure && \
+  make && \
+  make install
 
 # main ffmpeg build
 RUN \
@@ -469,10 +481,7 @@ RUN \
     libx11-6 \
     libxcb1 \
     libxext6 \
-    libxml2 \
-    libwebp7 \
-    libwebpmux3 \
-    libwebpdemux2 && \
+    libxml2 && \
   echo "**** clean up ****" && \
   rm -rf \
     /var/lib/apt/lists/* \
diff --git a/README.md b/README.md
index 00ca9c4..553a116 100644
--- a/README.md
+++ b/README.md
@@ -152,6 +152,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **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.
 * **13.06.23:** - Bump to 6.0, update shared libraries, deprecate armhf, combine bin stage.
@@ -161,4 +162,4 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 * **01.07.21:** - Bump to 4.4.
 * **17.06.20:** - Bump to 4.3.
 * **16.06.20:** - Add support for libvmaf.
-* **01.08.19:** - Initial release.
+* **01.08.19:** - Initial release.
\ No newline at end of file
diff --git a/readme-vars.yml b/readme-vars.yml
index b24fc9c..07e52c0 100644
--- a/readme-vars.yml
+++ b/readme-vars.yml
@@ -155,6 +155,7 @@ full_custom_readme: |
 
   ## Versions
 
+  * **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.
   * **13.06.23:** - Bump to 6.0, update shared libraries, deprecate armhf, combine bin stage.