From 3b6ba5e7c55048a1fb558da5ff7520fab7947d5d Mon Sep 17 00:00:00 2001
From: Jan Grulich <jgrulich@redhat.com>
Date: Fri, 11 Oct 2024 16:14:53 +0200
Subject: [PATCH] 6.8.0

---
 .gitignore                               |  1 +
 qt6-qtmultimedia.spec                    | 19 ++++++++++------
 qtmultimedia-fix-build-on-x86-arch.patch | 28 ++++++++++++++++++++++++
 sources                                  |  2 +-
 4 files changed, 42 insertions(+), 8 deletions(-)
 create mode 100644 qtmultimedia-fix-build-on-x86-arch.patch

diff --git a/.gitignore b/.gitignore
index 617e4e0..79db622 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,3 +20,4 @@
 /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
diff --git a/qt6-qtmultimedia.spec b/qt6-qtmultimedia.spec
index e270419..5f6503a 100644
--- a/qt6-qtmultimedia.spec
+++ b/qt6-qtmultimedia.spec
@@ -20,8 +20,8 @@
 
 Summary: Qt6 - Multimedia support
 Name:    qt6-%{qt_module}
-Version: 6.7.2
-Release: 3%{?dist}
+Version: 6.8.0
+Release: 1%{?dist}
 
 License: LGPL-3.0-only OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 Url:     http://www.qt.io
@@ -34,6 +34,8 @@ 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)$
 
@@ -156,15 +158,13 @@ popd
 %endif
 
 %files devel
-%{_qt6_headerdir}/QtQGstreamerMediaPlugin/
 %{_qt6_headerdir}/QtMultimedia/
 %{_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}/libQt6MultimediaQuick.so
@@ -175,12 +175,12 @@ popd
 %{_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/Qt6QGstreamerMediaPluginPrivate/
-%{_qt6_libdir}/cmake/Qt6QGstreamerMediaPluginPrivate/*.cmake
 %dir  %{_qt6_libdir}/cmake/Qt6MultimediaQuickPrivate
 %{_qt6_libdir}/cmake/Qt6MultimediaQuickPrivate/*.cmake
 %dir %{_qt6_libdir}/cmake/Qt6Multimedia
@@ -191,6 +191,8 @@ popd
 %{_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
@@ -206,6 +208,9 @@ 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
 
diff --git a/qtmultimedia-fix-build-on-x86-arch.patch b/qtmultimedia-fix-build-on-x86-arch.patch
new file mode 100644
index 0000000..ffc2aca
--- /dev/null
+++ b/qtmultimedia-fix-build-on-x86-arch.patch
@@ -0,0 +1,28 @@
+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
+
diff --git a/sources b/sources
index 34771e5..26002b8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (qtmultimedia-everywhere-src-6.7.2.tar.xz) = bfcd04a5ba142e2a3bee3b67a261ffb4f651ac4e043e3dcafc0175bd25409de375041aa6fdda4f6899b00e4bad6c06ae9fd0d6a1e7db0b874f1bcf0a578d3c70
+SHA512 (qtmultimedia-everywhere-src-6.8.0.tar.xz) = 1374db720141d09ca3081b5a7dd6d0f1b4457ab87096b4bfac0b9ab97de1dadf36ded5cf04ae01824fd9e16cfe7f45f45f2ebebc464696a348284462a731388e