Merge branch 'rawhide' into f40

This commit is contained in:
Jan Grulich 2024-05-27 14:34:59 +02:00
commit 8cb100eae9
3 changed files with 12 additions and 5 deletions

1
.gitignore vendored
View File

@ -18,3 +18,4 @@
/qtmultimedia-everywhere-src-6.6.1.tar.xz /qtmultimedia-everywhere-src-6.6.1.tar.xz
/qtmultimedia-everywhere-src-6.6.2.tar.xz /qtmultimedia-everywhere-src-6.6.2.tar.xz
/qtmultimedia-everywhere-src-6.7.0.tar.xz /qtmultimedia-everywhere-src-6.7.0.tar.xz
/qtmultimedia-everywhere-src-6.7.1.tar.xz

View File

@ -20,8 +20,8 @@
Summary: Qt6 - Multimedia support Summary: Qt6 - Multimedia support
Name: qt6-%{qt_module} Name: qt6-%{qt_module}
Version: 6.7.0 Version: 6.7.1
Release: 2%{?dist} Release: 1%{?dist}
License: LGPL-3.0-only OR GPL-3.0-only WITH Qt-GPL-exception-1.0 License: LGPL-3.0-only OR GPL-3.0-only WITH Qt-GPL-exception-1.0
Url: http://www.qt.io Url: http://www.qt.io
@ -34,8 +34,6 @@ 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 Source0: https://download.qt.io/official_releases/qt/%{majmin}/%{version}/submodules/%{qt_module}-everywhere-src-%{version}.tar.xz
%endif %endif
Patch0: qtmultimedia-6.7.0--fix-abi-breakage.patch
# filter plugin/qml provides # filter plugin/qml provides
%global __provides_exclude_from ^(%{_qt6_archdatadir}/qml/.*\\.so|%{_qt6_plugindir}/.*\\.so)$ %global __provides_exclude_from ^(%{_qt6_archdatadir}/qml/.*\\.so|%{_qt6_plugindir}/.*\\.so)$
@ -158,12 +156,15 @@ popd
%endif %endif
%files devel %files devel
%{_qt6_headerdir}/QtQGstreamerMediaPlugin/
%{_qt6_headerdir}/QtMultimedia/ %{_qt6_headerdir}/QtMultimedia/
%{_qt6_headerdir}/QtMultimediaQuick/ %{_qt6_headerdir}/QtMultimediaQuick/
%{_qt6_headerdir}/QtMultimediaWidgets/ %{_qt6_headerdir}/QtMultimediaWidgets/
%{_qt6_headerdir}/QtSpatialAudio/ %{_qt6_headerdir}/QtSpatialAudio/
%{_qt6_headerdir}/QtQuick3DSpatialAudio/ %{_qt6_headerdir}/QtQuick3DSpatialAudio/
%{_qt6_libdir}/libQt6BundledResonanceAudio.a %{_qt6_libdir}/libQt6BundledResonanceAudio.a
%{_qt6_libdir}/libQt6QGstreamerMediaPlugin.a
%{_qt6_libdir}/libQt6QGstreamerMediaPlugin.prl
%{_qt6_libdir}/libQt6Multimedia.so %{_qt6_libdir}/libQt6Multimedia.so
%{_qt6_libdir}/libQt6Multimedia.prl %{_qt6_libdir}/libQt6Multimedia.prl
%{_qt6_libdir}/libQt6MultimediaQuick.so %{_qt6_libdir}/libQt6MultimediaQuick.so
@ -178,6 +179,8 @@ popd
%{_qt6_libdir}/cmake/Qt6BuildInternals/StandaloneTests/*.cmake %{_qt6_libdir}/cmake/Qt6BuildInternals/StandaloneTests/*.cmake
%dir %{_qt6_libdir}/cmake/Qt6BundledResonanceAudio/ %dir %{_qt6_libdir}/cmake/Qt6BundledResonanceAudio/
%{_qt6_libdir}/cmake/Qt6BundledResonanceAudio/*.cmake %{_qt6_libdir}/cmake/Qt6BundledResonanceAudio/*.cmake
%dir %{_qt6_libdir}/cmake/Qt6QGstreamerMediaPluginPrivate/
%{_qt6_libdir}/cmake/Qt6QGstreamerMediaPluginPrivate/*.cmake
%dir %{_qt6_libdir}/cmake/Qt6MultimediaQuickPrivate %dir %{_qt6_libdir}/cmake/Qt6MultimediaQuickPrivate
%{_qt6_libdir}/cmake/Qt6MultimediaQuickPrivate/*.cmake %{_qt6_libdir}/cmake/Qt6MultimediaQuickPrivate/*.cmake
%dir %{_qt6_libdir}/cmake/Qt6Multimedia %dir %{_qt6_libdir}/cmake/Qt6Multimedia
@ -203,6 +206,9 @@ popd
%changelog %changelog
* Tue May 21 2024 Jan Grulich <jgrulich@redhat.com> - 6.7.1-1
- 6.7.1
* Sat May 25 2024 Fabio Valentini <decathorpe@gmail.com> - 6.7.0-2 * Sat May 25 2024 Fabio Valentini <decathorpe@gmail.com> - 6.7.0-2
- Rebuild for gstreamer-plugins-bad 1.24 - Rebuild for gstreamer-plugins-bad 1.24

View File

@ -1 +1 @@
SHA512 (qtmultimedia-everywhere-src-6.7.0.tar.xz) = 4e5fa8fff408b8abf761a12d9637c425fe9bfbf6475b44a69c8489fd61bf6cbcca95940a22d1b24aec59634a458888d2b34cb883c8e38d542f2f1cb36046e4c1 SHA512 (qtmultimedia-everywhere-src-6.7.1.tar.xz) = 18e7b2036baac68a421cb8741713b43d739f558cad8b9d2b8192e390b2c37cfda17f6bb290c9313ae9e3b7ea2ee4fda52b86a58195201e99179d6f4a4e386783