From bc080c45e3493ae16ba1c718f41558f223cfeb85 Mon Sep 17 00:00:00 2001 From: tigro Date: Fri, 29 Nov 2024 16:45:52 +0300 Subject: [PATCH] import qt6-qtmultimedia-6.6.2-1.el9 --- .gitignore | 2 +- .qt6-qtmultimedia.metadata | 2 +- SPECS/qt6-qtmultimedia.spec | 92 ++++--------------------------------- 3 files changed, 10 insertions(+), 86 deletions(-) diff --git a/.gitignore b/.gitignore index 93bc3ab..0d28222 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/qtmultimedia-everywhere-src-6.7.1.tar.xz +SOURCES/qtmultimedia-everywhere-src-6.6.2.tar.xz diff --git a/.qt6-qtmultimedia.metadata b/.qt6-qtmultimedia.metadata index 5cca8cf..86c0a5b 100644 --- a/.qt6-qtmultimedia.metadata +++ b/.qt6-qtmultimedia.metadata @@ -1 +1 @@ -000c00272c56be54e734e542d96639db09672d3c SOURCES/qtmultimedia-everywhere-src-6.7.1.tar.xz +5e015cbe78ae59f0d2bbddc0fcc194c0e62efa3a SOURCES/qtmultimedia-everywhere-src-6.6.2.tar.xz diff --git a/SPECS/qt6-qtmultimedia.spec b/SPECS/qt6-qtmultimedia.spec index 91c7871..b4629e2 100644 --- a/SPECS/qt6-qtmultimedia.spec +++ b/SPECS/qt6-qtmultimedia.spec @@ -18,12 +18,11 @@ %endif %global examples 1 -%global build_tests 1 Summary: Qt6 - Multimedia support Name: qt6-%{qt_module} -Version: 6.7.1 -Release: 4%{?dist} +Version: 6.6.2 +Release: 1%{?dist} License: LGPL-3.0-only OR GPL-3.0-only WITH Qt-GPL-exception-1.0 Url: http://www.qt.io @@ -36,9 +35,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 %endif -# upstream patches - - # filter plugin/qml provides %global __provides_exclude_from ^(%{_qt6_archdatadir}/qml/.*\\.so|%{_qt6_plugindir}/.*\\.so)$ @@ -54,7 +50,6 @@ 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) @@ -68,12 +63,7 @@ BuildRequires: pkgconfig(gstreamer-plugins-bad-%{gst}) BuildRequires: pkgconfig(gstreamer-video-%{gst}) BuildRequires: pkgconfig(libpulse) pkgconfig(libpulse-mainloop-glib) %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: ffmpeg-devel BuildRequires: pkgconfig(libva) pkgconfig(libva-drm) %endif BuildRequires: pkgconfig(xrandr) @@ -110,15 +100,6 @@ Requires: %{name}%{?_isa} = %{version}-%{release} %{summary}. %endif -%if 0%{?build_tests} -%package tests -Summary: Unit tests for %{name} -Requires: %{name}%{?_isa} = %{version}-%{release} - -%description tests -%{summary}. -%endif - %prep %autosetup -n %{qt_module}-everywhere-src-%{qt_version}%{?unstable:-%{prerelease}} -p1 @@ -127,31 +108,14 @@ Requires: %{name}%{?_isa} = %{version}-%{release} %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_BUILD_TESTS=%{?build_tests:ON}%{!?build_tests:OFF} \ - -DQT_INSTALL_EXAMPLES_SOURCES=%{?examples:ON}%{!?examples:OFF} - -%if 0%{?build_tests} -%qt6_fix_tests -%endif +%cmake_qt6 -DQT_BUILD_EXAMPLES:BOOL=%{?examples:ON}%{!?examples:OFF} %cmake_build %install -%if 0%{?build_tests} -%qt6_dont_autoinstall_tests -%endif - %cmake_install -%if 0%{?build_tests} -%qt6_install_tests -%endif - ## .prl/.la file love # nuke .prl reference(s) to %%buildroot, excessive (.la-like) libs pushd %{buildroot}%{_qt6_libdir} @@ -164,7 +128,6 @@ for prl_file in *.prl ; do done popd -rm -rf %{buildroot}%{_qt6_plugindir}/multimedia/libmockmultimediaplugin.prl %ldconfig_scriptlets @@ -174,10 +137,7 @@ rm -rf %{buildroot}%{_qt6_plugindir}/multimedia/libmockmultimediaplugin.prl %{_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} @@ -185,15 +145,11 @@ rm -rf %{buildroot}%{_qt6_plugindir}/multimedia/libmockmultimediaplugin.prl %endif %files devel -%{_qt6_headerdir}/QtQGstreamerMediaPlugin/ %{_qt6_headerdir}/QtMultimedia/ %{_qt6_headerdir}/QtMultimediaQuick/ %{_qt6_headerdir}/QtMultimediaWidgets/ %{_qt6_headerdir}/QtSpatialAudio/ -%{_qt6_headerdir}/QtQuick3DSpatialAudio/ %{_qt6_libdir}/libQt6BundledResonanceAudio.a -%{_qt6_libdir}/libQt6QGstreamerMediaPlugin.a -%{_qt6_libdir}/libQt6QGstreamerMediaPlugin.prl %{_qt6_libdir}/libQt6Multimedia.so %{_qt6_libdir}/libQt6Multimedia.prl %{_qt6_libdir}/libQt6MultimediaQuick.so @@ -202,14 +158,10 @@ rm -rf %{buildroot}%{_qt6_plugindir}/multimedia/libmockmultimediaplugin.prl %{_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/ %{_qt6_libdir}/cmake/Qt6BundledResonanceAudio/*.cmake -%dir %{_qt6_libdir}/cmake/Qt6QGstreamerMediaPluginPrivate/ -%{_qt6_libdir}/cmake/Qt6QGstreamerMediaPluginPrivate/*.cmake %dir %{_qt6_libdir}/cmake/Qt6MultimediaQuickPrivate %{_qt6_libdir}/cmake/Qt6MultimediaQuickPrivate/*.cmake %dir %{_qt6_libdir}/cmake/Qt6Multimedia @@ -218,8 +170,6 @@ rm -rf %{buildroot}%{_qt6_plugindir}/multimedia/libmockmultimediaplugin.prl %{_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 @@ -233,39 +183,13 @@ rm -rf %{buildroot}%{_qt6_plugindir}/multimedia/libmockmultimediaplugin.prl %{_qt6_examplesdir}/ %endif -%if 0%{?build_tests} -%files tests -%{_qt6_archdatadir}/tests -%endif %changelog -* Tue Oct 29 2024 Troy Dawson - 6.7.1-4 -- Bump release for October 2024 mass rebuild: - Resolves: RHEL-64018 - -* Mon Jun 24 2024 Troy Dawson - 6.7.1-3 -- Bump release for June 2024 mass rebuild - -* Tue Jun 04 2024 Jan Grulich - 6.7.1-2 -- Add rpminspect.yaml - Resolves: RHEL-36430 - -* Fri May 31 2024 Jan Grulich - 6.7.1-1 -- 6.7.1 - Resolves: RHEL-36430 - -* Mon Apr 22 2024 Jan Grulich - 6.7.0-2 -- Backport Qt 6.7.1 fix for ABI breakage - Resolves: RHEL-33606 - -* Fri Apr 19 2024 Jan Grulich - 6.7.0-1 -- 6.7.0 - Resolves: RHEL-27845 - Resolves: RHEL-31156 +* Fri Nov 29 2024 Arkady L. Shane - 6.6.2-1 +- Rebuilt for MSVSphere 9.5 -* Thu Mar 28 2024 Jan Grulich - 6.6.1-4 -- Add -tests subpackage with unit tests that can run in CI - Resolves: RHEL-28239 +* Thu Feb 15 2024 Jan Grulich - 6.6.2-1 +- 6.6.2 * Fri Jan 26 2024 Fedora Release Engineering - 6.6.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild