gentoo auto-resync : 31:05:2023 - 09:23:01

3 files changed, 3 insertions, 94 deletions

diff --git a/media-libs/intel-mediasdk/Manifest b/media-libs/intel-mediasdk/Manifest
index 3d36b2aaeab3..66b9d9f97911 100644
--- a/media-libs/intel-mediasdk/Manifest
+++ b/media-libs/intel-mediasdk/Manifest
@@ -1,9 +1,7 @@
 AUX intel-mediasdk-23.2.0-gcc13.patch 336 BLAKE2B beaea84539f84540be73863d2bafb8fe1f4b33c1c3d5d82c5480ab990cd64267e2a3c05fc4b5001c84fcfec565de16379ff1c440330f46971273dd349c265444 SHA512 fe7bbe6b62b775127d4550d997c7b27631416f6d136a71eb11d4bd589d42db5a2a41d275d72f23f0c14d29aa0de2764cf828542771e5a1e2fcb1acf16fc8524d
-DIST intel-mediasdk-22.6.5.tar.gz 11657890 BLAKE2B 53b38f7b3757895f65badb7e43e5d1f1112f744dd4a43ea9313f7bfbdf889088310b2093ccd45794426f0ac5e38ca8d901790d4963945648a3b99922476d02e0 SHA512 af9a59a9a7e9477672a875f454988cc49d8b782b32701ba681efa6dda445239e133b00f9366fc58ddadf79beef0ee74f1165990f0b8194124a841b36d5dca6bc
-DIST intel-mediasdk-23.2.0.tar.gz 22528541 BLAKE2B 12b613ea4e60c99383edb7703892931d5b787d78610972e1cc64c679333ca421c947075cbaec660db1ab4a5f0ac1f816bfa0f0e037e3800612cbfbd2b5038389 SHA512 43faa24cd2b8270dd74845063e2a61635e9d0adf5cf335f5eb805d686cc9feb22e69f1e14fd5cc75c0a4fc665898dde121c469a70a681caace3e18efad57ead5
 DIST intel-mediasdk-23.2.1.tar.gz 22528440 BLAKE2B ee1da0ab86dfce2bb69df3b03fd6773550cbd974ff7461a1ff46a69913194bb7b71a184985f54d82532f6cdd3d5970439bfd9423260849a7cd09541feda59154 SHA512 f37bfb2b2358dbbe68075f03a0ab9b387b063639ad31c247b5d61fb009bc5cc51642109af6dbdeeb07988a3fdd08a5d2f280b2460dfa6c7fc77047c4336e2499
-EBUILD intel-mediasdk-22.6.5.ebuild 1960 BLAKE2B 759c7ebb495ff50f21f4b2675b3234f20883629b15db9704064ccdf36b18bbe35d7e5afe23dbd6a33e56577826baf672ab8e158e9232230ee7b2a6b4aafbf5d2 SHA512 a6373b9030a0b37504e075c1c20d8919f9881e9b4e006b18dbe3db31aa15f995c2c8a55ac48cf808d1c2d995ffbc43c99cf2a8a7a9a73e47a82d4424efef7c2f
-EBUILD intel-mediasdk-23.2.0.ebuild 2126 BLAKE2B f808ee8ef7e256b0e5da9f46cc7028e77f3d09ccf3a865969dec554d2d6098ca5e7541e94bca923d7201d75f712a8e0bcac6766816f4677c9a632e8cee32abb8 SHA512 f9372e820663604a037ed2fbd80535e5a1ddad42c2c9e0735d6a65c574812515c9b36495b6f1ee274ada446b2e6b57917c536b88296d70a1faa57b33f3cac1ce
+DIST intel-mediasdk-23.2.2.tar.gz 22527304 BLAKE2B aa0e7b0fabc1bd376511a1022da5e40ea282c4f016384e8bc20fb4e28693e3bb06816ad790da1a708f623ac3a6e6b2f704f785dd4e6cd5c9db320f63c8bded78 SHA512 d4cfebee4f689b93c0171775ff2bab449f801c55822c5b800fe3217653d197216cf2a95dea115cf51f308e158adea7a271f03081b011e024c16bf7915fdcd586
 EBUILD intel-mediasdk-23.2.1.ebuild 2134 BLAKE2B 1acd2c39cb8e02c1feaa155daf607e8a211b6cd1b890f5919e7b619df639f5c4f55efebb205a720177235abe95bdf410db33633fb2a3788e9e039da03030da85 SHA512 7f0c38ab2ea12e8efbf4c178e7a795593fb995f03b2d68138b6314a69dbeec255c598db70374836182f341155f03f5ae93d49a3632c460dae190ddca7b257f17
+EBUILD intel-mediasdk-23.2.2.ebuild 2134 BLAKE2B 1acd2c39cb8e02c1feaa155daf607e8a211b6cd1b890f5919e7b619df639f5c4f55efebb205a720177235abe95bdf410db33633fb2a3788e9e039da03030da85 SHA512 7f0c38ab2ea12e8efbf4c178e7a795593fb995f03b2d68138b6314a69dbeec255c598db70374836182f341155f03f5ae93d49a3632c460dae190ddca7b257f17
 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-22.6.5.ebuild b/media-libs/intel-mediasdk/intel-mediasdk-22.6.5.ebuild
deleted file mode 100644
index 90efdf1fc399..000000000000
--- a/media-libs/intel-mediasdk/intel-mediasdk-22.6.5.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2023 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
-RDEPEND="
-	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
-	)
-	X? (
-		x11-libs/libX11
-		x11-libs/libxcb
-	)
-"
-DEPEND="${RDEPEND}
-	wayland? (
-		dev-libs/wayland-protocols
-	)
-"
-BDEPEND="
-	wayland? (
-		dev-util/wayland-scanner
-	)
-"
-
-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-23.2.0.ebuild b/media-libs/intel-mediasdk/intel-mediasdk-23.2.2.ebuild
index 5b13e7ba04b4..a0674e307b13 100644
--- a/media-libs/intel-mediasdk/intel-mediasdk-23.2.0.ebuild
+++ b/media-libs/intel-mediasdk/intel-mediasdk-23.2.2.ebuild
@@ -62,7 +62,7 @@ BDEPEND="
 
 PATCHES=(
 	# https://github.com/Intel-Media-SDK/MediaSDK/pull/2998
-	"${FILESDIR}/${P}-gcc13.patch"
+	"${FILESDIR}/${PN}-23.2.0-gcc13.patch"
 )
 
 multilib_src_configure() {