gentoo auto-resync : 13:03:2024 - 00:46:32

7 files changed, 7 insertions, 175 deletions

diff --git a/media-libs/libva-intel-media-driver/Manifest b/media-libs/libva-intel-media-driver/Manifest
index 375b83d547fe..6ba2b160551d 100644
--- a/media-libs/libva-intel-media-driver/Manifest
+++ b/media-libs/libva-intel-media-driver/Manifest
@@ -1,13 +1,8 @@
-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.4.3.tar.gz 25805389 BLAKE2B ecb766bc3316e7cda338cc0b279ee31455596d004c11282dd1cad94f85f36c7711077648ae78c9b24e02198f8cc00746161fef119b86b10da52ddb2bf2949de5 SHA512 f28967d5474d43878ce6bf3e793c1a129fa0cd0240a2478d5d56ceb1fba3171ee8389c328818d90f914cabdd26caf1e7185dc9b38cd911a799b1fe2d8bc1ddfb
-DIST intel-media-24.1.1.tar.gz 25814687 BLAKE2B b9d721c17f7caa594668c2221cb730fe7e2b8f7a8ccef85b3f174012d76500c5f890a1abc8a0b0ca893cc80314044321b5e965e72dac4ed357197bc426b493d0 SHA512 42c30d24aab0d73510069dd83e59e0e9a29484b98969e94078681cfa2a832a3c44fac3942535a57db8c75db75d47e3a76c7b7d919fcff292fe6455eede418198
 DIST intel-media-24.1.3.tar.gz 25817697 BLAKE2B 683c22c484b5b10ad392e98bb75e85652f8e3b0ca9d06ab08d8c23fe71f46cb34804722405c70727b97a9bdf13c7610518a093a674996e35affed7a327ed9d83 SHA512 4f1844422ebad74f698ae5d14fd8e0bf7d9b2c4e98edb8f7c0a36957f8ebb43bc0191fab36b9b7b57d96f44ec3bb1f3dcba7b2c74f51786164d9380fb3523c3e
-EBUILD libva-intel-media-driver-23.4.3.ebuild 1512 BLAKE2B cf3863f914dca4ca54c2d52455cd2e278e4fa9570743fae517bef623d94d6202a10ef583c724193d0a3fcb169064f2efc4e09c0d0581dd24428fa6ac27f305ee SHA512 ed937550ae0e8944c8e0dc3f76177150bf0fb45e06a193cd410b4d9d6643446f298c1ebcf6b315c7192f6fc342465abce823d01dc0a7667b7336dc012d1925c3
-EBUILD libva-intel-media-driver-24.1.1.ebuild 1513 BLAKE2B 497d026ff6824bd2dbe00e6fec56220b892daaace1c593fabac83220457e1f75b799d19d1388263fcb6c5b30701e9e7aea54b714e0201f6c240f763925dcfa80 SHA512 1b51d2a2e120dd71beb547a8ca2ecae4877be7ce0401157ec1acad222641e4f095a3f961e30fdfcd44d6c68cee4e1de5a42218740914cc0ff3dd0f2312402afe
+DIST intel-media-24.1.4.tar.gz 25821533 BLAKE2B 9c9d18f7c5a9b2016daa1df8e208f6ba2670fc353f72faec5f57f82bef69fcc9987cd81b4913e831e19930692631648fe9bc7a364486e51aa165f722af8c2e0b SHA512 ca590c1ffe5c38959717d48fdee893aab5896df45e3e80618cb63fa9cfc502688e68b5cc45d6e20ddd496b546906829852dfdb296f5fe4b1fec396878417fe23
 EBUILD libva-intel-media-driver-24.1.3.ebuild 1512 BLAKE2B cf3863f914dca4ca54c2d52455cd2e278e4fa9570743fae517bef623d94d6202a10ef583c724193d0a3fcb169064f2efc4e09c0d0581dd24428fa6ac27f305ee SHA512 ed937550ae0e8944c8e0dc3f76177150bf0fb45e06a193cd410b4d9d6643446f298c1ebcf6b315c7192f6fc342465abce823d01dc0a7667b7336dc012d1925c3
