Resolves: RHEL-27845
Resolves: RHEL-31156
This commit is contained in:
Jan Grulich 2024-04-19 14:55:56 +02:00
parent eecc888a62
commit 759a54777c
3 changed files with 24 additions and 6 deletions

1
.gitignore vendored
View File

@ -16,3 +16,4 @@
/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.7.0.tar.xz

View File

@ -22,8 +22,8 @@
Summary: Qt6 - Multimedia support
Name: qt6-%{qt_module}
Version: 6.6.1
Release: 4%{?dist}
Version: 6.7.0
Release: 1%{?dist}
License: LGPL-3.0-only OR GPL-3.0-only WITH Qt-GPL-exception-1.0
Url: http://www.qt.io
@ -42,7 +42,7 @@ Source0: https://download.qt.io/official_releases/qt/%{majmin}/%{version}/submod
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
@ -51,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)
@ -121,12 +122,14 @@ 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_FEATURE_alsa=ON \
-DQT_BUILD_EXAMPLES:BOOL=%{?examples:ON}%{!?examples:OFF} \
-DQT_BUILD_TESTS=%{?build_tests:ON}%{!?build_tests:OFF}
-DQT_BUILD_TESTS=%{?build_tests:ON}%{!?build_tests:OFF} \
-DQT_INSTALL_EXAMPLES_SOURCES=%{?examples:ON}%{!?examples:OFF}
%if 0%{?build_tests}
%qt6_fix_tests
@ -158,6 +161,7 @@ for prl_file in *.prl ; do
done
popd
rm -rf %{buildroot}%{_qt6_plugindir}/multimedia/libmockmultimediaplugin.prl
%ldconfig_scriptlets
@ -167,7 +171,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}
@ -179,6 +186,7 @@ popd
%{_qt6_headerdir}/QtMultimediaQuick/
%{_qt6_headerdir}/QtMultimediaWidgets/
%{_qt6_headerdir}/QtSpatialAudio/
%{_qt6_headerdir}/QtQuick3DSpatialAudio/
%{_qt6_libdir}/libQt6BundledResonanceAudio.a
%{_qt6_libdir}/libQt6Multimedia.so
%{_qt6_libdir}/libQt6Multimedia.prl
@ -188,6 +196,8 @@ popd
%{_qt6_libdir}/libQt6MultimediaWidgets.prl
%{_qt6_libdir}/libQt6SpatialAudio.so
%{_qt6_libdir}/libQt6SpatialAudio.prl
%{_qt6_libdir}/libQt6Quick3DSpatialAudio.so
%{_qt6_libdir}/libQt6Quick3DSpatialAudio.prl
%{_qt6_libdir}/cmake/Qt6/*.cmake
%{_qt6_libdir}/cmake/Qt6BuildInternals/StandaloneTests/*.cmake
%dir %{_qt6_libdir}/cmake/Qt6BundledResonanceAudio/
@ -200,6 +210,8 @@ 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/Qt6Qml/QmlPlugins
%{_qt6_libdir}/cmake/Qt6Qml/QmlPlugins/*.cmake
%{_qt6_archdatadir}/mkspecs/modules/*.pri
@ -219,6 +231,11 @@ popd
%endif
%changelog
* Fri Apr 19 2024 Jan Grulich <jgrulich@redhat.com> - 6.7.0-1
- 6.7.0
Resolves: RHEL-27845
Resolves: RHEL-31156
* Thu Mar 28 2024 Jan Grulich <jgrulich@redhat.com> - 6.6.1-4
- Add -tests subpackage with unit tests that can run in CI
Resolves: RHEL-28239

View File

@ -1 +1 @@
SHA512 (qtmultimedia-everywhere-src-6.6.1.tar.xz) = 11fb3e421a80fee82d30a817f20277505868de0c1a870c55dd488114a0302f6a1bf41694ed64d904e4d29b1a3ad1ba01ce8399ae11f03ae2f6994359698e9c94
SHA512 (qtmultimedia-everywhere-src-6.7.0.tar.xz) = 4e5fa8fff408b8abf761a12d9637c425fe9bfbf6475b44a69c8489fd61bf6cbcca95940a22d1b24aec59634a458888d2b34cb883c8e38d542f2f1cb36046e4c1