gentoo auto-resync : 15:08:2024 - 12:22:30

13 files changed, 1241 insertions, 6 deletions

diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 972cad2b11cc..fa08b6c5e810 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/embree/Manifest b/media-libs/embree/Manifest
index 37e63a88b227..6056f8d9316c 100644
--- a/media-libs/embree/Manifest
+++ b/media-libs/embree/Manifest
@@ -5,7 +5,9 @@ AUX embree-4.3.1-dont-install-tutorials.patch 10020 BLAKE2B ec13bf359eb36059062d
 DIST embree-3.13.4.tar.gz 13733908 BLAKE2B 4c6c24f62ee88a09149bd930716c71e91d54563eea5cc103c0346d3808c693e8470fc7ea98651e0df9e4423bda565d7ab1a23e16c9d0441c79e9ec9c8571b0fa SHA512 685c3935fabe1bfa7260ef148df26b686b085b75011d72011461471cbcef786a5ce7a0e85c57b2df05798489a2d4e80a8d3ee5df986029edad7df7511d99c0ca
 DIST embree-3.13.5.tar.gz 13739115 BLAKE2B 52ad8e3520aa789f7987467c6979be06f883803757e842316ecf708deeed11214dd60570eda5708e701047b1a14ea37710d158df544817dc536bfda444a68218 SHA512 13ae19b1750197fb4887ba601c75d1b54b3c388224672b6561dd922bc9b9747139cf46ce554727e3afa13dcf152ce4d703935cb9105ced792b011f2d05fa3e95
 DIST embree-4.3.1.tar.gz 71110988 BLAKE2B 0ab183fe8fae3948b319c74a922c001d0567d223adab74da3a0f55fd4e4fd5c2c17afeb065da706d411238b7877e208e7041aad9430f109e606ed1a9dd23646f SHA512 da7710c6dfaa90970c223a503702fc7c7dd86c1397372b3d6f51c4377d28d8e62b90ee8c99b70e3aa49e16971a5789bb8f588ea924881b9dd5dd8d5fcd16518a
+DIST embree-4.3.3.tar.gz 71114884 BLAKE2B 154d95a5e04d86d13738b0cb28782d0f47ec4c7c1af207fdbeb17805873be85501881e6699e488477af483505c181afdf95d8199d2f54de6623fe06cc77ec603 SHA512 f614c72c5e5c83b8936d37d4e916711b3ab29329786e96944e851a41d5e2358cf7ac739c145aee131403b0b91f7e2ce5422e892dc88d490e29356f79b47c8581
 EBUILD embree-3.13.4.ebuild 3921 BLAKE2B ead945d61e7a2d09f42696fae28dae644a2a6cdcf6f525ab544f5b070c892b20d83c05c4363f2ae38f3719516ca275b1e7f4c310cc87f5cb618dc070c50b5759 SHA512 bb4f5fecceb3ff58e0ea55ce14a864fc7200833178e4e2e5f694a4840451b79c79d749bc9ea460e207daf8bf9ee49c9d19d344a69e78cbb8088c0abb35d32b85
 EBUILD embree-3.13.5.ebuild 3864 BLAKE2B 3f461c95f8fddceccc32d73be5d5e2e47badfdd72cd34b464a5d85e2eb7e1251c6eb8c7ca4669fc7e6b3172f7eca9cb674254d64d3a0cd94bd83ae4e6170927c SHA512 d8081f7e2cd73825cc322b9843e64bf8bd0bd123b7ab7c87dc4e19daa5bce17589e434c129e3b1e30232a3bc6a54496a5635ce9d94a20ca3345e8c9ccb14bcf0
 EBUILD embree-4.3.1.ebuild 5293 BLAKE2B 68660984698395d7d241beeda4deb7b675bf8e31e22ddf1bba090c7d4109d281258783886a1e6f721ecdb1165038801fda632e1f3e688e68f9078311d2098a7d SHA512 a4b55b55e55d2db9e3d96723d9ce13afab31d02c5ad7e1f7ad9f913deee0fc404fa70d08e9ee24b6280426cae9777f1f19e563464a2591837146f4fd726a6b55
+EBUILD embree-4.3.3.ebuild 5511 BLAKE2B 92f3d0cd3642ebdccde5382497d487f4545a0dd818ae73ffb2b42ffb86c90af1f052d22425a8369f06885a603943f821468794013a456499d0b9b1aeba30bfb3 SHA512 a1ee3afbdc18e3891a6d672287c50659c53ec14866d34f6656a9422f3e22c86825982e3320a9b4d9f1c37720433e7f4fd15e43cbfb09d372413ab371873e3177
 MISC metadata.xml 1705 BLAKE2B 2785c8b8752e5730e014ce6edfdd1702a20565ab12c9ebee14c3cf603e267a63360eaa0428afb9e178091edad40fe82ea55e2a872339da744113e480b4eda6c2 SHA512 ebfa1a6d3f8a8fe6acc0cc06f54ad62efb86942b55e985542a049fde421663adddcffe2a78c7309774df9bbc714a2bb11dad73c94b89bf2d1cdf56b69d334f59
diff --git a/media-libs/embree/embree-4.3.3.ebuild b/media-libs/embree/embree-4.3.3.ebuild
new file mode 100644
index 000000000000..eb4bc120565a
--- /dev/null
+++ b/media-libs/embree/embree-4.3.3.ebuild
@@ -0,0 +1,174 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic linux-info toolchain-funcs
+
+DESCRIPTION="Collection of high-performance ray tracing kernels"
+HOMEPAGE="https://github.com/embree/embree"
+SRC_URI="https://github.com/embree/embree/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="$(ver_cut 1)"
+KEYWORDS="-* ~amd64 ~arm64"
+X86_CPU_FLAGS=( sse2 sse4_2 avx avx2 avx512dq )
+CPU_FLAGS=( cpu_flags_arm_neon "${X86_CPU_FLAGS[@]/#/cpu_flags_x86_}" )
+IUSE="compact-polys ispc +raymask ssp +tbb test ${CPU_FLAGS[*]}"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="
+	amd64? ( || ( ${X86_CPU_FLAGS[*]/#/cpu_flags_x86_} ) )
+	arm? ( cpu_flags_arm_neon )
+"
+
+BDEPEND="
+	virtual/pkgconfig
+"
+RDEPEND="
+	ispc? ( dev-lang/ispc )
+	tbb? ( dev-cpp/tbb:= )
+"
+DEPEND="${RDEPEND}"
+
+DOCS=( CHANGELOG.md README.md readme.pdf )
+
+PATCHES=(
+	"${FILESDIR}/embree-4.3.1-dont-install-tutorials.patch"
+)
+
+pkg_setup() {
+	CONFIG_CHECK="~TRANSPARENT_HUGEPAGE"
+	WARNING_TRANSPARENT_HUGEPAGE="Not enabling Transparent Hugepages (CONFIG_TRANSPARENT_HUGEPAGE) will impact rendering performance."
+
+	linux-info_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	# disable RPM package building
+	sed -e 's|CPACK_RPM_PACKAGE_RELEASE 1|CPACK_RPM_PACKAGE_RELEASE 0|' \
+		-i CMakeLists.txt || die
+
+	# don't redefine _FORTIFY_SOURCE https://bugs.gentoo.org/895016
+	sed -e '/-D_FORTIFY_SOURCE=2/d' \
+		-i common/cmake/*.cmake \
+		|| die
+
+	# raise cmake minimum version to silence warning
+	sed -e 's#CMAKE_MINIMUM_REQUIRED(VERSION 3.[0-9].0)#CMAKE_MINIMUM_REQUIRED(VERSION 3.5)#I' \
+	    -i \
+	        CMakeLists.txt \
+	        kernels/rthwif/CMakeLists.txt \
+	        tutorials/embree_info/CMakeLists.txt \
+	        tutorials/minimal/CMakeLists.txt \
+	    || die
+}
+
+src_configure() {
+	# -Werror=odr
+	# https://bugs.gentoo.org/859838
+	# https://github.com/embree/embree/issues/481
+	filter-lto
+
+	# NOTE: You can make embree accept custom CXXFLAGS by turning off
+	# EMBREE_IGNORE_CMAKE_CXX_FLAGS. However, the linking will fail if you use
+	# any "m*" compile flags. This is because embree builds modules for the
+	# different supported ISAs and picks the correct one at runtime.
+	# "m*" will pull in cpu instructions that shouldn't be in specific modules
+	# and it fails to link properly.
+	# https://github.com/embree/embree/issues/115
+
+	filter-flags -m*
+
+	# https://bugs.gentoo.org/910164
+	tc-is-clang && filter-lto
+
+	local mycmakeargs=(
+		-DCMAKE_SKIP_INSTALL_RPATH:BOOL=ON
+
+		# Default culling settings for Blender
+		# (Cycles will not render correctly without these)
+		# Some Embree tests will fail with these settings though...
+		-DEMBREE_BACKFACE_CULLING=OFF
+		-DEMBREE_BACKFACE_CULLING_CURVES=ON
+		-DEMBREE_BACKFACE_CULLING_SPHERES=ON
+
+		-DEMBREE_COMPACT_POLYS=$(usex compact-polys)
+
+		# Make sure that we are using our custom compilie flags
+		-DEMBREE_IGNORE_CMAKE_CXX_FLAGS=OFF
+
+		# Set to NONE so we can manually switch on ISAs below
+		-DEMBREE_MAX_ISA:STRING="NONE"
+		-DEMBREE_ISA_AVX=$(usex cpu_flags_x86_avx)
+		-DEMBREE_ISA_AVX2=$(usex cpu_flags_x86_avx2)
+		-DEMBREE_ISA_AVX512=$(usex cpu_flags_x86_avx512dq)
+		-DEMBREE_ISA_SSE2=$(usex cpu_flags_x86_sse2)
+		-DEMBREE_ISA_SSE42=$(usex cpu_flags_x86_sse4_2)
+		-DEMBREE_ISPC_SUPPORT=$(usex ispc)
+		-DEMBREE_RAY_MASK=$(usex raymask)
+
+		# TODO figure out sycl support
+		-DEMBREE_SYCL_SUPPORT="no"
+
+		-DEMBREE_STACK_PROTECTOR=$(usex ssp)
+		-DEMBREE_STATIC_LIB=OFF
+		-DEMBREE_TASKING_SYSTEM:STRING=$(usex tbb "TBB" "INTERNAL")
+		# Tutorial binaries are required by the tests
+		-DEMBREE_TUTORIALS=$(usex test)
+		-DEMBREE_ZIP_MODE=OFF
+	)
+
+	if { use arm && usex cpu_flags_arm_neon; } || use arm64; then
+		mycmakeargs+=(
+			-DEMBREE_ISA_NEON="yes"
+			# TODO look into neon 2x support
+			# -DEMBREE_ISA_NEON2X="yes"
+		)
+	fi
+
+	# Disable asserts
+	append-cppflags -DNDEBUG
+
+	if use test; then
+		mycmakeargs+=(
+			-DBUILD_TESTING=ON
+			-DEMBREE_TESTING_INSTALL_TESTS=OFF
+			-DEMBREE_TESTING_INTENSITY=4
+			# These tutorials are not used by the default tests
+			-DEMBREE_TUTORIALS_GLFW=OFF
+			-DEMBREE_TUTORIALS_INSTALL=OFF
+		)
+	fi
+
+	cmake_src_configure
+}
+
+src_test() {
+	# NOTE Some Embree tests will fail due to EMBREE_BACKFACE_CULLING settings for blender...
+	local CMAKE_SKIP_TESTS=(
+		'^embree_verify$'
+		'^embree_verify_i2$'
+		'^viewer_models_curves_round_line_segments_3.ecs(|_ispc)$'
+		'^viewer_models_curves_round_line_segments_7.ecs(|_ispc)$'
+		'^viewer_models_curves_round_line_segments_8.ecs(|_ispc)$'
+		'^viewer_models_curves_round_line_segments_9.ecs(|_ispc)$'
+		'^viewer_coherent_models_curves_round_line_segments_3.ecs(|_ispc)$'
+		'^viewer_coherent_models_curves_round_line_segments_7.ecs(|_ispc)$'
+		'^viewer_coherent_models_curves_round_line_segments_8.ecs(|_ispc)$'
+		'^viewer_coherent_models_curves_round_line_segments_9.ecs(|_ispc)$'
+		'^viewer_quad_coherent_models_curves_round_line_segments_3.ecs(|_ispc)$'
+		'^viewer_quad_coherent_models_curves_round_line_segments_7.ecs(|_ispc)$'
+		'^viewer_quad_coherent_models_curves_round_line_segments_8.ecs(|_ispc)$'
+		'^viewer_quad_coherent_models_curves_round_line_segments_9.ecs(|_ispc)$'
+		'^viewer_grid_coherent_models_curves_round_line_segments_3.ecs(|_ispc)$'
+		'^viewer_grid_coherent_models_curves_round_line_segments_7.ecs(|_ispc)$'
+		'^viewer_grid_coherent_models_curves_round_line_segments_8.ecs(|_ispc)$'
+		'^viewer_grid_coherent_models_curves_round_line_segments_9.ecs(|_ispc)$'
+		'^hair_geometry(|_ispc)$'
+		'^embree_tests$'
+	)
+
+	cmake_src_test
+}
diff --git a/media-libs/libaom/Manifest b/media-libs/libaom/Manifest
index eb0f3161676d..57cae026e445 100644
--- a/media-libs/libaom/Manifest
+++ b/media-libs/libaom/Manifest
@@ -4,6 +4,7 @@ AUX libaom-3.7.0-big-endian-tests.patch 1611 BLAKE2B 9c0ab0a6a5788fdbc87f30ef5f2
 AUX libaom-3.7.0-big-endian.patch 4168 BLAKE2B 6c9a9ac0933b29b3ee8111d8068dfff144385ae68ebf693a335672c3138cc31ef346486af44b0b0fff9bad58ad72d2335962b78bc82e40b1a7f4a4c9b5d3ca28 SHA512 aebd3f9d16f0cc6a6a0b7a240d5d8cb55d28fc8fe4a00444b26c4b54fed0536ff3577aab5aa624cd9900858770dfdad50f9429d91ee0638058d4be34873e8be6
 AUX libaom-3.8.1-tests-parallel.patch 907 BLAKE2B 3c969182fed047b6075ebd0d19f50dfe19028658da42eefc991eaf4ed15736ac95219f5562dc8c04e34849c615fe74a5c940701e274ed7485387092d8d46fb50 SHA512 293924e8732640977c706dcf7fe811f76f093402faa3db8e61d35e32552df889dc63073f004dce4bc4230ceb647f78d0085c9a0099b597b148b9a29fc38f2544
 AUX libaom-3.9.0-guard-ssse3.patch 1570 BLAKE2B 69b5b73ba6ff68b1e5badfcd7cfdf9cc6afeca2838363273852c7757efba448881d042e52be9632c7593cd0992daea439c05da3423a7d31c2abac64fe86723f0 SHA512 5222e5af8a41da106074ed312fb1c35ce7337b43cc6d0ec3e9fbf11fecef2e5f756d64dafa3d5cb6a0d4d31afa9e155b795dfe0db37b891f54ad2d1b409b74a4
+AUX libaom-3.9.1-gcc15-cstdint.patch 1173 BLAKE2B a52439c510a54a1af72c56efff47e004ffef6c276aeebc02981b95afeca30dbacaa87baadfb25f2638454ccbc556b023c06814878fcb45a0eaa0c3e5682fdb25 SHA512 396deeaefec8152c4f45a8c788941a30688d2b7d72cb6233902e3b4cdc7d2bb1110fed56219b176a77057dd7231a5deab3c190f261cdf9e194af519fbb71d09a
 DIST libaom-3.5.0.tar.gz 5206715 BLAKE2B d47ddb864c909c972f692667177417daef0350124a096547eacc83ab3630227fe7a23e95f3988a2109c580f9a87ba30a58bcc58be1a2e24fe694eb01655a4861 SHA512 370c529a84d54c95f05c5a3b3edadd1cca95eeccd5a6b5454e574211c6dd9bf5bd33ab67b43587c6de37688fe546ea9e16de0ab2d721e965143b7e8c85db6fd4
 DIST libaom-3.7.0-testdata.tar.xz 374076136 BLAKE2B 17036f37fbb04d59b50e13e5e2258215e99cab4b6f64ac558213009477bc22f43267b60bcbb30ec10325de2aed48b22237b12cd6220f4330e300b62bafedac0b SHA512 c08ef4c9c45f1a27e6c31b8cc9799d8e65d895663a79d7be51da1733be6d8013adaad3a8f1d7491f555a2eea58aead44b9ce935c3e9bb957cb8bbb93f6f4fd98
 DIST libaom-3.7.0.tar.gz 5347924 BLAKE2B 2693d60f5afa810e00ab6aadcf8ca763e328bc64e47b3678eeba9993db89b25cfa0380beeff5a5938f19da74410ce83068c318cff2aea30e5fe39680ac67e937 SHA512 b763a877db26dcaddea5513825900917e55bc131bf78a83f941f1e74b534a514cb599fb64c3ac18a8202ac0a72c511dfef6eeff21dfbe59ed9816887ca3ec5f3
@@ -17,6 +18,6 @@ EBUILD libaom-3.5.0.ebuild 3298 BLAKE2B d5039a7ac72305f1e4930e258577d8aa15b5fa1c
 EBUILD libaom-3.7.0-r2.ebuild 4388 BLAKE2B 0d0cf93808bbc21cdad38266631884bea7ea34bc0476578656b03ad2bd85fc17b20c7655ba9ba0cdce5405d6c434baae722f512d94538dda41b921dbdc49eb6e SHA512 88f0da21d5088db1ab848dd877b59a07415e2bfe604922964e3b6904e98a81177f40ca257d049bc98a1cb14eb869657dc8d6c579c5009cf025b5b2af1659e672
 EBUILD libaom-3.8.1.ebuild 5021 BLAKE2B efdf65610fd174e11d56b721f5cfeff9e1f9e394cb14a687a5129b779d26d2fbad91b0dc1ad91ad4f760f0994e251de4e293970f902c1cf0dde7b6c452912b95 SHA512 0a0d53ad8271f838c88e48c328533fa20846a76e2d76ce18673791a61360e5efaa883ca6c8cc8539d3dc00054c6a7cc15f6934cabb8a539aa1e662e763271263
 EBUILD libaom-3.9.0.ebuild 4546 BLAKE2B 2c776663efbfc9ed96750e31f83483e0281d6d7a976afd1259fa6b883a57e5287aef30fe2ee25c86103860158ab76fb8bacefeec2a1198ae0a7e595688e64cd0 SHA512 ec8ef1f77cd78a8341cfe47abba0586796e32f9f231ca440575300e96e084c23cba8ac62bf8c1e1b970efce5eaf7e2715fc88bc2863083a1c3e6849218483984
-EBUILD libaom-3.9.1.ebuild 4500 BLAKE2B 683ff001c44e58f2ef9a6647e5ab0528985d3e0ad2fa1e0cddebcf41994ea436cb9a0fde425798390e49c977e3ff535ed2e16a0a5e24eed9f077d3b5311c4e4f SHA512 44d493599fb34ac00db89c81e544dc6b733f88a43269c03405e9e4cc5dccce1ded513762b23002066f99ecb4a7b1b02a4992bc78fa53229186724dbee35307dc
+EBUILD libaom-3.9.1.ebuild 4547 BLAKE2B cc36bec843d1d93c31827bfee0f761db39bcbd32c8e0199490082fdbdb40008c0a858d66b89276f294387b188d315e860c9e3cecdf831acdf684ae341777d7bb SHA512 d2132f43c4f94f2094b1ace9f1b2a30da761109d7ae78c97a64eabb20913863ba9962dfdcd14cf1efb6968fa8573300d1ade03016c36c4f1fb137607a40656a7
 EBUILD libaom-9999.ebuild 4520 BLAKE2B 12310a60c0c2b3492c40464d3e33d870f16ff79553080b5d2f515e110f9f683c22fc31fdfe1bfdc026cca6e69cde248fe2f59fdd06a0b101a15f50923f07c76e SHA512 78824f8e0586cbdb76041524b4696b5ad314c35af3aebed45904a5b08614c29f2e6f299ac010e00136a802f6afbcd9df08836f71d9faa76e2a0bab105e02b1b7
 MISC metadata.xml 224 BLAKE2B a8fa831654345ddf74b54f53fdc27d128ff6896378c8aa2dcb27139a4382f63efd0cac17f94ee420932e2855042c94e32fe534c99a977698953aaab4c51c31d0 SHA512 0b59f17151d352f25e3b073a3ee388d0189e1caddf0d97142851a19df433d082e3eead9f5aae07f4beb247861d90f02ae217514d02445703b95ee6ff62d967b8
diff --git a/media-libs/libaom/files/libaom-3.9.1-gcc15-cstdint.patch b/media-libs/libaom/files/libaom-3.9.1-gcc15-cstdint.patch
new file mode 100644
index 000000000000..4195d240e493
--- /dev/null
+++ b/media-libs/libaom/files/libaom-3.9.1-gcc15-cstdint.patch
@@ -0,0 +1,39 @@
+https://bugs.gentoo.org/937420
+https://aomedia.issues.chromium.org/issues/357622679
+https://aomedia-review.googlesource.com/c/aom/+/192404
+
+From b20dcf3adf51919226b436151734ba38d1123850 Mon Sep 17 00:00:00 2001
+From: James Zern <jzern@google.com>
+Date: Tue, 06 Aug 2024 10:38:00 -0700
+Subject: [PATCH] update libwebm to libwebm-1.0.0.31-10-g3b63004
+
+This fixes a build error seen in gcc 15:
+3b63004 mkvparser/mkvparser.cc: add missing <cstdint> include
+
+Bug: aomedia:357622679
+Change-Id: I6c4a1795d189f9993d4f2c5c9f0375912bc58f0c
+(cherry picked from commit e448dcd13a9f534c7291903e9ab18dfc4fea54ad)
+--- a/third_party/libwebm/mkvmuxer/mkvmuxerutil.h
++++ b/third_party/libwebm/mkvmuxer/mkvmuxerutil.h
+@@ -8,9 +8,9 @@
+ #ifndef MKVMUXER_MKVMUXERUTIL_H_
+ #define MKVMUXER_MKVMUXERUTIL_H_
+ 
+-#include "mkvmuxertypes.h"
++#include <stdint.h>
+ 
+-#include "stdint.h"
++#include "mkvmuxertypes.h"
+ 
+ namespace mkvmuxer {
+ class Cluster;
+--- a/third_party/libwebm/mkvparser/mkvparser.cc
++++ b/third_party/libwebm/mkvparser/mkvparser.cc
+@@ -16,6 +16,7 @@
+ #include <cfloat>
+ #include <climits>
+ #include <cmath>
++#include <cstdint>
+ #include <cstring>
+ #include <memory>
+ #include <new>
diff --git a/media-libs/libaom/libaom-3.9.1.ebuild b/media-libs/libaom/libaom-3.9.1.ebuild
index 18e04da00b1b..7e193b62a448 100644
--- a/media-libs/libaom/libaom-3.9.1.ebuild
+++ b/media-libs/libaom/libaom-3.9.1.ebuild
@@ -50,6 +50,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-3.4.0-posix-c-source-ftello.patch
 	"${FILESDIR}"/${PN}-3.7.0-allow-fortify-source.patch
 	"${FILESDIR}"/${PN}-3.8.1-tests-parallel.patch
+	"${FILESDIR}"/${PN}-3.9.1-gcc15-cstdint.patch
 )
 
 multilib_src_configure() {
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index 57354fe2de10..1adf842670f9 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -3,16 +3,22 @@ DIST mesa-24.0.9.tar.xz 20197892 BLAKE2B 3c68e544898031fe76a57ea754f46ede5b105c2
 DIST mesa-24.1.3.tar.xz 29086488 BLAKE2B 2e8e4ee98f904aa02f304a6c3cbbb81d04802203e270e6b8ad2b7a62b334ac28f5e91687d7a92501f66b0043255a533d024537ff5ef3f2f03d986e46a7272eeb SHA512 db4071ac80747397023762d6e0355b001f4e942cdc706c67f8aced80e162058667c02a0dc0804a45afc2656cb65d8b16e17148bc03f0a1692067ec170f193c1a
 DIST mesa-24.1.4.tar.xz 29106920 BLAKE2B 2109fc604858a0927271d7b1edb76a24514acac6117e564c6999c99f068624964f5cf0b7d022cac5726e432353a32a5278b3aa00b64dd4118bb2f0b7123c3b41 SHA512 0293f1493685888e5d2f0e616645c937e5a9c348fcb654b050b7c42bfdade1518c508920e456cf8be0033dceab4570a916db87dbb454174e425d91e9c05d0748
 DIST mesa-24.1.5.tar.xz 29140156 BLAKE2B ea29b3b8b6f178dd21d7ee3042ea829755e398f8876dfac6c744de77c08d85abb2736add2141204e6d3343de46040f49d96e1ad455714880b4be46d7b36581f1 SHA512 5916cc38c4a17161b012310c473077177887c5fff1bc5cb1f6efdf5da44878c18c99fe0c62318d897798cd4edb0f7206a989198ba085c2d402d49cdd0ee25288
+DIST mesa-24.1.6.tar.xz 29172600 BLAKE2B 295634438e1a2ae64bd1c5b0309a253e72a4d95e559cabad72f94aa2b91e5b05179c69cce5e371b69707419399dae0bfe808cb16b2e9ee112277e18b8f0f31f9 SHA512 2df0c78126f34a9ab7ce4946ed9fcd58d828717ecfd93681d9e136e605e9a8e01428dd632c0125e06d805498ffd75250f0e617f47fbb7e6368e6c8a48f4c4dfc
 DIST mesa-24.2.0-rc4.tar.xz 29324360 BLAKE2B da26f43fa3e940a406e4987ed311fd22fc7608d4e09fc6cfd6584fe8873b8c5fdbf51d5f32042c46a883739cd22204a3dde2a0a1d6283c3453bc635bfba24ed5 SHA512 5a0b9043e8c3222faeaad31f435f3ea440d670ffa5497340c5809666a857fa4c77288745d52372a2267e9f9be97fc04e0d20b81bc027c1b7a33176a3bfa6b3c6
+DIST mesa-24.2.0.tar.xz 29342732 BLAKE2B dfbd0e5b8de3db475f40a8313ee3013bb513d505541e056efd84aad50d5043414dd2c0b95e6c7336a1b4d29037274dae2fa1fdb9697187bf239a5adb54dd3721 SHA512 a585c788801b5a341d356e44d958b148e6e14f6b3d7224e99a92faa2f004bf0cfc90103c5fdc651afb22f805c6f9dc594f9f3f5ecebcea36f6305b3a6ccb9294
 DIST paste-1.0.14.crate 18157 BLAKE2B 35e8548611c51ee75f4d04926149e5e54870d7073d9b635d550a6fa0f85891f57f326bdbcff3dd8618cf40f8e08cf903ef87d9c034d5921d8b91e1db842cdd7c SHA512 3a793f0e5e773a7f7defc798a4c17ae9a40d715144632ea6cb0a8c785e14c4212046491df016bb9838281f8eaf327a79f01c1e2ac5f26785c028bc880faff9ee
 DIST proc-macro2-1.0.70.crate 44343 BLAKE2B fff0dec06b21e391783cc136790238acb783780eaedcf14875a350e7ceb46fdc100c8b9e3f09fb7f4c2196c25d4c6b61e574c0dad762d94533b628faab68cf5c SHA512 ae9366856853f7d96caf7a7581843d36bfc7843f8683897b19ffc666c03b0b1eff502ddb18ca4c1c1a239a368f03f6cc258b0e2795f64b61c6a31404462eec5f
+DIST proc-macro2-1.0.86.crate 48958 BLAKE2B 4b89e07f23af8328dbb34fe2b3f1b202f1e6a3885a6269740a23359b41bb4099ac2484565d3b2b0936261689ca525785ac620c766997234fd8d0f409e80e5ea3 SHA512 1cdb7e22a35ae231d880c9420784c9acf97bda2db258b3d34aae5061dc1858449defe19a49e12c6a4173906aa72a4115059ac2db0fc760205fd2ab8b5b414434
 DIST quote-1.0.33.crate 28090 BLAKE2B 77c4b166f1200e1ee2ab94a5014acd334c1fe4b7d72851d73768d491c56c6779a0882a304c1f30c88732a6168351f0f786b10516ae537cff993892a749175848 SHA512 c1e76c3c017e8554eebe309f8167fd56fce931981c06798aa85a0cc6d64a9cba6ab103f5a1324e69c6f9ca5dc47a8e31ff2e847850542748697afcd265b5939c
 DIST syn-2.0.39.crate 244129 BLAKE2B 2cff6626624d03f70f1662af45a8644c28a9f92e2dfe38999bef3ba4a4c1ce825ae598277e9cb7abd5585eebfb17b239effc8d0bbf1c6ac196499f0d288e5e01 SHA512 96cc347cfdb0f9ca0b6c7289279a1cad8fc401625783742292564f7ceca8237ced8d9a3f62069696f6132ed06092dff2baaf4be09ef53b21260d93785b0e27c3
+DIST syn-2.0.68.crate 265035 BLAKE2B 8bc6f68ed286bea617a2cfaf3949bb699d3a0466faeca735314a51596ce950e4ee57eda88154bd562c1728cfaff4cdb5bc1ba701b9d47a9c50d4c4f011bee975 SHA512 7b781f8ea2b0d01c06f47d165da99cd96e3b44a33de1d77c78a2cb37ebe3f8304f426ba3d0d1cf766241dcc0537908774504df7d455d63bf89ec22ac0499d372
 DIST unicode-ident-1.0.12.crate 42168 BLAKE2B 4cede03c08758ccd6bf53a0d0057d7542dfdd0c93d342e89f3b90460be85518a9fd24958d8b1da2b5a09b5ddbee8a4263982194158e171c2bba3e394d88d6dac SHA512 bc1824e1e4452a40732fc69874d7e1a66f7803717a314790dcf48867eba34bc9441331ef031e386912e52c385645c25b6ed39d4f149973b5b97371b1b96b1920
 EBUILD mesa-24.0.9.ebuild 11904 BLAKE2B fbd74015635daad6ced24491c05e077b2617f42b154f208eba92c3f880bc2381e57db3287d1b5c6c129924e6a8476812ef8883ddbd1509b4b2206d1a58f8317e SHA512 a25ecf8382dd350d306ada954e54a049a9a61d95afd65c16ef378538a44ba532ea893a3212835758871c782502598fb5a533a5f7fe0e49f155f836c24679fcac
 EBUILD mesa-24.1.3.ebuild 13732 BLAKE2B ed406c8d4b4c14674dae17cf0bd52a975728a0ccb46888103537dc9fe0b4749d9980192148edf561731408a9673a3ff4b23cec5d4ba08365f0c6007aa29e143e SHA512 b4add16bc9019229eae7e598ba3784471e0095c2d4364e7127135408aedc9723b12d0b1a1c47394eea3d79133c5d850237abd921146a8e8b2c4ba174ef4d0344
 EBUILD mesa-24.1.4.ebuild 13739 BLAKE2B 23b5b302962a028676b753f1bf71b85986445e64540e4c702969e4c2045d7994ffa7e6424ed87b02406c9d300f29383df54eb397eec452e0714c827e9b7b3c05 SHA512 ad37b061d392cfe67d8fcefa82ebed2634bc5f0ae61f6b4f84193ffa9c866f10abd7ab7f915fee381c36643b88b1c6cdbb0ee40dd3f7a25fe0502caf07140309
 EBUILD mesa-24.1.5.ebuild 13739 BLAKE2B 23b5b302962a028676b753f1bf71b85986445e64540e4c702969e4c2045d7994ffa7e6424ed87b02406c9d300f29383df54eb397eec452e0714c827e9b7b3c05 SHA512 ad37b061d392cfe67d8fcefa82ebed2634bc5f0ae61f6b4f84193ffa9c866f10abd7ab7f915fee381c36643b88b1c6cdbb0ee40dd3f7a25fe0502caf07140309
+EBUILD mesa-24.1.6.ebuild 13739 BLAKE2B 23b5b302962a028676b753f1bf71b85986445e64540e4c702969e4c2045d7994ffa7e6424ed87b02406c9d300f29383df54eb397eec452e0714c827e9b7b3c05 SHA512 ad37b061d392cfe67d8fcefa82ebed2634bc5f0ae61f6b4f84193ffa9c866f10abd7ab7f915fee381c36643b88b1c6cdbb0ee40dd3f7a25fe0502caf07140309
+EBUILD mesa-24.2.0.ebuild 13665 BLAKE2B 77bb4aebb4bc005d1a03fa4f34dc47380302b4b7f6614bc3cd6413fbc08b29d49677255e728d76168bed215a3048f2a11c27460c334d7933e3e106bc0b898d30 SHA512 ae6303ce7eb79a2ca55c82de2f95d6cde71350f6fd72f11ab043ff06215d860e13016e7af825b98b4aa082fed306091114c9d52734560da6c2fc1e329b0619af
 EBUILD mesa-24.2.0_rc4.ebuild 13665 BLAKE2B f2191d5fac54380bacaf3e4f71ed7fa854e95c6e23f779800d046cfbd758bca20908af8a4d0023bbf2a3078b9c6aa602eed6ba158b18c3cd516ec3085de683e8 SHA512 5a956ca54b19d4d755e23baccaaea48144c9bd894e65c05f6ca79dd6d3ebe5967fbb55186fe25774b3c6adcd56bde70fb15bbf998f7441c2042e6af003125b07
-EBUILD mesa-9999.ebuild 13665 BLAKE2B f2191d5fac54380bacaf3e4f71ed7fa854e95c6e23f779800d046cfbd758bca20908af8a4d0023bbf2a3078b9c6aa602eed6ba158b18c3cd516ec3085de683e8 SHA512 5a956ca54b19d4d755e23baccaaea48144c9bd894e65c05f6ca79dd6d3ebe5967fbb55186fe25774b3c6adcd56bde70fb15bbf998f7441c2042e6af003125b07
+EBUILD mesa-9999.ebuild 13665 BLAKE2B 77bb4aebb4bc005d1a03fa4f34dc47380302b4b7f6614bc3cd6413fbc08b29d49677255e728d76168bed215a3048f2a11c27460c334d7933e3e106bc0b898d30 SHA512 ae6303ce7eb79a2ca55c82de2f95d6cde71350f6fd72f11ab043ff06215d860e13016e7af825b98b4aa082fed306091114c9d52734560da6c2fc1e329b0619af
 MISC metadata.xml 1435 BLAKE2B 53690878512b86ce0b8dce38b083684c85ad5c1a655d5a69cb3265e156869845263eb16f271691b66c9f0cd76e97b56908acf7a1792d6abac0ec99447826cbb5 SHA512 842106e5d6eb60ff33c8cae7f0d52983c4f7e104152718b50fc790cbcb2506551a6fc7841fe8e3c7963850c238f77505b0e49b10a3a936baf459e1acaf73e07f
diff --git a/media-libs/mesa/mesa-24.1.6.ebuild b/media-libs/mesa/mesa-24.1.6.ebuild
new file mode 100644
index 000000000000..9a583c95d8ec
--- /dev/null
+++ b/media-libs/mesa/mesa-24.1.6.ebuild
@@ -0,0 +1,494 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LLVM_COMPAT=( {15..18} )
+LLVM_OPTIONAL=1
+CARGO_OPTIONAL=1
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit flag-o-matic llvm-r1 meson-multilib python-any-r1 linux-info rust-toolchain toolchain-funcs
+
+MY_P="${P/_/-}"
+
+CRATES="
+	syn@2.0.39
+	proc-macro2@1.0.70
+	quote@1.0.33
+	unicode-ident@1.0.12
+	paste@1.0.14
+"
+
+inherit cargo
+
+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
+
+# This should be {CARGO_CRATE_URIS//.crate/.tar.gz} to correspond to the wrap files,
+# but there are "stale" distfiles on the mirrors with the wrong names.
+# export MESON_PACKAGE_CACHE_DIR="${DISTDIR}"
+SRC_URI+="
+	${CARGO_CRATE_URIS}
+"
+
+S="${WORKDIR}/${MY_P}"
+EGIT_CHECKOUT_DIR=${S}
+
+LICENSE="MIT SGI-B-2.0"
+SLOT="0"
+
+RADEON_CARDS="r300 r600 radeon radeonsi"
+VIDEO_CARDS="${RADEON_CARDS} d3d12 freedreno intel lavapipe lima nouveau nvk panfrost v3d vc4 virgl vivante vmware zink"
+for card in ${VIDEO_CARDS}; do
+	IUSE_VIDEO_CARDS+=" video_cards_${card}"
+done
+
+IUSE="${IUSE_VIDEO_CARDS}
+	cpu_flags_x86_sse2 d3d9 debug +llvm
+	lm-sensors opencl +opengl osmesa +proprietary-codecs selinux
+	test unwind vaapi valgrind vdpau vulkan
+	vulkan-overlay wayland +X xa +zstd"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="
+	d3d9? (
+		|| (
+			video_cards_freedreno
+			video_cards_intel
+			video_cards_nouveau
+			video_cards_panfrost
+			video_cards_r300
+			video_cards_r600
+			video_cards_radeonsi
+			video_cards_vmware
+			video_cards_zink
+		)
+	)
+	llvm? ( ${LLVM_REQUIRED_USE} )
+	vulkan-overlay? ( vulkan )
+	video_cards_lavapipe? ( llvm vulkan )
+	video_cards_radeon? ( x86? ( llvm ) amd64? ( llvm ) )
+	video_cards_r300?   ( x86? ( llvm ) amd64? ( llvm ) )
+	video_cards_zink? ( vulkan opengl )
+	video_cards_nvk? ( vulkan video_cards_nouveau )
+	vdpau? ( X )
+	xa? ( X )
+"
+
+LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.119"
+RDEPEND="
+	>=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}]
+	>=media-libs/libglvnd-1.3.2[X?,${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.9[${MULTILIB_USEDEP}]
+	unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
+	llvm? (
+		$(llvm_gen_dep "
+			sys-devel/llvm:\${LLVM_SLOT}[llvm_targets_AMDGPU(+),${MULTILIB_USEDEP}]
+			opencl? (
+				dev-util/spirv-llvm-translator:\${LLVM_SLOT}
+				sys-devel/clang:\${LLVM_SLOT}[llvm_targets_AMDGPU(+),${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.5:=[${MULTILIB_USEDEP}] )
+	video_cards_radeonsi? ( virtual/libelf:0=[${MULTILIB_USEDEP}] )
+	video_cards_zink? ( media-libs/vulkan-loader:=[${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.17:=[${MULTILIB_USEDEP}]
+		x11-libs/libXfixes[${MULTILIB_USEDEP}]
+		x11-libs/xcb-util-keysyms[${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] )
+"
+
+DEPEND="${RDEPEND}
+	video_cards_d3d12? ( >=dev-util/directx-headers-1.613.0[${MULTILIB_USEDEP}] )
+	valgrind? ( dev-debug/valgrind )
+	wayland? ( >=dev-libs/wayland-protocols-1.34 )
+	X? (
+		x11-libs/libXrandr[${MULTILIB_USEDEP}]
+		x11-base/xorg-proto
+	)
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	opencl? (
+		>=virtual/rust-1.62.0
+		>=dev-util/bindgen-0.58.0
+	)
+	>=dev-build/meson-1.4.1
+	app-alternatives/yacc
+	app-alternatives/lex
+	virtual/pkgconfig
+	$(python_gen_any_dep "
+		>=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]
+		dev-python/packaging[\${PYTHON_USEDEP}]
+	")
+	video_cards_intel? (
+		~dev-util/intel_clc-${PV}
+		dev-libs/libclc[spirv(-)]
+		$(python_gen_any_dep "dev-python/ply[\${PYTHON_USEDEP}]")
+	)
+	vulkan? (
+		dev-util/glslang
+		video_cards_nvk? (
+			>=dev-util/bindgen-0.68.1
+			>=dev-util/cbindgen-0.26.0
+			>=virtual/rust-1.74.1
+		)
+	)
+	wayland? ( dev-util/wayland-scanner )
+"
+
+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
+)"
+
+src_unpack() {
+	if [[ ${PV} == 9999 ]]; then
+		git-r3_src_unpack
+	else
+		unpack ${MY_P}.tar.xz
+	fi
+
+	# We need this because we cannot tell meson to use DISTDIR yet
+	pushd "${DISTDIR}" >/dev/null || die
+	mkdir -p "${S}"/subprojects/packagecache || die
+	local i
+	for i in *.crate; do
+		ln -s "${PWD}/${i}" "${S}/subprojects/packagecache/${i/.crate/}.tar.gz" || die
+	done
+	popd >/dev/null || die
+}
+
+pkg_pretend() {
+	if use vulkan; then
+		if ! use video_cards_d3d12 &&
+		   ! use video_cards_freedreno &&
+		   ! use video_cards_intel &&
+		   ! use video_cards_lavapipe &&
+		   ! use video_cards_nouveau &&
+		   ! use video_cards_nvk &&
+		   ! use video_cards_panfrost &&
+		   ! use video_cards_radeonsi &&
+		   ! use video_cards_v3d &&
+		   ! use video_cards_virgl; then
+			ewarn "Ignoring USE=vulkan     since VIDEO_CARDS does not contain d3d12, freedreno, intel, lavapipe, nouveau, nvk, panfrost, radeonsi, v3d, or virgl"
+		fi
+	fi
+
+	# VA
+	if use vaapi; then
+		if ! use video_cards_d3d12 &&
+		   ! use video_cards_nouveau &&
+		   ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi &&
+		   ! use video_cards_virgl; then
+			ewarn "Ignoring USE=vaapi      since VIDEO_CARDS does not contain d3d12, nouveau, r600, radeonsi, or virgl"
+		fi
+	fi
+
+	if use vdpau; then
+		if ! use video_cards_d3d12 &&
+		   ! use video_cards_nouveau &&
+		   ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi &&
+		   ! use video_cards_virgl; then
+			ewarn "Ignoring USE=vdpau      since VIDEO_CARDS does not contain d3d12, nouveau, r600, radeonsi, or virgl"
+		fi
+	fi
+
+	if use xa; then
+		if ! use video_cards_freedreno &&
+		   ! use video_cards_intel &&
+		   ! use video_cards_nouveau &&
+		   ! use video_cards_vmware; then
+			ewarn "Ignoring USE=xa         since VIDEO_CARDS does not contain freedreno, intel, 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}]" &&
+	python_has_version -b "dev-python/packaging[${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
+
+	use llvm && llvm-r1_pkg_setup
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	sed -i -e "/^PLATFORM_SYMBOLS/a '__gentoo_check_ldflags__'," \
+		bin/symbols-check.py || die # bug #830728
+}
+
+multilib_src_configure() {
+	local emesonargs=()
+
+	# bug #932591 and https://gitlab.freedesktop.org/mesa/mesa/-/issues/11140
+	tc-is-gcc && [[ $(gcc-major-version) -ge 14 ]] && filter-lto
+
+	local platforms
+	use X && platforms+="x11"
+	use wayland && platforms+=",wayland"
+	emesonargs+=(-Dplatforms=${platforms#,})
+
+	if use video_cards_freedreno ||
+	   use video_cards_intel || # crocus i915 iris
+	   use video_cards_nouveau ||
+	   use video_cards_panfrost ||
+	   use video_cards_r300 ||
+	   use video_cards_r600 ||
+	   use video_cards_radeonsi ||
+	   use video_cards_vmware || # swrast
+	   use video_cards_zink; then
+		emesonargs+=($(meson_use d3d9 gallium-nine))
+	else
+		emesonargs+=(-Dgallium-nine=false)
+	fi
+
+	if use video_cards_d3d12 ||
+	   use video_cards_nouveau ||
+	   use video_cards_r600 ||
+	   use video_cards_radeonsi ||
+	   use video_cards_virgl; 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_nouveau ||
+	   use video_cards_r600 ||
+	   use video_cards_radeonsi ||
+	   use video_cards_virgl; then
+		emesonargs+=($(meson_feature vdpau gallium-vdpau))
+	else
+		emesonargs+=(-Dgallium-vdpau=disabled)
+	fi
+
+	if use video_cards_freedreno ||
+	   use video_cards_intel ||
+	   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_d3d12 d3d12
+	gallium_enable video_cards_freedreno freedreno
+	gallium_enable video_cards_intel crocus i915 iris
+	gallium_enable video_cards_lima lima
+	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 video_cards_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_d3d12 microsoft-experimental
+		vulkan_enable video_cards_freedreno freedreno
+		vulkan_enable video_cards_intel intel intel_hasvk
+		vulkan_enable video_cards_lavapipe swrast
+		vulkan_enable video_cards_panfrost panfrost
+		vulkan_enable video_cards_radeonsi amd
+		vulkan_enable video_cards_v3d broadcom
+		vulkan_enable video_cards_vc4 broadcom
+		vulkan_enable video_cards_virgl virtio
+		if use video_cards_nvk; then
+			vulkan_enable video_cards_nvk nouveau
+			if ! multilib_is_native_abi; then
+				echo -e "[binaries]\nrust = ['rustc', '--target=$(rust_abi $CBUILD)']" > "${T}/rust_fix.ini"
+				emesonargs+=(
+					--native-file "${T}"/rust_fix.ini
+				)
+			fi
+		fi
+	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 opengl && use X; then
+		emesonargs+=(-Dglx=dri)
+	else
+		emesonargs+=(-Dglx=disabled)
+	fi
+
+	if [[ "${ABI}" == amd64 ]]; then
+		emesonargs+=($(meson_feature video_cards_intel intel-rt))
+	fi
+
+	use debug && EMESON_BUILDTYPE=debug
+
+	emesonargs+=(
+		$(meson_use test build-tests)
+		-Dshared-glapi=enabled
+		-Ddri3=enabled
+		-Dexpat=enabled
+		$(meson_use opengl)
+		$(meson_feature opengl gbm)
+		$(meson_feature opengl gles1)
+		$(meson_feature opengl gles2)
+		$(meson_feature opengl glvnd)
+		$(meson_feature opengl egl)
+		$(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)
+		-Dintel-clc=$(usex video_cards_intel system auto)
+		-Dvalgrind=$(usex valgrind auto disabled)
+		-Dvideo-codecs=$(usex proprietary-codecs "all" "all_free")
+		-Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
+		-Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
+		-Db_ndebug=$(usex debug false true)
+	)
+	meson_src_configure
+
+	if ! multilib_is_native_abi && use video_cards_nvk; then
+		sed -i -E '{N; s/(rule rust_COMPILER_FOR_BUILD\n command = rustc) --target=[a-zA-Z0-9=:-]+ (.*) -C link-arg=-m[[:digit:]]+/\1 \2/g}' build.ninja || die
+	fi
+}
+
+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/mesa/mesa-24.2.0.ebuild b/media-libs/mesa/mesa-24.2.0.ebuild
new file mode 100644
index 000000000000..a64eb1901f88
--- /dev/null
+++ b/media-libs/mesa/mesa-24.2.0.ebuild
@@ -0,0 +1,490 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LLVM_COMPAT=( {15..18} )
+LLVM_OPTIONAL=1
+CARGO_OPTIONAL=1
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit flag-o-matic llvm-r1 meson-multilib python-any-r1 linux-info rust-toolchain toolchain-funcs
+
+MY_P="${P/_/-}"
+
+CRATES="
+	syn@2.0.68
+	proc-macro2@1.0.86
+	quote@1.0.33
+	unicode-ident@1.0.12
+	paste@1.0.14
+"
+
+inherit cargo
+
+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
+
+# This should be {CARGO_CRATE_URIS//.crate/.tar.gz} to correspond to the wrap files,
+# but there are "stale" distfiles on the mirrors with the wrong names.
+# export MESON_PACKAGE_CACHE_DIR="${DISTDIR}"
+SRC_URI+="
+	${CARGO_CRATE_URIS}
+"
+
+S="${WORKDIR}/${MY_P}"
+EGIT_CHECKOUT_DIR=${S}
+
+LICENSE="MIT SGI-B-2.0"
+SLOT="0"
+
+RADEON_CARDS="r300 r600 radeon radeonsi"
+VIDEO_CARDS="${RADEON_CARDS}
+	d3d12 freedreno intel lavapipe lima nouveau nvk panfrost v3d vc4 virgl
+	vivante vmware zink"
+for card in ${VIDEO_CARDS}; do
+	IUSE_VIDEO_CARDS+=" video_cards_${card}"
+done
+
+IUSE="${IUSE_VIDEO_CARDS}
+	cpu_flags_x86_sse2 d3d9 debug +llvm
+	lm-sensors opencl +opengl osmesa +proprietary-codecs selinux
+	test unwind vaapi valgrind vdpau vulkan
+	vulkan-overlay wayland +X xa +zstd"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="
+	d3d9? (
+		|| (
+			video_cards_freedreno
+			video_cards_intel
+			video_cards_nouveau
+			video_cards_panfrost
+			video_cards_r300
+			video_cards_r600
+			video_cards_radeonsi
+			video_cards_vmware
+			video_cards_zink
+		)
+	)
+	llvm? ( ${LLVM_REQUIRED_USE} )
+	vulkan-overlay? ( vulkan )
+	video_cards_lavapipe? ( llvm vulkan )
+	video_cards_radeon? ( x86? ( llvm ) amd64? ( llvm ) )
+	video_cards_r300?   ( x86? ( llvm ) amd64? ( llvm ) )
+	video_cards_zink? ( vulkan opengl )
+	video_cards_nvk? ( vulkan video_cards_nouveau )
+	vdpau? ( X )
+	xa? ( X )
+"
+
+LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.121"
+RDEPEND="
+	>=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}]
+	>=media-libs/libglvnd-1.3.2[X?,${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.9[${MULTILIB_USEDEP}]
+	unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
+	llvm? (
+		$(llvm_gen_dep "
+			sys-devel/llvm:\${LLVM_SLOT}[llvm_targets_AMDGPU(+),${MULTILIB_USEDEP}]
+			opencl? (
+				dev-util/spirv-llvm-translator:\${LLVM_SLOT}
+				sys-devel/clang:\${LLVM_SLOT}[llvm_targets_AMDGPU(+),${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.5:=[${MULTILIB_USEDEP}] )
+	video_cards_radeonsi? ( virtual/libelf:0=[${MULTILIB_USEDEP}] )
+	video_cards_zink? ( media-libs/vulkan-loader:=[${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.17:=[${MULTILIB_USEDEP}]
+		x11-libs/libXfixes[${MULTILIB_USEDEP}]
+		x11-libs/xcb-util-keysyms[${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] )
+"
+
+DEPEND="${RDEPEND}
+	video_cards_d3d12? ( >=dev-util/directx-headers-1.613.0[${MULTILIB_USEDEP}] )
+	valgrind? ( dev-debug/valgrind )
+	wayland? ( >=dev-libs/wayland-protocols-1.34 )
+	X? (
+		x11-libs/libXrandr[${MULTILIB_USEDEP}]
+		x11-base/xorg-proto
+	)
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	opencl? (
+		>=virtual/rust-1.62.0
+		>=dev-util/bindgen-0.58.0
+	)
+	>=dev-build/meson-1.4.1
+	app-alternatives/yacc
+	app-alternatives/lex
+	virtual/pkgconfig
+	$(python_gen_any_dep "
+		>=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]
+		dev-python/packaging[\${PYTHON_USEDEP}]
+		dev-python/pyyaml[\${PYTHON_USEDEP}]
+	")
+	video_cards_intel? (
+		~dev-util/intel_clc-${PV}
+		dev-libs/libclc[spirv(-)]
+		$(python_gen_any_dep "dev-python/ply[\${PYTHON_USEDEP}]")
+	)
+	vulkan? (
+		dev-util/glslang
+		video_cards_nvk? (
+			>=dev-util/bindgen-0.68.1
+			>=dev-util/cbindgen-0.26.0
+			>=virtual/rust-1.74.1
+		)
+	)
+	wayland? ( dev-util/wayland-scanner )
+"
+
+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
+)"
+
+src_unpack() {
+	if [[ ${PV} == 9999 ]]; then
+		git-r3_src_unpack
+	else
+		unpack ${MY_P}.tar.xz
+	fi
+
+	# We need this because we cannot tell meson to use DISTDIR yet
+	pushd "${DISTDIR}" >/dev/null || die
+	mkdir -p "${S}"/subprojects/packagecache || die
+	local i
+	for i in *.crate; do
+		ln -s "${PWD}/${i}" "${S}/subprojects/packagecache/${i/.crate/}.tar.gz" || die
+	done
+	popd >/dev/null || die
+}
+
+pkg_pretend() {
+	if use vulkan; then
+		if ! use video_cards_d3d12 &&
+		   ! use video_cards_freedreno &&
+		   ! use video_cards_intel &&
+		   ! use video_cards_lavapipe &&
+		   ! use video_cards_nouveau &&
+		   ! use video_cards_nvk &&
+		   ! use video_cards_panfrost &&
+		   ! use video_cards_radeonsi &&
+		   ! use video_cards_v3d &&
+		   ! use video_cards_virgl; then
+			ewarn "Ignoring USE=vulkan     since VIDEO_CARDS does not contain d3d12, freedreno, intel, lavapipe, nouveau, nvk, panfrost, radeonsi, v3d, or virgl"
+		fi
+	fi
+
+	# VA
+	if use vaapi; then
+		if ! use video_cards_d3d12 &&
+		   ! use video_cards_nouveau &&
+		   ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi &&
+		   ! use video_cards_virgl; then
+			ewarn "Ignoring USE=vaapi      since VIDEO_CARDS does not contain d3d12, nouveau, r600, radeonsi, or virgl"
+		fi
+	fi
+
+	if use vdpau; then
+		if ! use video_cards_d3d12 &&
+		   ! use video_cards_nouveau &&
+		   ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi &&
+		   ! use video_cards_virgl; then
+			ewarn "Ignoring USE=vdpau      since VIDEO_CARDS does not contain d3d12, nouveau, r600, radeonsi, or virgl"
+		fi
+	fi
+
+	if use xa; then
+		if ! use video_cards_freedreno &&
+		   ! use video_cards_intel &&
+		   ! use video_cards_nouveau &&
+		   ! use video_cards_vmware; then
+			ewarn "Ignoring USE=xa         since VIDEO_CARDS does not contain freedreno, intel, 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}]" &&
+	python_has_version -b "dev-python/packaging[${PYTHON_USEDEP}]" &&
+	python_has_version -b "dev-python/pyyaml[${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
+
+	use llvm && llvm-r1_pkg_setup
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	sed -i -e "/^PLATFORM_SYMBOLS/a '__gentoo_check_ldflags__'," \
+		bin/symbols-check.py || die # bug #830728
+}
+
+multilib_src_configure() {
+	local emesonargs=()
+
+	# bug #932591 and https://gitlab.freedesktop.org/mesa/mesa/-/issues/11140
+	tc-is-gcc && [[ $(gcc-major-version) -ge 14 ]] && filter-lto
+
+	local platforms
+	use X && platforms+="x11"
+	use wayland && platforms+=",wayland"
+	emesonargs+=(-Dplatforms=${platforms#,})
+
+	if use video_cards_freedreno ||
+	   use video_cards_intel || # crocus i915 iris
+	   use video_cards_nouveau ||
+	   use video_cards_panfrost ||
+	   use video_cards_r300 ||
+	   use video_cards_r600 ||
+	   use video_cards_radeonsi ||
+	   use video_cards_vmware || # svga
+	   use video_cards_zink; then
+		emesonargs+=($(meson_use d3d9 gallium-nine))
+	else
+		emesonargs+=(-Dgallium-nine=false)
+	fi
+
+	if use video_cards_d3d12 ||
+	   use video_cards_nouveau ||
+	   use video_cards_r600 ||
+	   use video_cards_radeonsi ||
+	   use video_cards_virgl; 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_nouveau ||
+	   use video_cards_r600 ||
+	   use video_cards_radeonsi ||
+	   use video_cards_virgl; then
+		emesonargs+=($(meson_feature vdpau gallium-vdpau))
+	else
+		emesonargs+=(-Dgallium-vdpau=disabled)
+	fi
+
+	if use video_cards_freedreno ||
+	   use video_cards_intel ||
+	   use video_cards_nouveau ||
+	   use video_cards_vmware; then
+		emesonargs+=($(meson_feature xa gallium-xa))
+	else
+		emesonargs+=(-Dgallium-xa=disabled)
+	fi
+
+	gallium_enable !llvm softpipe
+	gallium_enable llvm llvmpipe
+	gallium_enable video_cards_d3d12 d3d12
+	gallium_enable video_cards_freedreno freedreno
+	gallium_enable video_cards_intel crocus i915 iris
+	gallium_enable video_cards_lima lima
+	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 video_cards_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_d3d12 microsoft-experimental
+		vulkan_enable video_cards_freedreno freedreno
+		vulkan_enable video_cards_intel intel intel_hasvk
+		vulkan_enable video_cards_lavapipe swrast
+		vulkan_enable video_cards_panfrost panfrost
+		vulkan_enable video_cards_radeonsi amd
+		vulkan_enable video_cards_v3d broadcom
+		vulkan_enable video_cards_vc4 broadcom
+		vulkan_enable video_cards_virgl virtio
+		if use video_cards_nvk; then
+			vulkan_enable video_cards_nvk nouveau
+			if ! multilib_is_native_abi; then
+				echo -e "[binaries]\nrust = ['rustc', '--target=$(rust_abi $CBUILD)']" > "${T}/rust_fix.ini"
+				emesonargs+=(
+					--native-file "${T}"/rust_fix.ini
+				)
+			fi
+		fi
+	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 opengl && use X; then
+		emesonargs+=(-Dglx=dri)
+	else
+		emesonargs+=(-Dglx=disabled)
+	fi
+
+	if [[ "${ABI}" == amd64 ]]; then
+		emesonargs+=($(meson_feature video_cards_intel intel-rt))
+	fi
+
+	use debug && EMESON_BUILDTYPE=debug
+
+	emesonargs+=(
+		$(meson_use test build-tests)
+		-Dshared-glapi=enabled
+		-Ddri3=enabled
+		-Dexpat=enabled
+		$(meson_use opengl)
+		$(meson_feature opengl gbm)
+		$(meson_feature opengl gles1)
+		$(meson_feature opengl gles2)
+		$(meson_feature opengl glvnd)
+		$(meson_feature opengl egl)
+		$(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)
+		-Dintel-clc=$(usex video_cards_intel system auto)
+		-Dvalgrind=$(usex valgrind auto disabled)
+		-Dvideo-codecs=$(usex proprietary-codecs "all" "all_free")
+		-Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
+		-Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
+		-Db_ndebug=$(usex debug false true)
+	)
+	meson_src_configure
+
+	if ! multilib_is_native_abi && use video_cards_nvk; then
+		sed -i -E '{N; s/(rule rust_COMPILER_FOR_BUILD\n command = rustc) --target=[a-zA-Z0-9=:-]+ (.*) -C link-arg=-m[[:digit:]]+/\1 \2/g}' build.ninja || die
+	fi
+}
+
+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/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 6da3a0f80393..a64eb1901f88 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -6,15 +6,15 @@ EAPI=8
 LLVM_COMPAT=( {15..18} )
 LLVM_OPTIONAL=1
 CARGO_OPTIONAL=1
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 
 inherit flag-o-matic llvm-r1 meson-multilib python-any-r1 linux-info rust-toolchain toolchain-funcs
 
 MY_P="${P/_/-}"
 
 CRATES="
-	syn@2.0.39
-	proc-macro2@1.0.70
+	syn@2.0.68
+	proc-macro2@1.0.86
 	quote@1.0.33
 	unicode-ident@1.0.12
 	paste@1.0.14
diff --git a/media-libs/opencolorio/Manifest b/media-libs/opencolorio/Manifest
index 6cecbf16e560..ab880daf62f6 100644
--- a/media-libs/opencolorio/Manifest
+++ b/media-libs/opencolorio/Manifest
@@ -5,6 +5,7 @@ AUX opencolorio-2.2.1-support-doxygen-1.9.7.patch 5263 BLAKE2B 7d9ddd3db43dba048
 AUX opencolorio-2.2.1-support-minizip-ng-4.patch 3133 BLAKE2B f84abb93233d0834b1f1bd8066140db1120ddf1a1eeb95d340283ed5ef56bb598787d8a23cdc5b8acbbdc595d6850956c25e0a0f57139d872e45dd5469407d55 SHA512 d0c811f80978f8d08dccd94cd25b26b5fd9e8ba3bcb2cffa82426e9faea5e0afef46843128e297614d7e2fd0886bc9928ddb7e03b9b691fd03b05923693de8da
 AUX opencolorio-2.3.0-fix-cxxflags.patch 868 BLAKE2B 0c0a553066f4901a48290be145bdd2d543b5b6afb3b2363227da4366e70ba5d9a803ffbe00f5d63e5ee5f4cfc292c9e4f79fdee5555b72bf6f3f3d0db80e80d0 SHA512 f272b547535691e5d4e73aa5c11bdb4e04ef06838b0e34153f08d0b742d8875f93dbf5c2502c2a54725b9b6c1e5caac795c5f69bd3d3b48cf6826f358889155a
 AUX opencolorio-2.3.0-support-yaml-cpp-0.8.0.patch 808 BLAKE2B aed4b9d8bf512e42578e239bfe9a60074cb812d5d8894fc489f535a709d1b755d1934cf1c556ee9a06b5fd199796f4f6defdb36b8f9df7503288fd4a7eb5db7c SHA512 cf5a4b007ab4a9c25f6f94caeb007a0f4f2d83203eca6a4b83b38abc9df08593eb10159194e9c399f5877a618acd4da355b8fb299f39a73d04a4c94a903dbecc
+AUX opencolorio-2.3.2-include-cstdint.patch 730 BLAKE2B 35df68ae92e99373f47a0aeba7425e27df851d63205af0c6343cfddeeb36331eab7a9b4a2eedafc13f52301232733160ba0fe0c338553bf0aae069b91c73a6fb SHA512 072c3ebc9d155c1ff389884871d098695dedcfcf3c339088f4b1888df83b0c6bbc8ea0e1bdd18f9e3d7d4d7f1d554ad72be6022552a57879e6c03badb7397e2d
 DIST opencolorio-2.1.3.tar.gz 11024701 BLAKE2B bcd1eb6a74260f451e49ef40e729bfc4c354ab255d96c261fbf865c586f285fe876ed54b05276f3b6b25ece4fd261672fe1dd519041ffad77d7c78efc8cf161d SHA512 b26fcfa3ea12ab6e4b019a13ce79ebcfd215c674acb348f2d9f85f749b2a5beccd395ed1cc9954e4b3cb83a160b24a8d7d81994ac1d9ea8cfe074b81d6b8a061
 DIST opencolorio-2.2.1.tar.gz 11336775 BLAKE2B b463d6a0a7e7fec0a890fa8a0cd06ed269f925c5986dfb82eb53728a09d884c89e6c4dfe112706ce27351d4440909ff9680387028d1dc887e7d866b30c39c54f SHA512 d5f3a4b5bd661af7336c015d07e0feccb286464a08239a3c259a97217001161e7571f5137475fc2f4d1b9af6381bbfa03c0b60f41de282f114307961b8d84fc9
 DIST opencolorio-2.3.0.tar.gz 11406998 BLAKE2B 0e62e43de076a712f68b68b91c9908bc9050316e3500e0924fafb08a3356ce361953f49dfd1eb022eeada11e499653833a48a22a4ba593504617c1c61b16d488 SHA512 cdf20ca6c85b1d70244d8532d010344f1cf85be6a116d831e83ea04d7c47a961049691e6a241e9a7f632d864df57a4bccb68084e27187ec8a05f1fdf344824d7
@@ -12,5 +13,5 @@ DIST opencolorio-2.3.2.tar.gz 11443450 BLAKE2B 2573d2f229ba0349574d83883cd653485
 EBUILD opencolorio-2.1.3.ebuild 3168 BLAKE2B 7e64eecf250f5f56b15dde6c7a283185f4bb95d939c771a98b0856eba91de18f02ae27ac354ef104c6eb515f79bfa49e5daa8b1f407347f3c1fb0706597a2261 SHA512 b5f4ec43b46270cc2b05875b722c70840822eb0a46f4b1fd6bcd781170a331d5ce9809aca4df1364666992059aba53ea6f20a4c88c6b2ac0015b2280c3bfd64d
 EBUILD opencolorio-2.2.1.ebuild 3705 BLAKE2B 59712f2546a5411902a98368ec6cf97921c12cb515ba555e2736deea90e643be2ab5b86f567b9158bf5fa75a040fb632e8c7b9a9f053fb6d74c42ca769380bdd SHA512 a419232dde52910c34ee7ecb6270a735e15c414754916ba6fad1495f4f14cff9714637b3cc6536828e955e2c0c794ecd23ead6eb17a2436740ab5eb577ccbd5f
 EBUILD opencolorio-2.3.0.ebuild 4606 BLAKE2B d907b310540d7124b311e36e897078559e9fb16ad944a183af464f3d4e88b859eab8325fea18686e756763689b6af209a0a19745897298185e7df65f338c1d7b SHA512 03887551e7376d62c51ba548aeef9a30bf4501097c40bf6315c499ada08ab8154cbb1d1fd5c6725636074045a3b07ea80b43ee38ad4717fa9b345e82ced4b766
-EBUILD opencolorio-2.3.2.ebuild 4827 BLAKE2B 8cf7b7a5ce4ffc4f276e8f58bf11fed3c40990b88142a7882041a6d0a45cfb8e0d39e689789836f4064c91f38451fe51dcea37ac63b9152f258740d305ee5b3e SHA512 ac794c39142b5e648080b4e6436b1988f15ec18eab480d9597022ae7e90ccf8e45fe1fc1f69475e3ea697201b195a8088b25f74e42568b124f4919882e76018b
+EBUILD opencolorio-2.3.2.ebuild 4876 BLAKE2B ba39476309537862701e5cc96d4a62ee2b4a02e42165fbe9865aabd94ef24b6de174e9b55f0b313e13757ba6f79fa63aefbdb785effc3daf8001c8d8680255c6 SHA512 fdbcd63ad2e0185a0b430c193b73b27df8b5ecc4628d939244d2e386afbc77121da1ffa274a71d06f19af8c74bb2df061607eb170e05eda36b5d44da4bffde83
 MISC metadata.xml 792 BLAKE2B 6b94c1223e756ef3179ab3442c134bf7881400434332691bc693a36c8bceb4db609dd143afb6a18192c7bfaa9ccb72015c215e08b3bd65fbdb3ccc2fb3ff713d SHA512 c1b3d44b5ce24813b3e07074ba2fe40c3af89033dfbe5a372b130be26fcfeba9fa9c2a0d9e6a695972dc402979aa732df27fd3c6128a8f3a51fe926ecb73cb25
diff --git a/media-libs/opencolorio/files/opencolorio-2.3.2-include-cstdint.patch b/media-libs/opencolorio/files/opencolorio-2.3.2-include-cstdint.patch
new file mode 100644
index 000000000000..89f3b9465754
--- /dev/null
+++ b/media-libs/opencolorio/files/opencolorio-2.3.2-include-cstdint.patch
@@ -0,0 +1,26 @@
+From fb9b39dcb69746f9011087a6e1bc727872b86cfb Mon Sep 17 00:00:00 2001
+From: Paul Zander <negril.nx+gentoo@gmail.com>
+Date: Wed, 14 Aug 2024 17:43:30 +0200
+Subject: [PATCH] Fix compilation on GCC 15
+
+Bug: https://bugs.gentoo.org/937408
+Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com>
+---
+ include/OpenColorIO/OpenColorIO.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/include/OpenColorIO/OpenColorIO.h b/include/OpenColorIO/OpenColorIO.h
+index 784cf8d..7e04976 100644
+--- a/include/OpenColorIO/OpenColorIO.h
++++ b/include/OpenColorIO/OpenColorIO.h
+@@ -6,6 +6,7 @@
+ #define INCLUDED_OCIO_OPENCOLORIO_H
+ 
+ #include <cstddef>
++#include <cstdint>
+ #include <iosfwd>
+ #include <limits>
+ #include <stdexcept>
+-- 
+2.46.0
+
diff --git a/media-libs/opencolorio/opencolorio-2.3.2.ebuild b/media-libs/opencolorio/opencolorio-2.3.2.ebuild
index 70d5fb6ebc07..a9aa47ecd117 100644
--- a/media-libs/opencolorio/opencolorio-2.3.2.ebuild
+++ b/media-libs/opencolorio/opencolorio-2.3.2.ebuild
@@ -90,6 +90,7 @@ RESTRICT="test" #"!test? ( test )"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-2.2.1-adjust-python-installation.patch"
+	"${FILESDIR}/${PN}-2.3.2-include-cstdint.patch"
 )
 
 pkg_setup() {