10 files changed, 502 insertions, 7 deletions
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 50a5ea681a0b..bf33c5edc63d 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/kvazaar/Manifest b/media-libs/kvazaar/Manifest
index 1ea04fd0169e..d24fbccbdd68 100644
--- a/media-libs/kvazaar/Manifest
+++ b/media-libs/kvazaar/Manifest
@@ -3,6 +3,6 @@ DIST greatest-1.2.1.tar.gz 19792 BLAKE2B e6abd20eebf3223311fcd62e341595318dd00f1
 DIST kvazaar-2.1.0.tar.gz 605962 BLAKE2B 0d61af55ab0caef2247524e8c564f9c24cfb479fcbd721f43e4409899e1a187a0e6de0b08a052cfb144ea31da906ba1c2160d6712828d6e55f0826d87f5c96ba SHA512 14b29f48908e004cf1b4f1f0c338b7b134a34140edcd58a645b4529c506cd567ebe3d56aa66e469dc417e1baa29bb8a476825b78825e810ac68a029191ad32ec
 DIST kvazaar-2.2.0.tar.gz 617414 BLAKE2B 6ddb88ddea315d80e0af87a13127f235c184ae829492d1ff456899d2a24669b3deca25a320a8bdcf6e2cebc2c24e33c0678ac7bf51d2634a46781f66497bed54 SHA512 476abe251d7f555911851bc5a7dca84a96c0cd243c6a45dd59b808b8adf2b0787f69101a061bd48dfb6fe54a0aea046417f21fc826f14f518cada25c6d22aec4
 EBUILD kvazaar-2.1.0.ebuild 1893 BLAKE2B 4fd421fc771cdef9ad7ce50e7cd4778aae6e1b8a2c18ed061e4a6e3acfce4256080ed2c188d9e66ca72d9a4063d34ad0bd237477a73ce31d51dd8d30a1863071 SHA512 9983889198b20539ab3a2e9a40fccb972be786189463df7bc2187b88a11540cdfbfc2d324369b622e5c7fba7d6cd4fd0126bc77b65bd2f4485286b131dbf35a7
-EBUILD kvazaar-2.2.0.ebuild 1594 BLAKE2B 853dac1c4f43f0a64b895eeb83fb19a1c35d964943f1ac630ac86948db644ada54835d0037545e8f63a3b511592839c82cb349e615ab1accef06ccfb12687da9 SHA512 d34c5a4092da075f7c34da26df2bc6b8ccdb29f9bf0228fff5f8757c3f87804995022969c82e191e73cf00a8e244fe9561fe46026808e801b78fec6f64e7d9c2
+EBUILD kvazaar-2.2.0.ebuild 1599 BLAKE2B 53a21c285cd44af81e5daf0b7047ff1cc847595fa55eda23b2757cf3b0fb09859c11f5688ad16f3d6b5d25b77392aae05e45f5afb42eaf4ff74436ba148e0ee2 SHA512 bdd371572051eba7d7ffe007d81f24cca6602c7e01e89130fa488e0d86cd6bc391ef1b26279bf5c9a72bae83d51e899b396f4eb0b3ca6417e79757c65ae72175
 EBUILD kvazaar-9999.ebuild 1587 BLAKE2B db1bf5792deb3c5b3e993d08b87ad3e15b4e65a79c905c8d2917ae3a1273595095eb896a915a8da36beaf363df4d5400b4eea8f1b9aae5c1a82695a077d03079 SHA512 e4821db7cd8c04b5ef2bebb48ae5a26013ae5bcc4174c3a25c8ac002edc59cdea0e5c22403cd6b61933a7490b3e0df8e83e48cd97e1fe96d2904a9e2613a16fe
 MISC metadata.xml 307 BLAKE2B 712a78cc3cbe9bee1e770452448efd933eb76c6de75e8302e8f61b22aec35a2f43ceb7c3014bf88b81ecf4ff27da4b115ab24605a53fbbba18100896fff12ff8 SHA512 29403efb372cc2ddb9e428be05bb7bf57b0a51a3ab66a0b0bfbdfbcdf6db1b5d357ddafc1b3a77d00109840ea4c610a088e7c8f97a3c0b9cd330a6edd2651ae6
