gentoo auto-resync : 07:01:2025 - 06:41:06

10 files changed, 21 insertions, 338 deletions

diff --git a/dev-qt/qtmultimedia/Manifest b/dev-qt/qtmultimedia/Manifest
index 2e273bf10bf9..0c2f12663ff6 100644
--- a/dev-qt/qtmultimedia/Manifest
+++ b/dev-qt/qtmultimedia/Manifest
@@ -1,16 +1,11 @@
-AUX qtmultimedia-6.7.2-ffmpeg-6.1.2.patch 2059 BLAKE2B 67af9cb2b860b46dd643b5677a9c50bde9d2f58db9262283b4de8a3708e1a1e7a23063dbdbf14ff6952a4150a9d716d22089535adbd611a2340c7fe1f780a6ec SHA512 33815330435ff9f21659161c1be3085bbb5b3ddd0449748bb962cd1f64ca4a4349b2a26e0615affb56250172e5fefe21fac4e569bab6a832cc563127ef2bb328
-AUX qtmultimedia-6.7.2-gstreamer-no-v4l.patch 567 BLAKE2B e7adab12e4823370677e0c466058cf4966b8384937edb7759ecb84062fcd43f205944835bbf9885a99bf117d310a7e6d23b05a167cab3be2ef994c21a7ebc07e SHA512 dc41e9e82ef2a740bba967cc6430f0e72c88810b978bb61e78b6f19fc980de9744cf9f05f7d787bc2c5807c54fb630b83b58c805d693d7c2306588773c1db481
 AUX qtmultimedia-6.7.3-eigen-ppc-no-vsx.patch 5814 BLAKE2B aaf9c453258b1afe6a443f4f1d67a2e2653e6c9c725bcd592e9917ae96d812b8ce6e0608368bfddfd6d59158cac279f397a9fad5eb965a80f814279c76d3dd54 SHA512 65815de9a59a48997de4716affd8fc6ffd0cf2ec05259fce944eff12ffc0ef35cff873ff941920d257add02b90157fc782ee2091a8edea364ded624d153d81dc
+AUX qtmultimedia-6.8.1-qversionnumber.patch 303 BLAKE2B 1745e30f52b9049d599941a2210cadfa7c36a6ca9e2fee107eb8d62c463b16741c3c586ce06d496db17f0f3b09c119e4c8bc53552d803da996ab9cdd682ecd7f SHA512 7440184de27da704550e94876985c254ff8ef7342577d26cdef1b4e621068f54c010a2670a0cb21c7bd6bfd9f253005c0f5d9c41ea98eea35f6507ead14c8018
 DIST qtmultimedia-5.15.16-gentoo-kde-1.tar.xz 1496 BLAKE2B 760f0ee32f353849c0e826622fea0e744ceb4e96d3ae3a6e903b32e7e5211d803e29761538c45797f61f0766ae726206fd799fc4d2fa094f46176ee0d6d5a0fb SHA512 97b161727450864643c0c2d395757d3f78503c02d26151017bdbebfd55e7ffeeffc63e530baecdba4a43dc364dad614dd893278eb84e89587c8ac51f89e14f87
 DIST qtmultimedia-everywhere-opensource-src-5.15.16.tar.xz 3824912 BLAKE2B d98fcc82164d36f2bc21769796ce69c4b0aff57295795004cc609662a10fa80ecf8709c39ed53f96576071fd9e1e2d6eaadcc4eeb97c3fa6406ca7e2f8dcafe7 SHA512 a848affbc38a532455a34bdf887948210ff9794dae312115be0622246993324902b81209c2cac89ca5db63e6fcc29690f47c1255b1b7c4de68bf6ad5a6ecc5e7