-EBUILD libva-intel-media-driver-9999.ebuild 1536 BLAKE2B 600fa8e7351ed4a0d2085571b1025cf93a7af5d36c47cb96e7332ac3e59ba8496f306e0744b714d2d883c9d9a32375e43ba08327ceae9051c599317825d74c64 SHA512 11f71377d69b25003a1ea1a960eddc1be785a1b84342b92106e3eda2572a72760777c299518fda6d6ad10e0493a68d9bc51b03ebc45a68a8787faa49ca66904b
+EBUILD libva-intel-media-driver-24.1.4.ebuild 1513 BLAKE2B 497d026ff6824bd2dbe00e6fec56220b892daaace1c593fabac83220457e1f75b799d19d1388263fcb6c5b30701e9e7aea54b714e0201f6c240f763925dcfa80 SHA512 1b51d2a2e120dd71beb547a8ca2ecae4877be7ce0401157ec1acad222641e4f095a3f961e30fdfcd44d6c68cee4e1de5a42218740914cc0ff3dd0f2312402afe
+EBUILD libva-intel-media-driver-9999.ebuild 1513 BLAKE2B 497d026ff6824bd2dbe00e6fec56220b892daaace1c593fabac83220457e1f75b799d19d1388263fcb6c5b30701e9e7aea54b714e0201f6c240f763925dcfa80 SHA512 1b51d2a2e120dd71beb547a8ca2ecae4877be7ce0401157ec1acad222641e4f095a3f961e30fdfcd44d6c68cee4e1de5a42218740914cc0ff3dd0f2312402afe
 MISC metadata.xml 565 BLAKE2B e630d474342839898d53aef1849b002ef651c9f4fe3bfcfe72e809012e6c65153b1a6c14db922a45440ffd5717b90dddd6973185f8a625906e9d5571e50728d9 SHA512 22227f8a9cc39fff74f0bf2cdc8953f110e94ce0ab107076269d604c3cf8ae46c8496c9bcf47598e351cb9714e427f213ade5e446a5e8c67acfc87db5530b370
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
deleted file mode 100644
index 81c80d80f902..000000000000
--- a/media-libs/libva-intel-media-driver/files/libva-intel-media-driver-20.2.0_x11_optional.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- 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
deleted file mode 100644
index 3c6d500f2fbf..000000000000
--- a/media-libs/libva-intel-media-driver/files/libva-intel-media-driver-20.4.5_testing_in_src_test.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-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
deleted file mode 100644
index 288fe2d7f517..000000000000
--- a/media-libs/libva-intel-media-driver/files/libva-intel-media-driver-21.4.2-Remove-unwanted-CFLAGS.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-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
-
diff --git a/media-libs/libva-intel-media-driver/libva-intel-media-driver-23.4.3.ebuild b/media-libs/libva-intel-media-driver/libva-intel-media-driver-23.4.3.ebuild
deleted file mode 100644
index 724fb1822753..000000000000
--- a/media-libs/libva-intel-media-driver/libva-intel-media-driver-23.4.3.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2024 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.14:=[${MULTILIB_USEDEP}]
-	>=media-libs/libva-2.20.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
-}
diff --git a/media-libs/libva-intel-media-driver/libva-intel-media-driver-24.1.1.ebuild b/media-libs/libva-intel-media-driver/libva-intel-media-driver-24.1.4.ebuild
index c39052ca1e08..c39052ca1e08 100644
--- a/media-libs/libva-intel-media-driver/libva-intel-media-driver-24.1.1.ebuild
+++ b/media-libs/libva-intel-media-driver/libva-intel-media-driver-24.1.4.ebuild
diff --git a/media-libs/libva-intel-media-driver/libva-intel-media-driver-9999.ebuild b/media-libs/libva-intel-media-driver/libva-intel-media-driver-9999.ebuild
index 1a647aa323ec..c39052ca1e08 100644
--- a/media-libs/libva-intel-media-driver/libva-intel-media-driver-9999.ebuild
+++ b/media-libs/libva-intel-media-driver/libva-intel-media-driver-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -35,9 +35,8 @@ DEPEND=">=media-libs/gmmlib-22.3.14:=[${MULTILIB_USEDEP}]
 RDEPEND="${DEPEND}"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-20.2.0_x11_optional.patch
-	"${FILESDIR}"/${PN}-21.4.2-Remove-unwanted-CFLAGS.patch
-	"${FILESDIR}"/${PN}-20.4.5_testing_in_src_test.patch
+	"${FILESDIR}"/${PN}-23.3.4-Remove-unwanted-CFLAGS.patch
+	"${FILESDIR}"/${PN}-23.3.4_testing_in_src_test.patch
 )
 
 multilib_src_configure() {
@@ -49,7 +48,7 @@ multilib_src_configure() {
 		-DMEDIA_RUN_TEST_SUITE=$(usex test)
 		-DBUILD_TYPE=Release
 		-DPLATFORM=linux
-		-DUSE_X11=$(usex X)
+		-DCMAKE_DISABLE_FIND_PACKAGE_X11=$(usex !X)
 		-DENABLE_NONFREE_KERNELS=$(usex redistributable)
 		-DLATEST_CPP_NEEDED=ON # Seems to be the best option for now
 	)