Compare commits

...

47 Commits
f34 ... rawhide

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
Jan Grulich
26b57b5af1 6.6.2 2024-02-15 14:33:34 +01:00
Fedora Release Engineering
9c24ea3cc9 Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild 2024-01-26 14:17:57 +00:00
Fedora Release Engineering
8c0b34b6a3 Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild 2024-01-22 10:01:15 +00:00
Jan Grulich
a5e9e945b9 6.6.1 2023-11-27 19:03:18 +01:00
Jan Grulich
6e3eefb04e 6.6.0 2023-10-11 12:56:30 +02:00
Justin Zobel
e31e371c19 Update to 6.5.3 2023-10-01 15:54:44 +10:30
Fedora Release Engineering
62353575dd Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2023-07-21 16:12:32 +00:00
Jan Grulich
d726d9cd68 6.5.2 2023-07-21 11:05:03 +02:00
Jan Grulich
9b2cddc976 Rebuild for qtbase private API version change 2023-07-12 13:47:45 +02:00
Jan Grulich
87e86fd82e Rebuild for qtbase private API version change 2023-07-12 10:39:19 +02:00
Yaakov Selkowitz
5d9709d64c Drop unused openal-soft build dependency
In Qt6 openal-soft is only used when building for the WebAssembly
platform.
2023-06-16 15:51:45 -04:00
Troy Dawson
25c7c00383 Use gcc-toolset-12 on RHEL 9 or older 2023-06-05 06:48:58 -07:00
Jan Grulich
8ace73bc7c 6.5.1 2023-05-25 12:13:33 +02:00
Yaakov Selkowitz
33d2a269dc Disable ffmpeg by default in RHEL builds
The ffmpeg plugin can be built separately as an EPEL-specific package.
2023-04-24 14:12:43 -04:00
Jan Grulich
b100b6e845 Fix listed files 2023-04-04 10:07:52 +02:00
Jan Grulich
eb459c198d 6.5.0 2023-04-04 07:07:17 +02:00
Jan Grulich
f6da1e99fd 6.4.3 2023-03-23 09:13:06 +01:00
Neal Gompa
a51fa56728 Rebuild for ffmpeg 6.0 2023-03-12 13:31:01 -04:00
Jan Grulich
3d3f361b8c migrated to SPDX license 2023-01-31 15:02:07 +01:00
Fedora Release Engineering
2d0a4eb77a Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2023-01-20 19:11:05 +00:00
Jan Grulich
3961d6b82a 6.4.2 2023-01-16 13:26:16 +01:00
Jan Grulich
aa4c2f35f1 Minor fixes in %files section 2022-12-06 13:30:00 +01:00
Jan Grulich
d01149f5f0 Move plugins out of -devel subpackage 2022-12-05 08:13:23 +01:00
Jan Grulich
68cfcd03c9 Bump build version 2022-12-02 10:58:36 +01:00
Jan Grulich
b2d27dba00 Build FFMpeg plugin 2022-12-02 10:57:31 +01:00
Jan Grulich
ef4d89f1f8 6.4.1 2022-11-23 14:02:07 +01:00
Jan Grulich
174fb4e1a2 Update %files section 2022-11-01 10:28:32 +01:00
Jan Grulich
0ec279c505 6.4.0 2022-11-01 07:27:50 +01:00
Fedora Release Engineering
97611427ed Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2022-07-23 00:12:30 +00:00
Jan Grulich
0fb90feb63 Fix pkgconfig file path 2022-07-14 11:20:54 +02:00
Jan Grulich
68966486b4 Add pkgconfig files 2022-07-14 09:52:08 +02:00
Jan Grulich
0295870c69 6.3.1 2022-07-14 09:06:12 +02:00
Jan Grulich
f01d0650a1 -examples: require same version of our devel package 2022-05-25 09:28:29 +02:00
Jan Grulich
7c2f4368f7 Enable examples 2022-05-25 09:11:54 +02:00
Jan Grulich
bcb6ae74c0 6.3.0 2022-04-20 15:53:57 +02:00
4 changed files with 218 additions and 19 deletions

17
.gitignore vendored
View File