-DIST qtmultimedia-everywhere-src-6.7.2.tar.xz 8451800 BLAKE2B 44523ebe4f1b0c910fdad8ff29f24273c1b7872e9f5dd58b2dd779e61fe3b5c1a97ee900009ca693c740a6e578f9dd62995ac101ef70e1cd718af1bd1c355430 SHA512 bfcd04a5ba142e2a3bee3b67a261ffb4f651ac4e043e3dcafc0175bd25409de375041aa6fdda4f6899b00e4bad6c06ae9fd0d6a1e7db0b874f1bcf0a578d3c70
-DIST qtmultimedia-everywhere-src-6.7.3.tar.xz 9360356 BLAKE2B c3ba0c1729b412022959900d4ee7b31f92df5c1b03326ffaea974a59a217be8f39cacf62e03374d63e1d804798ac1bfcfda011a42047ebaa53f5dc1511a44f06 SHA512 6c8c7c18ad71e32507af57456d1c11544f3e6c67c9cd3811a83fd0c20e12d6457ab294d91905e3911bdef1977ec1b535de82e9d92b2a38bd9eef7851e6349b5a
 DIST qtmultimedia-everywhere-src-6.8.1.tar.xz 9664564 BLAKE2B 675544811c845ddb34908fe82e33824451e6ec8fecb66730a2f4dbe754c4466db3ae6e157fac9e8d5d0505adf90ac65bed807bd52eaad0de05047e4532b8ebeb SHA512 77f8e913116ff75cf4602e9c5ee01c48161fb40aaadca0e09ca2f89292071fc6f2918403932b9b0653bbc2b007f25362e0cb84a382baedd67e9e4c31bc414463
 EBUILD qtmultimedia-5.15.16.ebuild 1504 BLAKE2B 7f3ba094454f1836208d3e33d2faaf6bf9b8eb281e9b6b7a8b596b9bfde2c67f3a0e3dc7da90c7b9c87c0f65540225ab315d98dc8f46a3ac82d0520b711fc1c5 SHA512 64b840b6169c5b77d83f58e41b93567e7ed287a634d5d225a2d41e17a0ada8694a7c86e3465659ba79d6af6501b40c88c6321fc6f836064989586220d8d12c1d
