Skip to content

Commit

Permalink
- Updated HandBrake to version 1.8.2.
Browse files Browse the repository at this point in the history
- Updated libva to version 2.22.0.
- Updated gmmlib to version 22.5.0.
- Updated Intel Media Driver to version 24.2.5.
- Updated Intel OneVPL GPU Runtime to version 24.2.5.
  • Loading branch information
jlesage committed Aug 27, 2024
1 parent b9d4661 commit 0d9545b
Show file tree
Hide file tree
Showing 4 changed files with 56 additions and 6 deletions.
10 changes: 5 additions & 5 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.8.1
ARG LIBVA_VERSION=2.21.0
ARG HANDBRAKE_VERSION=1.8.2
ARG LIBVA_VERSION=2.22.0
ARG INTEL_VAAPI_DRIVER_VERSION=2.4.1
ARG GMMLIB_VERSION=22.4.0
ARG INTEL_MEDIA_DRIVER_VERSION=24.1.5
ARG GMMLIB_VERSION=22.5.0
ARG INTEL_MEDIA_DRIVER_VERSION=24.2.5
ARG INTEL_MEDIA_SDK_VERSION=23.2.2
ARG INTEL_ONEVPL_GPU_RUNTIME_VERSION=24.1.5
ARG INTEL_ONEVPL_GPU_RUNTIME_VERSION=24.2.5
ARG CPU_FEATURES_VERSION=0.9.0

# Define software download URLs.
Expand Down
4 changes: 3 additions & 1 deletion src/handbrake/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -349,6 +349,7 @@ fi
if [ "$(xx-info arch)" = "amd64" ]; then
log "Patching Intel Media Driver..."
patch -d /tmp/intel-media-driver -p1 < "$SCRIPT_DIR"/intel-media-driver-compile-fix.patch
patch -d /tmp/gmmlib -p1 < "$SCRIPT_DIR"/gmmlib-compile-fix.patch
rm -rf /tmp/intel-media-driver/media_driver/*/ult

log "Configuring Intel Media driver..."
Expand All @@ -363,6 +364,7 @@ if [ "$(xx-info arch)" = "amd64" ]; then
-DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM=NEVER \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \
-Wno-dev \
-DBUILD_TYPE=Release \
-DINSTALL_DRIVER_SYSCONF=OFF \
Expand All @@ -372,7 +374,7 @@ if [ "$(xx-info arch)" = "amd64" ]; then
)

log "Compiling Intel Media driver..."
make -C /tmp/intel-media-driver/build -j$(nproc)
make VERBOSE=0 -C /tmp/intel-media-driver/build -j$(nproc)

log "Installing Intel Media driver..."
make DESTDIR=/tmp/handbrake-install -C /tmp/intel-media-driver/build install
Expand Down
12 changes: 12 additions & 0 deletions src/handbrake/gmmlib-compile-fix.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# Use the same C++ version as Intel Media Driver.
--- a/Source/GmmLib/Linux.cmake 2024-08-26 19:18:50.798504950 -0400
+++ b/Source/GmmLib/Linux.cmake 2024-08-26 19:18:55.078570496 -0400
@@ -130,7 +130,7 @@
-fno-rtti
-fexceptions
-fcheck-new
- -std=c++11
+ -std=c++14
-pthread
-Werror=non-virtual-dtor
)
36 changes: 36 additions & 0 deletions src/handbrake/intel-media-driver-compile-fix.patch
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,39 @@
)

if(NOT ${PLATFORM} STREQUAL "android")
@@ -112,13 +112,6 @@
-fcheck-new
)

-if(NOT ${PLATFORM} STREQUAL "android")
- set(MEDIA_COMPILER_CXX_FLAGS_COMMON
- ${MEDIA_COMPILER_CXX_FLAGS_COMMON}
- -std=c++1y
- )
-endif()
-
set(MEDIA_COMPILER_FLAGS_RELEASE "")

if(${UFO_VARIANT} STREQUAL "default")
--- a/Tools/bldsys/include/utils.cmakeg 2024-08-26 21:05:30.979553316 -0400
+++ b/Tools/bldsys/include/utils.cmake 2024-08-26 21:05:41.891712443 -0400
@@ -55,7 +55,7 @@
endif (${PLATFORM} STREQUAL "ghs")

if(NOT ${PLATFORM} STREQUAL "qnx")
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14")
endif()

if (${PLATFORM} STREQUAL linux)
--- a/cmrtlib/linux/CMakeLists.txt 2024-08-26 20:27:26.697618847 -0400
+++ b/cmrtlib/linux/CMakeLists.txt 2024-06-10 11:47:55.000000000 -0400
@@ -28,7 +28,7 @@
if (LATEST_CPP_NEEDED)
set(CPP_STANDARD_OPTION -std=c++17)
else()
- set(CPP_STANDARD_OPTION -std=c++11)
+ set(CPP_STANDARD_OPTION -std=c++14)
endif()

# Set up compile options that will be used for the Linux build

0 comments on commit 0d9545b

Please sign in to comment.