gentoo resync : 20.10.2021

3 files changed, 72 insertions, 4 deletions

diff --git a/x11-libs/libva-intel-media-driver/Manifest b/x11-libs/libva-intel-media-driver/Manifest
index 13305de0c0f3..f9cedc2ff2cc 100644
--- a/x11-libs/libva-intel-media-driver/Manifest
+++ b/x11-libs/libva-intel-media-driver/Manifest
@@ -12,6 +12,7 @@ DIST intel-media-21.2.2.tar.gz 23021952 BLAKE2B 0173eb8fb81c3012af30bb755b87e5f4
 DIST intel-media-21.2.3.tar.gz 23025524 BLAKE2B 0652563f8e8494c9fa181822a7af348cc5ce1e2446063c743fa89072ae46c6a4af0c71001fb8249b0306d67a220312f883a8f54dde1981078e6ee8fad71eaaa1 SHA512 b12ff5b3afbc4d4f34353c7a4ea50b1c66746b33920e450d7d17cffdc234921e82fc4c1afb025274caf2a5efbe87e577b6790d0648a52de08ea19b11a103ac81
 DIST intel-media-21.3.2.tar.gz 23069924 BLAKE2B cb7035698bc19eb65f0cf338e7fb0e11a379a27c243566b6f884d63897da10e2ded39523fcc81131f41885508d1413e7960e38cf9cf2d129d7a6a3994fa9b384 SHA512 27a1849ed2f2367e5de63189faa6e14a1a23f6708c45392f661fab819f856bb4a3d0d31754213b084c4f05be3b155b0a80c2f4e330c79879597910f77e3f1597
 DIST intel-media-21.3.3.tar.gz 23092541 BLAKE2B 083cc368095bbc9cf333953855ad94d7a8d633337b967f4f93d94e3c8e23bbcdadad19c1b1032cafc671ae9a9df9be547498ebe84426ad9d91a9e82557095eb8 SHA512 a9da8a627420c5ea0de9413ce0aeb471f40a0886abd67380ead7ffba32de4abbc1741c47cfcfc73d42b14456090266f4dad8d363c8ad590cef521ef48e42f692
+DIST intel-media-21.3.5.tar.gz 23110985 BLAKE2B 1dbbc1efa9ae2c8f3b4a34596c71173101f8a43591bf9e07d269a8499b7a57969d9af5c1d4ffb7774a6947947e572b441f871760d3ca695335bfa2976ac2cf6f SHA512 e7836b19050677e81aa34ce5d7cea661ca3b5ac55d73d5aa0bab93f1daba8ee010d84b1c585f62fcec65a4361ef2b7f14ed574858f56b85b4c4d59840ecb6cb6
 EBUILD libva-intel-media-driver-20.1.1-r2.ebuild 1182 BLAKE2B e453b09ac58040ab6e0da45768caf70d8cdace4b4683f94f8133904513212652e5fa7effa8392be7e495e00f8d6227163c465d4404f8628f804eebd9c0c3e3b4 SHA512 52b2221c79305305deda5a952314f8de487399f99f5840e0ec9a2d67ebce819cba2d8e31ee9de4e17300e758925d68ab5f3205ecec62631d19b0a1c7f213203c
 EBUILD libva-intel-media-driver-20.2.0-r2.ebuild 1225 BLAKE2B 195b1f1db03ad5bf2d42bae05cba99e9726a0ba3c682c993eb73b6cff6bf04b40004d15223d69fbd64fcae4b62bf1137f50911ec2b9c68bd9079d0302d682ba6 SHA512 a46e343c36dc51819c22b601b7eecc62f38c27b75cc4eafba844fdb32ce062047f3408e582b3daff9668a72df26d995d2a4909c7da98cf2fbc4a60682f41151b
 EBUILD libva-intel-media-driver-20.4.5.ebuild 1466 BLAKE2B 44ab893c79c0eace0f0e237c89a81636123733a51da2b71b4314f5707e98855a59696896cac73a783cfc0b646f9dd1b2e99bc555888d6b53ddd6a54d2e13dca7 SHA512 95749d2504f57449baddfe40b9f1595f45d5058e9afb3656b9ead1163a5dc8a899aef6e71c9bea3ffd5f452b181ca3eebbeae7943e563292be51be7bc24037e2
@@ -21,5 +22,6 @@ EBUILD libva-intel-media-driver-21.2.2_pre.ebuild 1484 BLAKE2B 30827123d8241e2cb
 EBUILD libva-intel-media-driver-21.2.3.ebuild 1456 BLAKE2B 3ef7e7a112b602fcc8bab298099e8cc139bfa7e2d2a3ab2eb5d515ac6bacd2b02d49fd5c0ef62951153e7bd19a8eafab68b51d0ab7ea7bb142f56cae827be1ae SHA512 5fffda372db6de84b266a9cd2d04f8f419a4a76d8576ea4fd04dd75798763899414cdf0e3db72469b43fb344741eaa8f158c0176e0b2d72977601bc293b27c8b
 EBUILD libva-intel-media-driver-21.3.2_pre.ebuild 1484 BLAKE2B 30827123d8241e2cb52bd92d1455ab40accbe60ca374206e38919f4f0add83c4b297b0a7fe86a4f38f1b8d9f1c8775d0e7d6181f0e9604afabcd406cc5a71519 SHA512 ded439fb9d7b41cd8ab6905dcfec3bcb4eb6f0527509a8ac62be6ce5873dc93dd9045be5e6222feca005385bcb16ad08f6e79769caa894ce4f5037fee4ae0392
 EBUILD libva-intel-media-driver-21.3.3_pre.ebuild 1484 BLAKE2B 30827123d8241e2cb52bd92d1455ab40accbe60ca374206e38919f4f0add83c4b297b0a7fe86a4f38f1b8d9f1c8775d0e7d6181f0e9604afabcd406cc5a71519 SHA512 ded439fb9d7b41cd8ab6905dcfec3bcb4eb6f0527509a8ac62be6ce5873dc93dd9045be5e6222feca005385bcb16ad08f6e79769caa894ce4f5037fee4ae0392
