10 files changed, 466 insertions, 7 deletions
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 637b97b3f4a4..a629e4672b88 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/libva-intel-media-driver/Manifest b/media-libs/libva-intel-media-driver/Manifest
index 11f44177d2e0..bc1c4bf7e022 100644
--- a/media-libs/libva-intel-media-driver/Manifest
+++ b/media-libs/libva-intel-media-driver/Manifest
@@ -8,6 +8,6 @@ DIST intel-media-23.3.2.tar.gz 28672587 BLAKE2B 15ae0b33c34e7ea6e9b4fa7424c54ad7
 EBUILD libva-intel-media-driver-23.2.4.ebuild 1511 BLAKE2B 08fb338238101411450d4b2ada8e8e7e2a4598394db29ceead660aa2a7356544d06b4ce28bd932e1c4a7de8ba479709624b0c9501ab74244f9f18ed66870d405 SHA512 2c625e14d5bf6678f0631072345bd97939178a15e657659ced38c488dfe62ad30e97eafc72ccc8bfeeeb55ad452e8b2387c9dbe2dad5003d9925b00ab56595f5
 EBUILD libva-intel-media-driver-23.3.0.ebuild 1512 BLAKE2B 6e4273c87c9ce89e139084e54585cf275e848dcdf23d87e7dbdaca39e479af4a38ac19ef68899200029d10ce29ee6b8e62c8bd07009f46af3bd9a6c539f8c7df SHA512 6715ad975388fe9c51de8d695549b41df8ac83cbf7612f12321523ae68fe5bb20beb6732ab9412297fc4a52244f38a09872390e167281e0857a32c762bada1a0
 EBUILD libva-intel-media-driver-23.3.1.ebuild 1512 BLAKE2B 6e4273c87c9ce89e139084e54585cf275e848dcdf23d87e7dbdaca39e479af4a38ac19ef68899200029d10ce29ee6b8e62c8bd07009f46af3bd9a6c539f8c7df SHA512 6715ad975388fe9c51de8d695549b41df8ac83cbf7612f12321523ae68fe5bb20beb6732ab9412297fc4a52244f38a09872390e167281e0857a32c762bada1a0
-EBUILD libva-intel-media-driver-23.3.2.ebuild 1512 BLAKE2B 6e4273c87c9ce89e139084e54585cf275e848dcdf23d87e7dbdaca39e479af4a38ac19ef68899200029d10ce29ee6b8e62c8bd07009f46af3bd9a6c539f8c7df SHA512 6715ad975388fe9c51de8d695549b41df8ac83cbf7612f12321523ae68fe5bb20beb6732ab9412297fc4a52244f38a09872390e167281e0857a32c762bada1a0
-EBUILD libva-intel-media-driver-9999.ebuild 1535 BLAKE2B 931f5a0680ec2677fc9aa82ccaf02e6f6662de9402d7153f2f235afc3ee1a1296ade947135142b046a495ba621fb14c61a21f42ab74759fa084f4061f8bd4b1c SHA512 e456f1894826d93798270cebae93fbce025f4635ca7b8298b7e5026cf344bdb851b69e7b36aca4c85eb9836a36ec6cbc4086c4b652eaa20b185b844e357f9f0e
+EBUILD libva-intel-media-driver-23.3.2.ebuild 1513 BLAKE2B c74317814cbd6955924f3de6df55c60dedb5cc6321882e188641812c3cffca6e0a3e9ef24794226e6911e6309d61b99ac244e7464b739abed8edda04d81e9a5b SHA512 5ce4963cc828ac3fabd9b18227186df0f3ca9989a0c7498cfb8f65dbcd5bc49b2dcc7bbe115f527ad2489ef5aa83819241a8b4f2a7b31805364d3c970966d936
+EBUILD libva-intel-media-driver-9999.ebuild 1536 BLAKE2B e94703e45e48555f48821a87a56f0063c387655352dfe97e3cd8c84243509920d789cc1103819c586868076f85482c11df3ddc9f4f692ba29e17b0962a9d6de1 SHA512 2a8b3a577ab65e94ecbd93794bb57aef1bacb1f4bd346073b3892db0961251e51d9892c3011a8d2bbe51da497dfbbea403d6884126f7731d966635d9195deaef
 MISC metadata.xml 565 BLAKE2B e630d474342839898d53aef1849b002ef651c9f4fe3bfcfe72e809012e6c65153b1a6c14db922a45440ffd5717b90dddd6973185f8a625906e9d5571e50728d9 SHA512 22227f8a9cc39fff74f0bf2cdc8953f110e94ce0ab107076269d604c3cf8ae46c8496c9bcf47598e351cb9714e427f213ade5e446a5e8c67acfc87db5530b370
