gentoo auto-resync : 06:12:2022 - 21:11:24

4 files changed, 142 insertions, 9 deletions

diff --git a/media-libs/intel-mediasdk/Manifest b/media-libs/intel-mediasdk/Manifest
index d5a17f312ea4..84f61f790aa4 100644
--- a/media-libs/intel-mediasdk/Manifest
+++ b/media-libs/intel-mediasdk/Manifest
@@ -1,5 +1,7 @@
 AUX intel-mediasdk-20.3.0-missing-limits-include.patch 751 BLAKE2B a43734984dad9be29ae79677c05d20c245e704d6cef9c6d69d06d38973eb2dadae34cbcba74a120061dfeef6bc10a5ca76fd9a252d35c25025158aaf251bc122 SHA512 a5a681d43613a20b9c8cd1549d6b4fa4288c401716cd95ab08e314855fea01acc24d4fc0f5c687a002ca2440b7eb4f14c64c727b2b0382ca9c99ab8981e051b3
 DIST intel-mediasdk-20.3.0.tar.gz 10810941 BLAKE2B 5c5bc1a8444b6780ee7ea13711e7c59f62e8c9d8a7577ff848a6fbc5fc416d3e03580fe44dd9df7a506c19dd677986804a055cb16b34a06a55897623d25298d5 SHA512 2bd2604e6f17aeeea661352fd52c19b0ff2361919ad67b858287e507e0356cc805f1d22b39ff28294d303efefc33e10c2c5912d774f1bc40751c2c6c3c9e90c4
+DIST intel-mediasdk-22.6.3.tar.gz 11657130 BLAKE2B 3f63cf85716159f38f52cd0941cb716d9a25d2635e8b6da295a8fb78898ae007c3216148db580b94aa83742803effc0c1c2b0a431414a85f6feb44c93ae04738 SHA512 bd9fb9ca5b96bb2911db7fdf2622127f0dc3e86de8dc732bc6df6f4fcb343406e3ab14ffa5ce4595ed9b3bf19a73652681137fbe5b473c812c5b74554998a2b0
 EBUILD intel-mediasdk-20.3.0-r1.ebuild 977 BLAKE2B a0fc7ba641c489b6fc913c3a3439b22ae3a881a5e07b995d7e3323dfabebdabd448d747dc7fcd5fdb0214a11391e08c5352afd9777ef9866d9b2121382fe5368 SHA512 2b283475c4657604815cb54c71d27ebe4bcf8901aaae2e369b5a5f64adff8a691d0b39c1a65e35a108c85d03046d3d0ab9a40c168cad597d316f6ac786333267