diff --git a/media-libs/kvazaar/kvazaar-2.2.0.ebuild b/media-libs/kvazaar/kvazaar-2.2.0.ebuild
index 0fe90be9a1f7..a4b3f9da4515 100644
--- a/media-libs/kvazaar/kvazaar-2.2.0.ebuild
+++ b/media-libs/kvazaar/kvazaar-2.2.0.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} = *9999 ]] ; then
 else
 	SRC_URI="https://github.com/ultravideo/kvazaar/archive/v${PV}.tar.gz -> ${P}.tar.gz
 		test? ( https://github.com/silentbicycle/greatest/archive/v${GREATEST_PV}.tar.gz -> greatest-${GREATEST_PV}.tar.gz )"
-	KEYWORDS="~amd64 ~mips ~riscv"
+	KEYWORDS="~amd64 ~arm ~mips ~riscv"
 fi
 inherit autotools flag-o-matic multilib-minimal
 
diff --git a/media-libs/liblscp/Manifest b/media-libs/liblscp/Manifest
index 5f521c5702ed..691694001fe8 100644
--- a/media-libs/liblscp/Manifest
+++ b/media-libs/liblscp/Manifest
@@ -1,5 +1,7 @@
-AUX liblscp-0.9.6-conditional.patch 350 BLAKE2B 5354ef415e5905d3dd03879372f6a434e1b0fb50ab6e5db750a0c61a6bb89ecce714d020b1e79fd09ef13fda947ad9c161d7302302ea34f4189803b33c86298c SHA512 c2db8ae9044138353ead1d4b992cb8bbb83038a96c1a20d953762f0c30ccd493d2503648c2f6588a97aa3e72edbb959e30e8629e7d3e1d7a74c7c2f5617863f5
+AUX liblscp-0.9.6-conditional.patch 275 BLAKE2B 4ce887eb210c4e32d16a8b0300d7a03903671967122aff13a1c5d59edd02778bc4f1a7e29fd9cb56e54526e91b4ba9c6ed6f8ab526c49f783f7800c9f4587a7e SHA512 1d3d2b0ab448d7e58b8eb561292d445de41df9989a3268fa34a8d3b440195c09d7ce5b674227a4786f8c947794933250fea636b294723bb26ce65b301cc096de
 DIST liblscp-0.9.8.tar.gz 98451 BLAKE2B 6b353f322194ee4fa13a3b916982b5fed25eda746c40d1efde28e407a7c5dda943f331bd25a130976b6410a16c6a6a95e055bdcdbd6846bb7d522fcbf600074a SHA512 b46ac3407fca12fe3d330041bcdca72e481ab1a1149faf31aed8f41e5b153b788678c2cd595a22eb7ec9ce285225f451f7b8fecaf60d31695a9c308dc506ed83
+DIST liblscp-0.9.9.tar.gz 98483 BLAKE2B 7fccc9846629d94d31ea5b4474dd59a23699c7ded911393c6e395dcc28a34b07a129cbd2e2f8b5e4fcd99230ed801cf1be3af8b2503e896bcb87d93a0875ea9d SHA512 514cf2ff33456beca6dde057a6db47c7c338647e9724a7f13bbfa878aaa606347b9b4fd7c432c545aa9d1a0fff7873ed46b28b82e6cf959c4ed81b1115e92caa
 EBUILD liblscp-0.9.8.ebuild 748 BLAKE2B 0d001b0d06c800f1f0a404e5ce07708c4e7e3c7333089430b1f2ccc866f983e65937b4d41c3d45b323c618e9a0ec7a1b7b1d86462b472315c7a8caa900cf3070 SHA512 9e377d3a7aead12fe991dce44d91446f9da73fe4c9d0ada58dab1a6f770d48416e5ccfda886998e18585fb4b65d8952059f1ee2f5b81c377013c8ff9c22a3a84
+EBUILD liblscp-0.9.9.ebuild 750 BLAKE2B da15f8dd1035a9120e1fb92ef027e6dcb3196443e78cf9b1449f6a10a42c2f77392a9b93dfb18ccf79cf6833723cf2e465939513799948c737ecaa35a772e1ff SHA512 229a934f489d28fd98674fb9887ab52cb65fe03f79a100cb58c243c44135c85d3da08621c39711743a1b87a573fffe4ea140f153ab02cf769415b12ec21ad539
 EBUILD liblscp-9999.ebuild 750 BLAKE2B 4ec1fd94a04806df5a2c8ec18f12a21cb53159a933be39253bbf2ad3d2e505e8cc71d8bfcb8bfeb751da7fc60c18437d63c74c05e4a723f94106f1d4717bb4c7 SHA512 fdcb708593aec437922f534f90a1bee1040d68c5659d56645052f933f7dec512767d70b359f535db3d7fec4dd6677dda306e0c205be565b25a48d470290e687f
 MISC metadata.xml 250 BLAKE2B 3e6dae5d5f3b3ac412806dd8615a1975c7ea8a64bfd72ad54f2c93a9b24c19c620ac3e8b26e1f6cadec899443e138ee4fb7a82ecb83c784d0c03ee91854d8622 SHA512 2bfce2cf73aefce6dda06ea351cb93b2990b9543f48be1ae5406a5a5acf2c34faed1eb2ce715eb689eb50a9a1add5576b39232eb818c233f5a5589e16032aca8
diff --git a/media-libs/liblscp/files/liblscp-0.9.6-conditional.patch b/media-libs/liblscp/files/liblscp-0.9.6-conditional.patch
index a7f1cdf5c45f..1fb71e022816 100644
--- a/media-libs/liblscp/files/liblscp-0.9.6-conditional.patch
+++ b/media-libs/liblscp/files/liblscp-0.9.6-conditional.patch
@@ -1,5 +1,3 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index cf38831..a13f094 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -129,8 +129,10 @@ endif ()
diff --git a/media-libs/liblscp/liblscp-0.9.9.ebuild b/media-libs/liblscp/liblscp-0.9.9.ebuild
new file mode 100644
index 000000000000..abf96900d91a
--- /dev/null
+++ b/media-libs/liblscp/liblscp-0.9.9.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="C++ library for the Linux Sampler control protocol"
+HOMEPAGE="https://www.linuxsampler.org"
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit subversion
+	ESVN_REPO_URI="https://svn.linuxsampler.org/svn/liblscp/trunk"
+else
+	SRC_URI="https://www.rncbc.org/archive/${P}.tar.gz
+		https://download.linuxsampler.org/packages/${P}.tar.gz"
+	KEYWORDS="~amd64 ~ppc ~x86"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="doc"
+
+BDEPEND="doc? ( app-doc/doxygen )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.9.6-conditional.patch"
+)
+
+DOCS=( ChangeLog README )
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_DOC=$(usex doc)
+	)
+	cmake_src_configure
+}
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index d0803377e5be..4b1304b4a4b6 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -1,6 +1,8 @@
 DIST mesa-22.3.7.tar.xz 17136476 BLAKE2B 291e94302d3a177f842def9339d1ba012bf10de792b7120985255168faac6b87a73d1d59d8b430f56ea2a2640ca0890a5c3721188b70c528b9aad9788d7e139d SHA512 c37bbcb3c0be1908726d6f83bfe98126d681935e401e03946e8b540611f832d2f272a2ac470600c2b77caa5b9a3a9059eb34bd9a93fcf88df114bedf8c39bf5a
 DIST mesa-23.0.0.tar.xz 17492236 BLAKE2B f543856c9d85411c86b4ce28cfd412762726c60a3381c7e3f81f70479ff8c01a597279b6a18225b41db51cf5e8786f6955cd3127c8c3244422bc1bca4bc0dfa8 SHA512 127e2759a2a31cacd65a0891719ab7bb4a9188844022b4bccaebbedce9c550b9ccb160ad519178ea0d851c4bcb8f0f56febda248ed2ba82b5ddf804855e4694b