diff --git a/media-libs/libva-intel-media-driver/libva-intel-media-driver-23.3.2.ebuild b/media-libs/libva-intel-media-driver/libva-intel-media-driver-23.3.2.ebuild
index 4b8e3b107c7b..50589b61de5b 100644
--- a/media-libs/libva-intel-media-driver/libva-intel-media-driver-23.3.2.ebuild
+++ b/media-libs/libva-intel-media-driver/libva-intel-media-driver-23.3.2.ebuild
@@ -29,7 +29,7 @@ IUSE="+redistributable test X"
 
 RESTRICT="!test? ( test )"
 
-DEPEND=">=media-libs/gmmlib-22.3.9:=[${MULTILIB_USEDEP}]
+DEPEND=">=media-libs/gmmlib-22.3.10:=[${MULTILIB_USEDEP}]
 	>=media-libs/libva-2.19.0[X?,${MULTILIB_USEDEP}]
 "
 RDEPEND="${DEPEND}"
diff --git a/media-libs/libva-intel-media-driver/libva-intel-media-driver-9999.ebuild b/media-libs/libva-intel-media-driver/libva-intel-media-driver-9999.ebuild
index 2552e63603a9..4eeb0fa4f80e 100644
--- a/media-libs/libva-intel-media-driver/libva-intel-media-driver-9999.ebuild
+++ b/media-libs/libva-intel-media-driver/libva-intel-media-driver-9999.ebuild
@@ -29,7 +29,7 @@ IUSE="+redistributable test X"
 
 RESTRICT="!test? ( test )"
 
-DEPEND=">=media-libs/gmmlib-22.3.9:=[${MULTILIB_USEDEP}]
+DEPEND=">=media-libs/gmmlib-22.3.10:=[${MULTILIB_USEDEP}]
 	>=media-libs/libva-2.19.0[X?,${MULTILIB_USEDEP}]
 "
 RDEPEND="${DEPEND}"
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index a55809088c6e..e783b208f6a0 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -1,7 +1,9 @@
 AUX clang_resource_dir.patch 1129 BLAKE2B 40cf2bc3381d5318c95d3fdadef1bdb6bb57f3b04270e07c0a66613b6432ad617be73d34122be3280d861dde0663fc5c96bb37a9312c2e333e39e69287a9e33a SHA512 493585cf0a93fda04d4577095ae04e1c3dc37aa446ea0873e81857cd2f2c6519bbdf34f0d6e6dd47dd1e927cc776f46901ebab14c7040a92688c3868204b3856
 DIST mesa-23.1.6.tar.xz 18505124 BLAKE2B 78b71ede0655e538a71d22ecbfb0bed7497c258a16ce5f7d9b627a4c9372f26292a50aec848a4923524e4862b00a6d5d3d2521b05033d9cf39d31f037bdb9254 SHA512 24f1c626fa05a82bcdfb24b67b8e5f96f94d5748309631b83e8d7a62142853cd3be90b92c56bac3bc4d223bf40b424d6d6a9977537b899107295b7d45d7e2575
+DIST mesa-23.1.7.tar.xz 18544916 BLAKE2B ec688b2a5db396423e53b8798dfbff0c2034e6f0f80e3b73a27b92b0441cfa8578bb633577b5199f1a4a107bdf80af23bc4663b424324f2f71b0abcaa6c4b103 SHA512 a5b8bebd2cbdb89fe38de0ff68629c76d248773543e23b77c9035ee0574321e8c0f7cb517decd8896e9dededf132ad87c2b7bddd58af8b97a843a99d158a61d4
 DIST mesa-23.2.0-rc3.tar.xz 18798600 BLAKE2B f00b559128bb5b0214447ba93b69c0b2953dee52c6354d032d1a2b16de7e8314385f79e7796971e3b500b45c23b4ae3804898d19e9acbb255341c870a5f4c644 SHA512 e6b3588f0d469cb42b2cf4df39bbde755f72ebec9a056da0add188dd419c4e342b131d6b551933868705d14b4cd5f707d91ae592ec01a9fb6c1413aa08a183a7
 EBUILD mesa-23.1.6.ebuild 12426 BLAKE2B eabd8a66168d13e7abad3c86708e9cc45bc7f4edf218ae847c0d2d8976b19a5592fbfeb4ba9b3a6729c9d41f8f4e26ca6b3749f90c96174ba7837c0935795132 SHA512 bfea41825da00d9223cbcb45ba61189d1f3657188f85cb4142008f9da57a5decfde0db361760f91ada3b84fb09d777fbdb609c952f31eda8ff88a2483b422274
