9 files changed, 145 insertions, 4 deletions
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 523ae3fc6e81..2aebe60cedcc 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/intel-mediasdk/Manifest b/media-libs/intel-mediasdk/Manifest
index 8ef706d580dd..3d36b2aaeab3 100644
--- a/media-libs/intel-mediasdk/Manifest
+++ b/media-libs/intel-mediasdk/Manifest
@@ -1,7 +1,9 @@
 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
+EBUILD intel-mediasdk-23.2.1.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-23.2.1.ebuild b/media-libs/intel-mediasdk/intel-mediasdk-23.2.1.ebuild
new file mode 100644
index 000000000000..a0674e307b13
--- /dev/null
+++ b/media-libs/intel-mediasdk/intel-mediasdk-23.2.1.ebuild
@@ -0,0 +1,91 @@
+# 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
+	)
+"
+
+PATCHES=(
+	# https://github.com/Intel-Media-SDK/MediaSDK/pull/2998
+	"${FILESDIR}/${PN}-23.2.0-gcc13.patch"
+)
+
+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/ksanecore/Manifest b/media-libs/ksanecore/Manifest
index 9e61734e8e08..2eafac063b9a 100644
--- a/media-libs/ksanecore/Manifest
+++ b/media-libs/ksanecore/Manifest
@@ -1,5 +1,5 @@
 DIST ksanecore-22.12.3.tar.xz 47072 BLAKE2B 0ffca990430a9be65f8b544a44c7df1ee59c974980cbff1cbe1394d14cf27eaee93b2babb2fea3a8a08c0ef8dbf7b53809ef99789b1f9d15bb2b5607a6aacc55 SHA512 73dcf6d65e587f2ec63453664c5b6ed4d35b230e4fd1cf9b3f548ea020dc80380dc6b86c2db01f69fb00ceadc278287a4f719a41386d882cd8107ac6f74abfc2
-DIST ksanecore-23.04.0.tar.xz 50028 BLAKE2B 053ec76b3a7e86ee51754644be0f10bf74f1e122bf76ba88b632ae5ad5982a08ddf0870926d0b6555ebe7feed63a99f793fd1d92b1e1fecf4fb5b5a6149e196b SHA512 02cd34f934c43f7ec94c294670b0f23bdee2a6bdaf5d092f44da5c5f21330d5b34dff6f46e6f0be5e6280de9de9a43d258393ddaabc4b9ee7a0bf0e2e06b12da
+DIST ksanecore-23.04.1.tar.xz 50264 BLAKE2B bf9ac1a6dcbac20d956a0b3aa66d079d482e10d102b7d7aba1ebe74a483a3d7ccad3a94a9294f1205bc7b9b83c5634186f1bd359a9c913e94c3ba9dfcea5a9a0 SHA512 fc741406c6c780f13b850d7201e5b61da362edf3ec34ef05616b775efb7bb5718e5d5524aa2e5ca120057b712f0d6bbf2c07a5c8fc966dea393842d69fdce24c
 EBUILD ksanecore-22.12.3.ebuild 547 BLAKE2B b25b0b254697a82dadfcda0e078fd0d855d08a60848ea618b970b6eca91e8a96bc7519a0921a669a3282842cbc299b63a54a226ec599f937cedfae36b6a3e02f SHA512 8a62f4b2075fde4285073628573ffe827ae31e39c0c0c6266f07872f9830ac79fe799577848303e60fe3137983bf1ab6fa85993a2f150789c4fc9613ff56467a
-EBUILD ksanecore-23.04.0.ebuild 550 BLAKE2B 1935d5052ed59b9392e81748e6230a233e875836be9d385a81f61c5813013c7dc987579f7ecdab5cb9ca71731a3a42eeb147f408c63a801102061508d500703b SHA512 d68293de5ede2d2708fbb896d16e277676bbcb75d515a48fdd94ec2710b7386066b07b3a885b268879062461193b430c47043522909a0ab5c65048f8faee2e3a
+EBUILD ksanecore-23.04.1.ebuild 550 BLAKE2B 1935d5052ed59b9392e81748e6230a233e875836be9d385a81f61c5813013c7dc987579f7ecdab5cb9ca71731a3a42eeb147f408c63a801102061508d500703b SHA512 d68293de5ede2d2708fbb896d16e277676bbcb75d515a48fdd94ec2710b7386066b07b3a885b268879062461193b430c47043522909a0ab5c65048f8faee2e3a
 MISC metadata.xml 250 BLAKE2B f3e9395137ebb9adf46cd35c1b6156f82c04cfa94f964f6da24fe71eb560cf51b4f70ebfa10daaa4884400ec22782d819ab794dfd29e7a47559f07208397195d SHA512 78c4ff15eed76ba883b457be95dabd41e928a0e64a42b758b5eab4d8a95afca27d5ea6a7cfe0948de578b169153a05f08aadfce1ddd41a88732212a1e76e565f
