commit:     07b80c2090ba3bc0a717dc03efdf0a6fb36d743c
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 16 13:04:36 2026 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Fri Jan 16 13:18:44 2026 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07b80c20

dev-qt/qtmultimedia: backport fix for QTBUG-142166

6.10.2 isn't far off (assuming not delayed), but still some time
to go before stabiliztion after that and given the change itself
is fairly trivial we can do it straight-to-stable.

(note that I haven't tried to reproduce, assuming that this does help)

Closes: https://bugs.gentoo.org/968832
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 .../files/qtmultimedia-6.10.1-QTBUG-142166.patch             | 12 ++++++++++++
 ...ultimedia-6.10.1.ebuild => qtmultimedia-6.10.1-r1.ebuild} |  3 ++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/dev-qt/qtmultimedia/files/qtmultimedia-6.10.1-QTBUG-142166.patch 
b/dev-qt/qtmultimedia/files/qtmultimedia-6.10.1-QTBUG-142166.patch
new file mode 100644
index 000000000000..8da13f3d2087
--- /dev/null
+++ b/dev-qt/qtmultimedia/files/qtmultimedia-6.10.1-QTBUG-142166.patch
@@ -0,0 +1,12 @@
+https://bugs.gentoo.org/968832
+https://qt-project.atlassian.net/browse/QTBUG-142166
+https://codereview.qt-project.org/c/qt/qtmultimedia/+/693529
+--- a/src/multimedia/audio/qaudio.h
++++ b/src/multimedia/audio/qaudio.h
+@@ -77,5 +77,5 @@
+ namespace QAudio
+ {
+-#if QT_CORE_REMOVED_SINCE(6, 10)
++#if QT_MULTIMEDIA_REMOVED_SINCE(6, 10)
+ Q_MULTIMEDIA_EXPORT float convertVolume(float volume, VolumeScale from, 
VolumeScale to);
+ #elif !defined(QT_MULTIMEDIA_BUILD_REMOVED_API)

diff --git a/dev-qt/qtmultimedia/qtmultimedia-6.10.1.ebuild 
b/dev-qt/qtmultimedia/qtmultimedia-6.10.1-r1.ebuild
similarity index 97%
rename from dev-qt/qtmultimedia/qtmultimedia-6.10.1.ebuild
rename to dev-qt/qtmultimedia/qtmultimedia-6.10.1-r1.ebuild
index a9a1d5f215ed..d5552c33bf6c 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-6.10.1.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-6.10.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021-2025 Gentoo Authors
+# Copyright 2021-2026 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.10.1-QTBUG-142166.patch
 )
 
 src_configure() {

Reply via email to