gentoo auto-resync : 22:03:2023 - 00:41:01

3 files changed, 99 insertions, 14 deletions

diff --git a/media-libs/intel-mediasdk/Manifest b/media-libs/intel-mediasdk/Manifest
index fac47a4e24c8..fb35d7f5b2f9 100644
--- a/media-libs/intel-mediasdk/Manifest
+++ b/media-libs/intel-mediasdk/Manifest
@@ -1,6 +1,8 @@
 DIST intel-mediasdk-22.6.5.tar.gz 11657890 BLAKE2B 53b38f7b3757895f65badb7e43e5d1f1112f744dd4a43ea9313f7bfbdf889088310b2093ccd45794426f0ac5e38ca8d901790d4963945648a3b99922476d02e0 SHA512 af9a59a9a7e9477672a875f454988cc49d8b782b32701ba681efa6dda445239e133b00f9366fc58ddadf79beef0ee74f1165990f0b8194124a841b36d5dca6bc
 DIST intel-mediasdk-23.1.2.tar.gz 11658547 BLAKE2B fb4314bb539630090594835b869c19c639097305cb3b72a14fca2c8b0e429c1c73a9736460db5852d4e2899efbca9aac076f8ff37da0851ac078ece913dab6ad SHA512 1f6a31197fc1f2670f36e1602cc7a194a02cd809470c7f4de630d68f0cbf9b643207491ce2f3c5b2d94af8843bfb9383d202e0f2ea8552e48307b7ad15a0cbb6
+DIST intel-mediasdk-23.1.3.tar.gz 11657956 BLAKE2B 69aeed5c706381571c03f5e62471ee6494182b181c682f959cfde88294d132872674aa04e59f91ac02718a87b2c9155122d72719dcffa23f441c21c3de9cea76 SHA512 560ac33ce6afaf078ae004d9d73ac4614b68596f961a1068bded738b4c4564c133b94a0f2b32b8c54a76ea70f0db2fcf21a68f74f59a3a3efe063d7c73ec6f29
 EBUILD intel-mediasdk-22.6.5.ebuild 1960 BLAKE2B 759c7ebb495ff50f21f4b2675b3234f20883629b15db9704064ccdf36b18bbe35d7e5afe23dbd6a33e56577826baf672ab8e158e9232230ee7b2a6b4aafbf5d2 SHA512 a6373b9030a0b37504e075c1c20d8919f9881e9b4e006b18dbe3db31aa15f995c2c8a55ac48cf808d1c2d995ffbc43c99cf2a8a7a9a73e47a82d4424efef7c2f
 EBUILD intel-mediasdk-23.1.2.ebuild 1914 BLAKE2B 130c75db7637c111ebc9fa229436a7d6e52ecef7417690fb06fcbfd59b4f86c899ae2410f653ce69054e9190dd550edec9a6eb56cd62bc6b3433fcaf00678e10 SHA512 2413e454af5f17327e857b7af3f77d0fc79a23cec9673c47041d04590b0ff36baab12c5e58bc9bc0402d6350eca9b4c694ac25f95ef37c4596b9cef966eb4777
-EBUILD intel-mediasdk-9999.ebuild 1960 BLAKE2B 759c7ebb495ff50f21f4b2675b3234f20883629b15db9704064ccdf36b18bbe35d7e5afe23dbd6a33e56577826baf672ab8e158e9232230ee7b2a6b4aafbf5d2 SHA512 a6373b9030a0b37504e075c1c20d8919f9881e9b4e006b18dbe3db31aa15f995c2c8a55ac48cf808d1c2d995ffbc43c99cf2a8a7a9a73e47a82d4424efef7c2f
+EBUILD intel-mediasdk-23.1.3.ebuild 2024 BLAKE2B f935f5a5bd9cc42db08ca3430ed1fba806cab08cafc8be1bfbdc202f29f93daf565ffe929a9f4842085b47d27672336b153d738dd1e252a9fdc897b50575a950 SHA512 f311ed3e54a0ec6cee30826a68dc75588effe77a691e622cef335b4e63044e6678b8198e20899904871f8f2fa64ccddb22bf6823b5739737378f1c1304295965
+EBUILD intel-mediasdk-9999.ebuild 2024 BLAKE2B f935f5a5bd9cc42db08ca3430ed1fba806cab08cafc8be1bfbdc202f29f93daf565ffe929a9f4842085b47d27672336b153d738dd1e252a9fdc897b50575a950 SHA512 f311ed3e54a0ec6cee30826a68dc75588effe77a691e622cef335b4e63044e6678b8198e20899904871f8f2fa64ccddb22bf6823b5739737378f1c1304295965
 MISC metadata.xml 507 BLAKE2B 1e08efd32142406ac7fc4390a10f51b117bbaf56fc2006ed508bf026d2720447a782f2e86ba323017dc6388ca18e4743688eaf1a8fb7165bc6377194b4139d0b SHA512 ef8d11178dcded14cb74c49e01bedde8986ff8aa02641c275d5a36ca3973782955f90d0c25ef728ca120fc1a46f1f3965f4b5a36376203c6f6cb9b1411af52e1
