rhel9 needs gcc-toolset-13

.gitignore

@@ -17,7 +17,3 @@
 /qtmultimedia-everywhere-src-6.6.0.tar.xz
 /qtmultimedia-everywhere-src-6.6.1.tar.xz
 /qtmultimedia-everywhere-src-6.6.2.tar.xz
-/qtmultimedia-everywhere-src-6.7.0.tar.xz
-/qtmultimedia-everywhere-src-6.7.1.tar.xz
-/qtmultimedia-everywhere-src-6.7.2.tar.xz
-/qtmultimedia-everywhere-src-6.8.0.tar.xz

qt6-qtmultimedia.spec

@@ -1,3 +1,4 @@
+
 %global qt_module qtmultimedia
 
 %global gst 0.10
@@ -20,7 +21,7 @@
 
 Summary: Qt6 - Multimedia support
 Name:    qt6-%{qt_module}
-Version: 6.8.0
+Version: 6.6.2
 Release: 1%{?dist}
 
 License: LGPL-3.0-only OR GPL-3.0-only WITH Qt-GPL-exception-1.0
@@ -34,8 +35,6 @@ Source0: https://download.qt.io/development_releases/qt/%{majmin}/%{qt_version}/
 Source0: https://download.qt.io/official_releases/qt/%{majmin}/%{version}/submodules/%{qt_module}-everywhere-src-%{version}.tar.xz
 %endif
 
-Patch0:  qtmultimedia-fix-build-on-x86-arch.patch
-
 # filter plugin/qml provides
 %global __provides_exclude_from ^(%{_qt6_archdatadir}/qml/.*\\.so|%{_qt6_plugindir}/.*\\.so)$
 
@@ -51,7 +50,6 @@ BuildRequires: qt6-qtbase-private-devel
 %{?_qt6:Requires: %{_qt6}%{?_isa} = %{_qt6_version}}
 BuildRequires: qt6-qtdeclarative-devel >= %{version}
 BuildRequires: qt6-qtshadertools-devel >= %{version}
-BuildRequires: qt6-qtquick3d-devel >= %{version}
 BuildRequires: pkgconfig(alsa)
 %if "%{?gst}" == "0.10"
 BuildRequires: pkgconfig(gstreamer-interfaces-0.10)
@@ -115,10 +113,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
 %if 0%{?rhel} && 0%{?rhel} < 10
 . /opt/rh/gcc-toolset-13/enable
 %endif
-%cmake_qt6 \
-  -DQT_FEATURE_alsa=ON \
-  -DQT_BUILD_EXAMPLES:BOOL=%{?examples:ON}%{!?examples:OFF} \
-  -DQT_INSTALL_EXAMPLES_SOURCES=%{?examples:ON}%{!?examples:OFF}
+%cmake_qt6 -DQT_BUILD_EXAMPLES:BOOL=%{?examples:ON}%{!?examples:OFF}
 
 %cmake_build
 
@@ -147,10 +142,7 @@ popd
 %{_qt6_libdir}/libQt6MultimediaQuick.so.6*
 %{_qt6_libdir}/libQt6MultimediaWidgets.so.6*
 %{_qt6_libdir}/libQt6SpatialAudio.so.6*
-%{_qt6_libdir}/libQt6Quick3DSpatialAudio.so.6*
 %{_qt6_archdatadir}/qml/QtMultimedia/
-%dir %{_qt6_archdatadir}/qml/QtQuick3D/SpatialAudio
-%{_qt6_archdatadir}/qml/QtQuick3D/SpatialAudio/
 %dir %{_qt6_plugindir}/multimedia
 %{_qt6_plugindir}/multimedia/libgstreamermediaplugin.so
 %if %{with ffmpeg}
@@ -162,8 +154,6 @@ popd
 %{_qt6_headerdir}/QtMultimediaQuick/
 %{_qt6_headerdir}/QtMultimediaWidgets/
 %{_qt6_headerdir}/QtSpatialAudio/
-%{_qt6_headerdir}/QtQuick3DSpatialAudio/
-%{_qt6_headerdir}/QtQGstreamerMediaPluginImpl/
 %{_qt6_libdir}/libQt6BundledResonanceAudio.a
 %{_qt6_libdir}/libQt6Multimedia.so
 %{_qt6_libdir}/libQt6Multimedia.prl
@@ -173,10 +163,6 @@ popd
 %{_qt6_libdir}/libQt6MultimediaWidgets.prl
 %{_qt6_libdir}/libQt6SpatialAudio.so
 %{_qt6_libdir}/libQt6SpatialAudio.prl