+DIST mesa-23.0.1.tar.xz 17559472 BLAKE2B 50d358e393037381d0d848f868ac3439b0851809c3533432dc428bd77e81bc71bbfd2b598e221b6e8c4c2528ef32e5624aec4fe2e552e01ee98abbcf96a1f5b7 SHA512 9bbe0ba0b1a16fe10b35b6aa3a821d96ab9c4ce4ad38056e2c32271e50b48fd5ef6e1a0babadded631f2b136dfb15acf0c41475d73ee28d132c861ce96517e24
 EBUILD mesa-22.3.7-r1.ebuild 12130 BLAKE2B a735afabb891b4b8600c5f00046496b12f845670b461f7fa078987368a2e0600729d45031dab04a7ad65a877df37445d33b25111ad43a65c0847f5a241bdf3d0 SHA512 c115092f8a8583f5f5bd71791541a6ff989b78b612a90ed95b9c189acb4ba9e3676269ad19e68df24b78dde8f84ad549e4976da7d50d9e6ca5c963d4c163192f
 EBUILD mesa-23.0.0-r1.ebuild 12138 BLAKE2B 9f9c5def8533c2589aa5af2aca1e70f54d16388f10cf76da91e2dbeed7b97199a5cd3ef3cc902dfc9d71e0f122fc24df1ea535b14ccbe752168f8cf5dbcdae15 SHA512 36fc3c4da06305020c079911ae35a2de45fb2da229e0e78dad98d8e6f1c6db9c366e83ca960dc0b22afcde21d26b00c1ad26895707452c75212126cf2e7eae8f
