Sync from SUSE:SLFO:1.1 qt6-multimedia revision 4a75d2fab54772ece31fc01fdcb98c4a

0001-Build-with-system-eigen-3.patch

@@ -1,60 +0,0 @@
-From de6655d8d81450d5da02c12e4c42c9c062ab231b Mon Sep 17 00:00:00 2001
-From: Christophe Marin <christophe@krop.fr>
-Date: Wed, 9 Oct 2024 14:19:49 +0200
-Subject: [PATCH] =?UTF-8?q?Build=20with=20system=20eigen=C2=A03?=
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
----
- src/3rdparty/resonance-audio/CMakeLists.txt | 2 +-
- src/resonance-audio/CMakeLists.txt          | 3 +--
- src/spatialaudio/CMakeLists.txt             | 2 +-
- 3 files changed, 3 insertions(+), 4 deletions(-)
-
-diff --git a/src/3rdparty/resonance-audio/CMakeLists.txt b/src/3rdparty/resonance-audio/CMakeLists.txt
-index 6af0b3f..fce0280 100644
---- a/src/3rdparty/resonance-audio/CMakeLists.txt
-+++ b/src/3rdparty/resonance-audio/CMakeLists.txt
-@@ -98,7 +98,7 @@ elseif (UNIX)
- endif ()
- 
- # Add Eigen3.
--set(EIGEN3_DIR "${PROJECT_SOURCE_DIR}/third_party/eigen/" CACHE PATH "Path to eigen3 library")
-+set(EIGEN3_DIR "/usr/include/eigen3" CACHE PATH "Path to eigen3 library")
- set(EIGEN3_INCLUDE_DIR ${EIGEN3_DIR})
- add_definitions(-DEIGEN_MPL2_ONLY)
- 
-diff --git a/src/resonance-audio/CMakeLists.txt b/src/resonance-audio/CMakeLists.txt
-index 7690ae2..1b9762b 100644
---- a/src/resonance-audio/CMakeLists.txt
-+++ b/src/resonance-audio/CMakeLists.txt
-@@ -211,11 +211,10 @@ qt_internal_add_3rdparty_library(BundledResonanceAudio
-         ${RA_SOURCE_DIR}
-         ${PFFFT_DIR}
-         ${SADIE_HRTFS_DIR}
--        ../3rdparty/eigen
-+        /usr/include/eigen3
-     ATTRIBUTION_FILE_DIR_PATHS
-         ${RA_TOPLEVEL_DIR}
-         ${PFFFT_DIR}
--        ../3rdparty/eigen
- )
- 
- # Required by pffft on certain PowerPC archs
-diff --git a/src/spatialaudio/CMakeLists.txt b/src/spatialaudio/CMakeLists.txt
-index 7ebd02c..01126af 100644
---- a/src/spatialaudio/CMakeLists.txt
-+++ b/src/spatialaudio/CMakeLists.txt
-@@ -18,7 +18,7 @@ qt_internal_add_module(SpatialAudio
-         "../3rdparty/resonance-audio/resonance_audio"
-         "../3rdparty/resonance-audio"
-         "../resonance-audio"
--        "../3rdparty/eigen"
-+        "/usr/include/eigen3"
-     DEFINES
-         QT_NO_CAST_FROM_ASCII
-         QT_NO_CAST_TO_ASCII
--- 
-2.49.0
-

0001-Fix-build-on-x86-arch.patch

@@ -1,25 +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)

qt6-multimedia.changes

