Accepting request 1228195 from KDE:Qt6
Qt 6.8.1 (forwarded request 1227981 from krop) OBS-URL: https://build.opensuse.org/request/show/1228195 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/qt6-multimedia?expand=0&rev=27
This commit is contained in:
commit
238d8c8837
@ -11,18 +11,15 @@ With GCC 14, build fails with:
|
|||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
diff --git a/src/resonance-audio/CMakeLists.txt b/src/resonance-audio/CMakeLists.txt
|
diff --git a/src/resonance-audio/CMakeLists.txt b/src/resonance-audio/CMakeLists.txt
|
||||||
index 0fa9dec..1eff0a3 100644
|
index 7690ae2..3abaa99 100644
|
||||||
--- a/src/resonance-audio/CMakeLists.txt
|
--- a/src/resonance-audio/CMakeLists.txt
|
||||||
+++ b/src/resonance-audio/CMakeLists.txt
|
+++ b/src/resonance-audio/CMakeLists.txt
|
||||||
@@ -233,7 +233,7 @@ qt_internal_extend_target(BundledResonanceAudio CONDITION (${CMAKE_SYSTEM_PROCES
|
@@ -233,7 +233,7 @@ qt_internal_extend_target(BundledResonanceAudio CONDITION (${CMAKE_SYSTEM_PROCES
|
||||||
# Use fallback mode if SSE is not available
|
# Use fallback mode if SSE is not available
|
||||||
qt_internal_extend_target(BundledResonanceAudio CONDITION (${CMAKE_SYSTEM_PROCESSOR} MATCHES "i[3-6]86$")
|
qt_internal_extend_target(BundledResonanceAudio CONDITION (${CMAKE_SYSTEM_PROCESSOR} MATCHES "i[3-6]86(-AT386)?$")
|
||||||
COMPILE_OPTIONS
|
COMPILE_OPTIONS
|
||||||
- -DPFFFT_SIMD_DISABLE
|
- -DPFFFT_SIMD_DISABLE
|
||||||
+ -DPFFFT_SIMD_DISABLE -DDISABLE_SIMD
|
+ -DPFFFT_SIMD_DISABLE -DDISABLE_SIMD
|
||||||
)
|
)
|
||||||
|
|
||||||
qt_disable_warnings(BundledResonanceAudio)
|
qt_disable_warnings(BundledResonanceAudio)
|
||||||
--
|
|
||||||
2.46.1
|
|
||||||
|
|
||||||
|
@ -1,3 +1,9 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
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>
|
Tue Oct 8 09:29:46 UTC 2024 - Christophe Marin <christophe@krop.fr>
|
||||||
|
|
||||||
|
@ -16,7 +16,7 @@
|
|||||||
#
|
#
|
||||||
|
|
||||||
|
|
||||||
%define real_version 6.8.0
|
%define real_version 6.8.1
|
||||||
%define short_version 6.8
|
%define short_version 6.8
|
||||||
%define short_name qtmultimedia
|
%define short_name qtmultimedia
|
||||||
%define tar_name qtmultimedia-everywhere-src
|
%define tar_name qtmultimedia-everywhere-src
|
||||||
@ -28,7 +28,7 @@
|
|||||||
%endif
|
%endif
|
||||||
#
|
#
|
||||||
Name: qt6-multimedia%{?pkg_suffix}
|
Name: qt6-multimedia%{?pkg_suffix}
|
||||||
Version: 6.8.0
|
Version: 6.8.1
|
||||||
Release: 0
|
Release: 0
|
||||||
Summary: Qt 6 Multimedia libraries
|
Summary: Qt 6 Multimedia libraries
|
||||||
License: GPL-3.0-or-later
|
License: GPL-3.0-or-later
|
||||||
@ -229,8 +229,9 @@ rm -r ./src/3rdparty/eigen
|
|||||||
%global _lto_cflags %{_lto_cflags} -ffat-lto-objects
|
%global _lto_cflags %{_lto_cflags} -ffat-lto-objects
|
||||||
|
|
||||||
%cmake_qt6 \
|
%cmake_qt6 \
|
||||||
-DINPUT_gstreamer:BOOL=ON \
|
-DQT_GENERATE_SBOM:BOOL=FALSE \
|
||||||
-DINPUT_ffmpeg:BOOL=ON
|
-DINPUT_gstreamer:BOOL=TRUE \
|
||||||
|
-DINPUT_ffmpeg:BOOL=TRUE
|
||||||
|
|
||||||
%{qt6_build}
|
%{qt6_build}
|
||||||
|
|
||||||
@ -256,6 +257,14 @@ rm %{buildroot}%{_qt6_mkspecsdir}/modules/qt_lib_qgstreamermediapluginimpl_priva
|
|||||||
rm -r %{buildroot}%{_qt6_cmakedir}/Qt6QGstreamerMediaPluginImplPrivate/
|
rm -r %{buildroot}%{_qt6_cmakedir}/Qt6QGstreamerMediaPluginImplPrivate/
|
||||||
rm -r %{buildroot}%{_qt6_includedir}/QtQGstreamerMediaPluginImpl/
|
rm -r %{buildroot}%{_qt6_includedir}/QtQGstreamerMediaPluginImpl/
|
||||||
|
|
||||||
|
# Same thing for the testlib
|
||||||
|
rm %{buildroot}%{_qt6_libdir}/libQt6MultimediaTestLib.*
|
||||||
|
rm -r %{buildroot}%{_qt6_cmakedir}/Qt6MultimediaTestLibPrivate
|
||||||
|
rm -r %{buildroot}%{_qt6_descriptionsdir}/MultimediaTestLibPrivate.json
|
||||||
|
rm -r %{buildroot}%{_qt6_includedir}/QtMultimediaTestLib
|
||||||
|
rm -r %{buildroot}%{_qt6_metatypesdir}/qt6multimediatestlibprivate_relwithdebinfo_metatypes.json
|
||||||
|
rm -r %{buildroot}%{_qt6_mkspecsdir}/modules/qt_lib_multimediatestlibprivate_private.pri
|
||||||
|
|
||||||
%ldconfig_scriptlets -n libQt6Multimedia6
|
%ldconfig_scriptlets -n libQt6Multimedia6
|
||||||
%ldconfig_scriptlets -n libQt6MultimediaQuick6
|
%ldconfig_scriptlets -n libQt6MultimediaQuick6
|
||||||
%ldconfig_scriptlets -n libQt6MultimediaWidgets6
|
%ldconfig_scriptlets -n libQt6MultimediaWidgets6
|
||||||
|
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:28766aa562fa7aa7dfa8420defd6ece90a891a0496b8d8a4c51958182d73cfcd
|
|
||||||
size 9591692
|
|
BIN
qtmultimedia-everywhere-src-6.8.1.tar.xz
(Stored with Git LFS)
Normal file
BIN
qtmultimedia-everywhere-src-6.8.1.tar.xz
(Stored with Git LFS)
Normal file
Binary file not shown.
Loading…
x
Reference in New Issue
Block a user