From 6b7693bf8bf7eeacb3f9f9f304fc7da7eafab574 Mon Sep 17 00:00:00 2001
From: aptalca <541623+aptalca@users.noreply.github.com>
Date: Mon, 20 Nov 2023 14:41:03 -0500
Subject: [PATCH] Add vulkan and shaderc to x86_64

---
 Dockerfile      | 36 +++++++++++++++++++++++++++++++++++-
 README.md       |  1 +
 readme-vars.yml |  1 +
 3 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index c606e19..69dde3a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -37,10 +37,12 @@ ENV \
   OPENCOREAMR=0.1.6 \
   OPENJPEG=2.5.0 \
   OPUS=1.3.1 \
+  SHADERC=v2023.7 \
   SVTAV1=1.7.0 \
   THEORA=1.1.1 \
   VORBIS=1.3.7 \
   VPX=1.13.1 \
+  VULKANHEADERS=vulkan-sdk-1.3.268.0 \
   WEBP=1.3.2 \
   X265=3.5 \
   XVID=1.3.7
@@ -454,6 +456,24 @@ RUN \
     --enable-shared && \
   make && \
   make install
+RUN \
+  echo "**** grabbing shaderc ****" && \
+  mkdir -p /tmp/shaderc && \
+  git clone \
+    --branch ${SHADERC} \
+    --depth 1 https://github.com/google/shaderc.git \
+    /tmp/shaderc
+RUN \
+  echo "**** compiling shaderc ****" && \
+  cd /tmp/shaderc && \
+  ./utils/git-sync-deps && \
+  mkdir -p build && \
+  cd build && \
+  cmake -GNinja \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr/local \
+    .. && \
+  ninja install
 RUN \
   echo "**** grabbing SVT-AV1 ****" && \
   mkdir -p /tmp/svt-av1 && \
@@ -540,6 +560,18 @@ RUN \
     --enable-vp9-highbitdepth && \
   make && \
   make install
+RUN \
+  echo "**** grabbing vulkan headers ****" && \
+  mkdir -p /tmp/vulkan-headers && \
+  git clone \
+    --branch ${VULKANHEADERS} \
+    --depth 1 https://github.com/KhronosGroup/Vulkan-Headers.git \
+    /tmp/vulkan-headers
+RUN \
+  echo "**** compiling vulkan headers ****" && \
+  cd /tmp/vulkan-headers && \
+  cmake -S . -B build/ && \
+  cmake --install build --prefix /usr/local
 RUN \
   echo "**** grabbing webp ****" && \
   mkdir -p /tmp/webp && \
@@ -626,6 +658,7 @@ RUN \
     --enable-libopencore-amrwb \
     --enable-libopenjpeg \
     --enable-libopus \
+    --enable-libshaderc \
     --enable-libsvtav1 \
     --enable-libtheora \
     --enable-libv4l2 \
@@ -647,7 +680,8 @@ RUN \
     --enable-stripping \
     --enable-vaapi \
     --enable-vdpau \
-    --enable-version3 && \
+    --enable-version3 \
+    --enable-vulkan && \
   make
 
 RUN \
diff --git a/README.md b/README.md
index f8bf410..408dcc2 100644
--- a/README.md
+++ b/README.md
@@ -151,6 +151,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **20.11.23:** - Add vulkan and shaderc support to x86_64.
 * **13.11.23:** - Bump FFmpeg to 6.1.
 * **02.11.23:** - Remove `--enable-small` from ffmpeg build options to add back some features.
 * **05.10.23:** - Add support for SVT-AV1. Update various libraries.
diff --git a/readme-vars.yml b/readme-vars.yml
index ad9196c..7fd3dc1 100644
--- a/readme-vars.yml
+++ b/readme-vars.yml
@@ -155,6 +155,7 @@ full_custom_readme: |
 
   ## Versions
 
+  * **20.11.23:** - Add vulkan and shaderc support to x86_64.
   * **13.11.23:** - Bump FFmpeg to 6.1.
   * **02.11.23:** - Remove `--enable-small` from ffmpeg build options to add back some features.
   * **05.10.23:** - Add support for SVT-AV1. Update various libraries.