-%{_qt6_libdir}/libQt6Quick3DSpatialAudio.so
-%{_qt6_libdir}/libQt6Quick3DSpatialAudio.prl
-%{_qt6_libdir}/libQt6QGstreamerMediaPluginImpl.a
-%{_qt6_libdir}/libQt6QGstreamerMediaPluginImpl.prl
 %{_qt6_libdir}/cmake/Qt6/*.cmake
 %{_qt6_libdir}/cmake/Qt6BuildInternals/StandaloneTests/*.cmake
 %dir %{_qt6_libdir}/cmake/Qt6BundledResonanceAudio/
@@ -189,10 +175,6 @@ popd
 %{_qt6_libdir}/cmake/Qt6MultimediaWidgets/*.cmake
 %dir %{_qt6_libdir}/cmake/Qt6SpatialAudio/
 %{_qt6_libdir}/cmake/Qt6SpatialAudio/*cmake
-%dir %{_qt6_libdir}/cmake/Qt6Quick3DSpatialAudioPrivate
-%{_qt6_libdir}/cmake/Qt6Quick3DSpatialAudioPrivate/*cmake
-%dir %{_qt6_libdir}/cmake/Qt6QGstreamerMediaPluginImplPrivate
-%{_qt6_libdir}/cmake/Qt6QGstreamerMediaPluginImplPrivate/*cmake
 %dir %{_qt6_libdir}/cmake/Qt6Qml/QmlPlugins
 %{_qt6_libdir}/cmake/Qt6Qml/QmlPlugins/*.cmake
 %{_qt6_archdatadir}/mkspecs/modules/*.pri
@@ -208,30 +190,6 @@ popd
 
 
 %changelog
-* Fri Oct 11 2024 Jan Grulich <jgrulich@redhat.com> - 6.8.0-1
-- 6.8.0
-
-* Mon Sep 23 2024 Fabio Valentini <decathorpe@gmail.com> - 6.7.2-3
-- Rebuild for ffmpeg 7
-
-* Fri Jul 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 6.7.2-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
-
-* Mon Jul 01 2024 Jan Grulich <jgrulich@redhat.com> - 6.7.2-1
-- 6.7.2
-
-* Tue May 21 2024 Jan Grulich <jgrulich@redhat.com> - 6.7.1-1
-- 6.7.1
-
-* Tue Apr 02 2024 Jan Grulich <jgrulich@redhat.com> - 6.7.0-1
-- 6.7.0
-
-* Thu Mar 21 2024 Marie Loise Nolden <loise@kde.org> - 6.6.2-3
-- add qt6-qtquick3d-devel as BR for spatial audio (3d)
-
-* Mon Feb 19 2024 Jan Grulich <jgrulich@redhat.com> - 6.6.2-2
-- Examples: also install source files
-
 * Thu Feb 15 2024 Jan Grulich <jgrulich@redhat.com> - 6.6.2-1
 - 6.6.2
 

qtmultimedia-fix-build-on-x86-arch.patch

@@ -1,28 +0,0 @@
-From 610d7280ad1db68be49cb26b3d05b3a8059962cc Mon Sep 17 00:00:00 2001
-From: Christophe Marin <christophe@krop.fr>
-Date: Wed, 9 Oct 2024 12:27:14 +0200
-Subject: [PATCH] Fix build on x86 arch
-
-With GCC 14, build fails with:
- /usr/lib/gcc/i586-suse-linux/14/include/xmmintrin.h:190:1: error: inlining failed in call to ‘always_inline’ ‘_mm_add_ps(float __vector(4), float __vector(4))’: target specific option mismatch
-
----
- src/resonance-audio/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/resonance-audio/CMakeLists.txt b/src/resonance-audio/CMakeLists.txt
-index 0fa9dec..1eff0a3 100644
---- a/src/resonance-audio/CMakeLists.txt
-+++ b/src/resonance-audio/CMakeLists.txt
-@@ -233,7 +233,7 @@ qt_internal_extend_target(BundledResonanceAudio CONDITION (${CMAKE_SYSTEM_PROCES
- # Use fallback mode if SSE is not available
- qt_internal_extend_target(BundledResonanceAudio CONDITION (${CMAKE_SYSTEM_PROCESSOR} MATCHES "i[3-6]86$")
-     COMPILE_OPTIONS
--        -DPFFFT_SIMD_DISABLE
-+        -DPFFFT_SIMD_DISABLE -DDISABLE_SIMD
- )
- 
- qt_disable_warnings(BundledResonanceAudio)
--- 
-2.46.1
-

sources

@@ -1 +1 @@
-SHA512 (qtmultimedia-everywhere-src-6.8.0.tar.xz) = 1374db720141d09ca3081b5a7dd6d0f1b4457ab87096b4bfac0b9ab97de1dadf36ded5cf04ae01824fd9e16cfe7f45f45f2ebebc464696a348284462a731388e
+SHA512 (qtmultimedia-everywhere-src-6.6.2.tar.xz) = 311f47acd7658d725855df06c25b4d516d4046922cc92ad44c91c48f1696fbcbb25a0d778b1a72f15834ce2e74ce64199814476ac04fc705fc19af73c91f2006