-EBUILD intel-mediasdk-9999.ebuild 907 BLAKE2B d86e90af518afdcd9e684a0ea04321efcc570d2bd448082ea8a68c61add886b9ca3527bcdbae4f923197b571439003d42ded7ced523ce68ed08d4fc58cf3bceb SHA512 d1d10dd6502d805c8f54285601d4f9d71fa2c3891d7eb1ac257861b0ada4723b908f952fb7337b4eef438788ad78743a240c9d9c5c48ce36bd02bde41de4dc69
-MISC metadata.xml 221 BLAKE2B a8ae02758e29edcbb6f3c9de4eb354eec3dcd1b3d5917639ac518b4085c61eb86187e0046a8076d21ce9fccbf76b9c98e0b3816bbea3f479a1955df68f1ff6c7 SHA512 56dcb24730cb51ba02e3cf46bf03dd27ac4f3afb5781bbf9984100dad25aacee64a13f667de0c988aab9059fb7487e3835f995aa9c515a9680dd8534d30f0d17
+EBUILD intel-mediasdk-22.6.3.ebuild 1916 BLAKE2B 0afe7a7034386a2f32dd3a7b074dca39a8771439ff1502cca97baa08959c928aa62614211d500f8d280faca37fa39b68e5bbf95ab77168620432289dcea65e08 SHA512 9c90d66da6c5ff7a93a993d977d48e6a496c1ca872b96465d44c0e954d1678e9a72bbc5f11d54f8578a7bf0811a7a9b2d68d48e42d36cb9a5cb4ec02938b0f4c
+EBUILD intel-mediasdk-9999.ebuild 1916 BLAKE2B 0afe7a7034386a2f32dd3a7b074dca39a8771439ff1502cca97baa08959c928aa62614211d500f8d280faca37fa39b68e5bbf95ab77168620432289dcea65e08 SHA512 9c90d66da6c5ff7a93a993d977d48e6a496c1ca872b96465d44c0e954d1678e9a72bbc5f11d54f8578a7bf0811a7a9b2d68d48e42d36cb9a5cb4ec02938b0f4c
+MISC metadata.xml 507 BLAKE2B 1e08efd32142406ac7fc4390a10f51b117bbaf56fc2006ed508bf026d2720447a782f2e86ba323017dc6388ca18e4743688eaf1a8fb7165bc6377194b4139d0b SHA512 ef8d11178dcded14cb74c49e01bedde8986ff8aa02641c275d5a36ca3973782955f90d0c25ef728ca120fc1a46f1f3965f4b5a36376203c6f6cb9b1411af52e1
diff --git a/media-libs/intel-mediasdk/intel-mediasdk-22.6.3.ebuild b/media-libs/intel-mediasdk/intel-mediasdk-22.6.3.ebuild
new file mode 100644
index 000000000000..a42d8290d2f3
--- /dev/null
+++ b/media-libs/intel-mediasdk/intel-mediasdk-22.6.3.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake optfeature
+
+if [[ ${PV} == *9999 ]] ; then
+	: ${EGIT_REPO_URI:="https://github.com/Intel-Media-SDK/MediaSDK"}
+	if [[ ${PV%9999} != "" ]] ; then
+		: ${EGIT_BRANCH:="release/${PV%.9999}"}
+	fi
+	inherit git-r3
+fi
+
+DESCRIPTION="Intel Media SDK"
+HOMEPAGE="https://github.com/Intel-Media-SDK/MediaSDK"
+if [[ ${PV} == *9999 ]] ; then
+	SRC_URI=""
+else
+	SRC_URI="https://github.com/Intel-Media-SDK/MediaSDK/archive/intel-mediasdk-${PV}.tar.gz"
+	S="${WORKDIR}/MediaSDK-intel-mediasdk-${PV}"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+
+IUSE="dri test +tools wayland X"
+# Test not working at the moment
+#RESTRICT="!test? ( test )"
+RESTRICT="test"
+# # Most of these flags only have an effect on the tools
+REQUIRED_USE="
+	dri? ( X )
+	wayland? ( tools )
+	X? ( tools )
+"
+
+# x11-libs/libdrm[video_cards_intel] for intel_bufmgr.h in samples
+# bug #805224
+DEPEND="
+	x11-libs/libpciaccess
+	>=media-libs/libva-intel-media-driver-${PV}
+	media-libs/libva[X?,wayland?]
+	x11-libs/libdrm[video_cards_intel]
+	wayland? (
+		dev-libs/wayland
+		dev-util/wayland-scanner
+		dev-libs/wayland-protocols
+	)
+	X? (
+		x11-libs/libX11
+		x11-libs/libxcb
+	)
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		# OpenCL only has an effect if we build kernels
+		-DENABLE_OPENCL=OFF
+		-DBUILD_TUTORIALS=OFF
+		# Need to package the cm-compiler to build kernels, use pre-built instead
+		-DBUILD_KERNELS=OFF
+		-DBUILD_RUNTIME=ON
+		-DBUILD_DISPATCHER=ON
+		-DBUILD_TOOLS="$(usex tools)"
+		# Cannot build tools without samples
+		-DBUILD_SAMPLES="$(usex tools)"
+		-DBUILD_TESTS="$(usex test)"
+		-DENABLE_X11="$(usex X)"
+		-DENABLE_X11_DRI3="$(usex dri)"
+		-DENABLE_WAYLAND="$(usex wayland)"
+	)
+
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	optfeature "Intel GPUs newer then, and including, Intel Xe" media-libs/oneVPL-intel-gpu
+}
diff --git a/media-libs/intel-mediasdk/intel-mediasdk-9999.ebuild b/media-libs/intel-mediasdk/intel-mediasdk-9999.ebuild
index 5e9ab6853a42..a42d8290d2f3 100644
--- a/media-libs/intel-mediasdk/intel-mediasdk-9999.ebuild
+++ b/media-libs/intel-mediasdk/intel-mediasdk-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit cmake
+inherit cmake optfeature
 
 if [[ ${PV} == *9999 ]] ; then
 	: ${EGIT_REPO_URI:="https://github.com/Intel-Media-SDK/MediaSDK"}
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]] ; then
 fi
 
 DESCRIPTION="Intel Media SDK"