diff --git a/media-libs/ksanecore/ksanecore-23.04.0.ebuild b/media-libs/ksanecore/ksanecore-23.04.1.ebuild
index e8293e1d689a..e8293e1d689a 100644
--- a/media-libs/ksanecore/ksanecore-23.04.0.ebuild
+++ b/media-libs/ksanecore/ksanecore-23.04.1.ebuild
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index 88c5c5c07312..ef903238c0fe 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -3,6 +3,6 @@ AUX mesa-23.0.2-wayland-crash-warnings.patch 1430 BLAKE2B a7c7ef4a34ac9c76c4c5af
 DIST mesa-22.3.7.tar.xz 17136476 BLAKE2B 291e94302d3a177f842def9339d1ba012bf10de792b7120985255168faac6b87a73d1d59d8b430f56ea2a2640ca0890a5c3721188b70c528b9aad9788d7e139d SHA512 c37bbcb3c0be1908726d6f83bfe98126d681935e401e03946e8b540611f832d2f272a2ac470600c2b77caa5b9a3a9059eb34bd9a93fcf88df114bedf8c39bf5a
 DIST mesa-23.0.3.tar.xz 17627728 BLAKE2B e716d9ddce3da649239c1bc37ec208b9669f316f6b547ca0c69937043f371f0d59ead34fec427297171916045061ddb8783d126f6dec5ece90a0719003fe2c40 SHA512 52c778de61daa406c6a1e96a657e9b6fdcc71c8cfda80b7f53acc6470556c7d502c057b9481bb0c3d57ef0263263413fd0d25d53ebf5aa0246fbcc3309de64ae
 EBUILD mesa-22.3.7-r1.ebuild 12130 BLAKE2B a735afabb891b4b8600c5f00046496b12f845670b461f7fa078987368a2e0600729d45031dab04a7ad65a877df37445d33b25111ad43a65c0847f5a241bdf3d0 SHA512 c115092f8a8583f5f5bd71791541a6ff989b78b612a90ed95b9c189acb4ba9e3676269ad19e68df24b78dde8f84ad549e4976da7d50d9e6ca5c963d4c163192f
-EBUILD mesa-23.0.3-r1.ebuild 12281 BLAKE2B ee33a702a829d5d4e06c6e13999cd9e1778eb5a97d8ca38a319173b4bfb9f369f1936cfbb2efdd30a48faffe4c824f0252bd57eb0773ee79d1ab528d620b30ec SHA512 2cd60b52f55fb0cbcfd5ac0c27942ae3671ac85b27d6fbf2fb968fd0ed064ca74ab57a4bbd83d942bb68d4408662bfda62436e948d8e98184952d0dedb48d66b
+EBUILD mesa-23.0.3-r1.ebuild 12280 BLAKE2B b50889a716789308ae8aabfa472613d87f5a96ef157e369b5ce0ae0ed99549397bd6f6fb2e131d44a8a4f04ca523ffea4428b6e05b38013e2d1fc38f6a57d05f SHA512 ebe4d8cc45b24da3ec359c4f3844cbe305ca88b6ac7894b8a66d7fba3f1d6699954437a1aee77237f193c0dc3aaba8fab75e0aa65b7c69ffb6f96a173254c1ce
 EBUILD mesa-9999.ebuild 12152 BLAKE2B 29d5a5df3e9222d41402b7a530264178d6c786b99334dca52b198a3ae0c49e5d1bb6d562fe3df718d78936b76592eebec5803efd5da2120d0ff464a0bcc69ffc SHA512 aa422813ae441467a77bc3e8af3c69a371788c80691f7e120b017b4a1cb0a609846c3661506d6ccce469ad1315c78f7431e479e703661ab0c8b59c3db7bc21dd
 MISC metadata.xml 1606 BLAKE2B 0f0d0be785aef5042a0a0ae6ce0855dea4ff0105db96339f6f81ac8e3e956f363a90d08bf087924e33873e9bf0182487cdd7ba7baa72b97d17db8afdc375b7e5 SHA512 cf6fe4938eef2e6bccbea43e63b271b5f55ad73b3201a36c484b0f72cd56efb70df6502296828a778477d72848474d8bdbf5ab270dc1dbe96b7464716a1bdc82
diff --git a/media-libs/mesa/mesa-23.0.3-r1.ebuild b/media-libs/mesa/mesa-23.0.3-r1.ebuild
index 767e5341ebf6..da9421be2d4a 100644
--- a/media-libs/mesa/mesa-23.0.3-r1.ebuild
+++ b/media-libs/mesa/mesa-23.0.3-r1.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://archive.mesa3d.org/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="MIT"
diff --git a/media-libs/oneVPL-intel-gpu/Manifest b/media-libs/oneVPL-intel-gpu/Manifest
index 2c23e395bca7..5512a3dbcc05 100644
--- a/media-libs/oneVPL-intel-gpu/Manifest
+++ b/media-libs/oneVPL-intel-gpu/Manifest
@@ -1,5 +1,7 @@
 DIST oneVPL-intel-gpu-22.6.5.tar.gz 6836805 BLAKE2B 73c2f0a7ec0f0712db737cbaee7c62d9801ebca3b75185bc35156922d04da1076015fcf9491be4ebe4cd2d5c87c90903d818a012d4af5c5393f298bd06fad200 SHA512 505bfc0235748fc4a3ee9229e5ffdb815212427266238dbaf0463565ec415c9c767247b6a1c6c10e479da186b834e5df114798a8e84d7b97873d1d97748e9bb5
 DIST oneVPL-intel-gpu-23.2.0.tar.gz 6983812 BLAKE2B b3e58e9b79f0689f847a7268fe2b465d424d5716298a3a61586be994d5bb8d3d68f90ef7bb3f877f799fead58b5acdecc64ed0c86e803770738f370d2b3f333f SHA512 fd8778bc197ab912d704a74c447f830451bfdd33614bae3ba62f4712ee9a90a54ffa6562e925aa1a5d0fc12e6b9494f9018753ce57e8ec49a5b7602a117e8321
