gentoo auto-resync : 09:10:2023 - 18:06:43

2 files changed, 107 insertions, 0 deletions

diff --git a/media-libs/libva-intel-media-driver/files/libva-intel-media-driver-23.3.4-Remove-unwanted-CFLAGS.patch b/media-libs/libva-intel-media-driver/files/libva-intel-media-driver-23.3.4-Remove-unwanted-CFLAGS.patch
new file mode 100644
index 000000000000..1048d0c6bbba
--- /dev/null
+++ b/media-libs/libva-intel-media-driver/files/libva-intel-media-driver-23.3.4-Remove-unwanted-CFLAGS.patch
@@ -0,0 +1,43 @@
+From f961b7d5141f8c795afe69b0b2868de6129ecdc8 Mon Sep 17 00:00:00 2001
+From: Matt Turner <mattst88@gmail.com>
+Date: Mon, 9 Oct 2023 11:55:56 -0400
+Subject: [PATCH] Remove unwanted CFLAGS
+
+---
+ media_driver/cmake/linux/media_compile_flags_linux.cmake | 6 ------
+ 1 file changed, 6 deletions(-)
+
+diff --git a/media_driver/cmake/linux/media_compile_flags_linux.cmake b/media_driver/cmake/linux/media_compile_flags_linux.cmake
+index 0a211fdc7..17b0cb5a5 100755
+--- a/media_driver/cmake/linux/media_compile_flags_linux.cmake
++++ b/media_driver/cmake/linux/media_compile_flags_linux.cmake
+@@ -53,8 +53,6 @@ set(MEDIA_COMPILER_FLAGS_COMMON
+ 
+     # Enable c++14 features
+     -std=c++14
+-    # -m32 or -m64
+-    -m${ARCH}
+ 
+     # Global defines
+     -DLINUX=1
+@@ -62,7 +60,6 @@ set(MEDIA_COMPILER_FLAGS_COMMON
+     -DNO_RTTI
+     -DNO_EXCEPTION_HANDLING
+     -DINTEL_NOT_PUBLIC
+-    -g
+ )
+ 
+ if(MEDIA_BUILD_HARDENING)
+@@ -204,9 +201,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.41.0
+
diff --git a/media-libs/libva-intel-media-driver/files/libva-intel-media-driver-23.3.4_testing_in_src_test.patch b/media-libs/libva-intel-media-driver/files/libva-intel-media-driver-23.3.4_testing_in_src_test.patch
new file mode 100644
index 000000000000..834c64bcf601
--- /dev/null
+++ b/media-libs/libva-intel-media-driver/files/libva-intel-media-driver-23.3.4_testing_in_src_test.patch
@@ -0,0 +1,64 @@
+From d462b4a2c6a134ab19d8903655a75f879642c5e0 Mon Sep 17 00:00:00 2001
+From: Matt Turner <mattst88@gmail.com>
+Date: Mon, 9 Oct 2023 12:01:26 -0400
+Subject: [PATCH] Run tests in src_test() instead of src_compile() and
+ src_install()
+
+---
+ CMakeLists.txt                                |  2 ++
+ media_driver/linux/ult/CMakeLists.txt         |  6 ------
+ media_driver/linux/ult/ult_app/CMakeLists.txt | 11 ++++-------
+ 3 files changed, 6 insertions(+), 13 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index aabce7341..5e58009a7 100755
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -42,6 +42,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)
+diff --git a/media_driver/linux/ult/CMakeLists.txt b/media_driver/linux/ult/CMakeLists.txt
+index 9fb5b39ee..94e53f4d9 100644
+--- 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")
+diff --git a/media_driver/linux/ult/ult_app/CMakeLists.txt b/media_driver/linux/ult/ult_app/CMakeLists.txt
+index a232ee38c..3132ce704 100644
+--- a/media_driver/linux/ult/ult_app/CMakeLists.txt
++++ b/media_driver/linux/ult/ult_app/CMakeLists.txt
+@@ -75,13 +75,10 @@ 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=${MEDIA_MISC_LIB}:../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 ()
+-- 
+2.41.0
+