-HOMEPAGE="http://mediasdk.intel.com"
+HOMEPAGE="https://github.com/Intel-Media-SDK/MediaSDK"
 if [[ ${PV} == *9999 ]] ; then
 	SRC_URI=""
 else
@@ -26,18 +26,57 @@ fi
 LICENSE="MIT"
 SLOT="0"
 
+IUSE="dri test +tools wayland X"
+# Test not working at the moment
+#RESTRICT="!test? ( test )"
+RESTRICT="test"
+# # Most of these flags only have an effect on the tools
+REQUIRED_USE="
+	dri? ( X )
+	wayland? ( tools )
+	X? ( tools )
+"
+
 # x11-libs/libdrm[video_cards_intel] for intel_bufmgr.h in samples
 # bug #805224
 DEPEND="
+	x11-libs/libpciaccess
 	>=media-libs/libva-intel-media-driver-${PV}
+	media-libs/libva[X?,wayland?]
 	x11-libs/libdrm[video_cards_intel]
+	wayland? (
+		dev-libs/wayland
+		dev-util/wayland-scanner
+		dev-libs/wayland-protocols
+	)
+	X? (
+		x11-libs/libX11
+		x11-libs/libxcb
+	)
 "
 RDEPEND="${DEPEND}"
 
 src_configure() {
 	local mycmakeargs=(
+		# OpenCL only has an effect if we build kernels
 		-DENABLE_OPENCL=OFF
+		-DBUILD_TUTORIALS=OFF
+		# Need to package the cm-compiler to build kernels, use pre-built instead
+		-DBUILD_KERNELS=OFF
+		-DBUILD_RUNTIME=ON
+		-DBUILD_DISPATCHER=ON
+		-DBUILD_TOOLS="$(usex tools)"
+		# Cannot build tools without samples
+		-DBUILD_SAMPLES="$(usex tools)"
+		-DBUILD_TESTS="$(usex test)"
+		-DENABLE_X11="$(usex X)"
+		-DENABLE_X11_DRI3="$(usex dri)"
+		-DENABLE_WAYLAND="$(usex wayland)"
 	)
 
 	cmake_src_configure
 }
+
+pkg_postinst() {
+	optfeature "Intel GPUs newer then, and including, Intel Xe" media-libs/oneVPL-intel-gpu
+}
diff --git a/media-libs/intel-mediasdk/metadata.xml b/media-libs/intel-mediasdk/metadata.xml
index 716be526394b..888102391fdf 100644
--- a/media-libs/intel-mediasdk/metadata.xml
+++ b/media-libs/intel-mediasdk/metadata.xml
@@ -1,7 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>media-video@gentoo.org</email>
-</maintainer>
+	<maintainer type="project">
+		<email>media-video@gentoo.org</email>
+	</maintainer>
+	<maintainer type="person">
+		<email>andrewammerlaan@gentoo.org</email>
+		<name>Andrew Ammerlaan</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">Intel-Media-SDK/MediaSDK</remote-id>
+	</upstream>
+	<use>
+		<flag name="tools">Build analyse and inspect tools</flag>
+	</use>
 </pkgmetadata>