diff --git a/media-libs/intel-mediasdk/intel-mediasdk-23.1.3.ebuild b/media-libs/intel-mediasdk/intel-mediasdk-23.1.3.ebuild
new file mode 100644
index 000000000000..61173b80745c
--- /dev/null
+++ b/media-libs/intel-mediasdk/intel-mediasdk-23.1.3.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake-multilib 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"
+REQUIRED_USE="
+	dri? ( X )
+"
+
+# x11-libs/libdrm[video_cards_intel] for intel_bufmgr.h in samples
+# bug #805224
+RDEPEND="
+	x11-libs/libpciaccess[${MULTILIB_USEDEP}]
+	>=media-libs/libva-intel-media-driver-${PV}[${MULTILIB_USEDEP}]
+	media-libs/libva[X?,wayland?,${MULTILIB_USEDEP}]
+	x11-libs/libdrm[video_cards_intel,${MULTILIB_USEDEP}]
+	wayland? (
+		dev-libs/wayland[${MULTILIB_USEDEP}]
+	)
+	X? (
+		x11-libs/libX11[${MULTILIB_USEDEP}]
+		x11-libs/libxcb[${MULTILIB_USEDEP}]
+	)
+"
+DEPEND="${RDEPEND}
+	wayland? (
+		dev-libs/wayland-protocols
+	)
+"
+BDEPEND="
+	wayland? (
+		dev-util/wayland-scanner
+	)
+"
+
+multilib_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 90efdf1fc399..61173b80745c 100644
--- a/media-libs/intel-mediasdk/intel-mediasdk-9999.ebuild
+++ b/media-libs/intel-mediasdk/intel-mediasdk-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit cmake optfeature
+inherit cmake-multilib optfeature
 
 if [[ ${PV} == *9999 ]] ; then
 	: ${EGIT_REPO_URI:="https://github.com/Intel-Media-SDK/MediaSDK"}
@@ -26,30 +26,27 @@ fi
 LICENSE="MIT"
 SLOT="0"
 
-IUSE="dri test +tools wayland X"
+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
 RDEPEND="
-	x11-libs/libpciaccess
-	>=media-libs/libva-intel-media-driver-${PV}
-	media-libs/libva[X?,wayland?]
-	x11-libs/libdrm[video_cards_intel]
+	x11-libs/libpciaccess[${MULTILIB_USEDEP}]
+	>=media-libs/libva-intel-media-driver-${PV}[${MULTILIB_USEDEP}]
+	media-libs/libva[X?,wayland?,${MULTILIB_USEDEP}]
+	x11-libs/libdrm[video_cards_intel,${MULTILIB_USEDEP}]
 	wayland? (
-		dev-libs/wayland
+		dev-libs/wayland[${MULTILIB_USEDEP}]
 	)
 	X? (
-		x11-libs/libX11
-		x11-libs/libxcb
+		x11-libs/libX11[${MULTILIB_USEDEP}]
+		x11-libs/libxcb[${MULTILIB_USEDEP}]
 	)
 "
 DEPEND="${RDEPEND}
@@ -63,7 +60,7 @@ BDEPEND="
 	)
 "
 
-src_configure() {
+multilib_src_configure() {
 	local mycmakeargs=(
 		# OpenCL only has an effect if we build kernels
 		-DENABLE_OPENCL=OFF