From ec678f8ac11c5ab9fa0fb364e3b96e108a0f7fa6 Mon Sep 17 00:00:00 2001
From: aptalca <541623+aptalca@users.noreply.github.com>
Date: Wed, 10 Apr 2024 18:20:25 -0400
Subject: [PATCH] also enable fribidi and fontconfig

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

diff --git a/Dockerfile b/Dockerfile
index cdce025..540214d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -751,10 +751,12 @@ RUN \
     --enable-alsa \
     --enable-cuvid \
     --enable-ffprobe \
+    --enable-fribidi \
     --enable-gpl \
     --enable-libaom \
     --enable-libass \
     --enable-libfdk_aac \
+    --enable-libfontconfig \
     --enable-libfreetype \
     --enable-libharfbuzz \
     --enable-libkvazaar \
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index 33a2412..aded2f9 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -16,6 +16,7 @@ ENV \
   AOM=v3.8.2 \
   FDKAAC=2.0.3 \
   FFMPEG_HARD=7.0 \
+  FONTCONFIG=2.15.0 \
   FREETYPE=2.13.2 \
   FRIBIDI=1.0.13 \
   KVAZAAR=2.2.0 \
@@ -56,7 +57,6 @@ RUN \
     gperf \
     libasound2-dev \
     libexpat1-dev \
-    libfontconfig1-dev \
     libgcc-10-dev \
     libgomp1 \
     libharfbuzz-dev \
@@ -141,6 +141,20 @@ RUN \
     --enable-shared && \
   make && \
   make install
+RUN \
+  echo "**** grabbing fontconfig ****" && \
+  mkdir -p /tmp/fontconfig && \
+  curl -Lf \
+    https://www.freedesktop.org/software/fontconfig/release/fontconfig-${FONTCONFIG}.tar.gz | \
+    tar -zx --strip-components=1 -C /tmp/fontconfig
+RUN \
+  echo "**** compiling fontconfig ****" && \
+  cd /tmp/fontconfig && \
+  ./configure \
+    --disable-static \
+    --enable-shared && \
+  make && \
+  make install 
 RUN \
   echo "**** grabbing fribidi ****" && \
   mkdir -p /tmp/fribidi && \
@@ -462,10 +476,12 @@ RUN \
     --disable-ffplay \
     --enable-alsa \
     --enable-ffprobe \
+    --enable-fribidi \
     --enable-gpl \
     --enable-libaom \
     --enable-libass \
     --enable-libfdk_aac \
+    --enable-libfontconfig \
     --enable-libfreetype \
     --enable-libharfbuzz \
     --enable-libkvazaar \
@@ -530,7 +546,6 @@ RUN \
   apt-get install -y \
     libasound2 \
     libexpat1 \
-    libfontconfig1 \
     libglib2.0-0 \
     libgomp1 \
     libharfbuzz0b \
diff --git a/readme-vars.yml b/readme-vars.yml
index 98da365..e3fe65a 100644
--- a/readme-vars.yml
+++ b/readme-vars.yml
@@ -177,7 +177,7 @@ full_custom_readme: |
 
   ## Versions
 
-  * **10.04.24:** - Compile with `--enable-libharfbuzz`.
+  * **10.04.24:** - Compile ffmpeg with `fribidi`, `libharfbuzz` and `libfontconfig`.
   * **05.04.24:** - Bump ffmpeg to 7.0, bump libdovi, libva, mesa and vulkan-sdk.
   * **16.03.24:** - Bump libaom, mesa, openjpeg, opus, shaderc and svtav1.
   * **11.02.24:** - Add Zimg support.