.gitignore

@@ -1 +1 @@
-SOURCES/qtmultimedia-everywhere-src-6.8.1.tar.xz
+SOURCES/qtmultimedia-everywhere-src-6.7.1.tar.xz

.qt6-qtmultimedia.metadata

@@ -1 +1 @@
-31fcffcaa62f2e8829873b163ba13d99ceb050ad SOURCES/qtmultimedia-everywhere-src-6.8.1.tar.xz
+000c00272c56be54e734e542d96639db09672d3c SOURCES/qtmultimedia-everywhere-src-6.7.1.tar.xz

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

@@ -1,26 +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 7690ae2..3abaa99 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(-AT386)?$")
-     COMPILE_OPTIONS
--        -DPFFFT_SIMD_DISABLE
-+        -DPFFFT_SIMD_DISABLE -DDISABLE_SIMD
- )
- 
- qt_disable_warnings(BundledResonanceAudio)
-

SPECS/qt6-qtmultimedia.spec

@@ -22,8 +22,8 @@
 
 Summary: Qt6 - Multimedia support
 Name:    qt6-%{qt_module}
-Version: 6.8.1
-Release: 1%{?dist}
+Version: 6.7.1
+Release: 3%{?dist}
 
 License: LGPL-3.0-only OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 Url:     http://www.qt.io
@@ -37,7 +37,7 @@ Source0: https://download.qt.io/official_releases/qt/%{majmin}/%{version}/submod
 %endif
 
 # upstream patches
-Patch0:  qtmultimedia-fix-build-on-x86-arch.patch
+
 
 # filter plugin/qml provides
 %global __provides_exclude_from ^(%{_qt6_archdatadir}/qml/.*\\.so|%{_qt6_plugindir}/.*\\.so)$
@@ -146,13 +146,6 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
 %qt6_dont_autoinstall_tests
 %endif
 
-%if 0%{?build_tests}
-# FIXME: avoid SBOM for test plugins
-sed -i -e 's@.*qt_sbom/SPDXRef-Package-qtmultimedia-qt-plugin-MockMultimediaPlugin.cmake")@@' \
-       -e 's@.*qt_sbom/SPDXRef-PackagedFile-qt-plugin-MockMultimediaPlugin.cmake")@@' \
-       %_vpath_srcdir/%_vpath_builddir/qt_sbom/assemble_sbom.cmake
-%endif
-
 %cmake_install
 
 %if 0%{?build_tests}
@@ -177,7 +170,6 @@ rm -rf %{buildroot}%{_qt6_plugindir}/multimedia/libmockmultimediaplugin.prl
 
 %files
 %license LICENSES/*
-%{_qt6_archdatadir}/sbom/%{qt_module}-%{qt_version}.spdx
 %{_qt6_libdir}/libQt6Multimedia.so.6*
 %{_qt6_libdir}/libQt6MultimediaQuick.so.6*
 %{_qt6_libdir}/libQt6MultimediaWidgets.so.6*
@@ -193,18 +185,17 @@ rm -rf %{buildroot}%{_qt6_plugindir}/multimedia/libmockmultimediaplugin.prl
 %endif
 
 %files devel
+%{_qt6_headerdir}/QtQGstreamerMediaPlugin/
 %{_qt6_headerdir}/QtMultimedia/
-%{_qt6_headerdir}/QtMultimediaTestLib/
 %{_qt6_headerdir}/QtMultimediaQuick/
 %{_qt6_headerdir}/QtMultimediaWidgets/
 %{_qt6_headerdir}/QtSpatialAudio/
 %{_qt6_headerdir}/QtQuick3DSpatialAudio/
-%{_qt6_headerdir}/QtQGstreamerMediaPluginImpl/
 %{_qt6_libdir}/libQt6BundledResonanceAudio.a
+%{_qt6_libdir}/libQt6QGstreamerMediaPlugin.a
+%{_qt6_libdir}/libQt6QGstreamerMediaPlugin.prl
 %{_qt6_libdir}/libQt6Multimedia.so
 %{_qt6_libdir}/libQt6Multimedia.prl
-%{_qt6_libdir}/libQt6MultimediaTestLib.a
-%{_qt6_libdir}/libQt6MultimediaTestLib.prl
 %{_qt6_libdir}/libQt6MultimediaQuick.so
 %{_qt6_libdir}/libQt6MultimediaQuick.prl
 %{_qt6_libdir}/libQt6MultimediaWidgets.so
@@ -213,14 +204,12 @@ rm -rf %{buildroot}%{_qt6_plugindir}/multimedia/libmockmultimediaplugin.prl
 %{_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/
 %{_qt6_libdir}/cmake/Qt6BundledResonanceAudio/*.cmake
-%dir %{_qt6_libdir}/cmake/Qt6MultimediaTestLibPrivate/
-%{_qt6_libdir}/cmake/Qt6MultimediaTestLibPrivate/*.cmake
+%dir %{_qt6_libdir}/cmake/Qt6QGstreamerMediaPluginPrivate/
+%{_qt6_libdir}/cmake/Qt6QGstreamerMediaPluginPrivate/*.cmake
 %dir  %{_qt6_libdir}/cmake/Qt6MultimediaQuickPrivate
 %{_qt6_libdir}/cmake/Qt6MultimediaQuickPrivate/*.cmake
 %dir %{_qt6_libdir}/cmake/Qt6Multimedia
@@ -231,8 +220,6 @@ rm -rf %{buildroot}%{_qt6_plugindir}/multimedia/libmockmultimediaplugin.prl
 %{_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
@@ -252,14 +239,6 @@ rm -rf %{buildroot}%{_qt6_plugindir}/multimedia/libmockmultimediaplugin.prl
 %endif
 
 %changelog
-* Fri Dec 06 2024 Jan Grulich <jgrulich@redhat.com> - 6.8.1-1
-- 6.8.1
-  Resolves: RHEL-53982
-
-* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 6.7.1-4
-- Bump release for October 2024 mass rebuild:
-  Resolves: RHEL-64018
-
 * Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 6.7.1-3
 - Bump release for June 2024 mass rebuild