-EBUILD libva-intel-media-driver-9999.ebuild 1456 BLAKE2B 9ebc73549d3ad9d9d0cbbccce0ca012599e952d324731841d5546a9aeb90768ffb1a780e9be0f89a66cc4b6cc38f76f03527cf8bf1bee31a9dd260b717fb548c SHA512 c6264b876982e35ae775c0863b6d1add2707451c6d13dce567220192d5e0efb8015eea834f5a036f4088a97a2a87c0694f660cd2640fdc814167bd0252ec8d23
+EBUILD libva-intel-media-driver-21.3.5.ebuild 1494 BLAKE2B 19e86871ffcfc7429630d27ddfea83c12aad6515fb835a164d3af932680b1cdc11a1afc2607e010a63cfc8318128535c103ec05a34525eb952251b0632b47402 SHA512 377bcfa3181f363ec2df809c237435531411d7aee6da415227e15df89fce118edc72fe56bc44606b4255b53c012a7246f654bd63cb479a164cdc91a3412b6097
+EBUILD libva-intel-media-driver-9999.ebuild 1494 BLAKE2B 19e86871ffcfc7429630d27ddfea83c12aad6515fb835a164d3af932680b1cdc11a1afc2607e010a63cfc8318128535c103ec05a34525eb952251b0632b47402 SHA512 377bcfa3181f363ec2df809c237435531411d7aee6da415227e15df89fce118edc72fe56bc44606b4255b53c012a7246f654bd63cb479a164cdc91a3412b6097
 MISC metadata.xml 617 BLAKE2B 70709460de09a33bcaac37b7a6b46ab82366fefd61b525a9d73fca0e3bbab3332635cfcc52d01468f5270168222b55360bb221890fd97f01af3e9c46ceb8ca14 SHA512 bab84b0d3113695f920d4710329e5a147a946b9fe56cf6ff7e583694b249c7f284b359d2edd1a8c12d3035232dc0eaa12f8f3450992d6dc0d287b4db0a94f497
diff --git a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.3.5.ebuild b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.3.5.ebuild
new file mode 100644
index 000000000000..15ca5a26b62c
--- /dev/null
+++ b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.3.5.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+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 VAAPI (iHD)"
+HOMEPAGE="https://github.com/intel/media-driver"
+
+LICENSE="MIT BSD"
+SLOT="0"
+IUSE="+custom-cflags set-as-default test X"
+
+RESTRICT="!test? ( test )"
+
+DEPEND=">=media-libs/gmmlib-21.3.1
+	>=x11-libs/libva-2.13.0[X?]
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-20.2.0_x11_optional.patch
+	"${FILESDIR}"/${PN}-21.2.2_custom_cflags.patch
+	"${FILESDIR}"/${PN}-20.4.5_testing_in_src_test.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DMEDIA_BUILD_FATAL_WARNINGS=OFF
+		-DMEDIA_RUN_TEST_SUITE=$(usex test)
+		-DBUILD_TYPE=Release
+		-DPLATFORM=linux
+		-DUSE_X11=$(usex X)
+		-DLATEST_CPP_NEEDED=ON # Seems to be the best option for now
+		-DOVERRIDE_COMPILER_FLAGS=$(usex !custom-cflags)
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	if use set-as-default ; then
+		echo 'LIBVA_DRIVER_NAME="iHD"' > "${T}/55libva-intel-media-driver" || die
+		doenvd "${T}/55libva-intel-media-driver"
+	fi
+}
diff --git a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-9999.ebuild b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-9999.ebuild
index 7e53505dd384..15ca5a26b62c 100644
--- a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-9999.ebuild
+++ b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-9999.ebuild
@@ -15,7 +15,9 @@ 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}"
-	KEYWORDS="~amd64"
+	if [[ ${PV} != *_pre* ]] ; then
+		KEYWORDS="~amd64"
+	fi
 fi
 
 DESCRIPTION="Intel Media Driver for VAAPI (iHD)"
@@ -27,8 +29,8 @@ IUSE="+custom-cflags set-as-default test X"
 
 RESTRICT="!test? ( test )"
 
-DEPEND=">=media-libs/gmmlib-21.1.3
-	>=x11-libs/libva-2.11.0[X?]
+DEPEND=">=media-libs/gmmlib-21.3.1
+	>=x11-libs/libva-2.13.0[X?]
 "
 RDEPEND="${DEPEND}"