-EBUILD qtmultimedia-6.7.2-r2.ebuild 3286 BLAKE2B 59566faeeb43449047c4829393193bb3f23ccf0bb02cc79885d3e8ff103c5bc191f79b26677ca460c18f3709802e310ef8abbdc414937f1141045f0848d43ba2 SHA512 4b99fb509091805e90d022c08e5f0de87fe6dc378318500cba843aacfb4a6cd613f0069d34286c3510f05282391be1b92618e0fe6f21badfa5e6433193e2cd84
-EBUILD qtmultimedia-6.7.3.ebuild 3791 BLAKE2B 27e2f4221e030c0daa3e2cb82963b4bf5f46a316ac2a47f7cfea3b2c443a2b694c4cdc3c2a786e76baa8fb509ebd05934ae55d30fb4ae809669523f666fd8d79 SHA512 4c4d68c7785bb8cf77a87b75ab8b210013e36ec2f06032b4ea6c4fbb7dc2f22b264010d76581490f6c71ee21aad6b92fb67fed02d3e98f72752588215b9492cd
-EBUILD qtmultimedia-6.8.1.ebuild 4092 BLAKE2B 929bd0a0e144cb11b8e4fc882a5ea1a642bdb6e252f1c6e32886a345b68a439acc54e4c3ee3014c257ed717852b73df3f22052a6dc2c10f4c324ab2faebac980 SHA512 b8c2bc8a3c0d5324bb2e394bc17815fa237f038f809aaf884d57cd4df12fc6164e9968f3e58ff205fac811505d021edecd7400469c5ab56f0b37475f8642e3c2
-EBUILD qtmultimedia-6.8.9999.ebuild 4098 BLAKE2B 90dcb1b7937298b99ec10e16c247f038d4629fe97350951ba9327e115022686c417b55d1302bcf05d95c16757d8db8a38b1a6ef322a43d8b48e141bc556a2408 SHA512 98cfae6b8f7e89b06de3a420a60c34331b3b701c26db6d4f110979db88eec857bc59db5091d6c1b3b4c4e041ef273f144c459a0aebc7443118f719413b4e3741
-EBUILD qtmultimedia-6.9.9999.ebuild 4098 BLAKE2B 90dcb1b7937298b99ec10e16c247f038d4629fe97350951ba9327e115022686c417b55d1302bcf05d95c16757d8db8a38b1a6ef322a43d8b48e141bc556a2408 SHA512 98cfae6b8f7e89b06de3a420a60c34331b3b701c26db6d4f110979db88eec857bc59db5091d6c1b3b4c4e041ef273f144c459a0aebc7443118f719413b4e3741
-EBUILD qtmultimedia-6.9999.ebuild 4098 BLAKE2B 90dcb1b7937298b99ec10e16c247f038d4629fe97350951ba9327e115022686c417b55d1302bcf05d95c16757d8db8a38b1a6ef322a43d8b48e141bc556a2408 SHA512 98cfae6b8f7e89b06de3a420a60c34331b3b701c26db6d4f110979db88eec857bc59db5091d6c1b3b4c4e041ef273f144c459a0aebc7443118f719413b4e3741
+EBUILD qtmultimedia-6.8.1.ebuild 4140 BLAKE2B d7ce39836e535940235d0e1fbb924f5af70f0abf581d61390bea068b6c7a63b01dae49edc2891278792d307735080bb44e65a6e1c3a29286b02f69f1c43eae55 SHA512 c4742a0fddbc96c508b25805b71aa7cb03dd4cf9095dabe3b974ca7d365460bafe337dcfedf511d2c81661d6ab2eb34b74870d6966dfc6ca316ee9646b30a570
+EBUILD qtmultimedia-6.8.9999.ebuild 4146 BLAKE2B 87a337199edf99a8f51ef841d1ea2e928a69fa8713718bef64c4e523b71c0437331cc3c2640be8328e8258a1380c9c2ff693941e85586a018caa2a2c63c02846 SHA512 d3e51cf8a9ef211876dcbd6cd21788cf592e0b5f54f992ef5727c854255c6688c1f96d2072a8a1326f39d48b6bad19b9ebe7347b48b292da5cc084bb31ebc9c6
+EBUILD qtmultimedia-6.9.9999.ebuild 4146 BLAKE2B 87a337199edf99a8f51ef841d1ea2e928a69fa8713718bef64c4e523b71c0437331cc3c2640be8328e8258a1380c9c2ff693941e85586a018caa2a2c63c02846 SHA512 d3e51cf8a9ef211876dcbd6cd21788cf592e0b5f54f992ef5727c854255c6688c1f96d2072a8a1326f39d48b6bad19b9ebe7347b48b292da5cc084bb31ebc9c6
+EBUILD qtmultimedia-6.9999.ebuild 4146 BLAKE2B 87a337199edf99a8f51ef841d1ea2e928a69fa8713718bef64c4e523b71c0437331cc3c2640be8328e8258a1380c9c2ff693941e85586a018caa2a2c63c02846 SHA512 d3e51cf8a9ef211876dcbd6cd21788cf592e0b5f54f992ef5727c854255c6688c1f96d2072a8a1326f39d48b6bad19b9ebe7347b48b292da5cc084bb31ebc9c6
 MISC metadata.xml 888 BLAKE2B bf3f5b1376585d4aa9021aa838b486b8143e5fbf7c5bf7c7324500de96ab86fd0176993567f97f5e5d115284f8c3ccc16475f787407d747689aefa82cf9a9534 SHA512 98e962234f1ed462444e5f7f3e77a08794b2d0480df7773e822a5671cdfbf708b51edfafacffade2ad5f8b177d89cc0d53b975ef181be66b885c17db2a4a542b
