Skip to content

Commit

Permalink
- Updated HandBrake to version 1.8.0.
Browse files Browse the repository at this point in the history
- 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.
  • Loading branch information
jlesage committed May 25, 2024
1 parent f4e6990 commit c0eb03f
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 23 deletions.
16 changes: 8 additions & 8 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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
Expand Down Expand Up @@ -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 / /
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/cpu_features/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ fi
#
apk --no-cache add \
curl \
clang15 \
clang17 \
make \
cmake \

Expand Down
8 changes: 4 additions & 4 deletions src/handbrake/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -148,8 +148,8 @@ apk --no-cache add \
curl \
binutils \
git \
clang15 \
llvm15 \
clang17 \
llvm17 \
make \
cmake \
pkgconf \
Expand Down Expand Up @@ -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 \
Expand Down Expand Up @@ -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..."
(
Expand Down Expand Up @@ -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
Expand Down
10 changes: 0 additions & 10 deletions src/handbrake/enable-svt-av1-avx512.patch

This file was deleted.

10 changes: 10 additions & 0 deletions src/handbrake/intel-media-sdk-compile-fix.patch
Original file line number Diff line number Diff line change
@@ -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>

0 comments on commit c0eb03f

Please sign in to comment.