+EBUILD mesa-23.1.7.ebuild 12433 BLAKE2B 9b3e18d6d87a73e6a176ff1386590c8a938c858ca8d68b3c0e250b7063224a2d359dd3786768ac657ee48799630605b34a10d6f8cd7dff346564310298871668 SHA512 d0600515bd3e541d2b1c48f8ebe51774c4d797ceb7faa85c5dcbbc701ffaa7aa7fb19ba15ef1070a510be9a7564696b218d2df815f6607ab21ba5f3225a98c9d
 EBUILD mesa-23.2.0_rc3.ebuild 12491 BLAKE2B 903224980095b456711c36dee36198d78377bb0592b340d9fed43637f1330383701f88a68bd3a4aa5fb8d2dfd40917454e97afef757563314a6d0353e96bab53 SHA512 64961c0db12c380a0b1cbbe443b7c122f5590a3955bd63c6a5bcbd46d40acdb1038e49bc3b12724b88f20eae9f5dd35de8c477d0f6c93b82395d3bcfc219a52d
 EBUILD mesa-9999.ebuild 12362 BLAKE2B 65326af1729dc5a92a621a8735aaaad71217773b0da1a8930df945071ed821efa3f24c76170d627f81c11eff52899ba7fb57609014bc2acf12f4289c5cacb26d SHA512 34447b66e911adbe37ae09c89a1d350ec096095535755f53d511804b30a8d9476fdc9feb6508e4c077c39354b34da649f818df1b4b6411eec39175c293942f29
 MISC metadata.xml 1488 BLAKE2B 7b776f0a6d92b34baec90c58d019d61af537044766ce34a6e139ef679a0724e57fe65d600307c7f9dc0c48618445527618322e2af737191082dece3e547d5533 SHA512 1d573d534f1099eb1f1912567cf559aeae28111eabefa806b292a66d1f1e539e86394a76ca40a1481a6bfb4b6f7a0b117344e39d7b4d2eac615ef49b8f62acb9
