diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2023-10-09 18:06:43 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2023-10-09 18:06:43 +0100 |
| commit | 4e4ee9865a958b6a854f9bca96637244c628d525 (patch) | |
| tree | 824d75c3a55f71fc978cdd1fca5cb03ff439e59c /media-libs/libva-intel-media-driver | |
| parent | c65def1225a421dd57ac582acefc5987c9d67e0d (diff) | |
gentoo auto-resync : 09:10:2023 - 18:06:43
Diffstat (limited to 'media-libs/libva-intel-media-driver')
4 files changed, 168 insertions, 0 deletions
diff --git a/media-libs/libva-intel-media-driver/Manifest b/media-libs/libva-intel-media-driver/Manifest index bc1c4bf7e022..53b39938cb1f 100644 --- a/media-libs/libva-intel-media-driver/Manifest +++ b/media-libs/libva-intel-media-driver/Manifest @@ -1,13 +1,17 @@ AUX libva-intel-media-driver-20.2.0_x11_optional.patch 458 BLAKE2B 22670f925729ab9e02a4b3ef753911f4e12867da2a0bad90c835ba3291ae139c65327dfdf1e236dd47cd66f943380bb20428d587c9fea57265c1287f31015ca7 SHA512 a235a4c18e388e0564c2ffa1fb4bdd86a05ae8622efdc03bd556b51361478e735330182f4310fd44c275d55759a48fc1ebef8384335daf5160d39b46642c3070 AUX libva-intel-media-driver-20.4.5_testing_in_src_test.patch 1724 BLAKE2B a4820733470396b42152b8d3863c45946307c3d6e62b16a90a199a29e1564fbb56c044f07c895b2e6d12ecd5ef235db054d87ee49fcf5c2ced2b9242fd11ebe9 SHA512 02edb8803be4dd4608e8ee970c5472c2c6e6c7dfd2ca5c33b2807900cba49f0ef6d65440c7ca7b978abc368b56bfb7a163c3671aead68512b879fbd446475319 AUX libva-intel-media-driver-21.4.2-Remove-unwanted-CFLAGS.patch 1473 BLAKE2B d3303d8cf11e99fc08b01cb4a12b1500afba27920e52a47cdf2d3cacc0b2cbea72e417ca4c118793c1149659cf1e51b619c0a81ca5103505a25994d9a0fee00a SHA512 41cd3cefd7a6aa6482c4d06b912cf441879e6fd14cee93380b081021e344d6555791e80d0925f66f59178d1b2d5ee15ff1f2deb4835d72f7fb74673912fc6b9e +AUX libva-intel-media-driver-23.3.4-Remove-unwanted-CFLAGS.patch 1530 BLAKE2B 732af31ff06fc92c7fa5375e767dfbcf52805baa52a71f26b9b2b9687eda9fe60cf9b618030040e5595aba24c9c781eb26243a257a2f025f2427a1a9d2cbafa4 SHA512 eeba11f6c4922c909aef909f145213418c32e28c19bab9b5c6051e51de9482562f1229f2236f1ed0e7365d59359827c889cabc7f81566205e47152bcea380313 +AUX libva-intel-media-driver-23.3.4_testing_in_src_test.patch 2497 BLAKE2B 5db90e062447461d7310dc039f8969abd9618142b85b18d7b98dace6ef144df386f3cec3e3a1540588781ef1b92c7b6b276d8bddf30199cb0ff36dc3d7d88b3d SHA512 5a7b10a740e62c8729449d5f1d255621e5dadf944c3c9e13f8c8598c8e11c9b44b59844106825cc22d1fc30846e84539254a4c5b1295c5291638943cd314ca88 DIST intel-media-23.2.4.tar.gz 28664669 BLAKE2B 01092c5786a7c665a3f1b61fdf306ba9fcb8957900fba987c9bca4716f48d7b006cb71a456cf75ea59f3dc9076e628dc4261bae5c3afe7da3bdc928c300cf4d4 SHA512 b02a50d5820cf22999c39ab2ff559c444682576018f2cb9aa669014f5c1fd07b01737fab706ec100929d3493a8b9e25bba7bcbae2af304d51c93b667af2884db 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 EBUILD libva-intel-media-driver-23.2.4.ebuild 1511 BLAKE2B 08fb338238101411450d4b2ada8e8e7e2a4598394db29ceead660aa2a7356544d06b4ce28bd932e1c4a7de8ba479709624b0c9501ab74244f9f18ed66870d405 SHA512 2c625e14d5bf6678f0631072345bd97939178a15e657659ced38c488dfe62ad30e97eafc72ccc8bfeeeb55ad452e8b2387c9dbe2dad5003d9925b00ab56595f5 EBUILD libva-intel-media-driver-23.3.0.ebuild 1512 BLAKE2B 6e4273c87c9ce89e139084e54585cf275e848dcdf23d87e7dbdaca39e479af4a38ac19ef68899200029d10ce29ee6b8e62c8bd07009f46af3bd9a6c539f8c7df SHA512 6715ad975388fe9c51de8d695549b41df8ac83cbf7612f12321523ae68fe5bb20beb6732ab9412297fc4a52244f38a09872390e167281e0857a32c762bada1a0 EBUILD libva-intel-media-driver-23.3.1.ebuild 1512 BLAKE2B 6e4273c87c9ce89e139084e54585cf275e848dcdf23d87e7dbdaca39e479af4a38ac19ef68899200029d10ce29ee6b8e62c8bd07009f46af3bd9a6c539f8c7df SHA512 6715ad975388fe9c51de8d695549b41df8ac83cbf7612f12321523ae68fe5bb20beb6732ab9412297fc4a52244f38a09872390e167281e0857a32c762bada1a0 EBUILD libva-intel-media-driver-23.3.2.ebuild 1513 BLAKE2B c74317814cbd6955924f3de6df55c60dedb5cc6321882e188641812c3cffca6e0a3e9ef24794226e6911e6309d61b99ac244e7464b739abed8edda04d81e9a5b SHA512 5ce4963cc828ac3fabd9b18227186df0f3ca9989a0c7498cfb8f65dbcd5bc49b2dcc7bbe115f527ad2489ef5aa83819241a8b4f2a7b31805364d3c970966d936 +EBUILD libva-intel-media-driver-23.3.4.ebuild 1513 BLAKE2B 68ab29884f88387547bf97886052efc7992308f423ec90a98fee0de498660cd8a26bcf677bbcaeec19043e05ac63ca11b8a803d89988496b0913aaa7771d0de2 SHA512 baa9efc64d5ea94a00fc2d7db3541e90ac31ac7893a861dc1b937dff7d2815216cf3a39ef13b044d22c4f1ec2a3b2d2115fc7adfe8fc7aeae454e6d58e6aafc3 EBUILD libva-intel-media-driver-9999.ebuild 1536 BLAKE2B e94703e45e48555f48821a87a56f0063c387655352dfe97e3cd8c84243509920d789cc1103819c586868076f85482c11df3ddc9f4f692ba29e17b0962a9d6de1 SHA512 2a8b3a577ab65e94ecbd93794bb57aef1bacb1f4bd346073b3892db0961251e51d9892c3011a8d2bbe51da497dfbbea403d6884126f7731d966635d9195deaef MISC metadata.xml 565 BLAKE2B e630d474342839898d53aef1849b002ef651c9f4fe3bfcfe72e809012e6c65153b1a6c14db922a45440ffd5717b90dddd6973185f8a625906e9d5571e50728d9 SHA512 22227f8a9cc39fff74f0bf2cdc8953f110e94ce0ab107076269d604c3cf8ae46c8496c9bcf47598e351cb9714e427f213ade5e446a5e8c67acfc87db5530b370 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 + 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 +} |