+DIST oneVPL-intel-gpu-23.2.1.tar.gz 6987103 BLAKE2B f4634aecfe3baba96b230d56915f864c1655c725fd05c72be9033406794afa7f501c42c13c442d676367a0ddbe176fcec9c1df6ec3013320fe3af2e348879ab8 SHA512 c097b0eb1879303d9138f8e92110216cd2e703ab3ad0ef2890678734b26b73037abc4724531f3ce4628993790f8de12bde82a9097df0f42e12a88b10ba5a9ae5
 EBUILD oneVPL-intel-gpu-22.6.5.ebuild 1189 BLAKE2B 8a6ed3716eb86c59cafe38febd015d9d66ed96f7db2397f9b3cf97283ed367d8d3ff49a764f97a0f59b831611576792df1398bd29d1cc740be7e0e6ccad8f62a SHA512 92c6095b06adfb4d3e697c8a2958d2afa9b5a50d13c1c16b870540be3356006a81913db012afbc8f5f9e0db96c29b95da6c547e9b9613666bbcdf932b33574db
 EBUILD oneVPL-intel-gpu-23.2.0.ebuild 1189 BLAKE2B b18f9405ece1aaf46f2bfc3ed514eb5ccbc16489412414b8a6e612c1fd34418fd85d801d4c2a786d8d6764163cc5b2a6f82b18086022a547b6666fedaf7446b1 SHA512 0279e6caa0ef6e730314b3ed8a7a64188f883375e439fd287761fab69967038b093c21e5437c5775f8b2196fc01d75fe8c2a21e4ae9c4bd46584113ba82fd8e4
+EBUILD oneVPL-intel-gpu-23.2.1.ebuild 1189 BLAKE2B b18f9405ece1aaf46f2bfc3ed514eb5ccbc16489412414b8a6e612c1fd34418fd85d801d4c2a786d8d6764163cc5b2a6f82b18086022a547b6666fedaf7446b1 SHA512 0279e6caa0ef6e730314b3ed8a7a64188f883375e439fd287761fab69967038b093c21e5437c5775f8b2196fc01d75fe8c2a21e4ae9c4bd46584113ba82fd8e4
 MISC metadata.xml 434 BLAKE2B f5f6ea2e0ebac9ba06ebdb2a8469e99171f25ad08d8e992695e7d189f5c3f8fb3e966d710fe02cbd1f590f2137e265d9bf5014f0d9e7a492574b526360d70133 SHA512 713bf6044fd4d5606568af248dc0adf1a93c5917fb7d6d79c7a033a5b52a0164769b02086caa0a4492979c586511b5a4d7b85fe603ffe80d4884786e05dc520e
diff --git a/media-libs/oneVPL-intel-gpu/oneVPL-intel-gpu-23.2.1.ebuild b/media-libs/oneVPL-intel-gpu/oneVPL-intel-gpu-23.2.1.ebuild
new file mode 100644
index 000000000000..6d87d22aff64
--- /dev/null
+++ b/media-libs/oneVPL-intel-gpu/oneVPL-intel-gpu-23.2.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="oneAPI Video Processing Library Intel GPU implementation"
+HOMEPAGE="https://github.com/oneapi-src/oneVPL-intel-gpu"
+SRC_URI="https://github.com/oneapi-src/oneVPL-intel-gpu/archive/refs/tags/intel-onevpl-${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-intel-onevpl-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	media-libs/libva
+	x11-libs/libdrm[video_cards_intel]
+"
+# At runtime we need a dispatcher, oneVPL is preferred but mediasdk also works
+RDEPEND="${DEPEND}
+	>=media-libs/libva-intel-media-driver-${PV}
+	|| (
+		media-libs/oneVPL[drm,vaapi]
+		media-libs/intel-mediasdk
+	)
+"
+BDEPEND="virtual/pkgconfig"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_RUNTIME=ON
+		# To build the kernels we need to package the cm-compiler, use pre-built instead
+		-DBUILD_KERNELS=OFF
+		-DBUILD_TESTS="$(usex test)"
+		# This only seems to do something if we BUILD_KERNELS=ON
+		#-DBUILD_TOOLS="$(usex tools)"
+		# OpenCL only has an effect if we build kernels
+		-DENABLE_OPENCL=OFF
+	)
+	cmake_src_configure
+}