public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Troy Dawson <tdawson@redhat.com>
To: git-commits@fedoraproject.org
Subject: [rpms/qt6-qtmultimedia] epel9: Merge branch 'epel9-next' into epel9
Date: Fri, 18 Sep 2026 19:08:36 GMT [thread overview]
Message-ID: <178975851601.1.16304989253280554647.rpms-qt6-qtmultimedia-c60dc8a199c7@fedoraproject.org> (raw)
A new commit has been pushed.
Repo : rpms/qt6-qtmultimedia
Branch : epel9
Commit : c60dc8a199c7a559e6164fca7d9632b319a89401
Author : Troy Dawson <tdawson@redhat.com>
Date : 2026-09-18T12:08:22-07:00
Stats : +18/-142 in 4 file(s)
URL : https://src.fedoraproject.org/rpms/qt6-qtmultimedia/c/c60dc8a199c7a559e6164fca7d9632b319a89401?branch=epel9
Log:
Merge branch 'epel9-next' into epel9
---
diff --git a/.gitignore b/.gitignore
index 7655fe7..7d0ef71 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,12 +17,3 @@
/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
-/qtmultimedia-everywhere-src-6.8.1.tar.xz
-/qtmultimedia-everywhere-src-6.8.2.tar.xz
-/qtmultimedia-everywhere-src-6.9.0-rc.tar.xz
-/qtmultimedia-everywhere-src-6.9.0.tar.xz
-/qtmultimedia-everywhere-src-6.9.1.tar.xz
diff --git a/qt6-qtmultimedia.spec b/qt6-qtmultimedia.spec
index a82c03a..69b2338 100644
--- a/qt6-qtmultimedia.spec
+++ b/qt6-qtmultimedia.spec
@@ -1,3 +1,4 @@
+
%global qt_module qtmultimedia
%global gst 0.10
@@ -11,17 +12,17 @@
%bcond_without ffmpeg
%endif
-#global unstable 0
+#global unstable 1
%if 0%{?unstable}
-%global prerelease rc
+%global prerelease rc2
%endif
%global examples 1
Summary: Qt6 - Multimedia support
Name: qt6-%{qt_module}
-Version: 6.9.1
-Release: 1%{?dist}
+Version: 6.6.2
+Release: 2%{?dist}
License: LGPL-3.0-only OR GPL-3.0-only WITH Qt-GPL-exception-1.0
Url: http://www.qt.io
@@ -34,8 +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
-Patch0: qtmultimedia-fix-build-on-x86-arch.patch
-
# filter plugin/qml provides
%global __provides_exclude_from ^(%{_qt6_archdatadir}/qml/.*\\.so|%{_qt6_plugindir}/.*\\.so)$
@@ -51,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)
@@ -72,7 +70,6 @@ BuildRequires: libavformat-free-devel
BuildRequires: libswscale-free-devel
BuildRequires: libswresample-free-devel
BuildRequires: pkgconfig(libva) pkgconfig(libva-drm)
-BuildRequires: pkgconfig(libpipewire-0.3)
%endif
BuildRequires: pkgconfig(xrandr)
BuildRequires: pkgconfig(xv)
@@ -116,9 +113,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
%if 0%{?rhel} && 0%{?rhel} < 10
. /opt/rh/gcc-toolset-13/enable
%endif
-%cmake_qt6 \
- -DQT_BUILD_EXAMPLES:BOOL=%{?examples:ON}%{!?examples:OFF} \
- -DQT_INSTALL_EXAMPLES_SOURCES=%{?examples:ON}%{!?examples:OFF}
+%cmake_qt6 -DQT_BUILD_EXAMPLES:BOOL=%{?examples:ON}%{!?examples:OFF}
%cmake_build
@@ -138,22 +133,16 @@ for prl_file in *.prl ; do
done
popd
-# Probably not needed on Linux installs
-rm -r %{buildroot}%{_qt6_archdatadir}/mkspecs/features/ios/add_ios_ffmpeg_libraries.prf
%ldconfig_scriptlets
%files
%license LICENSES/*
-%{_qt6_archdatadir}/sbom/%{qt_module}-%{qt_version}.spdx
%{_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_archdatadir}/qml/QtQuick3D/SpatialAudio
-%{_qt6_archdatadir}/qml/QtQuick3D/SpatialAudio/
%dir %{_qt6_plugindir}/multimedia
%{_qt6_plugindir}/multimedia/libgstreamermediaplugin.so
%if %{with ffmpeg}
@@ -161,72 +150,39 @@ rm -r %{buildroot}%{_qt6_archdatadir}/mkspecs/features/ios/add_ios_ffmpeg_librar
%endif
%files devel
-%if %{with ffmpeg}
-%{_qt6_headerdir}/QtFFmpegMediaPluginImpl/
-%endif
-%{_qt6_headerdir}/QtGstreamerMediaPluginImpl/
%{_qt6_headerdir}/QtMultimedia/
-%{_qt6_headerdir}/QtMultimediaTestLib/
%{_qt6_headerdir}/QtMultimediaQuick/
%{_qt6_headerdir}/QtMultimediaWidgets/
%{_qt6_headerdir}/QtSpatialAudio/
-%{_qt6_headerdir}/QtQuick3DSpatialAudio/
%{_qt6_libdir}/libQt6BundledResonanceAudio.a
-%if %{with ffmpeg}
-%{_qt6_libdir}/libQt6FFmpegMediaPluginImpl.a
-%{_qt6_libdir}/libQt6FFmpegMediaPluginImpl.prl
-%endif
-%{_qt6_libdir}/libQt6GstreamerMediaPluginImpl.a
-%{_qt6_libdir}/libQt6GstreamerMediaPluginImpl.prl
%{_qt6_libdir}/libQt6Multimedia.so
%{_qt6_libdir}/libQt6Multimedia.prl
-%{_qt6_libdir}/libQt6MultimediaTestLib.a
-%{_qt6_libdir}/libQt6MultimediaTestLib.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
-%dir %{_qt6_libdir}/cmake/Qt6MultimediaQuickPrivate
-%dir %{_qt6_libdir}/cmake/Qt6BundledResonanceAudio/
-%if %{with ffmpeg}
-%dir %{_qt6_libdir}/cmake/Qt6FFmpegMediaPluginImplPrivate
-%endif
-%dir %{_qt6_libdir}/cmake/Qt6GstreamerMediaPluginImplPrivate
-%dir %{_qt6_libdir}/cmake/Qt6Multimedia
-%dir %{_qt6_libdir}/cmake/Qt6MultimediaPrivate
-%dir %{_qt6_libdir}/cmake/Qt6MultimediaTestLibPrivate/
-%dir %{_qt6_libdir}/cmake/Qt6MultimediaWidgets
-%dir %{_qt6_libdir}/cmake/Qt6MultimediaWidgetsPrivate
-%dir %{_qt6_libdir}/cmake/Qt6Qml/QmlPlugins
-%dir %{_qt6_libdir}/cmake/Qt6Quick3DSpatialAudioPrivate
-%dir %{_qt6_libdir}/cmake/Qt6SpatialAudio/
-%dir %{_qt6_libdir}/cmake/Qt6SpatialAudioPrivate
%{_qt6_libdir}/cmake/Qt6/*.cmake
%{_qt6_libdir}/cmake/Qt6BuildInternals/StandaloneTests/*.cmake
+%dir %{_qt6_libdir}/cmake/Qt6BundledResonanceAudio/
%{_qt6_libdir}/cmake/Qt6BundledResonanceAudio/*.cmake
-%if %{with ffmpeg}
-%{_qt6_libdir}/cmake/Qt6FFmpegMediaPluginImplPrivate/*.cmake
-%endif
-%{_qt6_libdir}/cmake/Qt6GstreamerMediaPluginImplPrivate/*.cmake
-%{_qt6_libdir}/cmake/Qt6Multimedia/*.cmake
-%{_qt6_libdir}/cmake/Qt6MultimediaPrivate/*.cmake
+%dir %{_qt6_libdir}/cmake/Qt6MultimediaQuickPrivate
%{_qt6_libdir}/cmake/Qt6MultimediaQuickPrivate/*.cmake
-%{_qt6_libdir}/cmake/Qt6MultimediaTestLibPrivate/*.cmake
+%dir %{_qt6_libdir}/cmake/Qt6Multimedia
+%{_qt6_libdir}/cmake/Qt6Multimedia/*.cmake
+%dir %{_qt6_libdir}/cmake/Qt6MultimediaWidgets
%{_qt6_libdir}/cmake/Qt6MultimediaWidgets/*.cmake
-%{_qt6_libdir}/cmake/Qt6MultimediaWidgetsPrivate/*.cmake
-%{_qt6_libdir}/cmake/Qt6Qml/QmlPlugins/*.cmake
-%{_qt6_libdir}/cmake/Qt6Quick3DSpatialAudioPrivate/*cmake
+%dir %{_qt6_libdir}/cmake/Qt6SpatialAudio/
%{_qt6_libdir}/cmake/Qt6SpatialAudio/*cmake
-%{_qt6_libdir}/cmake/Qt6SpatialAudioPrivate/*.cmake
+%dir %{_qt6_libdir}/cmake/Qt6Qml/QmlPlugins
+%{_qt6_libdir}/cmake/Qt6Qml/QmlPlugins/*.cmake
%{_qt6_archdatadir}/mkspecs/modules/*.pri
%{_qt6_libdir}/qt6/metatypes/qt6*_metatypes.json
%{_qt6_libdir}/qt6/modules/*.json
%{_qt6_libdir}/pkgconfig/*.pc
+
%if 0%{?examples}
%files examples
%{_qt6_examplesdir}/
@@ -234,53 +190,8 @@ rm -r %{buildroot}%{_qt6_archdatadir}/mkspecs/features/ios/add_ios_ffmpeg_librar
%changelog
-* Mon Jun 02 2025 Jan Grulich <jgrulich@redhat.com> - 6.9.1-1
-- 6.9.1
-
-* Wed Apr 02 2025 Jan Grulich <jgrulich@redhat.com> - 6.9.0-1
-- 6.9.0
-
-* Mon Mar 24 2025 Jan Grulich <jgrulich@redhat.com> - 6.9.0~rc-1
-- 6.9.0 RC
-
-* Fri Jan 31 2025 Jan Grulich <jgrulich@redhat.com> - 6.8.2-1
-- 6.8.2
-
-* Sat Jan 18 2025 Fedora Release Engineering <releng@fedoraproject.org> - 6.8.1-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
-
-* Sun Dec 15 2024 Pavel Solovev <daron439@gmail.com> - 6.8.1-3
-- Add optional libpipewire
-
-* Thu Dec 05 2024 Jan Grulich <jgrulich@redhat.com> - 6.8.1-2
-- Move Software Bill of Materials from -devel
-
-* Thu Nov 28 2024 Jan Grulich <jgrulich@redhat.com> - 6.8.1-1
-- 6.8.1
-
-* 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
+* Mon Jul 20 2026 Troy Dawson <tdawson@redhat.com> - 6.6.2-2
+- Rebuild for ffmpeg7 update
* Thu Feb 15 2024 Jan Grulich <jgrulich@redhat.com> - 6.6.2-1
- 6.6.2
diff --git a/qtmultimedia-fix-build-on-x86-arch.patch b/qtmultimedia-fix-build-on-x86-arch.patch
deleted file mode 100644
index c8b193f..0000000
--- a/qtmultimedia-fix-build-on-x86-arch.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-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 7690ae2..3abaa99 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(-AT386)?$")
- COMPILE_OPTIONS
-- -DPFFFT_SIMD_DISABLE
-+ -DPFFFT_SIMD_DISABLE -DDISABLE_SIMD
- )
-
- qt_disable_warnings(BundledResonanceAudio)
-
diff --git a/sources b/sources
index 033fb56..cc9dce7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (qtmultimedia-everywhere-src-6.9.1.tar.xz) = 8b246af98d643699017713614e441068e5adea8b825be2776934716875b04a4fdb5ff48984ad9b63cc10c78d57dc653b00d9648c00236f4755840da911d5845e
+SHA512 (qtmultimedia-everywhere-src-6.6.2.tar.xz) = 311f47acd7658d725855df06c25b4d516d4046922cc92ad44c91c48f1696fbcbb25a0d778b1a72f15834ce2e74ce64199814476ac04fc705fc19af73c91f2006
reply other threads:[~2026-09-18 19:08 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=178975851601.1.16304989253280554647.rpms-qt6-qtmultimedia-c60dc8a199c7@fedoraproject.org \
--to=tdawson@redhat.com \
--cc=git-commits@fedoraproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox