18 files changed, 636 insertions, 128 deletions
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 4355e4b305f4..3f497fd65bf3 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/gmmlib/Manifest b/media-libs/gmmlib/Manifest
index 69cc0b24366c..245a39e0110f 100644
--- a/media-libs/gmmlib/Manifest
+++ b/media-libs/gmmlib/Manifest
@@ -3,7 +3,9 @@ AUX gmmlib-20.3.2_cmake_project.patch 145 BLAKE2B f42306b41a0c62ea9d3d5bfe3d1e1f
 AUX gmmlib-22.1.1_custom_cflags.patch 2963 BLAKE2B af9979ee3c7977c93288b6afd0c0a65451f6f06cffbb00d32d53541410beded1feb6212bb0a5b7820e4ba8c4ee03656f274b94a26e0688e90e0ad140b37ee4a2 SHA512 933a9234f178ec566ca88fd3b48d746ac869936acfd5541d8b6b3cac3125c029054fe385101d734e5e35eeb9393f1609be96c9bcc2f1e0bb79a7295ccdd6c292
 DIST intel-gmmlib-22.5.5.tar.gz 868894 BLAKE2B be17a0b1c16bf0ffcb37da3f63db20643803757ea42911f5666218e34bb3f59919bfa369749bef81598e8fb1855a8cad7347b6811791bc2c483b20a3e644e6dd SHA512 8603847f7d2daf0e7839973fea96fa552dbd8c25f29eb961a4f3c5918c70e61ed975a1f6f886547b605dd9f65a059e9decad6372a4269e2b61195259b049630e
 DIST intel-gmmlib-22.6.0.tar.gz 869017 BLAKE2B 8c17ecffb77150c4a2d97ccc13f86a75e2846eb8f3d61310452ad091d7d5f6375abc3e703b37a97ea8b6c18cd2f5adc52747cfa72b3fb9d3ad0785ef45b47dba SHA512 b4d7fb6bcc5827f5883f76fb7371ac17192c5278aa0f68650667f2257536bd0d01e1939927be0f7df4186aeb500eeb648d0336ac821a4f92bcfec75190c89fe1
+DIST intel-gmmlib-22.7.0.tar.gz 870302 BLAKE2B e9406e7370505382bf503d62222860beb1f718f811cb954a94b4ee7662ec67bdf953ab2271414d14fe19596fdd595c63837d5bad24a9d7fca07f4c3d11ed10f7 SHA512 1d8a1d75ae839ea52f96a7a6ff2cbd41f13b60ec05756df4e95cbaf40465d2a5ddd1314dc8b18b6f056ad8d03de7e4c2bd3b04004897895fbbcdf2aafd63b76d
 EBUILD gmmlib-22.5.5.ebuild 954 BLAKE2B 18a172f42aadea783ddeefee9b73f0b2f9231dc55eceaca62fb6a6682ff6fba2d2bada08cc72e462eadce8a11ec470aa21a779a90b3217a37c4626aaca21305d SHA512 ffb776fbae95a2415b658e68439b76bc0497f1aa2c33c0315984eb07172db8a7935c570dcaa715ad3aa0780887645d9af6b21cd61fc94be72d2dbb13efc24433
 EBUILD gmmlib-22.6.0.ebuild 955 BLAKE2B eba2f14d093a7b8b63a1cee0dff0fab805b9681bca014bd11cb2ff7682aec1b3adeaf41cac8b33a1d8a48c4c4420bfcc296a91429c3d55ab3e51581ee126adaa SHA512 f6f89934cf6bb49c453de13a599224d6415f494522f0ebc876cdecda9a061b9d41788ce3ae55d1c168c1f73d6d362403cb15b81067866e1554a4f57ff73c9494
+EBUILD gmmlib-22.7.0.ebuild 955 BLAKE2B 34b65f8bb13bccfce9d1e2e2f99da781e3f6315ec140aef0c8ef4f90c7dfe2903efab2ecf52f32298bfa9dfbe62b72e0c45d915474a560d88bf935a14f1ca0c3 SHA512 78d2a9e8d47dba86c8c294a65c83277a9a3b475c1dfad5ed99af8dd623996601821e5f7fad1db701ce77fc6dc55816f43cbabf738df46eab57bf61271cff8177
 EBUILD gmmlib-9999.ebuild 955 BLAKE2B eba2f14d093a7b8b63a1cee0dff0fab805b9681bca014bd11cb2ff7682aec1b3adeaf41cac8b33a1d8a48c4c4420bfcc296a91429c3d55ab3e51581ee126adaa SHA512 f6f89934cf6bb49c453de13a599224d6415f494522f0ebc876cdecda9a061b9d41788ce3ae55d1c168c1f73d6d362403cb15b81067866e1554a4f57ff73c9494
 MISC metadata.xml 478 BLAKE2B 22fa7744f1f6ae793034225645314ed7f0a5499cc33b570a00aa2c076cb3fdc9c2663654df4998a30fc76f7d833ed4f2022fd8b2869539e25c47f64e6b0f438a SHA512 0c46a6af2f254ee9c314f08654739003f58283e3ec00a8a3e628225e14065d359d0816a05aba1754379dea826d1bf2d501fb35ba58c5020f036917771ea035d9
diff --git a/media-libs/gmmlib/gmmlib-22.7.0.ebuild b/media-libs/gmmlib/gmmlib-22.7.0.ebuild
new file mode 100644
index 000000000000..cc1fc6f3b2d1
--- /dev/null
+++ b/media-libs/gmmlib/gmmlib-22.7.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake-multilib
+
+if [[ ${PV} == *9999 ]] ; then
+	: ${EGIT_REPO_URI:="https://github.com/intel/gmmlib"}
+	if [[ ${PV%9999} != "" ]] ; then
+		: ${EGIT_BRANCH:="release/${PV%.9999}"}
+	fi
+	inherit git-r3
+else
+	KEYWORDS="~amd64"
+	SRC_URI="https://github.com/intel/gmmlib/archive/intel-${P}.tar.gz"
+	S="${WORKDIR}/${PN}-intel-${P}"
+fi
+
+DESCRIPTION="Intel Graphics Memory Management Library"
+HOMEPAGE="https://github.com/intel/gmmlib"
+
+LICENSE="MIT"
+SLOT="0/12.3"
+IUSE="+custom-cflags test"
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-20.2.2_conditional_testing.patch
+	"${FILESDIR}"/${PN}-20.3.2_cmake_project.patch
+	"${FILESDIR}"/${PN}-22.1.1_custom_cflags.patch
+)
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING="$(usex test)"
+		-DOVERRIDE_COMPILER_FLAGS="$(usex !custom-cflags)"
+	)
+
+	cmake_src_configure
+}
diff --git a/media-libs/libfpx/Manifest b/media-libs/libfpx/Manifest
index d93d22bdedcc..104a03f18e4e 100644
--- a/media-libs/libfpx/Manifest
+++ b/media-libs/libfpx/Manifest
@@ -1,5 +1,5 @@
 AUX libfpx-1.2.0.13-export-symbols.patch 347 BLAKE2B d0bc3b1fecba641554a549c0241e098f801f0dd1a471427127c99f56945836ca679b14c2bdff3a85c3be32d399bae871911742fa1ea0c74c8a2e50741ae70938 SHA512 a8e9793f78902317fa2aacc9fc61160579fd211f6e36ae817afc1d8963c60eeb930b0f4574bb855b75bfbfa1b678882773b581db91462289132cd44bb2b0be6e
 AUX libfpx-1.3.1_p10-musl-1.2.3-null.patch 1906 BLAKE2B 2dcccc22aa1f163ecc5d3f3de3981950844d89dce57599635eab749af8531b2e31e74dbdfba9c01895f530b15c054e1311a965c63e013c8b9115f91ab2b6c516 SHA512 d37d8315a8e3e1c6ee83e71cf38b1e0656ba59f6d6a9bd24ea9c03366b8d2c5f8a092ab2f39f1b10429eec2bb7aeba83dea94ebd8ea5dcb2146a2f7944f8cf2c
 DIST libfpx-1.3.1-10.tar.bz2 2358246 BLAKE2B d67b5a38e29d8916471ced46005983427ea1e77ff1fa682b67f80e8db71bd5460aafb59753bd901aa40e955cbeb453cf017109577b8d9357e86ac3e7d988d4b4 SHA512 afa96b240ead4d3c56e8e6c66db188d1f4441e7b4d08e12e0e96359cfa2cea9eae5625105d87df65ceacd97d84a386876c62dee5bc1916c420755d9bcc4655d4
-EBUILD libfpx-1.3.1_p10-r1.ebuild 1339 BLAKE2B 31be5d670aac80e03503d8622a20325522603a3e1b8db007d0f0b7dc7ee16d42bcd26aa8a2557bb1d6086f33eef783b3dafb2c6f27d16ef99f75bda5bd3dd6e3 SHA512 350ee7d7d6c52d5ae71c8b2d0c3838d221332853e08b7c6d0c79c663f18934f30dcc67c6793dbfe295502d02f86bd19dce318fe702bfeec23d57fd58fb3147c6
+EBUILD libfpx-1.3.1_p10-r1.ebuild 1575 BLAKE2B 8b8c64d787be9ccb097a347614c7228057063bbd97e3a6ad558973143859ce828079e465b4028aaf46f0a51a98f91ff205280c3e60da91b65ec87c938722ccaf SHA512 413f89d043baf05e0272cb94c3e3f609f3588434d0f680d154bb710cbb4cf0efd50ccad5f8d0da56f0b57ce8e93fcd38eafa0bf38f67b90da3a0d0b5c44bad4b
 MISC metadata.xml 334 BLAKE2B 5f2c903be8e07657f0b5ea2f60d1d51cd22c18582227ca2f3d7e86b1911b790e442aed299bd894217c99e106fbcb4a31c3c240eba69338f9de14cfb8ede765da SHA512 b4d167b6a8f3dadcde95c86990d0855862b84e465bf4538c7991d0d581cc0c91d42923435e66d381c91f657b150ac322f25fd7bc1bdb4870cf489534279f5859
diff --git a/media-libs/libfpx/libfpx-1.3.1_p10-r1.ebuild b/media-libs/libfpx/libfpx-1.3.1_p10-r1.ebuild
index 59235c4ea6ef..a06152cd7dc0 100644
--- a/media-libs/libfpx/libfpx-1.3.1_p10-r1.ebuild
+++ b/media-libs/libfpx/libfpx-1.3.1_p10-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -38,6 +38,11 @@ src_configure() {
 	append-flags -fno-strict-aliasing
 	filter-lto
 
+	# https://bugs.gentoo.org/896246
+	# already fixed by upstream but the patch is too large, waiting for new releases
+	# https://github.com/ImageMagick/libfpx/commit/5f340b0a490450b40302cc9948c7dfac60d40041
+	append-cxxflags -std=gnu++14
+
 	append-ldflags -Wl,--no-undefined
 	econf \
 		$(use_enable static-libs static) \
diff --git a/media-libs/libva-intel-media-driver/Manifest b/media-libs/libva-intel-media-driver/Manifest
index f3a69b329537..9f45fecb5e1a 100644
--- a/media-libs/libva-intel-media-driver/Manifest
+++ b/media-libs/libva-intel-media-driver/Manifest
@@ -5,9 +5,11 @@ DIST intel-media-24.4.4.tar.gz 27696988 BLAKE2B cf13b3d0feb005b204892a62402d2a04
 DIST intel-media-25.1.0.tar.gz 28243498 BLAKE2B 7b0982cf06c13754897c46ca3c54b3d0d0d9c1b8aff6066c148770946f83655185bc02f67d83c762a2843969f6f70b4fae56c6853930ff228059e6ff7484b7bd SHA512 20c0f7952a59ab86a6e6c1281c198961d835380e5d4f17fe2cc1c74a31da426560cc244950e6e91f0b4fb659133e461f5ba539c7000ad26e8032fc2aaf79c416
 DIST intel-media-25.1.1.tar.gz 28255804 BLAKE2B 960c53a7f9920b782c2c4fa10a37c1de4b51271a37ec3b6eea1a814d842d4725564122e3d1b4b1a28dfa4beda80f13db20fe64831a5cdeeb5c299e754d2576f2 SHA512 dcdbbd5c7e2b5ae93784cc38229aab6bd9a330bcde08e6f7597264d9124a5044086c67e08828dfe81292b233e33148fe9b5426cf2d0003f62b3af6452f07de57
 DIST intel-media-25.1.2.tar.gz 28258215 BLAKE2B a3ca71d049f3a56d2e11f45009cfccc6fab7530449a4890b4082c2f4e1263e980b6d0717a2f2703290977886343b33122f88689e33814bb59405d21b09fedbe0 SHA512 ef8516c5a90ffc10199214d79a4725825ddd0e9050255c7ec6a7f118256a62b1faab28c301c8d64ee25cde137ed48500010c1b78a4aee105d5aa59b6ba6f346b
+DIST intel-media-25.1.3.tar.gz 28262040 BLAKE2B 35dbf8b624438be331c0ac264f5c8c077b9a8aef247d9090d87fa3233bcd3fd4f42b894cf8425c83cab67d4504ae4c339c20913e453176d5bd6c4113a2136da9 SHA512 670bfcb79848e9d0b7f74dbdc9aee9af9a47e209d7228f35c3f78ad9dac3ddc7fdccd9d48068dbc14cc134181bbe22c632707c9268d1eec8908e9b00e88b5b28
 EBUILD libva-intel-media-driver-24.4.4-r1.ebuild 1553 BLAKE2B 8a00e4f58d7a1b69ed18c191a03d1342bbd330af9fd76c66953ea7d5d343e3c56be2732390fa4598dfcbc271bda5709b0d0df20af478f76ebba5672af311c49f SHA512 9d2241aab18bcab1430901a8bbfa501bdd5e28a31df264579108382e309589e961d66beb29f0a1d60ef0f4905b8019ed4d5bce558a45d94fdbe42b777a8b9a87
 EBUILD libva-intel-media-driver-25.1.0.ebuild 1512 BLAKE2B 761266db69786809a3d777d5ef5c8698a5da93f5639b53227446a1ac5fc9f63a20a21ba4fe6e03495e05796b3f9cd768f68907f123a7a7fa49f6aa5ee1d3c01a SHA512 e1c28b94142609cf8b4eb29e18ba461ccb5fdf9b6a0b141a406b2ec0457d699faf06592d3d2eca4459c48b575e62b5bc0fc8387570bd7adf8902c635aa89ee0b
 EBUILD libva-intel-media-driver-25.1.1.ebuild 1512 BLAKE2B 761266db69786809a3d777d5ef5c8698a5da93f5639b53227446a1ac5fc9f63a20a21ba4fe6e03495e05796b3f9cd768f68907f123a7a7fa49f6aa5ee1d3c01a SHA512 e1c28b94142609cf8b4eb29e18ba461ccb5fdf9b6a0b141a406b2ec0457d699faf06592d3d2eca4459c48b575e62b5bc0fc8387570bd7adf8902c635aa89ee0b
 EBUILD libva-intel-media-driver-25.1.2.ebuild 1512 BLAKE2B 761266db69786809a3d777d5ef5c8698a5da93f5639b53227446a1ac5fc9f63a20a21ba4fe6e03495e05796b3f9cd768f68907f123a7a7fa49f6aa5ee1d3c01a SHA512 e1c28b94142609cf8b4eb29e18ba461ccb5fdf9b6a0b141a406b2ec0457d699faf06592d3d2eca4459c48b575e62b5bc0fc8387570bd7adf8902c635aa89ee0b
+EBUILD libva-intel-media-driver-25.1.3.ebuild 1512 BLAKE2B 761266db69786809a3d777d5ef5c8698a5da93f5639b53227446a1ac5fc9f63a20a21ba4fe6e03495e05796b3f9cd768f68907f123a7a7fa49f6aa5ee1d3c01a SHA512 e1c28b94142609cf8b4eb29e18ba461ccb5fdf9b6a0b141a406b2ec0457d699faf06592d3d2eca4459c48b575e62b5bc0fc8387570bd7adf8902c635aa89ee0b
 EBUILD libva-intel-media-driver-9999.ebuild 1512 BLAKE2B 761266db69786809a3d777d5ef5c8698a5da93f5639b53227446a1ac5fc9f63a20a21ba4fe6e03495e05796b3f9cd768f68907f123a7a7fa49f6aa5ee1d3c01a SHA512 e1c28b94142609cf8b4eb29e18ba461ccb5fdf9b6a0b141a406b2ec0457d699faf06592d3d2eca4459c48b575e62b5bc0fc8387570bd7adf8902c635aa89ee0b
 MISC metadata.xml 565 BLAKE2B e630d474342839898d53aef1849b002ef651c9f4fe3bfcfe72e809012e6c65153b1a6c14db922a45440ffd5717b90dddd6973185f8a625906e9d5571e50728d9 SHA512 22227f8a9cc39fff74f0bf2cdc8953f110e94ce0ab107076269d604c3cf8ae46c8496c9bcf47598e351cb9714e427f213ade5e446a5e8c67acfc87db5530b370
diff --git a/media-libs/libva-intel-media-driver/libva-intel-media-driver-25.1.3.ebuild b/media-libs/libva-intel-media-driver/libva-intel-media-driver-25.1.3.ebuild
new file mode 100644
index 000000000000..a27f472ef10b
--- /dev/null
+++ b/media-libs/libva-intel-media-driver/libva-intel-media-driver-25.1.3.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake-multilib flag-o-matic
+
+if [[ ${PV} == *9999 ]] ; then
+	: ${EGIT_REPO_URI:="https://github.com/intel/media-driver"}
+	if [[ ${PV%9999} != "" ]] ; then
+		: ${EGIT_BRANCH:="release/${PV%.9999}"}
+	fi
+	inherit git-r3
+else
+	MY_PV="${PV%_pre}"
+	SRC_URI="https://github.com/intel/media-driver/archive/intel-media-${MY_PV}.tar.gz"
+	S="${WORKDIR}/media-driver-intel-media-${MY_PV}"
+	if [[ ${PV} != *_pre* ]] ; then
+		KEYWORDS="~amd64"
+	fi
+fi
+
+DESCRIPTION="Intel Media Driver for VA-API (iHD)"
+HOMEPAGE="https://github.com/intel/media-driver"
+
+LICENSE="MIT BSD redistributable? ( no-source-code )"
+SLOT="0"
+IUSE="+redistributable test X"
+
+RESTRICT="!test? ( test )"
+
+DEPEND=">=media-libs/gmmlib-22.6.0:=[${MULTILIB_USEDEP}]
+	>=media-libs/libva-2.22.0[X?,${MULTILIB_USEDEP}]
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-23.3.4-Remove-unwanted-CFLAGS.patch
+	"${FILESDIR}"/${PN}-23.3.4_testing_in_src_test.patch
+)
+
+multilib_src_configure() {
+	# https://github.com/intel/media-driver/issues/356
+	append-cxxflags -D_FILE_OFFSET_BITS=64
+
+	local mycmakeargs=(
+		-DMEDIA_BUILD_FATAL_WARNINGS=OFF
+		-DMEDIA_RUN_TEST_SUITE=$(usex test)
+		-DBUILD_TYPE=Release
+		-DPLATFORM=linux
+		-DCMAKE_DISABLE_FIND_PACKAGE_X11=$(usex !X)
+		-DENABLE_NONFREE_KERNELS=$(usex redistributable)
+		-DLATEST_CPP_NEEDED=ON # Seems to be the best option for now
+	)
+	local CMAKE_BUILD_TYPE="Release"
+	cmake_src_configure
+}
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index 44b1c07058f6..21ae81f24669 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -1,6 +1,7 @@
 DIST mesa-24.1.7.tar.xz 29206724 BLAKE2B b3102fcf96c032d07826186c2d60dc93e5c17b26f725c20cf1e402d1cfbaaba9809bff7a04d3df0179d2ec8606bc9fb391761d17a148671b9270cf2aaca0324d SHA512 890f6387963bbb86a85305ea963cca326a3b3f8f8758ae2082fd62c52df77c2883a359341e91f36614fea59219394ef78f799a334080699a0bb71d984a68cb01
 DIST mesa-24.3.4.tar.xz 30691532 BLAKE2B a5cf1f49c6d809d19510793f5d1dcec1a3842495d3b4166e303d7f2d4744d179811697d264c5c9b39f2819ebc64a76357195b3eae6b1d2a83128de141354e3c2 SHA512 9c23cd86fda4cf0289c5a78b08ceea8b01e5b141d86ee3e659fa46e62ff9586ff92a4984d2a340b5bf209c4c7f3414bf99f3ced19feee8fb39ef99fe572dbd55
 DIST mesa-25.0.0.tar.xz 46643728 BLAKE2B 9aca2416ea4e304d46fda648cb9b8e04caa053458b91893fb874e9a30d8293722c3bed1098c2720b04b0c7278eba3b0387900b56e13b6133a23c0f6be705025c SHA512 7f5b6674c40b6c8dcab7934512ff754b40a6a8a466422c90236f614d322033d4d465307ddcd983f9f3afb1310e132ec3186a085d261c95493a0c460b2ec59ce8
+DIST mesa-25.0.1.tar.xz 46679784 BLAKE2B 9a73a3321c9f1d7d4384779f647c43bcb536b316dcc9a61b8a78a6f4bfd4642366e418155db5c2190b530cebee434554c6c4d2d59f68a87bb4056467fe601825 SHA512 1ecb1b90c5f78de4c61f177888543778285731faccc6f78d266d4b437f7b422a78b705a6e9fc6c9eab62c08f2573db5dd725eaa9cc9e5bedcaa7d8cfe6b47a1f
 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
@@ -11,5 +12,6 @@ DIST unicode-ident-1.0.12.crate 42168 BLAKE2B 4cede03c08758ccd6bf53a0d0057d7542d
 EBUILD mesa-24.1.7-r1.ebuild 13769 BLAKE2B cbdd0130cb55c039d1d81d67eeb2b0b8493fe25db50f938f08e2e437b3e0b0a9d50d2c6250bee66f081b7a3577da3ffab810ba636e8ebfe450a7e7c7b8dc8a7b SHA512 dd1de43ecd26536b96d753a479d509667382243ed536edd3c181207bd4b7fc1528d7ab53a3d491659a0866d4b9d4c90f06e5c5a61f4e3353a0f3fbb4ec81d90e
 EBUILD mesa-24.3.4-r1.ebuild 13759 BLAKE2B a0be1b47c3055f7302281d6413880db6787ffffbaf75d40a665078868b3a754419d45b47a35f26457556b46e049f81ef23aa6a13fb1874f5b2022f1d2c80737f SHA512 b5f84b9ec1c7789b2e3dc44b8f7a2752d72c9a5adc421630c8bedd8ea40cf0541868daaaaa59d142cc41f707d9ff66ca45bb9a181b5fc3e7088aa27dce222683
 EBUILD mesa-25.0.0.ebuild 13811 BLAKE2B 10b36021bf5a99e1a9c32a287e086db61b4af5814564e96306af87e61c919e2ace543796076e9401b82524dde81958fe1a35db0ca6595ec5182038669f3b306c SHA512 8971ea07468b5240b50bc81232adc44b9cb02360534aa48d9e9c31a7a235422c00a6ab92481a7c89794d43668ccf5114df90d858b1ab93f523748109fed630ca
+EBUILD mesa-25.0.1.ebuild 13811 BLAKE2B 10b36021bf5a99e1a9c32a287e086db61b4af5814564e96306af87e61c919e2ace543796076e9401b82524dde81958fe1a35db0ca6595ec5182038669f3b306c SHA512 8971ea07468b5240b50bc81232adc44b9cb02360534aa48d9e9c31a7a235422c00a6ab92481a7c89794d43668ccf5114df90d858b1ab93f523748109fed630ca
 EBUILD mesa-9999.ebuild 13867 BLAKE2B 23a013097523692a82aa03dd4de20a1f2cf5f1a10b21544952f5f0b14d01da862802e24f910153b951fbe5ac9f98d7e51e5675e9d3c4aa4a535e27382b8ade68 SHA512 039b835929f21dc09f08d93d3b6e7f6d4ee98f82d494d619f328095916e85549f39d9c02c6fb7e022eb1a7fcf5bcab9555069156640d95201927db0dd1d75e20
 MISC metadata.xml 1303 BLAKE2B 348e84a15156bd8ae4634c1866f83f1b283b77f8478e66e57dd3f047a6346d1cc67a7c808ce159b82d292dfab62e8b6c4d17cefcae7aea6fa38739667947258b SHA512 448c3d73ded90117f38cec7c80eead4bdac1599c563798c91c96bca8543b9db2e5c2a06f26f9b7496af085a964aff51ed8b0882aa88f18404b64447de2f65598