@@ -1,53 +1,3 @@
--------------------------------------------------------------------
-Tue Jun  3 07:49:28 UTC 2025 - Christophe Marin <christophe@krop.fr>
-
-- Update to 6.9.1:
-  * https://www.qt.io/blog/qt-6.9.1-released
-
--------------------------------------------------------------------
-Wed Apr  2 11:03:39 UTC 2025 - Christophe Marin <christophe@krop.fr>
-
-- Update to 6.9.0:
-  * https://www.qt.io/blog/qt-6.9-released
-
--------------------------------------------------------------------
-Sun Mar  9 22:45:56 UTC 2025 - Christophe Marin <christophe@krop.fr>
-
-- Ignore private QML imports
-
--------------------------------------------------------------------
-Fri Jan 31 10:22:56 UTC 2025 - Christophe Marin <christophe@krop.fr>
-
-- Update to 6.8.2
-  https://www.qt.io/blog/qt-6.8.2-released
-
--------------------------------------------------------------------
-Wed Jan 22 17:22:19 UTC 2025 - Antonio Larrosa <alarrosa@suse.com>
-
-- Fix license. 
-
--------------------------------------------------------------------
-Mon Dec  2 13:02:07 UTC 2024 - Christophe Marin <christophe@krop.fr>
-
-- Update to 6.8.1:
-  * https://www.qt.io/blog/qt-6.8.1-released
-
--------------------------------------------------------------------
-Tue Oct  8 09:29:46 UTC 2024 - Christophe Marin <christophe@krop.fr>
-
-- Update to 6.8.0:
-  * https://www.qt.io/blog/qt-6.8-released
-- Add patch to fix build on x86:
-  * 0001-Fix-build-on-x86-arch.patch
-- Add patch to use system Eigen headers
-  * 0001-Build-with-system-eigen-3.patch
-
--------------------------------------------------------------------
-Sat Sep 28 08:23:01 UTC 2024 - Christophe Marin <christophe@krop.fr>
-
-- Update to 6.7.3
-  * https://www.qt.io/blog/qt-6.7.3-released
-
 -------------------------------------------------------------------
 Wed Jun 19 07:25:49 UTC 2024 - Christophe Marin <christophe@krop.fr>
 

qt6-multimedia.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package qt6-multimedia
 #
-# Copyright (c) 2025 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,8 +16,8 @@
 #
 
 
-%define real_version 6.9.1
+%define real_version 6.7.2
-%define short_version 6.9
+%define short_version 6.7
 %define short_name qtmultimedia
 %define tar_name qtmultimedia-everywhere-src
 %define tar_suffix %{nil}
@@ -27,52 +27,43 @@
 %define pkg_suffix -docs
 %endif
 #
