From c0eb03f3643b2341aec2b092855d27e90712bf54 Mon Sep 17 00:00:00 2001
From: Jocelyn Le Sage <jocelyn@le-sage.com>
Date: Sat, 25 May 2024 12:05:18 -0400
Subject: [PATCH] - Updated HandBrake to version 1.8.0. - Updated libva to
 version 2.21.0. - Updated gmmlib to version 22.3.19. - Updated Intel Media
 driver to version 24.1.5. - Updated OneVPL GPU runtime to version 24.1.5.

---
 Dockerfile                                      | 16 ++++++++--------
 src/cpu_features/build.sh                       |  2 +-
 src/handbrake/build.sh                          |  8 ++++----
 src/handbrake/enable-svt-av1-avx512.patch       | 10 ----------
 src/handbrake/intel-media-sdk-compile-fix.patch | 10 ++++++++++
 5 files changed, 23 insertions(+), 23 deletions(-)
 delete mode 100644 src/handbrake/enable-svt-av1-avx512.patch
 create mode 100644 src/handbrake/intel-media-sdk-compile-fix.patch

diff --git a/Dockerfile b/Dockerfile
index 889ff02..5572f89 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,13 +8,13 @@
 ARG DOCKER_IMAGE_VERSION=
 
 # Define software versions.
-ARG HANDBRAKE_VERSION=1.7.3
-ARG LIBVA_VERSION=2.20.0
+ARG HANDBRAKE_VERSION=1.8.0
+ARG LIBVA_VERSION=2.21.0
 ARG INTEL_VAAPI_DRIVER_VERSION=2.4.1
-ARG GMMLIB_VERSION=22.3.12
-ARG INTEL_MEDIA_DRIVER_VERSION=23.3.5
+ARG GMMLIB_VERSION=22.3.19
+ARG INTEL_MEDIA_DRIVER_VERSION=24.1.5
 ARG INTEL_MEDIA_SDK_VERSION=23.2.2
-ARG INTEL_ONEVPL_GPU_RUNTIME_VERSION=23.3.4
+ARG INTEL_ONEVPL_GPU_RUNTIME_VERSION=24.1.5
 ARG CPU_FEATURES_VERSION=0.9.0
 
 # Define software download URLs.
@@ -34,7 +34,7 @@ ARG HANDBRAKE_DEBUG_MODE=none
 FROM --platform=$BUILDPLATFORM tonistiigi/xx AS xx
 
 # Build HandBrake.
-FROM --platform=$BUILDPLATFORM alpine:3.17 AS handbrake
+FROM --platform=$BUILDPLATFORM alpine:3.19 AS handbrake
 ARG TARGETPLATFORM
 ARG HANDBRAKE_VERSION
 ARG HANDBRAKE_URL
@@ -62,7 +62,7 @@ RUN xx-verify \
     /tmp/handbrake-install/usr/bin/HandBrakeCLI
 
 # Build cpu_features.
-FROM --platform=$BUILDPLATFORM alpine:3.17 AS cpu_features
+FROM --platform=$BUILDPLATFORM alpine:3.19 AS cpu_features
 ARG TARGETPLATFORM
 ARG CPU_FEATURES_URL
 COPY --from=xx / /
@@ -71,7 +71,7 @@ RUN /build/build.sh "$CPU_FEATURES_URL"
 RUN xx-verify /tmp/cpu_features-install/bin/list_cpu_features
 
 # Pull base image.
-FROM jlesage/baseimage-gui:alpine-3.17-v4.5.3
+FROM jlesage/baseimage-gui:alpine-3.19-v4.5.3
 
 ARG HANDBRAKE_VERSION
 ARG DOCKER_IMAGE_VERSION
diff --git a/src/cpu_features/build.sh b/src/cpu_features/build.sh
index cd6b9f5..f12c676 100755
--- a/src/cpu_features/build.sh
+++ b/src/cpu_features/build.sh
@@ -30,7 +30,7 @@ fi
 #
 apk --no-cache add \
     curl \
-    clang15 \
+    clang17 \
     make \
     cmake \
 
diff --git a/src/handbrake/build.sh b/src/handbrake/build.sh
index a770aaf..0d4fddd 100755
--- a/src/handbrake/build.sh
+++ b/src/handbrake/build.sh
@@ -148,8 +148,8 @@ apk --no-cache add \
     curl \
     binutils \
     git \
-    clang15 \
-    llvm15 \
+    clang17 \
+    llvm17 \
     make \
     cmake \
     pkgconf \
@@ -205,7 +205,7 @@ xx-apk --no-cache --no-scripts add \
 
 # gtk
 xx-apk --no-cache --no-scripts add \
-    gtk+3.0-dev \
+    gtk4.0-dev \
     dbus-glib-dev \
     libnotify-dev \
     libgudev-dev \
@@ -369,6 +369,7 @@ if [ "$(xx-info arch)" = "amd64" ]; then
 
     log "Patching Intel Media SDK..."
     patch -d /tmp/MediaSDK -p1 < "$SCRIPT_DIR"/intel-media-sdk-debug-no-assert.patch
+    patch -d /tmp/MediaSDK -p1 < "$SCRIPT_DIR"/intel-media-sdk-compile-fix.patch
 
     log "Configuring Intel Media SDK..."
     (
@@ -428,7 +429,6 @@ log "Patching HandBrake..."
 if xx-info is-cross; then
     patch -d /tmp/handbrake -p1 < "$SCRIPT_DIR"/cross-compile-fix.patch
 fi
-patch -d /tmp/handbrake -p1 < "$SCRIPT_DIR"/enable-svt-av1-avx512.patch
 
 # Create the meson cross compile config file.
 if xx-info is-cross; then
diff --git a/src/handbrake/enable-svt-av1-avx512.patch b/src/handbrake/enable-svt-av1-avx512.patch
deleted file mode 100644
index bed5dc7..0000000
--- a/src/handbrake/enable-svt-av1-avx512.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/contrib/svt-av1/module.defs	2023-12-12 19:07:02.563002053 -0500
-+++ b/contrib/svt-av1/module.defs	2023-12-12 19:07:36.675069920 -0500
-@@ -15,6 +15,7 @@
- SVT-AV1.CONFIGURE.shared      = -DBUILD_SHARED_LIBS=OFF
- SVT-AV1.CONFIGURE.extra       = -DBUILD_DEC=OFF -DBUILD_APPS=OFF -DREPRODUCIBLE_BUILDS=1
- SVT-AV1.CONFIGURE.extra      += -DCMAKE_INSTALL_LIBDIR=lib
-+SVT-AV1.CONFIGURE.extra      += -DENABLE_AVX512=ON
- 
- ifeq ($(GCC.O),$(filter $(GCC.O),size size-aggressive))
-     SVT-AV1.CONFIGURE.extra += -DCMAKE_BUILD_TYPE=MinSizeRel
diff --git a/src/handbrake/intel-media-sdk-compile-fix.patch b/src/handbrake/intel-media-sdk-compile-fix.patch
new file mode 100644
index 0000000..e166670
--- /dev/null
+++ b/src/handbrake/intel-media-sdk-compile-fix.patch
@@ -0,0 +1,10 @@
+--- a/api/mfx_dispatch/linux/mfxparser.cpp	2024-05-13 19:26:39.409018293 -0400
++++ b/api/mfx_dispatch/linux/mfxparser.cpp	2024-05-13 19:26:59.205040655 -0400
+@@ -22,6 +22,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include <stdint.h>
+ 
+ #include <list>
+