Compare commits

...

12 Commits

Author SHA1 Message Date
Jan Grulich
3b6ba5e7c5 6.8.0 2024-10-11 16:14:53 +02:00
Fabio Valentini
1b7e451e62
Rebuild for ffmpeg 7 2024-09-23 17:00:49 +02:00
Fedora Release Engineering
5db7ad48ba Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild 2024-07-19 17:56:19 +00:00
Jan Grulich
dfbb4ec894 6.7.2 2024-07-01 21:06:49 +02:00
Jan Grulich
f82bc9cc39 Update %files section 2024-05-22 07:37:06 +02:00
Jan Grulich
9329f235b2 6.7.1 2024-05-21 15:53:58 +02:00
Jan Grulich
2df2c31f87 6.7.0 2024-04-03 20:31:43 +02:00
Marie Loise Nolden
2bf7eb50ef enable alsa like on qt5-qtmultimedia 2024-03-22 11:58:30 +00:00
Marie Loise Nolden
acb57a1298 add qt6-qtquick3d-devel as BR for spatial audio (3d)
This enables Spatial Audio for QtQuick3D, see https://doc.qt.io/qt-6/qtspatialaudio-index.html
-- Configure summary:

Qt Multimedia:
  Spatial Audio .......................... yes
  Spatial Audio (Quick3D) ................ yes
2024-03-21 08:33:11 +01:00
Troy Dawson
e2dd47e731 rhel9 needs gcc-toolset-13 2024-03-20 06:36:37 -07:00
Jan Grulich
dbe59b7594 Bump build for examples change 2024-02-19 19:56:36 +01:00
Jan Grulich
bc0743be08 Examples: also install source files 2024-02-19 19:48:25 +01:00
4 changed files with 80 additions and 6 deletions

4
.gitignore vendored
View File

@ -17,3 +17,7 @@
/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

View File

@ -1,4 +1,3 @@
%global qt_module qtmultimedia
%global gst 0.10
@ -21,7 +20,7 @@
Summary: Qt6 - Multimedia support
Name: qt6-%{qt_module}
Version: 6.6.2
Version: 6.8.0
Release: 1%{?dist}
License: LGPL-3.0-only OR GPL-3.0-only WITH Qt-GPL-exception-1.0
@ -35,13 +34,15 @@ 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)$
BuildRequires: cmake
BuildRequires: gcc-c++
%if 0%{?rhel} && 0%{?rhel} < 10
BuildRequires: gcc-toolset-12
BuildRequires: gcc-toolset-13
%endif
BuildRequires: ninja-build
BuildRequires: qt6-rpm-macros
@ -50,6 +51,7 @@ 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)
@ -111,9 +113,12 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
%build
%if 0%{?rhel} && 0%{?rhel} < 10
. /opt/rh/gcc-toolset-12/enable
. /opt/rh/gcc-toolset-13/enable
%endif
%cmake_qt6 -DQT_BUILD_EXAMPLES:BOOL=%{?examples:ON}%{!?examples:OFF}
%cmake_qt6 \
-DQT_FEATURE_alsa=ON \
-DQT_BUILD_EXAMPLES:BOOL=%{?examples:ON}%{!?examples:OFF} \
-DQT_INSTALL_EXAMPLES_SOURCES=%{?examples:ON}%{!?examples:OFF}
%cmake_build
@ -142,7 +147,10 @@ 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}
@ -154,6 +162,8 @@ 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
@ -163,6 +173,10 @@ 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/
@ -175,6 +189,10 @@ 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
@ -190,6 +208,30 @@ 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

View File

@ -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

View File

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