commit: 7750ac667d4ff950bf3da4b2356956080d151a90 Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> AuthorDate: Mon Jan 6 11:36:29 2025 +0000 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> CommitDate: Mon Jan 6 12:02:08 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7750ac66
dev-qt/qtmultimedia: fix build w/ USE="gstreamer pulseaudio -vulkan" QVersionNumber is only used with USE="gstreamer pulseaudio", but the required header is not included for it. Seems works with USE="vulkan" given Qt vulkan headers just happen to include it. Furthermore only fails with clang, albeit haven't looked for what is being treated differently with it (perhaps a version check somewhere includes the header with gcc). Closes: https://bugs.gentoo.org/947606 Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> dev-qt/qtmultimedia/files/qtmultimedia-6.8.1-qversionnumber.patch | 8 ++++++++ dev-qt/qtmultimedia/qtmultimedia-6.8.1.ebuild | 3 ++- dev-qt/qtmultimedia/qtmultimedia-6.8.9999.ebuild | 3 ++- dev-qt/qtmultimedia/qtmultimedia-6.9.9999.ebuild | 3 ++- dev-qt/qtmultimedia/qtmultimedia-6.9999.ebuild | 3 ++- 5 files changed, 16 insertions(+), 4 deletions(-) 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.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() {
