gentoo auto-resync : 06:09:2023 - 04:25:10

5 files changed, 68 insertions, 3 deletions

diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 85d009b74e0f..7cc445e9d455 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/libva-intel-driver/Manifest b/media-libs/libva-intel-driver/Manifest
index b78e91466ec8..bc2093b85d7f 100644
--- a/media-libs/libva-intel-driver/Manifest
+++ b/media-libs/libva-intel-driver/Manifest
@@ -1,4 +1,4 @@
 DIST intel-vaapi-driver-2.4.1.tar.bz2 2889762 BLAKE2B 25888ac7a1a42233c4b0269bd910c5161f99bf22c932b46e20c8c77ed0404bf99702dd9f11b73bc0fd76a3b012ffa1de6c6133cbd7be880428235de9cfcc6ad8 SHA512 1e9dc81ecd0b3640fccd1fb827a0ade0a1e5bbabe375130df159849e47ce98c8e879c65ddaaae11d16e916be76b507be69bc0c813494e37e7fca86b0b897a94f
 EBUILD libva-intel-driver-2.4.1-r4.ebuild 1432 BLAKE2B 80fee8c5f431ad22d7bf8c1c6e87329683f5c94be2e93615945d310d792bdca76d4af1a57e1f0e57678320436367cf4b1f30433103be6a89a1734d05bec977bd SHA512 5e80f6d6d1587649952d06b59c513960d0786985102f5c7f6e986afccd1fbdd0fb74c4d012ef4417d7546a17ad4ae6c171c68bd93bc6f1ae7d5dc92dff3bac71
-EBUILD libva-intel-driver-9999.ebuild 1315 BLAKE2B 43f74385af30eaa60e053cd4ac6342fb71f4face46c0d019a2cf5d2330ca57b7c5903d113d188622803d30782c5e4d2902b7c3365ae6e3b76e188da1176a3674 SHA512 c9a8eb771580bcb66e65172a23feb6c03bfba03ac505003883479d6efe3a9df92b8595135e0e2db0ee6b6e7326e0613494e57b916f72af5fc76086de40067cf5
+EBUILD libva-intel-driver-9999.ebuild 1434 BLAKE2B 187b9f9c37d5e17fddf9669e112b869ce7054836e40186902f7d4740c0e6b381468f6bab4879b79a4f0d5ccd0973faaec51698c4cb8bfc4bab801feac757e6ce SHA512 3869a58a3a4a76e9c58cebf2a8ce55862eabc3da676617b3183cd59fc9d6d39a661db872b7e82cc6f9a0caa61928700a6a309da1d2ab5abc0e4d6907f073dfed
 MISC metadata.xml 490 BLAKE2B 1a66bd19f05f0c21849b8fe57ffc8f8e153af9a963e045b0c23050734a4aa506b920b91fb4606306f0850514df4465ef6f448042c0c339b61f75d7d6904e0ce7 SHA512 5bf8d70288c3b63678f6adafbf0a3284385e9122e4acf50455741e0472dd8fe1b8eb6d41ea92056cb2da462c31aa812b061297427dc9de1853539dbf762d7cef
diff --git a/media-libs/libva-intel-driver/libva-intel-driver-9999.ebuild b/media-libs/libva-intel-driver/libva-intel-driver-9999.ebuild
index 2f30270780ef..f59da31c7a3b 100644
--- a/media-libs/libva-intel-driver/libva-intel-driver-9999.ebuild
+++ b/media-libs/libva-intel-driver/libva-intel-driver-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -21,12 +21,17 @@ fi
 
 LICENSE="MIT"
 SLOT="0"
-IUSE="wayland X"
+IUSE="hybrid wayland X"
 RESTRICT="test" # No tests
 
 RDEPEND="
 	>=x11-libs/libdrm-2.4.52[video_cards_intel,${MULTILIB_USEDEP}]
 	>=media-libs/libva-2.4.0:=[X?,wayland?,${MULTILIB_USEDEP}]
+
+	hybrid? (
+		>=media-libs/intel-hybrid-codec-driver-2.0.0[X?,wayland?]
+	)
+
 	wayland? (
 		>=dev-libs/wayland-1.11[${MULTILIB_USEDEP}]
 		>=media-libs/mesa-9.1.6[egl(+),${MULTILIB_USEDEP}]
@@ -43,6 +48,7 @@ src_prepare() {
 
 multilib_src_configure() {
 	local myconf=(
+		$(use_enable hybrid hybrid-codec)
 		$(use_enable wayland)
 		$(use_enable X x11)
 	)
diff --git a/media-libs/libva-intel-media-driver/Manifest b/media-libs/libva-intel-media-driver/Manifest
index b87d3c48ae6d..11f44177d2e0 100644
--- a/media-libs/libva-intel-media-driver/Manifest
+++ b/media-libs/libva-intel-media-driver/Manifest
@@ -4,8 +4,10 @@ AUX libva-intel-media-driver-21.4.2-Remove-unwanted-CFLAGS.patch 1473 BLAKE2B d3
 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
 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 1512 BLAKE2B 6e4273c87c9ce89e139084e54585cf275e848dcdf23d87e7dbdaca39e479af4a38ac19ef68899200029d10ce29ee6b8e62c8bd07009f46af3bd9a6c539f8c7df SHA512 6715ad975388fe9c51de8d695549b41df8ac83cbf7612f12321523ae68fe5bb20beb6732ab9412297fc4a52244f38a09872390e167281e0857a32c762bada1a0
 EBUILD libva-intel-media-driver-9999.ebuild 1535 BLAKE2B 931f5a0680ec2677fc9aa82ccaf02e6f6662de9402d7153f2f235afc3ee1a1296ade947135142b046a495ba621fb14c61a21f42ab74759fa084f4061f8bd4b1c SHA512 e456f1894826d93798270cebae93fbce025f4635ca7b8298b7e5026cf344bdb851b69e7b36aca4c85eb9836a36ec6cbc4086c4b652eaa20b185b844e357f9f0e
 MISC metadata.xml 565 BLAKE2B e630d474342839898d53aef1849b002ef651c9f4fe3bfcfe72e809012e6c65153b1a6c14db922a45440ffd5717b90dddd6973185f8a625906e9d5571e50728d9 SHA512 22227f8a9cc39fff74f0bf2cdc8953f110e94ce0ab107076269d604c3cf8ae46c8496c9bcf47598e351cb9714e427f213ade5e446a5e8c67acfc87db5530b370
diff --git a/media-libs/libva-intel-media-driver/libva-intel-media-driver-23.3.2.ebuild b/media-libs/libva-intel-media-driver/libva-intel-media-driver-23.3.2.ebuild
new file mode 100644
index 000000000000..4b8e3b107c7b
--- /dev/null
+++ b/media-libs/libva-intel-media-driver/libva-intel-media-driver-23.3.2.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.9:=[${MULTILIB_USEDEP}]
+	>=media-libs/libva-2.19.0[X?,${MULTILIB_USEDEP}]
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-21.4.2-Remove-unwanted-CFLAGS.patch
+	"${FILESDIR}"/${PN}-20.4.5_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
+}