diff --git a/media-libs/mesa/mesa-23.1.7.ebuild b/media-libs/mesa/mesa-23.1.7.ebuild
new file mode 100644
index 000000000000..6036a8c0264b
--- /dev/null
+++ b/media-libs/mesa/mesa-23.1.7.ebuild
@@ -0,0 +1,454 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit llvm meson-multilib python-any-r1 linux-info
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="OpenGL-like graphic library for Linux"
+HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
+	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 ~x64-solaris"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+RESTRICT="!test? ( test )"
+
+RADEON_CARDS="r300 r600 radeon radeonsi"
+VIDEO_CARDS="${RADEON_CARDS} d3d12 freedreno intel lavapipe lima nouveau panfrost v3d vc4 virgl vivante vmware"
+for card in ${VIDEO_CARDS}; do
+	IUSE_VIDEO_CARDS+=" video_cards_${card}"
+done
+
+IUSE="${IUSE_VIDEO_CARDS}
+	cpu_flags_x86_sse2 d3d9 debug gles1 +gles2 +llvm
+	lm-sensors opencl osmesa +proprietary-codecs selinux
+	test unwind vaapi valgrind vdpau vulkan
+	vulkan-overlay wayland +X xa zink +zstd"
+
+REQUIRED_USE="
+	d3d9? (
+		|| (
+			video_cards_intel
+			video_cards_r300
+			video_cards_r600
+			video_cards_radeonsi
+			video_cards_nouveau
+			video_cards_vmware
+		)
+	)
+	vulkan? ( video_cards_radeonsi? ( llvm ) )
+	vulkan-overlay? ( vulkan )
+	video_cards_lavapipe? ( llvm vulkan )
+	video_cards_radeon? ( x86? ( llvm ) amd64? ( llvm ) )
+	video_cards_r300?   ( x86? ( llvm ) amd64? ( llvm ) )
+	video_cards_radeonsi?   ( llvm )
+	vdpau? ( X )
+	xa? ( X )
+	zink? ( vulkan )
+"
+
+LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.110"
+RDEPEND="
+	>=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}]
+	>=media-libs/libglvnd-1.3.2[X?,${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
+	unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
+	llvm? (
+		video_cards_radeonsi? (
+			virtual/libelf:0=[${MULTILIB_USEDEP}]
+		)
+		video_cards_r600? (
+			virtual/libelf:0=[${MULTILIB_USEDEP}]
+		)
+		video_cards_radeon? (
+			virtual/libelf:0=[${MULTILIB_USEDEP}]
+		)
+	)
+	lm-sensors? ( sys-apps/lm-sensors:=[${MULTILIB_USEDEP}] )
+	opencl? (
+		>=virtual/opencl-3
+		dev-libs/libclc[spirv(-)]
+		>=dev-util/spirv-tools-1.3.231.0
+		virtual/libelf:0=
+	)
+	vaapi? (
+		>=media-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
+	)
+	vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
+	vulkan? (
+		video_cards_intel? (
+			amd64? (
+				dev-libs/libclc[spirv(-)]
+				>=dev-util/spirv-tools-1.3.231.0
+			)
+		)
+	)
+	selinux? ( sys-libs/libselinux[${MULTILIB_USEDEP}] )
+	wayland? ( >=dev-libs/wayland-1.18.0[${MULTILIB_USEDEP}] )
+	${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_intel?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
+	X? (
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libxshmfence-1.1[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXxf86vm-1.1.3[${MULTILIB_USEDEP}]
+		>=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}]
+		x11-libs/libXfixes[${MULTILIB_USEDEP}]
+	)
+	zink? ( media-libs/vulkan-loader:=[${MULTILIB_USEDEP}] )
+	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
+"
+for card in ${RADEON_CARDS}; do
+	RDEPEND="${RDEPEND}
+		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
+	"
+done
+RDEPEND="${RDEPEND}
+	video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
+"
+
+# Please keep the LLVM dependency block separate. Since LLVM is slotted,
+# we need to *really* make sure we're not pulling one than more slot
+# simultaneously.
+#
+# How to use it:
+# 1. Specify LLVM_MAX_SLOT (inclusive), e.g. 16.
+# 2. Specify LLVM_MIN_SLOT (inclusive), e.g. 15.
+LLVM_MAX_SLOT="16"
+LLVM_MIN_SLOT="15"
+LLVM_USE_DEPS="llvm_targets_AMDGPU(+),${MULTILIB_USEDEP}"
+PER_SLOT_DEPSTR="
+	(
+		!opencl? ( sys-devel/llvm:@SLOT@[${LLVM_USE_DEPS}] )
+		opencl? ( sys-devel/clang:@SLOT@[${LLVM_USE_DEPS}] )
+		opencl? ( dev-util/spirv-llvm-translator:@SLOT@ )
+		vulkan? ( video_cards_intel? ( amd64? ( dev-util/spirv-llvm-translator:@SLOT@ ) ) )
+	)
+"
+LLVM_DEPSTR="
+	|| (
+		$(for ((slot=LLVM_MAX_SLOT; slot>=LLVM_MIN_SLOT; slot--)); do
+			echo "${PER_SLOT_DEPSTR//@SLOT@/${slot}}"
+		done)
+	)
+	!opencl? ( <sys-devel/llvm-$((LLVM_MAX_SLOT + 1)):=[${LLVM_USE_DEPS}] )
+	opencl? ( <sys-devel/clang-$((LLVM_MAX_SLOT + 1)):=[${LLVM_USE_DEPS}] )
+"
+RDEPEND="${RDEPEND}
+	llvm? ( ${LLVM_DEPSTR} )
+"
+unset LLVM_MIN_SLOT {LLVM,PER_SLOT}_DEPSTR
+
+DEPEND="${RDEPEND}
+	video_cards_d3d12? ( dev-util/directx-headers[${MULTILIB_USEDEP}] )
+	valgrind? ( dev-util/valgrind )
+	wayland? ( >=dev-libs/wayland-protocols-1.24 )
+	X? (
+		x11-libs/libXrandr[${MULTILIB_USEDEP}]
+		x11-base/xorg-proto
+	)
+"
+BDEPEND="
+	>=dev-util/meson-1.0.0
+	${PYTHON_DEPS}
+	opencl? (
+		>=virtual/rust-1.62.0
+		>=dev-util/bindgen-0.58.0
+	)
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+	$(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]")
+	llvm? (
+		vulkan? (
+			dev-util/glslang
+			video_cards_intel? (
+				amd64? (
+					$(python_gen_any_dep "dev-python/ply[\${PYTHON_USEDEP}]")
+				)
+			)
+		)
+	)
+	wayland? ( dev-util/wayland-scanner )
+"
+
+S="${WORKDIR}/${MY_P}"
+EGIT_CHECKOUT_DIR=${S}
+
+QA_WX_LOAD="
+x86? (
+	usr/lib/libglapi.so.0.0.0
+	usr/lib/libOSMesa.so.8.0.0
+	usr/lib/libGLX_mesa.so.0.0.0
+)"
+
+llvm_check_deps() {
+	if use opencl; then
+		has_version "sys-devel/clang:${LLVM_SLOT}[${LLVM_USE_DEPS}]" || return 1
+	fi
+	if use opencl || { use vulkan && use video_cards_intel && use amd64; }; then
+		has_version "dev-util/spirv-llvm-translator:${LLVM_SLOT}" || return 1
+	fi
+	has_version "sys-devel/llvm:${LLVM_SLOT}[${LLVM_USE_DEPS}]"
+}
+
+PATCHES=(
+	# Temporary rusticl workaround: https://gitlab.freedesktop.org/mesa/mesa/-/issues/7717#note_1832122
+	"${FILESDIR}/clang_resource_dir.patch"
+)
+
+pkg_pretend() {
+	if use vulkan; then
+		if ! use video_cards_d3d12 &&
+		   ! use video_cards_freedreno &&
+		   ! use video_cards_intel &&
+		   ! use video_cards_radeonsi &&
+		   ! use video_cards_v3d; then
+			ewarn "Ignoring USE=vulkan     since VIDEO_CARDS does not contain d3d12, freedreno, intel, radeonsi, or v3d"
+		fi
+	fi
+
+	if use vaapi; then
+		if ! use video_cards_d3d12 &&
+		   ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi &&
+		   ! use video_cards_nouveau; then
+			ewarn "Ignoring USE=vaapi      since VIDEO_CARDS does not contain d3d12, r600, radeonsi, or nouveau"
+		fi
+	fi
+
+	if use vdpau; then
+		if ! use video_cards_d3d12 &&
+		   ! use video_cards_r300 &&
+		   ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi &&
+		   ! use video_cards_nouveau; then
+			ewarn "Ignoring USE=vdpau      since VIDEO_CARDS does not contain d3d12, r300, r600, radeonsi, or nouveau"
+		fi
+	fi
+
+	if use xa; then
+		if ! use video_cards_freedreno &&
+		   ! use video_cards_nouveau &&
+		   ! use video_cards_vmware; then
+			ewarn "Ignoring USE=xa         since VIDEO_CARDS does not contain freedreno, nouveau, or vmware"
+		fi
+	fi
+
+	if ! use llvm; then
+		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain llvm"
+	fi
+
+	if use osmesa && ! use llvm; then
+		ewarn "OSMesa will be slow without enabling USE=llvm"
+	fi
+}
+
+python_check_deps() {
+	python_has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]" || return 1
+	if use llvm && use vulkan && use video_cards_intel && use amd64; then
+		python_has_version -b "dev-python/ply[${PYTHON_USEDEP}]" || return 1
+	fi
+}
+
+pkg_setup() {
+	# warning message for bug 459306
+	if use llvm && has_version sys-devel/llvm[!debug=]; then
+		ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
+		ewarn "detected! This can cause problems. For details, see bug 459306."
+	fi
+
+	if use video_cards_intel ||
+	   use video_cards_radeonsi; then
+		if kernel_is -ge 5 11 3; then
+			CONFIG_CHECK="~KCMP"
+		elif kernel_is -ge 5 11; then
+			CONFIG_CHECK="~CHECKPOINT_RESTORE"
+		elif kernel_is -ge 5 10 20; then
+			CONFIG_CHECK="~KCMP"
+		else
+			CONFIG_CHECK="~CHECKPOINT_RESTORE"
+		fi
+		linux-info_pkg_setup
+	fi
+
+	if use llvm; then
+		llvm_pkg_setup
+	fi
+	python-any-r1_pkg_setup
+}
+
+multilib_src_configure() {
+	local emesonargs=()
+
+	local platforms
+	use X && platforms+="x11"
+	use wayland && platforms+=",wayland"
+	emesonargs+=(-Dplatforms=${platforms#,})
+
+	if use video_cards_intel ||
+	   use video_cards_r300 ||
+	   use video_cards_r600 ||
+	   use video_cards_radeonsi ||
+	   use video_cards_nouveau ||
+	   use video_cards_vmware; then
+		emesonargs+=($(meson_use d3d9 gallium-nine))
+	else
+		emesonargs+=(-Dgallium-nine=false)
+	fi
+
+	if use video_cards_d3d12 ||
+	   use video_cards_r600 ||
+	   use video_cards_radeonsi ||
+	   use video_cards_nouveau; then
+		emesonargs+=($(meson_feature vaapi gallium-va))
+		use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers )
+	else
+		emesonargs+=(-Dgallium-va=disabled)
+	fi
+
+	if use video_cards_d3d12; then
+		emesonargs+=($(meson_feature vaapi gallium-d3d12-video))
+	fi
+
+	if use video_cards_d3d12 ||
+	   use video_cards_r300 ||
+	   use video_cards_r600 ||
+	   use video_cards_radeonsi ||
+	   use video_cards_nouveau; then
+		emesonargs+=($(meson_feature vdpau gallium-vdpau))
+	else
+		emesonargs+=(-Dgallium-vdpau=disabled)
+	fi
+
+	if use video_cards_freedreno ||
+	   use video_cards_nouveau ||
+	   use video_cards_vmware; then
+		emesonargs+=($(meson_feature xa gallium-xa))
+	else
+		emesonargs+=(-Dgallium-xa=disabled)
+	fi
+
+	if use video_cards_freedreno ||
+	   use video_cards_lima ||
+	   use video_cards_panfrost ||
+	   use video_cards_v3d ||
+	   use video_cards_vc4 ||
+	   use video_cards_vivante; then
+		gallium_enable -- kmsro
+	fi
+
+	gallium_enable -- swrast
+	gallium_enable video_cards_freedreno freedreno
+	gallium_enable video_cards_intel crocus i915 iris
+	gallium_enable video_cards_lima lima
+	gallium_enable video_cards_d3d12 d3d12
+	gallium_enable video_cards_nouveau nouveau
+	gallium_enable video_cards_panfrost panfrost
+	gallium_enable video_cards_v3d v3d
+	gallium_enable video_cards_vc4 vc4
+	gallium_enable video_cards_virgl virgl
+	gallium_enable video_cards_vivante etnaviv
+	gallium_enable video_cards_vmware svga
+	gallium_enable zink zink
+
+	gallium_enable video_cards_r300 r300
+	gallium_enable video_cards_r600 r600
+	gallium_enable video_cards_radeonsi radeonsi
+	if ! use video_cards_r300 && \
+		! use video_cards_r600; then
+		gallium_enable video_cards_radeon r300 r600
+	fi
+
+	if use llvm && use opencl; then
+		PKG_CONFIG_PATH="$(get_llvm_prefix)/$(get_libdir)/pkgconfig"
+		# See https://gitlab.freedesktop.org/mesa/mesa/-/blob/main/docs/rusticl.rst
+		emesonargs+=(
+			$(meson_native_true gallium-rusticl)
+			-Drust_std=2021
+		)
+	fi
+
+	if use vulkan; then
+		vulkan_enable video_cards_lavapipe swrast
+		vulkan_enable video_cards_freedreno freedreno
+		vulkan_enable video_cards_intel intel intel_hasvk
+		vulkan_enable video_cards_d3d12 microsoft-experimental
+		vulkan_enable video_cards_radeonsi amd
+		vulkan_enable video_cards_v3d broadcom
+	fi
+
+	driver_list() {
+		local drivers="$(sort -u <<< "${1// /$'\n'}")"
+		echo "${drivers//$'\n'/,}"
+	}
+
+	local vulkan_layers
+	use vulkan && vulkan_layers+="device-select"
+	use vulkan-overlay && vulkan_layers+=",overlay"
+	emesonargs+=(-Dvulkan-layers=${vulkan_layers#,})
+
+	if use llvm && use vulkan && use video_cards_intel; then
+		PKG_CONFIG_PATH="$(get_llvm_prefix)/$(get_libdir)/pkgconfig"
+		emesonargs+=(-Dintel-clc=enabled)
+	else
+		emesonargs+=(-Dintel-clc=disabled)
+	fi
+
+	emesonargs+=(
+		$(meson_use test build-tests)
+		-Dglx=$(usex X dri disabled)
+		-Dshared-glapi=enabled
+		-Ddri3=enabled
+		-Degl=enabled
+		-Dexpat=enabled
+		-Dgbm=enabled
+		-Dglvnd=true
+		$(meson_feature gles1)
+		$(meson_feature gles2)
+		$(meson_feature llvm)
+		$(meson_feature lm-sensors lmsensors)
+		$(meson_use osmesa)
+		$(meson_use selinux)
+		$(meson_feature unwind libunwind)
+		$(meson_feature zstd)
+		$(meson_use cpu_flags_x86_sse2 sse2)
+		-Dvalgrind=$(usex valgrind auto disabled)
+		-Dvideo-codecs=$(usex proprietary-codecs "h264dec,h264enc,h265dec,h265enc,vc1dec" "")
+		-Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
+		-Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
+		--buildtype $(usex debug debug plain)
+		-Db_ndebug=$(usex debug false true)
+	)
+	meson_src_configure
+}
+
+multilib_src_test() {
+	meson_src_test -t 100
+}
+
+# $1 - VIDEO_CARDS flag (check skipped for "--")
+# other args - names of DRI drivers to enable
+gallium_enable() {
+	if [[ $1 == -- ]] || use $1; then
+		shift
+		GALLIUM_DRIVERS+=("$@")
+	fi
+}
+
+vulkan_enable() {
+	if [[ $1 == -- ]] || use $1; then
+		shift
+		VULKAN_DRIVERS+=("$@")
+	fi
+}
diff --git a/media-libs/vulkan-layers/Manifest b/media-libs/vulkan-layers/Manifest
index 99d88c9b0629..8fb66a970369 100644
--- a/media-libs/vulkan-layers/Manifest
+++ b/media-libs/vulkan-layers/Manifest
@@ -1,7 +1,7 @@
 AUX vulkan-layers-1.3.250-Build-shared-libs.patch 333 BLAKE2B 557bfc8dc1639f31b873ec950dc9d99f4632d953b7c3d104d0b69b68985a0d214a4d5eb42a64d28aeed41a889515305f47f8a1b3646501d36f99d67c79f24789 SHA512 ddd30ac012cfa0e1ea7cbc84c11d4398272c9f2314bb8f0d3a3758f89162239feaff0e1044284a730a8288754dd1b6cab99b98e28199457a81137a7a22601413
 DIST vulkan-layers-1.3.250.tar.gz 4829919 BLAKE2B 9e05c53d283df1d57c20574224333249e468242eb73f7feb9ce47b4d194a80a1b1958bc71743eed3d108cedba972eeb9aa27ef33e838828e8a0baefe85254613 SHA512 5e8aef501961b49d7b4390d8c8ce09fe0b7657d323859d2052a8a14b042da69d7b1387a8aadede8372711313518b6d75fb78f41e2e0c1ad69c99a5b58524fb82
 DIST vulkan-layers-1.3.261.tar.gz 5005066 BLAKE2B 76eee1121e58892be3b608d4fda17d1ef67bf1e8a361ff9b51651fb9dd80c14b52798e8978d4167d51f7dfe09a680f10868d2a4b576ff5af8938cbf2d0f943fa SHA512 cadd44773701b0937956c1b1f7c6a9f8c574c857af044271a64065367ec8c453dbda04c5bd42e307d7997441e9ad67df5656f18b5a81b315174ec8618cfe0e1a
-EBUILD vulkan-layers-1.3.250.ebuild 1568 BLAKE2B d90b7b98bd974e8dbe15184cb9a64a45f6a696ca1e5a976011f1485ced2f58003d8ee44a3ef29b29f2653548ade2e4703a12f30f51cbbe0fe289466e3051bf5b SHA512 36b28ca8a18303688e9fa2698b33ccf9144054e45a38ebbd74c198d958f461f7ba6453fa38e5cfd0bf6ce11963aa4a90be4f7919492353ed89ad7ffd1e87d392
-EBUILD vulkan-layers-1.3.261.ebuild 1574 BLAKE2B 5012ec35f581aee7d0fa2696248b814034fdbc1b9e1190bee24bb6eda41d4cf02f92e23f6f5c7226a04c218fd0cb7d7049f7db834da9b2ba1448116e4b6d9688 SHA512 05d5c4a86b20b5a0a12306c26c70029fd723c9635b207604ab98bc7a82c78698edbcd5d690fb78851b09a05f7835e573b5d54e8275b2486a45c8e58ff3513568
-EBUILD vulkan-layers-9999.ebuild 1577 BLAKE2B 5172b581017817a8db8cc126566a54d8712cdc9456c246b041171fa8811d1e66bd871923face2031f81a077d03ce0d29e93c3973038cee0338c7d577c8b26e27 SHA512 0ce7e8918612899e41a4d93a7380d887df8d06b134303df2ae6f9def522fbddf3e03f9075d8e5e958d7f2c3b4e2e0fd37fba2f7e5938c8729d49b65d6c1d601f
+EBUILD vulkan-layers-1.3.250.ebuild 1599 BLAKE2B ba24ff8608d26f7bf2f68717202e3f728631c010d0a070cdedf1e1c5dcc82a8003428026ae49e324e211215e2a1aebcde702a6cda65278b1c24bbcdc965b2ec8 SHA512 6f5250cc7bbf04330f0394a524b6472ead35740b6b65c022ef15b027d88aa8ef57bcc6b27ab97a8ec66d0570889378882ea04fdffaf44d19023186c872da086d
+EBUILD vulkan-layers-1.3.261.ebuild 1605 BLAKE2B 35824e91568277e18aae293310157377b60743da156c3a3e988b6bd0cfd7178e8d7448f9a38d97bfdf4d16094e1939c0ae9bb256707173e4e876926def48b2db SHA512 89c59ed91d30f4f91ce0bc5bb2abcca9bd72ae1d51da376117b379157af9c1863e8832fe80ef42e528da49229e82f9b8b5695b857abaea73b6123cfdc49e6f8c
+EBUILD vulkan-layers-9999.ebuild 1608 BLAKE2B 487838a87da3431cbfd57b44414a464a755f9f4797b761dda6eb68066433d61e998d118301b9915a0a14f569e44dd70adc949ec794b30587cc16596282dbf154 SHA512 2d368bb3bef7d0881353c34550a75833ef101968bbea79c102eb3fac6452b18a2886e86168e1800e93fc2f128e40861867f4d1f95cdf8ba30dd46e4963aec3a8
 MISC metadata.xml 441 BLAKE2B d2183b70060e05054bd1fa93696ab04b5487fb8cc6b6af72520a47d0490b066c8ecdf10c9717cfaec7463668d7f639cfe8d05e5aa3ad860dbce3f4316122cd02 SHA512 c6c9c42f4cdd6c08cff6259c24ae05fe0755792f77078741e60594cd083a198b5575def4544a85162a7120578416c95b76d4b5847b9b781e16e9b826dcb5d095
diff --git a/media-libs/vulkan-layers/vulkan-layers-1.3.250.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.3.250.ebuild
index 230f948e3237..cebba301110a 100644
--- a/media-libs/vulkan-layers/vulkan-layers-1.3.250.ebuild
+++ b/media-libs/vulkan-layers/vulkan-layers-1.3.250.ebuild
@@ -29,6 +29,7 @@ DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
 	>=dev-cpp/robin-hood-hashing-3.11.5
 	~dev-util/glslang-${PV}:=[${MULTILIB_USEDEP}]
+	~dev-util/spirv-headers-${PV}
 	~dev-util/vulkan-headers-${PV}
 	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
 	X? (
diff --git a/media-libs/vulkan-layers/vulkan-layers-1.3.261.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.3.261.ebuild
index 7af48d11e398..0233d3de6afb 100644
--- a/media-libs/vulkan-layers/vulkan-layers-1.3.261.ebuild
+++ b/media-libs/vulkan-layers/vulkan-layers-1.3.261.ebuild
@@ -29,6 +29,7 @@ DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
 	>=dev-cpp/robin-hood-hashing-3.11.5
 	~dev-util/glslang-${PV}:=[${MULTILIB_USEDEP}]
+	~dev-util/spirv-headers-${PV}
 	~dev-util/vulkan-headers-${PV}
 	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
 	X? (
diff --git a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild b/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
index 12806d2b6391..ee88b9892869 100644
--- a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
+++ b/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
@@ -29,6 +29,7 @@ DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
 	>=dev-cpp/robin-hood-hashing-3.11.5
 	~dev-util/glslang-${PV}:=[${MULTILIB_USEDEP}]
+	~dev-util/spirv-headers-${PV}
 	~dev-util/vulkan-headers-${PV}
 	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
 	X? (