-# Private QML imports
-%global __requires_exclude qt6qmlimport\\((FrequencyMonitor|frequencymonitor|performancemonitor).*
-#
 Name:           qt6-multimedia%{?pkg_suffix}
-Version:        6.9.1
+Version:        6.7.2
 Release:        0
 Summary:        Qt 6 Multimedia libraries
-License:        GPL-3.0-only
+License:        GPL-3.0-or-later
 URL:            https://www.qt.io
 Source0:        https://download.qt.io/official_releases/qt/%{short_version}/%{real_version}%{tar_suffix}/submodules/%{tar_name}-%{real_version}%{tar_suffix}.tar.xz
 Source1:        qt6-multimedia-rpmlintrc
-# PATCH-FIX-OPENSUSE -- Disable SIMD on x86 again
-Patch0:         0001-Fix-build-on-x86-arch.patch
-# PATCH-FIX-OPENSUSE -- Use system eigen 3
-Patch1:         0001-Build-with-system-eigen-3.patch
 BuildRequires:  fdupes
 BuildRequires:  pkgconfig
+BuildRequires:  qt6-core-private-devel
+BuildRequires:  qt6-gui-private-devel
+BuildRequires:  qt6-quick-private-devel
+BuildRequires:  qt6-quick3d-private-devel
+BuildRequires:  qt6-widgets-private-devel
 BuildRequires:  cmake(Qt6Core) = %{real_version}
-BuildRequires:  cmake(Qt6CorePrivate) = %{real_version}
 BuildRequires:  cmake(Qt6Gui) = %{real_version}
-BuildRequires:  cmake(Qt6GuiPrivate) = %{real_version}
 BuildRequires:  cmake(Qt6Network) = %{real_version}
 BuildRequires:  cmake(Qt6Qml) = %{real_version}
 BuildRequires:  cmake(Qt6Quick) = %{real_version}
 BuildRequires:  cmake(Qt6Quick3D) = %{real_version}
-BuildRequires:  cmake(Qt6Quick3DPrivate) = %{real_version}
 BuildRequires:  cmake(Qt6QuickControls2) = %{real_version}
-BuildRequires:  cmake(Qt6QuickPrivate) = %{real_version}
 BuildRequires:  cmake(Qt6QuickTest) = %{real_version}
 BuildRequires:  cmake(Qt6ShaderTools) = %{real_version}
 BuildRequires:  cmake(Qt6Svg) = %{real_version}
 BuildRequires:  cmake(Qt6Widgets) = %{real_version}
-BuildRequires:  cmake(Qt6WidgetsPrivate) = %{real_version}
-BuildRequires:  pkgconfig(eigen3) >= 3.4.0
-# GStreamer may cause high latencies and is not the default anymore for desktop
 BuildRequires:  pkgconfig(gstreamer-1.0)
 BuildRequires:  pkgconfig(gstreamer-app-1.0)
 BuildRequires:  pkgconfig(gstreamer-pbutils-1.0)
 BuildRequires:  pkgconfig(gstreamer-plugins-bad-1.0)
 BuildRequires:  pkgconfig(gstreamer-plugins-base-1.0)
 BuildRequires:  pkgconfig(gstreamer-video-1.0)
+# GStreamer may cause high latencies, enable the ffmpeg backend
 BuildRequires:  pkgconfig(libavcodec)
 BuildRequires:  pkgconfig(libavdevice)
 BuildRequires:  pkgconfig(libavformat)
 BuildRequires:  pkgconfig(libavutil)
-BuildRequires:  pkgconfig(libpipewire-0.3)
 BuildRequires:  pkgconfig(libpulse)
 BuildRequires:  pkgconfig(libswresample)
 BuildRequires:  pkgconfig(libswscale)
@@ -113,9 +104,9 @@ Development files for the Qt 6 Multimedia library.
 
 %package private-devel
 Summary:        Non-ABI stable API for the Qt 6 Multimedia Library
-Requires:       cmake(Qt6CorePrivate) = %{real_version}
-Requires:       cmake(Qt6GuiPrivate) = %{real_version}
 Requires:       cmake(Qt6Multimedia) = %{real_version}
+%requires_eq    qt6-core-private-devel
+%requires_eq    qt6-gui-private-devel
 
 %description private-devel
 This package provides private headers of libQt6Multimedia that do not have any
@@ -139,9 +130,9 @@ Development files for the Qt 6 MultimediaWidgets library.
 
 %package -n qt6-multimediawidgets-private-devel
 Summary:        Non-ABI stable API for the Qt 6 MultimediaWidgets Library
-Requires:       cmake(Qt6MultimediaPrivate) = %{real_version}
+Requires:       qt6-multimedia-private-devel = %{version}
 Requires:       cmake(Qt6MultimediaWidgets) = %{real_version}
-Requires:       cmake(Qt6WidgetsPrivate) = %{real_version}
+%requires_eq    qt6-widgets-private-devel
 
 %description -n qt6-multimediawidgets-private-devel
 This package provides private headers of libQt6MultimediaWidgets that do not
@@ -181,10 +172,10 @@ This library does not have any ABI or API guarantees.
 %package -n qt6-multimediaquick-private-devel
 Summary:        Qt 6 MultimediaQuick library - Development files
 Requires:       libQt6MultimediaQuick6 = %{version}
+Requires:       qt6-multimedia-private-devel = %{version}
 Requires:       cmake(Qt6Multimedia) = %{real_version}
-Requires:       cmake(Qt6MultimediaPrivate) = %{real_version}
 Requires:       cmake(Qt6Quick) = %{real_version}
-Requires:       cmake(Qt6QuickPrivate) = %{real_version}
+%requires_eq    qt6-quick-private-devel
 
 %description -n qt6-multimediaquick-private-devel
 Development files for the Qt 6 Multimedia private library.
@@ -200,9 +191,9 @@ This library does not have any ABI or API guarantees.
 %package -n qt6-quick3dspatialaudio-private-devel
 Summary:        Qt 6 Quick3DSpatialAudio library - Development files
 Requires:       libQt6Quick3DSpatialAudio6 = %{version}
-Requires:       cmake(Qt6Quick3D) = %{real_version}
+Requires:       cmake(Qt6Quick3D) = %{version}
-Requires:       cmake(Qt6Quick3DPrivate) = %{real_version}
+Requires:       cmake(Qt6SpatialAudio) = %{version}
-Requires:       cmake(Qt6SpatialAudio) = %{real_version}
+%requires_eq    qt6-quick3d-private-devel
 
 %description -n qt6-quick3dspatialaudio-private-devel
 Development files for the Qt 6 Quick3DSpatialAudio private library.
@@ -212,7 +203,7 @@ This library does not have any ABI or API guarantees.
 
 %package -n qt6-bundledresonanceaudio-devel-static
 Summary:        Qt6 BundledResonanceAudio static library
-Requires:       cmake(Qt6CorePrivate) = %{real_version}
+%requires_eq    qt6-core-private-devel
 
 %description -n qt6-bundledresonanceaudio-devel-static
 The Qt6 BundledResonanceAudio static library.
@@ -225,16 +216,12 @@ This library does not have any ABI or API guarantees.
 %prep
 %autosetup -p1 -n %{tar_name}-%{real_version}%{tar_suffix}
 
-# Use system eigen3
-rm -r ./src/3rdparty/eigen
-
 %build
 %global _lto_cflags %{_lto_cflags} -ffat-lto-objects
 
 %cmake_qt6 \
-  -DQT_GENERATE_SBOM:BOOL=FALSE \
+  -DINPUT_gstreamer:BOOL=ON \
-  -DINPUT_gstreamer:BOOL=TRUE \
+  -DINPUT_ffmpeg:BOOL=ON
-  -DINPUT_ffmpeg:BOOL=TRUE
 
 %{qt6_build}
 
@@ -245,9 +232,6 @@ rm -r ./src/3rdparty/eigen
 
 %fdupes %{buildroot}%{_qt6_includedir}/QtMultimedia
 
-# Unneeded
-rm -r %{buildroot}%{_qt6_mkspecsdir}/features/ios
-
 # CMake files are not needed for plugins
 rm -r %{buildroot}%{_qt6_cmakedir}/Qt6Qml/QmlPlugins
 rm %{buildroot}%{_qt6_cmakedir}/*/*Plugin{Config,Targets}*.cmake
@@ -255,29 +239,13 @@ rm %{buildroot}%{_qt6_cmakedir}/*/*Plugin{Config,Targets}*.cmake
 # The GstreamerMediaPlugin library has a limited usage outside of Qt development
 # (needed to create unit tests for the gstreamer plugin)
 rm %{buildroot}%{_qt6_cmakedir}/Qt6Multimedia/Qt6QGstreamerMediaPluginAdditionalTargetInfo.cmake
-rm %{buildroot}%{_qt6_descriptionsdir}/GstreamerMediaPluginImplPrivate.json
+rm %{buildroot}%{_qt6_descriptionsdir}/QGstreamerMediaPluginPrivate.json
-rm %{buildroot}%{_qt6_libdir}/libQt6GstreamerMediaPluginImpl.a
+rm %{buildroot}%{_qt6_libdir}/libQt6QGstreamerMediaPlugin.a
-rm %{buildroot}%{_qt6_libdir}/libQt6GstreamerMediaPluginImpl.prl
+rm %{buildroot}%{_qt6_libdir}/libQt6QGstreamerMediaPlugin.prl
-rm %{buildroot}%{_qt6_metatypesdir}/qt6gstreamermediapluginimplprivate_*_metatypes.json
+rm %{buildroot}%{_qt6_metatypesdir}/qt6qgstreamermediapluginprivate_*_metatypes.json
-rm %{buildroot}%{_qt6_mkspecsdir}/modules/qt_lib_gstreamermediapluginimpl_private.pri
+rm %{buildroot}%{_qt6_mkspecsdir}/modules/qt_lib_qgstreamermediaplugin_private.pri
-rm -r %{buildroot}%{_qt6_cmakedir}/Qt6GstreamerMediaPluginImplPrivate/
+rm -r %{buildroot}%{_qt6_cmakedir}/Qt6QGstreamerMediaPluginPrivate/
-rm -r %{buildroot}%{_qt6_includedir}/QtGstreamerMediaPluginImpl/
+rm -r %{buildroot}%{_qt6_includedir}/QtQGstreamerMediaPlugin/
-
-# Same thing for the testlib
-rm %{buildroot}%{_qt6_descriptionsdir}/MultimediaTestLibPrivate.json
-rm %{buildroot}%{_qt6_libdir}/libQt6MultimediaTestLib.*
-rm %{buildroot}%{_qt6_metatypesdir}/qt6multimediatestlibprivate_*_metatypes.json
-rm %{buildroot}%{_qt6_mkspecsdir}/modules/qt_lib_multimediatestlibprivate_private.pri
-rm -r %{buildroot}%{_qt6_cmakedir}/Qt6MultimediaTestLibPrivate
-rm -r %{buildroot}%{_qt6_includedir}/QtMultimediaTestLib
-
-# The FFmpegMediaPluginImpl files are probably unneeded
-rm %{buildroot}%{_qt6_descriptionsdir}/FFmpegMediaPluginImplPrivate.json
-rm %{buildroot}%{_qt6_libdir}/libQt6FFmpegMediaPluginImpl.*
-rm %{buildroot}%{_qt6_metatypesdir}/qt6ffmpegmediapluginimplprivate_*_metatypes.json
-rm %{buildroot}%{_qt6_mkspecsdir}/modules/qt_lib_ffmpegmediapluginimpl_private.pri
-rm -r %{buildroot}%{_qt6_cmakedir}/Qt6FFmpegMediaPluginImplPrivate
-rm -r %{buildroot}%{_qt6_includedir}/QtFFmpegMediaPluginImpl
 
 %ldconfig_scriptlets -n libQt6Multimedia6
 %ldconfig_scriptlets -n libQt6MultimediaQuick6
@@ -303,7 +271,6 @@ rm -r %{buildroot}%{_qt6_includedir}/QtFFmpegMediaPluginImpl
 %{_qt6_cmakedir}/Qt6/FindGStreamer.cmake
 %{_qt6_cmakedir}/Qt6/FindMMRenderer.cmake
 %{_qt6_cmakedir}/Qt6/FindMMRendererCore.cmake
-%{_qt6_cmakedir}/Qt6/FindPipeWire.cmake
 %{_qt6_cmakedir}/Qt6/FindVAAPI.cmake
 %{_qt6_cmakedir}/Qt6/FindWMF.cmake
 %{_qt6_cmakedir}/Qt6/FindWrapPulseAudio.cmake
@@ -319,7 +286,6 @@ rm -r %{buildroot}%{_qt6_includedir}/QtFFmpegMediaPluginImpl
 %exclude %{_qt6_includedir}/QtMultimedia/%{real_version}
 
 %files private-devel
-%{_qt6_cmakedir}/Qt6MultimediaPrivate/
 %{_qt6_includedir}/QtMultimedia/%{real_version}
 %{_qt6_mkspecsdir}/modules/qt_lib_multimedia_private.pri
 
@@ -338,7 +304,6 @@ rm -r %{buildroot}%{_qt6_includedir}/QtFFmpegMediaPluginImpl
 %exclude %{_qt6_includedir}/QtMultimediaWidgets/%{real_version}
 
 %files -n qt6-multimediawidgets-private-devel
-%{_qt6_cmakedir}/Qt6MultimediaWidgetsPrivate/
 %{_qt6_includedir}/QtMultimediaWidgets/%{real_version}
 %{_qt6_mkspecsdir}/modules/qt_lib_multimediawidgets_private.pri
 
@@ -357,7 +322,6 @@ rm -r %{buildroot}%{_qt6_includedir}/QtFFmpegMediaPluginImpl
 %exclude %{_qt6_includedir}/QtSpatialAudio/%{real_version}
 
 %files -n qt6-spatialaudio-private-devel
-%{_qt6_cmakedir}/Qt6SpatialAudioPrivate/
 %{_qt6_includedir}/QtSpatialAudio/%{real_version}
 %{_qt6_mkspecsdir}/modules/qt_lib_spatialaudio_private.pri