diff --git a/dev-qt/qtmultimedia/files/qtmultimedia-6.7.2-ffmpeg-6.1.2.patch b/dev-qt/qtmultimedia/files/qtmultimedia-6.7.2-ffmpeg-6.1.2.patch
deleted file mode 100644
index d364699fc401..000000000000
--- a/dev-qt/qtmultimedia/files/qtmultimedia-6.7.2-ffmpeg-6.1.2.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-Fix was for ffmpeg-7.0.1 (masked) but the change was backported to 6.1.2.
-
-Should hardly be an issue but it does cause a test failure when it
-attempts to compare the return error when reading a (intentionally)
-corrupted file (aborts either way, just differently). Still some time
-until 6.7.3, and prefer to keep tests in a working state meanwhile.
-
-https://bugreports.qt.io/browse/QTBUG-126687
-https://github.com/qt/qtmultimedia/commit/8d809d56697f8d23669a9b1476ac0b0748e32e0d
-From: Pavel Dubsky <pavel.dubsky@qt.io>
-Date: Wed, 10 Jul 2024 14:42:51 +0200
-Subject: [PATCH] Process FFmpeg AVERROR_INVALIDDATA from avformat_open_input
-
-FFmpeg version n7.0.1 changed the error code that is returned from
-function mp3_read_header: AVERROR(EINVAL) -> AVERROR_INVALIDDATA.
-
-Task-number: QTBUG-126687
-Pick-to: 6.8 6.7 6.5
-Change-Id: I6aee7771a9d1f80ea459376711d5264bed9a7bac
-Reviewed-by: Artem Dyomin <artem.dyomin@qt.io>
---- a/src/plugins/multimedia/ffmpeg/playbackengine/qffmpegmediadataholder.cpp
-+++ b/src/plugins/multimedia/ffmpeg/playbackengine/qffmpegmediadataholder.cpp
-@@ -194,7 +194,7 @@ loadMedia(const QUrl &mediaUrl, QIODevice *stream, const std::shared_ptr<ICancel
-         auto code = QMediaPlayer::ResourceError;
-         if (ret == AVERROR(EACCES))
-             code = QMediaPlayer::AccessDeniedError;
--        else if (ret == AVERROR(EINVAL))
-+        else if (ret == AVERROR(EINVAL) || ret == AVERROR_INVALIDDATA)
-             code = QMediaPlayer::FormatError;
- 
-         return MediaDataHolder::ContextError{ code, QMediaPlayer::tr("Could not open file") };
---- a/tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp
-+++ b/tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp
-@@ -962,7 +962,7 @@ void tst_QMediaPlayerBackend::setSource_emitsError_whenSdpFileIsLoaded()
-     });
- 
-     m_fixture->player.setSource(sdpUrl);
--    QTRY_COMPARE_EQ(m_fixture->player.error(), QMediaPlayer::ResourceError);
-+    QTRY_COMPARE_EQ(m_fixture->player.error(), QMediaPlayer::FormatError);
- #endif // QT_CONFIG(process)
- }
- 
diff --git a/dev-qt/qtmultimedia/files/qtmultimedia-6.7.2-gstreamer-no-v4l.patch b/dev-qt/qtmultimedia/files/qtmultimedia-6.7.2-gstreamer-no-v4l.patch
deleted file mode 100644
index 0f61539b00d2..000000000000
--- a/dev-qt/qtmultimedia/files/qtmultimedia-6.7.2-gstreamer-no-v4l.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-# https://bugs.gentoo.org/934582
-
---- a/src/plugins/multimedia/gstreamer/mediacapture/qgstreamercamera.cpp
-+++ b/src/plugins/multimedia/gstreamer/mediacapture/qgstreamercamera.cpp
-@@ -718,6 +718,7 @@ int QGstreamerCamera::getV4L2Parameter(quint32 id) const
-         return control.value;
-     });
- }
-+#endif // QT_CONFIG(linux_v4l)
- 
- QGstreamerCustomCamera::QGstreamerCustomCamera(QCamera *camera)
-     : QGstreamerCameraBase{
-@@ -766,6 +767,4 @@ void QGstreamerCustomCamera::setActive(bool active)
-     emit activeChanged(active);
- }
- 
--#endif
--
- QT_END_NAMESPACE
-
diff --git a/dev-qt/qtmultimedia/files/qtmultimedia-6.8.1-qversionnumber.patch b/dev-qt/qtmultimedia/files/qtmultimedia-6.8.1-qversionnumber.patch
new file mode 100644
index 000000000000..625c760fb1ce
--- /dev/null
+++ b/dev-qt/qtmultimedia/files/qtmultimedia-6.8.1-qversionnumber.patch
@@ -0,0 +1,8 @@
+https://bugs.gentoo.org/947606
+TODO: needs upstreaming
+--- a/src/plugins/multimedia/gstreamer/common/qgstreameraudiooutput.cpp
++++ b/src/plugins/multimedia/gstreamer/common/qgstreameraudiooutput.cpp
+@@ -13,2 +13,3 @@
+ #if QT_CONFIG(pulseaudio)
++#  include <QVersionNumber>
+ #  include <pulse/version.h>
diff --git a/dev-qt/qtmultimedia/qtmultimedia-6.7.2-r2.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.7.2-r2.ebuild
deleted file mode 100644
index 75aefa2fa156..000000000000
--- a/dev-qt/qtmultimedia/qtmultimedia-6.7.2-r2.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic qt6-build
-
-DESCRIPTION="Multimedia (audio, video, radio, camera) library for the Qt6 framework"
-
-if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv x86"
-fi
-
-IUSE="+X alsa eglfs +ffmpeg gstreamer opengl pulseaudio qml v4l vaapi vulkan"
-# tst_qmediaplayerbackend hard requires qml, review in case becomes optional
-REQUIRED_USE="
-	|| ( ffmpeg gstreamer )
-	eglfs? ( ffmpeg opengl qml )
-	vaapi? ( ffmpeg opengl )
-	test? ( qml )
-"
-
-RDEPEND="
-	~dev-qt/qtbase-${PV}:6[gui,network,opengl=,vulkan=,widgets]
-	alsa? (
-		!pulseaudio? ( media-libs/alsa-lib )
-	)
-	ffmpeg? (
-		~dev-qt/qtbase-${PV}:6[X=,concurrent,eglfs=]
-		media-video/ffmpeg:=[vaapi?]
-		X? (
-			x11-libs/libX11
-			x11-libs/libXext
-			x11-libs/libXrandr
-		)
-	)
-	gstreamer? (
-		dev-libs/glib:2
-		media-libs/gst-plugins-bad:1.0
-		media-libs/gst-plugins-base:1.0[X=,opengl?]
-		media-libs/gstreamer:1.0
-	)
-	opengl? ( media-libs/libglvnd )
-	pulseaudio? ( media-libs/libpulse )
-	qml? (
-		~dev-qt/qtdeclarative-${PV}:6
-		~dev-qt/qtquick3d-${PV}:6
-	)
-"
-DEPEND="
-	${RDEPEND}
-	X? ( x11-base/xorg-proto )
-	v4l? ( sys-kernel/linux-headers )
-	vulkan? ( dev-util/vulkan-headers )
-"
-BDEPEND="~dev-qt/qtshadertools-${PV}:6"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-gstreamer-no-v4l.patch
-	"${FILESDIR}"/${P}-ffmpeg-6.1.2.patch
-)
-
-CMAKE_SKIP_TESTS=(
-	# unimportant and expects all backends to be available (bug #928420)
-	tst_backends
-	# tries to use real alsa or pulseaudio and fails in sandbox
-	tst_qaudiosink
-	tst_qaudiosource
-	tst_qmediacapturesession
-	tst_qmediaplayerbackend
-	tst_qsoundeffect
-	# may try to use v4l2 or hardware acceleration depending on availability
-	tst_qscreencapture_integration
-	tst_qscreencapturebackend
-	tst_qvideoframebackend
-	# fails with offscreen rendering
-	tst_qvideoframecolormanagement
-	tst_qwindowcapturebackend
-)
-
-src_configure() {
-	# normally passed by the build system, but needed for 32-on-64 chroots
-	use x86 && append-cppflags -DPFFFT_SIMD_DISABLE
-
-	local mycmakeargs=(
-		$(cmake_use_find_package qml Qt6Qml)
-		$(qt_feature ffmpeg)
-		$(qt_feature gstreamer)
-		$(usev gstreamer $(qt_feature opengl gstreamer_gl))
-		$(qt_feature pulseaudio)
-		$(qt_feature v4l linux_v4l)
-		$(qt_feature vaapi)
-	)
-
-	# ALSA backend is experimental off-by-default and can take priority
-	# causing problems (bug #935146), disable if USE=pulseaudio is set
-	# (also do not want unnecessary usage of ALSA plugins -> pulse)
-	if use alsa && use pulseaudio; then
-		# einfo should be enough given pure-ALSA users tend to disable pulse
-		einfo "Warning: USE=alsa is ignored when USE=pulseaudio is set"
-		mycmakeargs+=( -DQT_FEATURE_alsa=OFF )
-	else
-		mycmakeargs+=( $(qt_feature alsa) )
-	fi
-
-	qt6-build_src_configure
-}
-
-src_install() {
-	qt6-build_src_install
-
-	if use test; then
-		local delete=( # sigh
-			"${D}${QT6_LIBDIR}"/cmake/Qt6Multimedia/Qt6MockMultimediaPlugin*.cmake
-			"${D}${QT6_MKSPECSDIR}"/modules/qt_plugin_mockmultimediaplugin.pri
-			"${D}${QT6_PLUGINDIR}"/multimedia/libmockmultimediaplugin.*
-			"${D}${QT6_PLUGINDIR}"/multimedia/objects-*
-		)
-		# using -f given not tracking which tests may be skipped or not
-		rm -rf -- "${delete[@]}" || die
-	fi
-}
diff --git a/dev-qt/qtmultimedia/qtmultimedia-6.7.3.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.7.3.ebuild
deleted file mode 100644
index 4c90076675b9..000000000000
--- a/dev-qt/qtmultimedia/qtmultimedia-6.7.3.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic qt6-build
-
-DESCRIPTION="Multimedia (audio, video, radio, camera) library for the Qt6 framework"
-
-if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv x86"
-fi
-
-IUSE="
-	+X alsa eglfs +ffmpeg gstreamer opengl pulseaudio
-	qml v4l vaapi vulkan wayland
-"
-# tst_qmediaplayerbackend hard requires qml, review in case becomes optional
-REQUIRED_USE="
-	|| ( ffmpeg gstreamer )
-	eglfs? ( ffmpeg opengl qml )
-	test? ( qml )
-	vaapi? ( ffmpeg opengl )
-"
-
-# gstreamer[X=] is to avoid broken gst detect if -X w/ gst[X] w/o xorg-proto
-# (*could* be removed if gst-plugins-base[X] RDEPENDs on xorg-proto)
-RDEPEND="
-	~dev-qt/qtbase-${PV}:6[gui,network,opengl=,vulkan=,widgets]
-	alsa? (
-		!pulseaudio? ( media-libs/alsa-lib )
-	)
-	ffmpeg? (
-		~dev-qt/qtbase-${PV}:6[X=,concurrent,eglfs=]
-		media-video/ffmpeg:=[vaapi?]
-		X? (
-			x11-libs/libX11
-			x11-libs/libXext
-			x11-libs/libXrandr
-		)
-	)
-	gstreamer? (
-		dev-libs/glib:2
-		media-libs/gst-plugins-bad:1.0
-		media-libs/gst-plugins-base:1.0[X=]
-		media-libs/gstreamer:1.0
-		opengl? (
-			~dev-qt/qtbase-${PV}:6[X?,wayland?]
-			media-libs/gst-plugins-base:1.0[X?,egl,opengl,wayland?]
-		)
-	)
-	opengl? ( media-libs/libglvnd )
-	pulseaudio? ( media-libs/libpulse )
-	qml? (
-		~dev-qt/qtdeclarative-${PV}:6
-		~dev-qt/qtquick3d-${PV}:6
-	)
-"
-DEPEND="
-	${RDEPEND}
-	X? ( x11-base/xorg-proto )
-	v4l? ( sys-kernel/linux-headers )
-	vulkan? ( dev-util/vulkan-headers )
-"
-BDEPEND="~dev-qt/qtshadertools-${PV}:6"
-
-CMAKE_SKIP_TESTS=(
-	# unimportant and expects all backends to be available (bug #928420)
-	tst_backends
-	# tries to use real alsa or pulseaudio and fails in sandbox
-	tst_qaudiosink
-	tst_qaudiosource
-	tst_qmediacapture_gstreamer
-	tst_qmediacapturesession
-	tst_qmediaplayerbackend
-	tst_qsoundeffect
-	# may try to use v4l2 or hardware acceleration depending on availability
-	tst_qscreencapture_integration
-	tst_qscreencapturebackend
-	tst_qvideoframebackend
-	# fails with offscreen rendering
-	tst_qvideoframecolormanagement
-	tst_qwindowcapturebackend
-)
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-6.7.3-eigen-ppc-no-vsx.patch
-)
-
-src_configure() {
-	# eigen + ppc32 seems broken w/ -maltivec (forced by Qt, bug #943402)
-	use ppc && append-cppflags -DEIGEN_DONT_VECTORIZE
-
-	# normally passed by the build system, but needed for 32-on-64 chroots
-	use x86 && append-cppflags -DPFFFT_SIMD_DISABLE
-
-	local mycmakeargs=(
-		$(cmake_use_find_package qml Qt6Qml)
-		$(qt_feature ffmpeg)
-		$(qt_feature gstreamer)
-		$(usev gstreamer "
-			$(qt_feature opengl gstreamer_gl)
-			$(usev opengl "
-				$(qt_feature X gstreamer_gl_x11)
-				$(qt_feature wayland gstreamer_gl_wayland)
-			")
-		")
-		$(qt_feature pulseaudio)
-		$(qt_feature v4l linux_v4l)
-		$(qt_feature vaapi)
-	)
-
-	# ALSA backend is experimental off-by-default and can take priority
-	# causing problems (bug #935146), disable if USE=pulseaudio is set
-	# (also do not want unnecessary usage of ALSA plugins -> pulse)
-	if use alsa && use pulseaudio; then
-		# einfo should be enough given pure-ALSA users tend to disable pulse
-		einfo "Warning: USE=alsa is ignored when USE=pulseaudio is set"
-		mycmakeargs+=( -DQT_FEATURE_alsa=OFF )
-	else
-		mycmakeargs+=( $(qt_feature alsa) )
-	fi
-
-	qt6-build_src_configure
-}
-
-src_install() {
-	qt6-build_src_install
-
-	if use test; then
-		local delete=( # sigh
-			"${D}${QT6_LIBDIR}"/cmake/Qt6Multimedia/Qt6MockMultimediaPlugin*.cmake
-			"${D}${QT6_MKSPECSDIR}"/modules/qt_plugin_mockmultimediaplugin.pri
-			"${D}${QT6_PLUGINDIR}"/multimedia/libmockmultimediaplugin.*
-			"${D}${QT6_PLUGINDIR}"/multimedia/objects-*
-		)
-		# using -f given not tracking which tests may be skipped or not
-		rm -rf -- "${delete[@]}" || die
-	fi
-}
diff --git a/dev-qt/qtmultimedia/qtmultimedia-6.8.1.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.8.1.ebuild
index f018b0b87f76..3bed1852e8eb 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-6.8.1.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-6.8.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021-2024 Gentoo Authors
+# Copyright 2021-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -94,6 +94,7 @@ CMAKE_SKIP_TESTS=(
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-6.7.3-eigen-ppc-no-vsx.patch
+	"${FILESDIR}"/${PN}-6.8.1-qversionnumber.patch
 )
 
 src_configure() {
diff --git a/dev-qt/qtmultimedia/qtmultimedia-6.8.9999.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.8.9999.ebuild
index 5c9d4372dcb4..669bee51d312 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-6.8.9999.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-6.8.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021-2024 Gentoo Authors
+# Copyright 2021-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -94,6 +94,7 @@ CMAKE_SKIP_TESTS=(
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-6.7.3-eigen-ppc-no-vsx.patch
+	"${FILESDIR}"/${PN}-6.8.1-qversionnumber.patch
 )
 
 src_configure() {
diff --git a/dev-qt/qtmultimedia/qtmultimedia-6.9.9999.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.9.9999.ebuild
index 5c9d4372dcb4..669bee51d312 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-6.9.9999.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-6.9.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021-2024 Gentoo Authors
+# Copyright 2021-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -94,6 +94,7 @@ CMAKE_SKIP_TESTS=(
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-6.7.3-eigen-ppc-no-vsx.patch
+	"${FILESDIR}"/${PN}-6.8.1-qversionnumber.patch
 )
 
 src_configure() {
diff --git a/dev-qt/qtmultimedia/qtmultimedia-6.9999.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.9999.ebuild
index 5c9d4372dcb4..669bee51d312 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-6.9999.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-6.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021-2024 Gentoo Authors
+# Copyright 2021-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -94,6 +94,7 @@ CMAKE_SKIP_TESTS=(
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-6.7.3-eigen-ppc-no-vsx.patch
+	"${FILESDIR}"/${PN}-6.8.1-qversionnumber.patch
 )
 
 src_configure() {