commit: 408d0a0e5e616bcb230b057ec29a58e65aff1807 Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> AuthorDate: Mon Oct 9 15:53:30 2023 +0000 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> CommitDate: Mon Oct 9 16:18:17 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=408d0a0e
media-libs/libva-intel-media-driver: Version bump to 23.3.4 Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> media-libs/libva-intel-media-driver/Manifest | 1 + ...edia-driver-23.3.4-Remove-unwanted-CFLAGS.patch | 43 +++++++++++++++ ...l-media-driver-23.3.4_testing_in_src_test.patch | 64 ++++++++++++++++++++++ .../libva-intel-media-driver-23.3.4.ebuild | 57 +++++++++++++++++++ 4 files changed, 165 insertions(+) diff --git a/media-libs/libva-intel-media-driver/Manifest b/media-libs/libva-intel-media-driver/Manifest index de1185bb0b3c..8e54ad8d8108 100644 --- a/media-libs/libva-intel-media-driver/Manifest +++ b/media-libs/libva-intel-media-driver/Manifest @@ -2,3 +2,4 @@ DIST intel-media-23.2.4.tar.gz 28664669 BLAKE2B 01092c5786a7c665a3f1b61fdf306ba9 DIST intel-media-23.3.0.tar.gz 28669245 BLAKE2B 3554ba23eef4adc0b24196bed96669b68f3a6eb3fc74817c155f2d88d041226feaea384f6e1f1602dfb45630dd826f02835ead670b311384b18e3082855eb9e5 SHA512 9eddb4294c8718a133144736c536b30e3a7a1cb0e96467ffc9565cc14f94659c59559b3bf59540b9e605325ee186afe9e359fbe2e64ab167dcbbd965ace68e9e DIST intel-media-23.3.1.tar.gz 28670977 BLAKE2B 7c546db40ecb65a1d6fc02779106c9cf7575f00d35614e9eb8b992a01b7fb5421b6fe7abd2192408caacb4b135d8c4677922c1710558c3835de0e482233628ad SHA512 b7944c94d89f456e017223c937d3e7dcd5d831fd6eb8b47c17e38a68227699953301d740119a8cf648e8d404cd8a02e4d4308472892b062858668d34272bed7d DIST intel-media-23.3.2.tar.gz 28672587 BLAKE2B 15ae0b33c34e7ea6e9b4fa7424c54ad7404a1d7561107ded3d9c8d6ab1703e59aad71734a8d0b1be73a638a6d241e7ae690602d8d19f7354856f99ff7a08897e SHA512 f88791175ee82996a8e4bb7bdac5fa46bad2e76eb7ae1812d4036e2ebc9a4a0b7f58776fc05bc862e9af78d1cb12efef3464a554c32f6b4e13b5a5d206e87432 +DIST intel-media-23.3.4.tar.gz 28685223 BLAKE2B b1d1d0283ea0b30ba3ee8348cfe8cacc9b242ec8e2f1f18f147aa6d444c69ddd04d2902cf36fd8e81e924a34ffb6aa6a6fd83ef0fa6dbe93e36ed2f34c716a8e SHA512 305ba7d94a7b2b8ac1000776c48e5654b8e42da414785851e5872db55d2125c6ef5acfe349746d7fd332b11a34ffe9a7be2a2c46bb1e91d5aedb445eb764ecfa 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 <[email protected]> +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 <[email protected]> +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 + diff --git a/media-libs/libva-intel-media-driver/libva-intel-media-driver-23.3.4.ebuild b/media-libs/libva-intel-media-driver/libva-intel-media-driver-23.3.4.ebuild new file mode 100644 index 000000000000..d75e117f636d --- /dev/null +++ b/media-libs/libva-intel-media-driver/libva-intel-media-driver-23.3.4.ebuild @@ -0,0 +1,57 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake-multilib flag-o-matic + +if [[ ${PV} == *9999 ]] ; then + : ${EGIT_REPO_URI:="https://github.com/intel/media-driver"} + if [[ ${PV%9999} != "" ]] ; then + : ${EGIT_BRANCH:="release/${PV%.9999}"} + fi + inherit git-r3 +else + MY_PV="${PV%_pre}" + SRC_URI="https://github.com/intel/media-driver/archive/intel-media-${MY_PV}.tar.gz"; + S="${WORKDIR}/media-driver-intel-media-${MY_PV}" + if [[ ${PV} != *_pre* ]] ; then + KEYWORDS="~amd64" + fi +fi + +DESCRIPTION="Intel Media Driver for VA-API (iHD)" +HOMEPAGE="https://github.com/intel/media-driver"; + +LICENSE="MIT BSD redistributable? ( no-source-code )" +SLOT="0" +IUSE="+redistributable test X" + +RESTRICT="!test? ( test )" + +DEPEND=">=media-libs/gmmlib-22.3.10:=[${MULTILIB_USEDEP}] + >=media-libs/libva-2.19.0[X?,${MULTILIB_USEDEP}] +" +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}"/${PN}-23.3.4-Remove-unwanted-CFLAGS.patch + "${FILESDIR}"/${PN}-23.3.4_testing_in_src_test.patch +) + +multilib_src_configure() { + # https://github.com/intel/media-driver/issues/356 + append-cxxflags -D_FILE_OFFSET_BITS=64 + + local mycmakeargs=( + -DMEDIA_BUILD_FATAL_WARNINGS=OFF + -DMEDIA_RUN_TEST_SUITE=$(usex test) + -DBUILD_TYPE=Release + -DPLATFORM=linux + -DCMAKE_DISABLE_FIND_PACKAGE_X11=$(usex !X) + -DENABLE_NONFREE_KERNELS=$(usex redistributable) + -DLATEST_CPP_NEEDED=ON # Seems to be the best option for now + ) + local CMAKE_BUILD_TYPE="Release" + cmake_src_configure +}