diff --git a/media-libs/mesa/mesa-25.0.1.ebuild b/media-libs/mesa/mesa-25.0.1.ebuild
new file mode 100644
index 000000000000..762af41772c1
--- /dev/null
+++ b/media-libs/mesa/mesa-25.0.1.ebuild
@@ -0,0 +1,506 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LLVM_COMPAT=( {15..19} )
+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
+
+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
+"
+
+RUST_MIN_VER="1.78.0"
+RUST_MULTILIB=1
+RUST_OPTIONAL=1
+
+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="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~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
+	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} )
+	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}]
+	>=dev-util/spirv-tools-1.3.231.0[${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 "
+			llvm-core/llvm:\${LLVM_SLOT}[llvm_targets_AMDGPU(+),${MULTILIB_USEDEP}]
+			opencl? (
+				dev-util/spirv-llvm-translator:\${LLVM_SLOT}
+				llvm-core/clang:\${LLVM_SLOT}[llvm_targets_AMDGPU(+),${MULTILIB_USEDEP}]
+				=llvm-core/libclc-\${LLVM_SLOT}*[spirv(-)]
+			)
+		")
+		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
+		llvm-core/libclc[spirv(-)]
+		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.614.1[${MULTILIB_USEDEP}] )
+	valgrind? ( dev-debug/valgrind )
+	wayland? ( >=dev-libs/wayland-protocols-1.38 )
+	X? (
+		x11-libs/libXrandr[${MULTILIB_USEDEP}]
+		x11-base/xorg-proto
+	)
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	opencl? (
+		>=dev-build/meson-1.7.0
+		>=dev-util/bindgen-0.71.0
+		${RUST_DEPEND}
+	)
+	>=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/mesa_clc-${PV}
+		llvm-core/libclc[spirv(-)]
+		$(python_gen_any_dep "dev-python/ply[\${PYTHON_USEDEP}]")
+	)
+	vulkan? (
+		dev-util/glslang
+		video_cards_nvk? (
+			>=dev-build/meson-1.7.0
+			>=dev-util/bindgen-0.71.0
+			>=dev-util/cbindgen-0.26.0
+			${RUST_DEPEND}
+		)
+	)
+	wayland? ( dev-util/wayland-scanner )
+"
+
+QA_WX_LOAD="
+x86? (
+	usr/lib/libgallium-*.so
+	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 llvm-core/llvm[!debug=]; then
+		ewarn "Mismatch between debug USE flags in media-libs/mesa and llvm-core/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
+
+	if use opencl || (use vulkan && use video_cards_nvk); then
+		rust_pkg_setup
+	fi
+}
+
+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
+	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
+
+		emesonargs+=(-Dvulkan-layers=device-select,overlay)
+	fi
+
+	driver_list() {
+		local drivers="$(sort -u <<< "${1// /$'\n'}")"
+		echo "${drivers//$'\n'/,}"
+	}
+
+	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
+		-Dlegacy-x11=dri2
+		-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)
+		-Dmesa-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_compile() {
+	if [[ ${ABI} == x86 ]]; then
+		# Bug 939803
+		BINDGEN_EXTRA_CLANG_ARGS="-m32" meson_src_compile
+	else
+		meson_src_compile
+	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/opencv/Manifest b/media-libs/opencv/Manifest
index 6458ce194a5f..b2d077654a03 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -31,6 +31,6 @@ DIST opencv_contrib-4.10.0.tar.gz 55387316 BLAKE2B 5d6f884817b6d45b86833fcab1e31
 DIST opencv_contrib-4.9.0.tar.gz 59803362 BLAKE2B e6b90e9bd462f96ef010490d45105d7125622d6c49912653c0d387568ae7109b1cbcac4cc0f52c1f997a45ed75923caea90bf4ad9336e689a56742b029789038 SHA512 ebaee3b88bd7ae246727e65a98d9fbc1d9772a4181a1926f3af742410b78dc87d2386bcd96ac67d7fb1a3020c3717a2cdebdcf9304d6dfd9ea494004791cf043
 DIST opencv_extra-4.10.0.tar.gz 504349887 BLAKE2B 6e76860beb95cf00698980a19cfd2894e5bfe0d477d94352cbb2ff98688acbc1c404953cbc3baa95453588e7b9063175a067f24006c5d2719a6c75d15f2ef891 SHA512 1a581dad61bc1e5075af5afed2dd3d67793232a9e1219408448d08c518ae714cf0c4d5fec2c25791351a49a0d265fe051ea142b2170f82843e19e82f65abc8c6
 DIST opencv_extra-4.9.0.tar.gz 502141517 BLAKE2B ed7351f29c6fb80d56d5ef383af68322fa805c7689132f7ca9bb43c9a1319c5876ce6d5c40d583c955eb255dd82b876c94ed42625cd71b13830ec94b2cc75dc2 SHA512 f05c1eaed491d15107c858af5b33d0d5856070dcb6f94491ba33a172b2f0caf34905eb5d1787e1247bc888626478647fce0db7f3ccbc6d6faba0ee43fd6b6bfa
-EBUILD opencv-4.10.0.ebuild 43132 BLAKE2B 61bd996de803a2b51184558cc6670c3d20eee83fcdeca83bafe5a9d5e11d507a69f30146096aebf2a7f191a6889d33acdc8aa0c5da980c2a1d9a0b8ad707519a SHA512 8bff1cad8316623373f31193bef895a56892e249517134a9b75a78f3a6284b0de66b7a2420c626195141779b52d9954c2863a15e582cf92b1b696ac31a974d8b
+EBUILD opencv-4.10.0.ebuild 42996 BLAKE2B 844b33735f2473a07f341d0ac4d6bf5cc9961f9bab291aa196bece138625d8a02b58ddcea2154ec2d6ef666c3fdc02bb45c437c42a3dfae59aae8836e79bccb7 SHA512 850b2bb590440548a78f04713ef15ac20bc741814350b4ec5038ebf2fbea2d7d033957f83a1f67fd38575bdcb18bcbe10ea68683eb6500191eac5199da7f64f5
 EBUILD opencv-4.9.0-r2.ebuild 35016 BLAKE2B 2f355e13f1a13e8d6b039ac8dea37fae80e3a6b3464406a668d809cbadb046b34afa022240fdfe474106543e28686b7b8746a391e06807bf8656ee0cdb657ae9 SHA512 f65508a457c94c903b045384f6afe23ee3730cd92321d959c51525a7e9e2c5b18b48a5c5d1c7fec3621af5d5aad28c09ad31311a46504a6ed340bb39bc15ce9a
 MISC metadata.xml 3937 BLAKE2B 5c56985141668333faa8e5f6f022207639cf1494bafba5ecfaf920b67a6b5de18d58c8535d2462ea6c973501400e927e5d15b220adc8b17dab78a184304849d3 SHA512 35cf8694e0a6e5a8017cff560238fc064493100da17bd35dc0ea926cd9a8e6de440cf1d860dc29df9b197c2b4f54a1e50152b495580f165ba44805443587672b
diff --git a/media-libs/opencv/opencv-4.10.0.ebuild b/media-libs/opencv/opencv-4.10.0.ebuild
index 40354686489c..4bb3003623f7 100644
--- a/media-libs/opencv/opencv-4.10.0.ebuild
+++ b/media-libs/opencv/opencv-4.10.0.ebuild
@@ -565,11 +565,6 @@ multilib_src_configure() {
 	# bug #919101 and https://github.com/opencv/opencv/issues/19020
 	filter-lto
 
-	# bug #948071 (gcc PR118464)
-	if tc-is-gcc && [[ $(gcc-major-version) -eq 15 ]]; then
-		append-cxxflags "-fno-tree-loop-optimize"
-	fi
-
 	# please don't sort here, order is the same as in CMakeLists.txt
 	local mycmakeargs=(
 		-DMIN_VER_CMAKE=3.26
diff --git a/media-libs/openimageio/Manifest b/media-libs/openimageio/Manifest
index 5d7f190a1d67..1fd1cb83898e 100644
--- a/media-libs/openimageio/Manifest
+++ b/media-libs/openimageio/Manifest
@@ -24,5 +24,5 @@ DIST tst0007.fits 8640 BLAKE2B cf6eaff174e88bbd27f642964e6b3e5502cb08742d465a7ca
 DIST tst0008.fits 8640 BLAKE2B 7b4213cef2106cf0e298fce1ba3b28e74ba6ed26a2441650af297384b46c22910af8a36c2693c1c0e5aed6196561a8e4b4c75cde54541ea7a1a9d684a41f2f40 SHA512 c2dc77eb54cfc48bc97228a06e25cc5b4b2a8f32f417d5a34bb6794b020b277e144b1d5c71f09a44c94e05797c99f318de3f8705eabd22b44ac1b47fe601f918
 DIST tst0013.fits 72000 BLAKE2B 6ca11cd033782adc8f359217e30752b47623c317aa155dc1bae43a0a019f7d5f9d4ba9c7349e99ee14f2d6498d5d166597606721b251b1b2dc039fbe400d00a3 SHA512 c816642e89e3bfdce38a4f755e84a12af35c9da48916abb66bcabf2f899201dfba3c988f929395092921a53a6d94922d84d325334e9bd8d348cdb305878ccb6a
 EBUILD openimageio-2.5.13.1.ebuild 7975 BLAKE2B c345d6ec84a5be80facf3f659e781e262349d5f72bc21f36a527e625954de6a810b1cec328bd14076c11cd6b94149c69342a8937961d2b830500ec5e83a93708 SHA512 02394f5a5e9f81a8513ff1f6a4d70df64255183f5d27251206e8fc3b9fed1954f62d87dc03ba7827603c513396e3f0ebbe798d1d8a00b45aaf9a859440d9cf95
-EBUILD openimageio-2.5.18.0.ebuild 8162 BLAKE2B 403d9b4b2a58e4bf02aa7f84423979c68f508b5be91eafa4a3acf691a4b437c5c9656602da5f36a6539ae02041715a5dc6cbd99a9b8073f22af0d62975d36a21 SHA512 94434bfb3c40a06e08cc09a1eb28bd6839625b548795671f1a703615e4fc5e51c0794299d560803b65051d5193894129594cbb85ac9b5367c7bfae78766123ab
+EBUILD openimageio-2.5.18.0.ebuild 7994 BLAKE2B b45c29d3d65e819a40750d131a6a7a0222b5c7c0e229d39d8ef14d50919a8843970a68308c3bd7ed95fb183c80088e2617b98618b9545bbcd99d36903617eb0f SHA512 64f43ae38d8874befac062af741eed72bafe942aa9a077be717db2bbb394818d678ef80bd3c61466be32138fc49cd10cb3ae8ce57eab59fea6dcf18908024bab
 MISC metadata.xml 956 BLAKE2B 952d23327253a49b38478eac7d1b5f14e63f0b2a25464f6b4eec8196581d1163518acd1b2bc9b9472eaa6ed41f3cc0ed806568e0fba4723697a06c82d77747b3 SHA512 d71ae07afeee0c7ba59ee0034b58150c1097050de9fca491b00b7f7031aef464efda94df9fa86b272f432b30f8d3403999a7478fef1cd47001e607f1faefeae5
diff --git a/media-libs/openimageio/openimageio-2.5.18.0.ebuild b/media-libs/openimageio/openimageio-2.5.18.0.ebuild
index d8c259f1bc7f..573e5e385188 100644
--- a/media-libs/openimageio/openimageio-2.5.18.0.ebuild
+++ b/media-libs/openimageio/openimageio-2.5.18.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{11..13} )
 
 TEST_OIIO_IMAGE_COMMIT="7e6d875542b5bc1b2974b7cbecee115365a36527"
 TEST_OEXR_IMAGE_COMMIT="d45a2d5a890d6963b94479c7a644440068c37dd2"
-inherit cmake flag-o-matic python-single-r1 toolchain-funcs virtualx
+inherit cmake flag-o-matic python-single-r1 virtualx
 
 DESCRIPTION="A library for reading and writing images"
 HOMEPAGE="https://sites.google.com/site/openimageio/ https://github.com/OpenImageIO"
@@ -184,11 +184,6 @@ src_configure() {
 	# Even if there are no SIMD features selected, it seems like the code will turn on NEON support if it is available.
 	use arm64 && append-flags -flax-vector-conversions
 
-	# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=118077
-	if tc-is-gcc && [[ $(gcc-major-version) -eq 15 ]]; then
-		append-flags -fno-early-inlining
-	fi
-
 	local mycmakeargs=(
 		-DVERBOSE="yes"
 		-DINTERNALIZE_FMT="no"
diff --git a/media-libs/opusfile/Manifest b/media-libs/opusfile/Manifest
index a27e34345dd9..9e8ef648bd1c 100644
--- a/media-libs/opusfile/Manifest
+++ b/media-libs/opusfile/Manifest
@@ -1,4 +1,4 @@
 AUX opusfile-0.12-configure-clang16.patch 2946 BLAKE2B 7eab443d03a08136e55329c87e5f084724c205f6789db5747f40318153fbcc4d413024fac6abb5441dbfcca3ece893b82714e0d5ec6d2cced9f94fbbd944c7e4 SHA512 2e7a2c9594f0eda9ed9486e621c932660cd2b86694e4fb5c166da05fd90949a7e74d627ee49ffb516525bf0d5fcfeb2407834d9163da0b46f0c9625362c2f550
 DIST opusfile-0.12.tar.gz 471354 BLAKE2B d54d9b8ed011c018dc6de77afab524d2e47ba6cca69b911efacf361b41f3b59a31424cb15a778db14166815ba5e2352f33f8aa7987c30e5e14339c652558d18d SHA512 e25e6968a3183ac0628ce1000840fd6f9f636e92ba984d6a72b76fb2a98ec632d2de4c66a8e4c05ef30655c2a4a13ab35f89606fa7d79a54cfa8506543ca57af
-EBUILD opusfile-0.12-r1.ebuild 1057 BLAKE2B e781c664ad8093c9b1705d811b9411bb6052b2e228df88af18adfcb3297cc510c76e3cdefbee5a69c0de183b7ce3e803c3777222d205145ede2770aef0191357 SHA512 157802835d05d900b0d7895f49c3db1847d2a30b3e31d9d2a5a7feccee4ca1604b62a7296d4af6ad2f084f93e2732d224be5bbeb6a0f5b446437981ab6c06bc9
+EBUILD opusfile-0.12-r1.ebuild 1194 BLAKE2B 411a822d4a57c34916f5facceb60233457842ac9cbf6203df212f46af253a4c41f065a072265d17860c1808b283609d290ae2aca947edf18b4008e8e9f0c1cdc SHA512 bb692b67b7010e79a7617bef4c2f5943af51ec24bea5b79bb06cf00de44394274031a1ee05f3330a4a38202a6a111e14067d1ac134cdad529517fa25ae15fe65
 MISC metadata.xml 653 BLAKE2B 67076fdf6a18be5b1ebce27ebc0679580105aff3654d11f4369e9d23d13b2ea25feac8e763ffac7a149dd882839c18bcf57dec4f7a4fa47813dc1a1caa85207a SHA512 1d983d7ac52639f15c220cbe6b02e49f829425301dab86e8c68e5f85a674b823bb194c67195ccb45c48022a1a56f0772d206819ddf5dc0b21e235c4df1336660
diff --git a/media-libs/opusfile/opusfile-0.12-r1.ebuild b/media-libs/opusfile/opusfile-0.12-r1.ebuild
index 1a2f0f67d628..4910b4acd381 100644
--- a/media-libs/opusfile/opusfile-0.12-r1.ebuild
+++ b/media-libs/opusfile/opusfile-0.12-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit autotools
+inherit autotools multilib-minimal
 
 DESCRIPTION="A high-level decoding and seeking API for .opus files"
 HOMEPAGE="https://www.opus-codec.org/"
@@ -15,10 +15,10 @@ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv sparc
 IUSE="doc fixed-point +float +http static-libs"
 
 RDEPEND="
-	media-libs/libogg
-	media-libs/opus
+	media-libs/libogg[${MULTILIB_USEDEP}]
+	media-libs/opus[${MULTILIB_USEDEP}]
 	http? (
-		dev-libs/openssl:=
+		dev-libs/openssl:=[${MULTILIB_USEDEP}]
 	)
 "
 DEPEND="${RDEPEND}"
@@ -37,18 +37,18 @@ src_prepare() {
 	eautoreconf
 }
 
-src_configure() {
+multilib_src_configure() {
 	local myeconfargs=(
-		$(use_enable doc)
-		$(use_enable fixed-point)\
+		$(multilib_native_use_enable doc)
+		$(use_enable fixed-point)
 		$(use_enable float)
 		$(use_enable http)
 		$(use_enable static-libs static)
 	)
-	econf "${myeconfargs[@]}"
+	ECONF_SOURCE=${S} econf "${myeconfargs[@]}"
 }
 
-src_install() {
-	default
+multilib_src_install_all() {
+	einstalldocs
 	find "${ED}" -type f -name "*.la" -delete || die
 }
diff --git a/media-libs/sdl2-mixer/Manifest b/media-libs/sdl2-mixer/Manifest
index 84761b789a38..6df5b8d8ad40 100644
--- a/media-libs/sdl2-mixer/Manifest
+++ b/media-libs/sdl2-mixer/Manifest
@@ -1,7 +1,5 @@
 DIST SDL2_mixer-2.6.3.tar.gz 9935069 BLAKE2B 9908bdc549300af05b4fbcbb6c0533913ae62bfa2f761118983e0da58a4bcd68c2d008fa5bbcd94b0141241e54f1cd507e275e2d4b637214b803dabdbc5b0250 SHA512 2e9da045d2fdab97236c3901b3d441834a67a47c8851ddfb817c9db6f23ed9fb355a5ef8d2158d0c9959a83934e8cd1b95db8a69eaddf8f7fcca115f01818740
-DIST SDL2_mixer-2.8.0.tar.gz 10874471 BLAKE2B 701ed21416e7a3ceda313f3e9ad47f98687f357712fb90f6c3c2ac065c96a4ded04a907c563f3b9b7bf42f192b6c442d025abb0a5cfbb745bd8719c49e29ff61 SHA512 5ddbc4b0b5fad2e0844a503daa79564b912654192599ef8fa7698531f08323ce01801f6bb17b2b3905020a3df362a967b7566ae725eb085da991578cc0807aad
 DIST SDL2_mixer-2.8.1.tar.gz 5996239 BLAKE2B e03fc3f2aee9e8ed5c2b2fabc54cd319adc57f88e3b965e7c8a26339808cf9d68bac83b53369e172f175896d90f1bd026125fe1356ec73ee88b369402706f455 SHA512 6148591404b2113bcdb54391821658548acfe380a9cba660113e55e6f2fb7da2a5a59a99fefe51a0d7f8b91160648f11f72750353da88d285a962e3a410aecd7
 EBUILD sdl2-mixer-2.6.3-r1.ebuild 3000 BLAKE2B fbcd9cd8458114a589bc95b8577b1bf1cdccf19f05e88241590af1baebc1f3d0cfd5e047a58b2b752757c6d6b32cb2565a400a2a88edfaa427928b29ae058f4b SHA512 aa82a7e7633ee34d5e9ce7a18d664d5e4708c158369cba0e73aca79b89a4db30e6d41cc10956b7eefded1337674ef45d6fbdf38313a3ebd9357c865f130d1e80
-EBUILD sdl2-mixer-2.8.0.ebuild 2790 BLAKE2B e2c6d4cd59f1878c0ada3cb86662d93d9599e5c677508b823cd0371c27cf87f03baa4a37cde23fadf41e2dd5945f95c668a8d7cccaaae4f1fd1e5112a4ede5c4 SHA512 f8597f8f7d0486103f514583d12b1a8e7a0cf84d7c047b84f577434ba7a2d2bf0d062eda12caef6af8c602d32e8e203cbb160e0b48f30c1bf2c3a4b9ea851a45
-EBUILD sdl2-mixer-2.8.1.ebuild 2784 BLAKE2B 8971cb2d0d4befbb4f61ccf6829299f7c9acc158fdc2ff417b01ebe5b3eab2e7a8235f548bae93677f153c7db561efe0c85ae9b2e68f6023bd5cbb083d8887fc SHA512 e8fb7e19ade9e1345ff51face342c42f429f38d26d01940110493d90a97b5af32ef21ffe2a2a4145d3b223f948f61d093ddbb62c547936b28fd8eac34d0b5745
+EBUILD sdl2-mixer-2.8.1-r2.ebuild 2871 BLAKE2B e6085b36d2ff15630911399a11f95bbb25ea51db884bd7c58e21525107baa18fbcebf3859f7c937dac6e61a6f497b41f3fec09cd24a4ceb3a9aab8a0d52eda15 SHA512 4681381631ca131c760995cf41baac44e19a1f0c65c967e39220add3c2f884ecde1eaa1e146d833bf88293043c99898d32a0a227fe746dcff735c78061c40b0e
 MISC metadata.xml 1496 BLAKE2B 05f497210171797d550f073fcd1901374103a55d7658868646cdf55017a0d0889c9444b3de45c9da390ae6ed025ad2b2079183eb170b7f560e266921f9d0a7eb SHA512 2bc4dbaebe3c89d716c1a82940203a524fb0e06a451ad4003224745d0f48fd68234d0a151451f72b883a338efa1c875b6d412e7c798a596a4324cf736c21c780
diff --git a/media-libs/sdl2-mixer/sdl2-mixer-2.8.0.ebuild b/media-libs/sdl2-mixer/sdl2-mixer-2.8.0.ebuild
deleted file mode 100644
index f336653b1b09..000000000000
--- a/media-libs/sdl2-mixer/sdl2-mixer-2.8.0.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_P="SDL2_mixer-${PV}"
-inherit cmake-multilib
-
-DESCRIPTION="Simple Direct Media Layer Mixer Library"
-HOMEPAGE="https://github.com/libsdl-org/SDL_mixer"
-SRC_URI="https://www.libsdl.org/projects/SDL_mixer/release/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc64 ~riscv ~sparc ~x86"
-IUSE="flac fluidsynth gme midi mod modplug mp3 opus playtools stb timidity tremor vorbis +wav wavpack xmp"
-REQUIRED_USE="
-	midi? ( || ( timidity fluidsynth ) )
-	timidity? ( midi )
-	fluidsynth? ( midi )
-
-	vorbis? ( ?? ( stb tremor ) )
-	stb? ( vorbis )
-	tremor? ( vorbis )
-
-	mod? ( || ( modplug xmp ) )
-	modplug? ( mod )
-	xmp? ( mod )
-"
-
-RDEPEND="
-	media-libs/libsdl2[${MULTILIB_USEDEP}]
-	flac? ( media-libs/flac:=[${MULTILIB_USEDEP}] )
-	midi? (
-		fluidsynth? ( media-sound/fluidsynth:=[${MULTILIB_USEDEP}] )
-		timidity? ( media-sound/timidity++ )
-	)
-	mod? (
-		modplug? ( media-libs/libmodplug[${MULTILIB_USEDEP}] )
-		xmp? ( media-libs/libxmp )
-	)
-	mp3? ( media-sound/mpg123[${MULTILIB_USEDEP}] )
-	opus? ( media-libs/opusfile )
-	vorbis? (
-		stb? ( dev-libs/stb )
-		tremor? ( media-libs/tremor[${MULTILIB_USEDEP}] )
-		!stb? ( !tremor? ( media-libs/libvorbis[${MULTILIB_USEDEP}] ) )
-	)
-	gme? ( media-libs/game-music-emu[${MULTILIB_USEDEP}] )
-	wavpack? ( media-sound/wavpack[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}"
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DSDL2MIXER_CMD=yes
-		-DSDL2MIXER_WAVE=$(usex wav)
-		-DSDL2MIXER_MOD=$(usex mod)
-		-DSDL2MIXER_MOD_MODPLUG=$(usex modplug)
-		-DSDL2MIXER_MOD_XMP=$(usex xmp)
-		-DSDL2MIXER_MIDI=$(usex midi)
-		-DSDL2MIXER_MIDI_TIMIDITY=$(usex timidity)
-		-DSDL2MIXER_MIDI_FLUIDSYNTH=$(usex fluidsynth)
-		-DSDL2MIXER_VORBIS=$(usex vorbis $(usex stb STB $(usex tremor TREMOR VORBISFILE) ) no )
-		-DSDL2MIXER_FLAC=$(usex flac)
-		-DSDL2MIXER_FLAC_LIBFLAC=$(usex flac)
-		-DSDL2MIXER_MP3=$(usex mp3)
-		-DSDL2MIXER_MP3_MPG123=$(usex mp3)
-		-DSDL2MIXER_OPUS=$(usex opus)
-		-DSDL2MIXER_GME=$(usex gme)
-		-DSDL2MIXER_WAVPACK=$(usex wavpack)
-		-DSDL2MIXER_SAMPLES=$(usex playtools)
-		-DSDL2MIXER_SAMPLES_INSTALL=$(usex playtools)
-	)
-	cmake_src_configure
-}
-
-multilib_src_install_all() {
-	dodoc {CHANGES,README}.txt
-	rm -r "${ED}"/usr/share/licenses || die
-}
-
-pkg_postinst() {
-	# bug #412035
-	if use midi && use fluidsynth; then
-		ewarn "FluidSynth support requires you to set the SDL_SOUNDFONTS"
-		ewarn "environment variable to the location of a SoundFont file"
-		ewarn "unless the game or application happens to do this for you."
-		if use timidity; then
-			ewarn "Failing to do so will result in Timidity being used instead."
-		else
-			ewarn "Failing to do so will result in silence."
-		fi
-	fi
-}
diff --git a/media-libs/sdl2-mixer/sdl2-mixer-2.8.1.ebuild b/media-libs/sdl2-mixer/sdl2-mixer-2.8.1-r2.ebuild
index 3ecd6fa4c27b..b8009d7f9f54 100644
--- a/media-libs/sdl2-mixer/sdl2-mixer-2.8.1.ebuild
+++ b/media-libs/sdl2-mixer/sdl2-mixer-2.8.1-r2.ebuild
@@ -40,8 +40,8 @@ RDEPEND="
 		modplug? ( media-libs/libmodplug[${MULTILIB_USEDEP}] )
 		xmp? ( media-libs/libxmp )
 	)
-	mp3? ( media-sound/mpg123[${MULTILIB_USEDEP}] )
-	opus? ( media-libs/opusfile )
+	mp3? ( media-sound/mpg123-base[${MULTILIB_USEDEP}] )
+	opus? ( media-libs/opusfile[${MULTILIB_USEDEP}] )
 	vorbis? (
 		stb? ( dev-libs/stb )
 		tremor? ( media-libs/tremor[${MULTILIB_USEDEP}] )
@@ -54,6 +54,7 @@ DEPEND="${RDEPEND}"
 
 multilib_src_configure() {
 	local mycmakeargs=(
+		-DSDL2MIXER_DEPS_SHARED=no # aka, no dlopen() (bug #950965)
 		-DSDL2MIXER_CMD=yes
 		-DSDL2MIXER_WAVE=$(usex wav)
 		-DSDL2MIXER_MOD=$(usex mod)