+EBUILD mesa-23.0.1.ebuild 12138 BLAKE2B 9f9c5def8533c2589aa5af2aca1e70f54d16388f10cf76da91e2dbeed7b97199a5cd3ef3cc902dfc9d71e0f122fc24df1ea535b14ccbe752168f8cf5dbcdae15 SHA512 36fc3c4da06305020c079911ae35a2de45fb2da229e0e78dad98d8e6f1c6db9c366e83ca960dc0b22afcde21d26b00c1ad26895707452c75212126cf2e7eae8f
 EBUILD mesa-9999.ebuild 12138 BLAKE2B 9f9c5def8533c2589aa5af2aca1e70f54d16388f10cf76da91e2dbeed7b97199a5cd3ef3cc902dfc9d71e0f122fc24df1ea535b14ccbe752168f8cf5dbcdae15 SHA512 36fc3c4da06305020c079911ae35a2de45fb2da229e0e78dad98d8e6f1c6db9c366e83ca960dc0b22afcde21d26b00c1ad26895707452c75212126cf2e7eae8f
 MISC metadata.xml 1606 BLAKE2B 0f0d0be785aef5042a0a0ae6ce0855dea4ff0105db96339f6f81ac8e3e956f363a90d08bf087924e33873e9bf0182487cdd7ba7baa72b97d17db8afdc375b7e5 SHA512 cf6fe4938eef2e6bccbea43e63b271b5f55ad73b3201a36c484b0f72cd56efb70df6502296828a778477d72848474d8bdbf5ab270dc1dbe96b7464716a1bdc82