@ -4,3 +4,20 @@
/qtmultimedia-everywhere-src-6.2.1.tar.xz
/qtmultimedia-everywhere-src-6.2.2.tar.xz
/qtmultimedia-everywhere-src-6.2.3.tar.xz
/qtmultimedia-everywhere-src-6.3.0.tar.xz
/qtmultimedia-everywhere-src-6.3.1.tar.xz
/qtmultimedia-everywhere-src-6.4.0.tar.xz
/qtmultimedia-everywhere-src-6.4.1.tar.xz
/qtmultimedia-everywhere-src-6.4.2.tar.xz
/qtmultimedia-everywhere-src-6.4.3.tar.xz
/qtmultimedia-everywhere-src-6.5.0.tar.xz
/qtmultimedia-everywhere-src-6.5.1.tar.xz
/qtmultimedia-everywhere-src-6.5.2.tar.xz
/qtmultimedia-everywhere-src-6.5.3.tar.xz
/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,25 +1,29 @@
%global qt_module qtmultimedia
%global openal 1
%global gst 0.10
%if 0%{?fedora} || 0%{?rhel} > 7
%global gst 1.0
%endif
%if 0%{?rhel} && ! 0%{?epel}
%bcond_with ffmpeg
%else
%bcond_without ffmpeg
%endif
#global unstable 1
%if 0%{?unstable}
%global prerelease rc2
%endif
%global examples 1
Summary: Qt6 - Multimedia support
Name: qt6-%{qt_module}
Version: 6.2.3
Release: 2%{?dist}
Version: 6.8.0
Release: 1%{?dist}
# See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
License: LGPLv2 with exceptions or GPLv3 with exceptions
License: LGPL-3.0-only OR GPL-3.0-only WITH Qt-GPL-exception-1.0
Url: http://www.qt.io
%global majmin %(echo %{version} | cut -d. -f1-2)
%global qt_version %(echo %{version} | cut -d~ -f1)
@ -30,11 +34,16 @@ 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-13
%endif
BuildRequires: ninja-build
BuildRequires: qt6-rpm-macros
BuildRequires: qt6-qtbase-devel >= %{version}
@ -42,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)
@ -54,9 +64,16 @@ BuildRequires: pkgconfig(gstreamer-pbutils-%{gst})
BuildRequires: pkgconfig(gstreamer-plugins-bad-%{gst})
BuildRequires: pkgconfig(gstreamer-video-%{gst})
BuildRequires: pkgconfig(libpulse) pkgconfig(libpulse-mainloop-glib)
%if 0%{?openal}
BuildRequires: pkgconfig(openal)
%if %{with ffmpeg}
BuildRequires: ffmpeg-free-devel
BuildRequires: libavcodec-free-devel
BuildRequires: libavutil-free-devel
BuildRequires: libavformat-free-devel
BuildRequires: libswscale-free-devel
BuildRequires: libswresample-free-devel
BuildRequires: pkgconfig(libva) pkgconfig(libva-drm)
%endif
BuildRequires: pkgconfig(xrandr)
BuildRequires: pkgconfig(xv)
BuildRequires: pkgconfig(xkbcommon) >= 0.5.0
BuildRequires: openssl-devel
@ -81,19 +98,27 @@ Requires: pkgconfig(libpulse-mainloop-glib)
%description devel
%{summary}.
%if 0%{?examples}
%package examples
Summary: Programming examples for %{name}
Requires: %{name}%{?_isa} = %{version}-%{release}
# BuildRequires: qt6-qtmultimedia-devel >= %{version}
%description examples
%{summary}.
%endif
%prep
%autosetup -n %{qt_module}-everywhere-src-%{qt_version}%{?unstable:-%{prerelease}} -p1
%build
%cmake_qt6
%if 0%{?rhel} && 0%{?rhel} < 10
. /opt/rh/gcc-toolset-13/enable
%endif
%cmake_qt6 \
-DQT_FEATURE_alsa=ON \
-DQT_BUILD_EXAMPLES:BOOL=%{?examples:ON}%{!?examples:OFF} \
-DQT_INSTALL_EXAMPLES_SOURCES=%{?examples:ON}%{!?examples:OFF}
%cmake_build
@ -117,45 +142,174 @@ popd
%ldconfig_scriptlets
%files
%license LICENSE.*
%license LICENSES/*
%{_qt6_libdir}/libQt6Multimedia.so.6*
%{_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_libdir}/cmake/Qt6MultimediaWidgets/
%dir %{_qt6_archdatadir}/qml/QtQuick3D/SpatialAudio
%{_qt6_archdatadir}/qml/QtQuick3D/SpatialAudio/
%dir %{_qt6_plugindir}/multimedia
%{_qt6_plugindir}/multimedia/libgstreamermediaplugin.so
%if %{with ffmpeg}
%{_qt6_plugindir}/multimedia/libffmpegmediaplugin.so
%endif
%files devel
%{_qt6_headerdir}/QtMultimedia/
%{_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
%{_qt6_libdir}/libQt6MultimediaQuick.so
%{_qt6_libdir}/libQt6MultimediaQuick.prl
%{_qt6_libdir}/libQt6MultimediaWidgets.so
%{_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/
%{_qt6_libdir}/cmake/Qt6BundledResonanceAudio/*.cmake
%dir %{_qt6_libdir}/cmake/Qt6MultimediaQuickPrivate
%{_qt6_libdir}/cmake/Qt6MultimediaQuickPrivate
%{_qt6_libdir}/cmake/Qt6MultimediaQuickPrivate/*.cmake
%dir %{_qt6_libdir}/cmake/Qt6Multimedia
%{_qt6_libdir}/cmake/Qt6Multimedia/*.cmake
%dir %{_qt6_libdir}/cmake/Qt6MultimediaWidgets
%{_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
%{_qt6_libdir}/metatypes/qt6*_metatypes.json
%{_qt6_datadir}/modules/*.json
%{_qt6_libdir}/qt6/metatypes/qt6*_metatypes.json
%{_qt6_libdir}/qt6/modules/*.json
%{_qt6_libdir}/pkgconfig/*.pc
%if 0%{?_qt6_examplesdir:1}
%if 0%{?examples}
%files examples
%license LICENSE.FDL
%{_qt6_examplesdir}/
%endif
%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
* Fri Jan 26 2024 Fedora Release Engineering <releng@fedoraproject.org> - 6.6.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 6.6.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Mon Nov 27 2023 Jan Grulich <jgrulich@redhat.com> - 6.6.1-1
- 6.6.1
* Tue Oct 10 2023 Jan Grulich <jgrulich@redhat.com> - 6.6.0-1
- 6.6.0
* Sun Oct 01 2023 Justin Zobel <justin.zobel@gmail.com> - 6.5.3-1
- new version
* Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 6.5.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Fri Jul 21 2023 Jan Grulich <jgrulich@redhat.com> - 6.5.2-1
- 6.5.2
* Wed Jul 12 2023 Jan Grulich <jgrulich@redhat.com> - 6.5.1-4
- Rebuild for qtbase private API version change
* Wed Jul 12 2023 Jan Grulich <jgrulich@redhat.com> - 6.5.1-3
- Rebuild for qtbase private API version change
* Fri Jun 16 2023 Yaakov Selkowitz <yselkowi@redhat.com> - 6.5.1-2
- Drop unused openal-soft build dependency
* Mon May 22 2023 Jan Grulich <jgrulich@redhat.com> - 6.5.1-1
- 6.5.1
* Tue Apr 04 2023 Jan Grulich <jgrulich@redhat.com> - 6.5.0-1
- 6.5.0
* Thu Mar 23 2023 Jan Grulich <jgrulich@redhat.com> - 6.4.3-1
- 6.4.3
* Sun Mar 12 2023 Neal Gompa <ngompa@fedoraproject.org> - 6.4.2-4
- Rebuild for ffmpeg 6.0
* Tue Jan 31 2023 Jan Grulich <jgrulich@redhat.com> - 6.4.2-3
- migrated to SPDX license
* Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 6.4.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Mon Jan 16 2023 Jan Grulich <jgrulich@redhat.com> - 6.4.2-1
- 6.4.2
* Mon Dec 05 2022 Jan Grulich <jgrulich@redhat.com> - 6.4.1-3
- Move plugins out of -devel subpackage
* Fri Dec 02 2022 Jan Grulich <jgrulich@redhat.com> - 6.4.1-2
- Build FFmpeg plugin
* Wed Nov 23 2022 Jan Grulich <jgrulich@redhat.com> - 6.4.1-1
- 6.4.1
* Mon Oct 31 2022 Jan Grulich <jgrulich@redhat.com> - 6.4.0-1
- 6.4.0
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 6.3.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Wed Jul 13 2022 Jan Grulich <jgrulich@redhat.com> - 6.3.1-1
- 6.3.1
* Wed May 25 2022 Jan Grulich <jgrulich@redhat.com> - 6.3.0-2
- Enable examples
* Wed Apr 13 2022 Jan Grulich <jgrulich@redhat.com> - 6.3.0-1
- 6.3.0
* Fri Feb 25 2022 Jan Grulich <jgrulich@redhat.com> - 6.2.3-2
- Enable s390x builds

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.2.3.tar.xz) = ab2ee3f765ad8c9b61e2517b2267eedf1467950df1f7947cf29aa204294e9cc11475c5d27f8f93becac6f0693a4bbd9593ce5d675772822677baa747e45cb2b0
SHA512 (qtmultimedia-everywhere-src-6.8.0.tar.xz) = 1374db720141d09ca3081b5a7dd6d0f1b4457ab87096b4bfac0b9ab97de1dadf36ded5cf04ae01824fd9e16cfe7f45f45f2ebebc464696a348284462a731388e