diff options
Diffstat (limited to 'media-libs/libva-intel-media-driver/files')
3 files changed, 105 insertions, 0 deletions
diff --git a/media-libs/libva-intel-media-driver/files/libva-intel-media-driver-20.2.0_x11_optional.patch b/media-libs/libva-intel-media-driver/files/libva-intel-media-driver-20.2.0_x11_optional.patch new file mode 100644 index 000000000000..81c80d80f902 --- /dev/null +++ b/media-libs/libva-intel-media-driver/files/libva-intel-media-driver-20.2.0_x11_optional.patch @@ -0,0 +1,16 @@ +--- a/media_driver/media_top_cmake.cmake ++++ b/media_driver/media_top_cmake.cmake +@@ -21,7 +21,12 @@ + project( media ) + + find_package(PkgConfig) ++if(NOT DEFINED USE_X11 OR USE_X11) + find_package(X11) ++endif(NOT DEFINED USE_X11 OR USE_X11) ++if(USE_X11 AND NOT X11_FOUND) ++ message(FATAL_ERROR "Usage of X11 is required by USE_X11 variable, but X11 package is not found") ++endif(USE_X11 AND NOT X11_FOUND) + + bs_set_if_undefined(LIB_NAME iHD_drv_video) + + diff --git a/media-libs/libva-intel-media-driver/files/libva-intel-media-driver-20.4.5_testing_in_src_test.patch b/media-libs/libva-intel-media-driver/files/libva-intel-media-driver-20.4.5_testing_in_src_test.patch new file mode 100644 index 000000000000..3c6d500f2fbf --- /dev/null +++ b/media-libs/libva-intel-media-driver/files/libva-intel-media-driver-20.4.5_testing_in_src_test.patch @@ -0,0 +1,46 @@ +Run tests in src_test() instead of src_compile() and src_install() + +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -37,6 +37,8 @@ if("${os_name}" STREQUAL "clear-linux-os") + set(CMAKE_INSTALL_SYSCONFDIR "usr/share/defaults/etc") + endif() + ++include(CTest) ++ + include(CMakeDependentOption) + + option (ENABLE_KERNELS "Build driver with shaders (kernels) support" ON) +--- a/media_driver/linux/ult/CMakeLists.txt ++++ b/media_driver/linux/ult/CMakeLists.txt +@@ -52,9 +52,3 @@ endif () + add_subdirectory(libdrm_mock) + add_subdirectory(ult_app) + +-enable_testing() +-add_test(NAME test_devult COMMAND devult ${UMD_PATH}) +-set_tests_properties(test_devult +- PROPERTIES PASS_REGULAR_EXPRESSION "PASS") +-set_tests_properties(test_devult +- PROPERTIES FAIL_REGULAR_EXPRESSION "FAIL") +--- a/media_driver/linux/ult/ult_app/CMakeLists.txt ++++ b/media_driver/linux/ult/ult_app/CMakeLists.txt +@@ -68,13 +68,11 @@ if (DEFINED BYPASS_MEDIA_ULT AND "${BYPASS_MEDIA_ULT}" STREQUAL "yes") + message("-- media -- BYPASS_MEDIA_ULT = ${BYPASS_MEDIA_ULT}") + else () + if (ENABLE_NONFREE_KERNELS) +- add_custom_target(RunULT ALL DEPENDS ${LIB_NAME} devult) + +- add_custom_command( +- TARGET RunULT +- POST_BUILD +- COMMAND LD_PRELOAD=../libdrm_mock/libdrm_mock.so ./devult ../../../${LIB_NAME}.so ++ add_test( ++ NAME RunULT ++ COMMAND "${CMAKE_COMMAND}" -E env "LD_PRELOAD=${CMAKE_CURRENT_BINARY_DIR}/../libdrm_mock/libdrm_mock.so" "${CMAKE_CURRENT_BINARY_DIR}/devult" "${CMAKE_CURRENT_BINARY_DIR}/../../../${LIB_NAME}.so" + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} +- COMMENT "Running devult...") ++ ) + endif () + endif () + diff --git a/media-libs/libva-intel-media-driver/files/libva-intel-media-driver-21.4.2-Remove-unwanted-CFLAGS.patch b/media-libs/libva-intel-media-driver/files/libva-intel-media-driver-21.4.2-Remove-unwanted-CFLAGS.patch new file mode 100644 index 000000000000..288fe2d7f517 --- /dev/null +++ b/media-libs/libva-intel-media-driver/files/libva-intel-media-driver-21.4.2-Remove-unwanted-CFLAGS.patch @@ -0,0 +1,43 @@ +From f1c5c12d866783f7a3079be440c06fdb8a931ed2 Mon Sep 17 00:00:00 2001 +From: Matt Turner <mattst88@gmail.com> +Date: Tue, 23 Nov 2021 12:28:05 -0800 +Subject: [PATCH] Remove unwanted CFLAGS + +--- + media_driver/cmake/linux/media_compile_flags_linux.cmake | 7 ------- + 1 file changed, 7 deletions(-) + +diff --git a/media_driver/cmake/linux/media_compile_flags_linux.cmake b/media_driver/cmake/linux/media_compile_flags_linux.cmake +index 512ef17b..e8ade76d 100755 +--- a/media_driver/cmake/linux/media_compile_flags_linux.cmake ++++ b/media_driver/cmake/linux/media_compile_flags_linux.cmake +@@ -52,16 +52,12 @@ set(MEDIA_COMPILER_FLAGS_COMMON + -ffunction-sections + -Wl,--gc-sections + +- # -m32 or -m64 +- -m${ARCH} +- + # Global defines + -DLINUX=1 + -DLINUX + -DNO_RTTI + -DNO_EXCEPTION_HANDLING + -DINTEL_NOT_PUBLIC +- -g + ) + + +@@ -189,9 +185,6 @@ include(${MEDIA_EXT_CMAKE}/ext/linux/media_compile_flags_linux_ext.cmake OPTIONA + if(${PLATFORM} STREQUAL "linux") + #set predefined compiler flags set + add_compile_options("${MEDIA_COMPILER_FLAGS_COMMON}") +- add_compile_options("$<$<CONFIG:Debug>:${MEDIA_COMPILER_FLAGS_DEBUG}>") +- add_compile_options("$<$<CONFIG:Release>:${MEDIA_COMPILER_FLAGS_RELEASE}>") +- add_compile_options("$<$<CONFIG:ReleaseInternal>:${MEDIA_COMPILER_FLAGS_RELEASEINTERNAL}>") + + foreach (flag ${MEDIA_COMPILER_CXX_FLAGS_COMMON}) + SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}") +-- +2.32.0 + |