diff --git a/media-libs/mesa/mesa-23.0.1.ebuild b/media-libs/mesa/mesa-23.0.1.ebuild
new file mode 100644
index 000000000000..06b88a6fdeca
--- /dev/null
+++ b/media-libs/mesa/mesa-23.0.1.ebuild
@@ -0,0 +1,456 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+
+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 ~sparc-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+RESTRICT="!test? ( test )"
+
+RADEON_CARDS="r300 r600 radeon radeonsi"
+VIDEO_CARDS="${RADEON_CARDS} d3d12 freedreno intel 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_radeon? ( x86? ( llvm ) amd64? ( llvm ) )
+	video_cards_r300?   ( x86? ( llvm ) amd64? ( llvm ) )
+	video_cards_radeonsi?   ( llvm )
+	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[${MULTILIB_USEDEP}]
+				dev-libs/libclc
+				virtual/libelf:0=[${MULTILIB_USEDEP}]
+			)
+	vaapi? (
+		>=media-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
+	)
+	vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
+	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. List all the working slots (with min versions) in ||, newest first.
+# 2. Update the := to specify *max* version, e.g. < 10.
+# 3. Specify LLVM_MAX_SLOT, e.g. 9.
+LLVM_MAX_SLOT="16"
+LLVM_DEPSTR="
+	|| (
+		sys-devel/llvm:16[${MULTILIB_USEDEP}]
+		sys-devel/llvm:15[${MULTILIB_USEDEP}]
+	)
+	<sys-devel/llvm-$((LLVM_MAX_SLOT + 1)):=[${MULTILIB_USEDEP}]
+"
+LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
+CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang}
+CLANG_DEPSTR_AMDGPU=${CLANG_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
+RDEPEND="${RDEPEND}
+	llvm? (
+		opencl? (
+			video_cards_r600? (
+				${CLANG_DEPSTR_AMDGPU}
+			)
+			!video_cards_r600? (
+				video_cards_radeonsi? (
+					${CLANG_DEPSTR_AMDGPU}
+				)
+			)
+			!video_cards_r600? (
+				!video_cards_radeonsi? (
+					video_cards_radeon? (
+						${CLANG_DEPSTR_AMDGPU}
+					)
+				)
+			)
+			!video_cards_r600? (
+				!video_cards_radeon? (
+					!video_cards_radeonsi? (
+						${CLANG_DEPSTR}
+					)
+				)
+			)
+		)
+		!opencl? (
+			video_cards_r600? (
+				${LLVM_DEPSTR_AMDGPU}
+			)
+			!video_cards_r600? (
+				video_cards_radeonsi? (
+					${LLVM_DEPSTR_AMDGPU}
+				)
+			)
+			!video_cards_r600? (
+				!video_cards_radeonsi? (
+					video_cards_radeon? (
+						${LLVM_DEPSTR_AMDGPU}
+					)
+				)
+			)
+			!video_cards_r600? (
+				!video_cards_radeon? (
+					!video_cards_radeonsi? (
+						${LLVM_DEPSTR}
+					)
+				)
+			)
+		)
+	)
+"
+unset {LLVM,CLANG}_DEPSTR{,_AMDGPU}
+
+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="
+	${PYTHON_DEPS}
+	opencl? (
+		>=sys-devel/gcc-4.6
+	)
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+	$(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]")
+	vulkan? ( dev-util/glslang )
+	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*/libGLESv1_CM.so.1.1.0
+	usr/lib*/libGLESv2.so.2.0.0
+	usr/lib*/libGL.so.1.2.0
+	usr/lib*/libOSMesa.so.8.0.0
+	usr/lib/libGLX_mesa.so.0.0.0
+)"
+
+llvm_check_deps() {
+	local flags=${MULTILIB_USEDEP}
+	if use video_cards_r600 || use video_cards_radeon || use video_cards_radeonsi
+	then
+		flags+=",llvm_targets_AMDGPU(-)"
+	fi
+
+	if use opencl; then
+		has_version "sys-devel/clang:${LLVM_SLOT}[${flags}]" || return 1
+	fi
+	has_version "sys-devel/llvm:${LLVM_SLOT}[${flags}]"
+}
+
+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 opencl; then
+		if ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi; then
+			ewarn "Ignoring USE=opencl     since VIDEO_CARDS does not contain r600 or radeonsi"
+		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}]"
+}
+
+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
+
+	# opencl stuff
+	emesonargs+=(
+		-Dgallium-opencl="$(usex opencl icd disabled)"
+	)
+
+	if use vulkan; then
+		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#,})
+
+	emesonargs+=(
+		$(meson_use test build-tests)
+		-Dglx=$(usex X dri disabled)
+		-Dshared-glapi=enabled
+		-Ddri3=enabled
+		-Degl=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/sdl2-mixer/Manifest b/media-libs/sdl2-mixer/Manifest
index fb1f359d311c..12fcf93117bb 100644
--- a/media-libs/sdl2-mixer/Manifest
+++ b/media-libs/sdl2-mixer/Manifest
@@ -5,6 +5,6 @@ DIST SDL2_mixer-2.6.2.tar.gz 9934376 BLAKE2B 9cf378d03046389b3625b90ca7a4c34d9b8
 DIST SDL2_mixer-2.6.3.tar.gz 9935069 BLAKE2B 9908bdc549300af05b4fbcbb6c0533913ae62bfa2f761118983e0da58a4bcd68c2d008fa5bbcd94b0141241e54f1cd507e275e2d4b637214b803dabdbc5b0250 SHA512 2e9da045d2fdab97236c3901b3d441834a67a47c8851ddfb817c9db6f23ed9fb355a5ef8d2158d0c9959a83934e8cd1b95db8a69eaddf8f7fcca115f01818740
 EBUILD sdl2-mixer-2.0.4-r2.ebuild 3495 BLAKE2B e60946ff082f2e56017b3c2ff569fc1d414c9bf78e484e43f628e1ac8bba37216cc20197ab056306295defb303680a42a22769fb6d85f4b908f97fa60f679648 SHA512 f887456d210183651b46a502a001e3d8656c88aa85896d045b76311014a523e5c3c027c17d61591f8342ed63f54d0748635c3af0e2b9415e6d4a90ef19ac210d
 EBUILD sdl2-mixer-2.0.4-r3.ebuild 3547 BLAKE2B d87698586e5254f68a101bf6512fca733fadddba9188fe0e125d2d74194e9c14fb0c876df32c2f957a80e14c7a91bf2b01b9a9c392950563de472ffd67471663 SHA512 c52bf308bab225a1a17a0d40c7ed09843a9c95c06cef6379995a73f43ee33db0d10932f862e4144890fa3361906b5412482ffe59ebaa8ade19c7fcfbe68c40b3
-EBUILD sdl2-mixer-2.6.2-r1.ebuild 2974 BLAKE2B 7615b8b61cd1c6a7a213bb53dc96097e61a956d1ee311dcb746f2e87a48f1d1cd58bc10f0eb7035aea871253c0a0bbe28d44f99b481bf94ab1e40a653433be23 SHA512 c6c0f18e705e999165d1356744c206d3440e5c842fabf33e2cb97719abb18bef13d47c41d0851ea87df5c5f5378f8969304bcd895ec730f8fff0a4f25c3b8856
+EBUILD sdl2-mixer-2.6.2-r1.ebuild 2973 BLAKE2B 6daaa2e74f6c627bdd7fd9305611c6b52d23d5ad306b3469739515b35e3d81c1c3fe74fad0639d371eba6026e41ebd7223b3cda5ec3fc4b2cc489f0492a824f9 SHA512 db80b931100d35ceb44a77a7172bf3dfd9311d412e60f859455905a1c8650350572901c2d9e322742bdc17fd2573297027ef3d78525e00a5240c07ec352901f0
 EBUILD sdl2-mixer-2.6.3.ebuild 2980 BLAKE2B a5ae69cd472b3ec8b763c41b150b8228b46661738b220eb3451762f98024f7cf3ba77908daefeb0b32d7fb3e174aaeba69de6e8d09380cf3931892580cecf9df SHA512 b2d1813aec1ded7461bb360904be8f9520cd5e5d2d91690681b25b342587f7fa8a363d229cda5812af14919d450de57691acbe6acb54d4c290aedb14c32ca313
 MISC metadata.xml 758 BLAKE2B 1f95dea5a9ad3e40050cb55bf829e89bc51d7c03525b5f91e3239d30ab6131390c0af595ca52ffb2257d11a11efe3c617291028dddd2a9fce76a815a74aa4389 SHA512 94bbb6ea83a1e975a701f7d885f83b56d8511eb69e8121126f46755377a3e966c89f3a3745530f5780d6bf81bb0a47b3b93dceb63ce44bcbe459718aebcf672d
diff --git a/media-libs/sdl2-mixer/sdl2-mixer-2.6.2-r1.ebuild b/media-libs/sdl2-mixer/sdl2-mixer-2.6.2-r1.ebuild
index d6e787ab01ce..2b996b35e670 100644
--- a/media-libs/sdl2-mixer/sdl2-mixer-2.6.2-r1.ebuild
+++ b/media-libs/sdl2-mixer/sdl2-mixer-2.6.2-r1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 IUSE="flac fluidsynth midi mod mp3 opus playtools static-libs timidity tremor vorbis +wav"
 REQUIRED_USE="
 	midi? ( || ( timidity fluidsynth ) )