qt6: 6.8.1
This commit is contained in:
parent
da8581834f
commit
26d720210c
@ -1,8 +1,8 @@
|
|||||||
%bcond_with qt5
|
%bcond_with qt5
|
||||||
|
|
||||||
Name: polkit-qt-1
|
Name: polkit-qt-1
|
||||||
Version: 0.114.0
|
Version: 0.200.0
|
||||||
Release: 8%{?dist}
|
Release: 1%{?dist}
|
||||||
Summary: Qt bindings for PolicyKit
|
Summary: Qt bindings for PolicyKit
|
||||||
|
|
||||||
License: GPLv2+
|
License: GPLv2+
|
||||||
@ -123,6 +123,15 @@ Requires: polkit-qt6-1%{?_isa} = %{version}-%{release}
|
|||||||
%{_libdir}/cmake/PolkitQt6-1/
|
%{_libdir}/cmake/PolkitQt6-1/
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Dec 3 2024 Raven <raven@sysadmins.ws> - 0.200.0-1
|
||||||
|
- 0.200.0
|
||||||
|
|
||||||
|
* Wed Oct 16 2024 Raven <raven@sysadmins.ws> - 0.114.0-9
|
||||||
|
- Rebuilt for Qt6
|
||||||
|
|
||||||
|
* Mon Sep 30 2024 Raven <raven@sysadmins.ws> - - 0.114.0-8
|
||||||
|
- Rebuilt for Qt6
|
||||||
|
|
||||||
* Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.114.0-7
|
* Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.114.0-7
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
|
||||||
|
|
||||||
|
|||||||
@ -1,21 +1,21 @@
|
|||||||
%global pypi_name PyQt-builder
|
%global pypi_name PyQt-builder
|
||||||
%global srcname PyQt-builder
|
%global srcname pyqt_builder
|
||||||
|
|
||||||
Name: python%{python3_pkgversion}-%{srcname}
|
Name: python%{python3_pkgversion}-%{pypi_name}
|
||||||
Version: 1.15.3
|
Version: 1.17.1
|
||||||
Release: 1%{?dist}
|
Release: 1%{?dist}
|
||||||
Summary: The PEP 517 compliant PyQt build system
|
Summary: The PEP 517 compliant PyQt build system
|
||||||
|
|
||||||
License: GPLv2 or GPLv3
|
License: GPLv2 or GPLv3
|
||||||
URL: https://www.riverbankcomputing.com/software/pyqt/
|
URL: https://www.riverbankcomputing.com/software/pyqt/
|
||||||
Source0: %{pypi_source}
|
# download manually from https://pypi.org/project/PyQt-builder/
|
||||||
|
Source0: %{srcname}-%{version}.tar.gz
|
||||||
|
#{pypi_source}
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
|
|
||||||
# Don't bundle any precompiled libraries
|
|
||||||
Patch1: PyQt-builder_no-bundle.patch
|
|
||||||
|
|
||||||
BuildRequires: python%{python3_pkgversion}-devel
|
BuildRequires: python%{python3_pkgversion}-devel
|
||||||
BuildRequires: python%{python3_pkgversion}dist(setuptools)
|
BuildRequires: python%{python3_pkgversion}dist(setuptools) >= 64.0
|
||||||
|
BuildRequires: python%{python3_pkgversion}-setuptools_scm
|
||||||
|
|
||||||
%description
|
%description
|
||||||
PyQt-builder is the PEP 517 compliant build system for PyQt and projects that
|
PyQt-builder is the PEP 517 compliant build system for PyQt and projects that
|
||||||
@ -25,29 +25,27 @@ PyQt- builder provide an appropriate pyproject.toml file and an optional
|
|||||||
project.py.
|
project.py.
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%autosetup -p1 -n %{pypi_name}-%{version}
|
%autosetup -p1 -n %{srcname}-%{version}
|
||||||
# Remove bundled egg-info
|
|
||||||
rm -rf %{pypi_name}.egg-info
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%py3_build
|
%pyproject_wheel
|
||||||
|
|
||||||
%install
|
%install
|
||||||
%py3_install
|
%pyproject_install
|
||||||
# These dll files are from openssl and microsoft visiual studio
|
|
||||||
# While we can redistribute them, we don't have source and it's
|
|
||||||
# unlikely anyone will want to bundle a windows executable from linux.
|
|
||||||
rm -rf %{buildroot}/%{python3_sitelib}/pyqtbuild/bundle/dlls
|
|
||||||
|
|
||||||
%files
|
%files
|
||||||
%license LICENSE-GPL2
|
%license LICENSE
|
||||||
%license LICENSE-GPL3
|
|
||||||
%{_bindir}/pyqt-bundle
|
%{_bindir}/pyqt-bundle
|
||||||
%{_bindir}/pyqt-qt-wheel
|
%{_bindir}/pyqt-qt-wheel
|
||||||
%{python3_sitelib}/pyqtbuild
|
%{python3_sitelib}/pyqtbuild
|
||||||
%{python3_sitelib}/PyQt_builder-%{version}-py%{python3_version}.egg-info
|
%{python3_sitelib}/PyQt_builder*-info
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Jan 3 2025 Raven <raven@sysadmins.ws> - 1.17.1-1
|
||||||
|
- Update to new upstream release 1.17.1
|
||||||
|
|
||||||
* Tue Dec 19 2023 Raven <raven@sysadmins.ws> - 1.15.3-1
|
* Tue Dec 19 2023 Raven <raven@sysadmins.ws> - 1.15.3-1
|
||||||
- Update to new upstream release 1.15.3
|
- Update to new upstream release 1.15.3
|
||||||
|
|
||||||
|
|||||||
@ -1,12 +0,0 @@
|
|||||||
diff -rupN --no-dereference PyQt-builder-1.15.3/setup.py PyQt-builder-1.15.3-new/setup.py
|
|
||||||
--- PyQt-builder-1.15.3/setup.py 2023-10-12 22:17:53.000000000 +0200
|
|
||||||
+++ PyQt-builder-1.15.3-new/setup.py 2023-10-19 13:31:05.506204941 +0200
|
|
||||||
@@ -52,7 +52,7 @@ setup(
|
|
||||||
install_requires=['packaging', 'sip >=6.7, <7'],
|
|
||||||
packages=find_packages(),
|
|
||||||
package_data={
|
|
||||||
- 'pyqtbuild.bundle': ['dlls/*/*', 'qt_wheel_distinfo/*'],
|
|
||||||
+ 'pyqtbuild.bundle': ['qt_wheel_distinfo/*'],
|
|
||||||
},
|
|
||||||
entry_points={
|
|
||||||
'console_scripts': [
|
|
||||||
@ -5,13 +5,15 @@
|
|||||||
%global _sip_api %{_sip_api_major}.%{_sip_api_minor}
|
%global _sip_api %{_sip_api_major}.%{_sip_api_minor}
|
||||||
|
|
||||||
Name: python-%{pkg_name}
|
Name: python-%{pkg_name}
|
||||||
Version: 13.8.0
|
Version: 13.9.1
|
||||||
Release: 1%{?dist}
|
Release: 1%{?dist}
|
||||||
Summary: The sip module support for PyQt6
|
Summary: The sip module support for PyQt6
|
||||||
|
|
||||||
License: GPLv2 or GPLv3
|
License: GPLv2 or GPLv3
|
||||||
URL: https://www.riverbankcomputing.com/software/sip/
|
URL: https://www.riverbankcomputing.com/software/sip/
|
||||||
Source0: %{pypi_source}
|
# https://pypi.org/project/PyQt6-sip/
|
||||||
|
Source0: pyqt6_sip-%{version}.tar.gz
|
||||||
|
#{pypi_source}
|
||||||
|
|
||||||
BuildRequires: gcc
|
BuildRequires: gcc
|
||||||
BuildRequires: python%{python3_pkgversion}-devel
|
BuildRequires: python%{python3_pkgversion}-devel
|
||||||
@ -32,7 +34,7 @@ Provides: python%{python3_pkgversion}-pyqt6-sip-api(%{_sip_api_major})%{?_isa} =
|
|||||||
|
|
||||||
%description -n python%{python3_pkgversion}-%{pkg_name} %_description
|
%description -n python%{python3_pkgversion}-%{pkg_name} %_description
|
||||||
%prep
|
%prep
|
||||||
%autosetup -n %{pypi_name}-%{version}
|
%autosetup -n pyqt6_sip-%{version}
|
||||||
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
@ -51,6 +53,9 @@ Provides: python%{python3_pkgversion}-pyqt6-sip-api(%{_sip_api_major})%{?_isa} =
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Jan 3 2025 Raven <raven@sysadmins.ws> - 13.9.1-1
|
||||||
|
- 13.9.1
|
||||||
|
|
||||||
* Mon Sep 30 2024 Raven <raven@sysadmins.ws> - 13.8.0-1
|
* Mon Sep 30 2024 Raven <raven@sysadmins.ws> - 13.8.0-1
|
||||||
- 13.8.0
|
- 13.8.0
|
||||||
|
|
||||||
|
|||||||
@ -0,0 +1,24 @@
|
|||||||
|
diff --git a/sip/QtWebEngineCore/qwebengineframe.sip b/sip/QtWebEngineCore/qwebengineframe.sip
|
||||||
|
index d5420e6..55f2685 100644
|
||||||
|
--- a/sip/QtWebEngineCore/qwebengineframe.sip
|
||||||
|
+++ b/sip/QtWebEngineCore/qwebengineframe.sip
|
||||||
|
@@ -25,6 +25,7 @@
|
||||||
|
class QWebEngineFrame /NoDefaultCtors/
|
||||||
|
{
|
||||||
|
%TypeHeaderCode
|
||||||
|
+#include <qvariant.h>
|
||||||
|
#include <qwebengineframe.h>
|
||||||
|
%End
|
||||||
|
|
||||||
|
diff --git a/sip/QtWebEngineCore/qwebenginepage.sip b/sip/QtWebEngineCore/qwebenginepage.sip
|
||||||
|
index ba7b0bc..8ed67bc 100644
|
||||||
|
--- a/sip/QtWebEngineCore/qwebenginepage.sip
|
||||||
|
+++ b/sip/QtWebEngineCore/qwebenginepage.sip
|
||||||
|
@@ -23,6 +23,7 @@
|
||||||
|
class QWebEnginePage : public QObject
|
||||||
|
{
|
||||||
|
%TypeHeaderCode
|
||||||
|
+#include <qvariant.h>
|
||||||
|
#include <qwebenginepage.h>
|
||||||
|
%End
|
||||||
|
|
||||||
@ -11,7 +11,7 @@
|
|||||||
%global pypi_name PyQt6_WebEngine
|
%global pypi_name PyQt6_WebEngine
|
||||||
|
|
||||||
Name: python-pyqt6-webengine
|
Name: python-pyqt6-webengine
|
||||||
Version: 6.7.0
|
Version: 6.8.0
|
||||||
Release: %autorelease
|
Release: %autorelease
|
||||||
Summary: Python bindings for Qt6WebEngine
|
Summary: Python bindings for Qt6WebEngine
|
||||||
License: GPL-3.0-only
|
License: GPL-3.0-only
|
||||||
@ -22,8 +22,9 @@ Source0: %pypi_source
|
|||||||
ExclusiveArch: aarch64 x86_64
|
ExclusiveArch: aarch64 x86_64
|
||||||
|
|
||||||
## downstream patches
|
## downstream patches
|
||||||
|
Patch0: pyqt6-webengine-fix-build.patch
|
||||||
|
|
||||||
BuildRequires: gcc-c++
|
BuildRequires: gcc-toolset-14-gcc-c++
|
||||||
BuildRequires: make
|
BuildRequires: make
|
||||||
BuildRequires: pkgconfig(Qt6WebEngineCore)
|
BuildRequires: pkgconfig(Qt6WebEngineCore)
|
||||||
BuildRequires: pkgconfig(Qt6WebEngineQuick)
|
BuildRequires: pkgconfig(Qt6WebEngineQuick)
|
||||||
@ -54,10 +55,12 @@ Requires: python3-pyqt6-devel
|
|||||||
|
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n PyQt6_WebEngine-%{version}
|
%autosetup -p1 -n PyQt6_WebEngine-%{version}
|
||||||
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
|
%enable_devtoolset14
|
||||||
|
|
||||||
sip-build \
|
sip-build \
|
||||||
--no-make \
|
--no-make \
|
||||||
--qmake=%{_qt6_qmake} \
|
--qmake=%{_qt6_qmake} \
|
||||||
@ -80,7 +83,7 @@ done
|
|||||||
|
|
||||||
|
|
||||||
%files -n python%{python3_pkgversion}-pyqt6-webengine
|
%files -n python%{python3_pkgversion}-pyqt6-webengine
|
||||||
%doc README
|
%doc README.md
|
||||||
%license LICENSE
|
%license LICENSE
|
||||||
%{python3_sitearch}/PyQt6_WebEngine-%{version}.dist-info/
|
%{python3_sitearch}/PyQt6_WebEngine-%{version}.dist-info/
|
||||||
%{python3_sitearch}/PyQt6/QtWebEngineCore.*
|
%{python3_sitearch}/PyQt6/QtWebEngineCore.*
|
||||||
@ -97,6 +100,12 @@ done
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Jan 3 2025 Raven <raven@sysadmins.ws> - 6.8.0-1
|
||||||
|
- Update to 6.8.0
|
||||||
|
|
||||||
|
* Wed Oct 16 2024 Raven <raven@sysadmins.ws> - 6.7.0-2
|
||||||
|
- Rebuild for Qt 6.8.0
|
||||||
|
|
||||||
* Mon May 27 2024 Raven <raven@sysadmins.ws> - 6.7.0-1
|
* Mon May 27 2024 Raven <raven@sysadmins.ws> - 6.7.0-1
|
||||||
- Update to 6.7.0
|
- Update to 6.7.0
|
||||||
|
|
||||||
|
|||||||
@ -6,7 +6,7 @@
|
|||||||
|
|
||||||
Summary: PyQt6 is Python bindings for Qt6
|
Summary: PyQt6 is Python bindings for Qt6
|
||||||
Name: python-pyqt6
|
Name: python-pyqt6
|
||||||
Version: 6.7.1
|
Version: 6.8.0
|
||||||
Release: 1%{?snap:^%{snap}}%{?dist}
|
Release: 1%{?snap:^%{snap}}%{?dist}
|
||||||
|
|
||||||
License: gpl-3.0-only
|
License: gpl-3.0-only
|
||||||
@ -56,7 +56,8 @@ BuildRequires: cmake(Qt6RemoteObjects)
|
|||||||
|
|
||||||
BuildRequires: python%{python3_pkgversion}-devel python%{python3_pkgversion}
|
BuildRequires: python%{python3_pkgversion}-devel python%{python3_pkgversion}
|
||||||
BuildRequires: python%{python3_pkgversion}-dbus
|
BuildRequires: python%{python3_pkgversion}-dbus
|
||||||
BuildRequires: %{py3_dist PyQt-builder} >= 1.1.0
|
BuildRequires: python%{python3_pkgversion}-setuptools >= 69.5
|
||||||
|
BuildRequires: %{py3_dist PyQt-builder} >= 1.17.0
|
||||||
BuildRequires: %{py3_dist sip}
|
BuildRequires: %{py3_dist sip}
|
||||||
|
|
||||||
%description
|
%description
|
||||||
@ -242,6 +243,12 @@ sed -i \
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Jan 3 2025 Raven <raven@sysadmins.ws> - 6.8.0-1
|
||||||
|
- Update to 6.8.0
|
||||||
|
|
||||||
|
* Wed Oct 16 2024 Raven <raven@sysadmins.ws> - 6.7.1-2
|
||||||
|
- rebuilt for qt 6.8.0
|
||||||
|
|
||||||
* Mon Sep 30 2024 Raven <raven@sysadmins.ws> - 6.7.1-1
|
* Mon Sep 30 2024 Raven <raven@sysadmins.ws> - 6.7.1-1
|
||||||
- Update to 6.7.1
|
- Update to 6.7.1
|
||||||
|
|
||||||
|
|||||||
@ -14,8 +14,8 @@ coroutine is co_awaiting, the Qt event loop runs as usual, meaning that your
|
|||||||
application remains responsive.}
|
application remains responsive.}
|
||||||
|
|
||||||
Name: qcoro
|
Name: qcoro
|
||||||
Version: 0.10.0
|
Version: 0.11.0
|
||||||
Release: 3%{?dist}
|
Release: 1%{?dist}
|
||||||
|
|
||||||
License: MIT
|
License: MIT
|
||||||
Summary: C++ Coroutines for Qt
|
Summary: C++ Coroutines for Qt
|
||||||
@ -45,7 +45,7 @@ BuildRequires: cmake(Qt6Quick)
|
|||||||
BuildRequires: cmake(Qt6Test)
|
BuildRequires: cmake(Qt6Test)
|
||||||
BuildRequires: cmake(Qt6WebSockets)
|
BuildRequires: cmake(Qt6WebSockets)
|
||||||
BuildRequires: cmake(Qt6Widgets)
|
BuildRequires: cmake(Qt6Widgets)
|
||||||
BuildRequires: pkgconfig(xkbcommon) >= 1.0
|
BuildRequires: pkgconfig(xkbcommon)
|
||||||
BuildRequires: qt6-qtbase-private-devel
|
BuildRequires: qt6-qtbase-private-devel
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
@ -190,6 +190,12 @@ popd
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Dec 3 2024 Raven <raven@sysadmins.ws> - 0.11.0-1
|
||||||
|
- 0.11.0
|
||||||
|
|
||||||
|
* Thu Oct 10 2024 Raven <raven@sysadmins.ws> - 0.10.0-4
|
||||||
|
- Rebuild (qt6)
|
||||||
|
|
||||||
* Fri Jun 21 2024 Raven <raven@sysadmins.ws> - 0.10.0-3
|
* Fri Jun 21 2024 Raven <raven@sysadmins.ws> - 0.10.0-3
|
||||||
- Rebuild (libxkbcommon)
|
- Rebuild (libxkbcommon)
|
||||||
|
|
||||||
|
|||||||
1
base/qt6/qt6-doc/.gitignore
vendored
Normal file
1
base/qt6/qt6-doc/.gitignore
vendored
Normal file
@ -0,0 +1 @@
|
|||||||
|
qt6/
|
||||||
@ -1,11 +1,11 @@
|
|||||||
#!/bin/bash -x
|
#!/bin/bash -x
|
||||||
|
|
||||||
QT_BRANCH=6.6.2
|
QT_BRANCH=6.8.0
|
||||||
QT_VERSION=6.6.2
|
QT_VERSION=6.8.0
|
||||||
|
|
||||||
# Install fedora deps for qt6-qtbase, qt6-qttools
|
# Install fedora deps for qt6-qtbase, qt6-qttools
|
||||||
#sudo dnf builddep qt6-qtbase qt6-qttools qt6-qtwebengine -y
|
#sudo dnf builddep qt6-qtbase qt6-qttools qt6-qtwebengine -y
|
||||||
sudo dnf install qt6-qtbase qt6-doctools -y
|
#sudo dnf install qt6-qtbase qt6-doctools -y
|
||||||
|
|
||||||
# Clone full qt tree
|
# Clone full qt tree
|
||||||
#git clone -b $QT_BRANCH git://code.qt.io/qt/qt5.git qt6
|
#git clone -b $QT_BRANCH git://code.qt.io/qt/qt5.git qt6
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
Name: qt6-doc
|
Name: qt6-doc
|
||||||
Summary: Qt6 - Complete documentation
|
Summary: Qt6 - Complete documentation
|
||||||
Version: 6.7.0
|
Version: 6.8.1
|
||||||
Release: 1%{?dist}
|
Release: 1%{?dist}
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
|
|
||||||
@ -58,6 +58,12 @@ tar xf %{SOURCE0} -C %{buildroot}
|
|||||||
%{_qt6_docdir}/*/*.tags
|
%{_qt6_docdir}/*/*.tags
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Dec 3 2024 Raven <raven@sysadmins.ws> - 6.8.1-1
|
||||||
|
- 6.8.1
|
||||||
|
|
||||||
|
* Thu Oct 10 2024 Raven <raven@sysadmins.ws> - 6.8.0-1
|
||||||
|
- 6.8.0
|
||||||
|
|
||||||
* Tue Apr 02 2024 Marie Loise Nolden <loise@kde.org> - 6.7.0-1
|
* Tue Apr 02 2024 Marie Loise Nolden <loise@kde.org> - 6.7.0-1
|
||||||
- update to 6.7.0
|
- update to 6.7.0
|
||||||
|
|
||||||
|
|||||||
@ -9,7 +9,7 @@
|
|||||||
|
|
||||||
Summary: Qt6 - Qt3D QML bindings and C++ APIs
|
Summary: Qt6 - Qt3D QML bindings and C++ APIs
|
||||||
Name: qt6-%{qt_module}
|
Name: qt6-%{qt_module}
|
||||||
Version: 6.7.3
|
Version: 6.8.1
|
||||||
Release: 1%{?dist}
|
Release: 1%{?dist}
|
||||||
|
|
||||||
%global examples 1
|
%global examples 1
|
||||||
@ -129,6 +129,7 @@ popd
|
|||||||
%{_qt6_libdir}/libQt63DQuickInput.so.6*
|
%{_qt6_libdir}/libQt63DQuickInput.so.6*
|
||||||
%{_qt6_libdir}/libQt63DQuickRender.so.6*
|
%{_qt6_libdir}/libQt63DQuickRender.so.6*
|
||||||
%{_qt6_libdir}/libQt63DQuickScene2D.so.6*
|
%{_qt6_libdir}/libQt63DQuickScene2D.so.6*
|
||||||
|
%{_qt6_libdir}/libQt63DQuickScene3D.so.6*
|
||||||
%{_qt6_libdir}/libQt63DRender.so.6*
|
%{_qt6_libdir}/libQt63DRender.so.6*
|
||||||
%{_qt6_plugindir}/geometryloaders/
|
%{_qt6_plugindir}/geometryloaders/
|
||||||
%{_qt6_plugindir}/renderers/
|
%{_qt6_plugindir}/renderers/
|
||||||
@ -163,6 +164,7 @@ popd
|
|||||||
%{_qt6_includedir}/Qt3DQuickInput/
|
%{_qt6_includedir}/Qt3DQuickInput/
|
||||||
%{_qt6_includedir}/Qt3DQuickRender/
|
%{_qt6_includedir}/Qt3DQuickRender/
|
||||||
%{_qt6_includedir}/Qt3DQuickScene2D
|
%{_qt6_includedir}/Qt3DQuickScene2D
|
||||||
|
%{_qt6_includedir}/Qt3DQuickScene3D/
|
||||||
%{_qt6_includedir}/Qt3DRender/
|
%{_qt6_includedir}/Qt3DRender/
|
||||||
%{_qt6_libdir}/cmake/Qt6/FindWrapQt3DAssimp.cmake
|
%{_qt6_libdir}/cmake/Qt6/FindWrapQt3DAssimp.cmake
|
||||||
%{_qt6_libdir}/cmake/Qt6BuildInternals/StandaloneTests/Qt3DTestsConfig.cmake
|
%{_qt6_libdir}/cmake/Qt6BuildInternals/StandaloneTests/Qt3DTestsConfig.cmake
|
||||||
@ -177,6 +179,7 @@ popd
|
|||||||
%{_qt6_libdir}/cmake/Qt63DQuickInput/*.cmake
|
%{_qt6_libdir}/cmake/Qt63DQuickInput/*.cmake
|
||||||
%{_qt6_libdir}/cmake/Qt63DQuickRender/*.cmake
|
%{_qt6_libdir}/cmake/Qt63DQuickRender/*.cmake
|
||||||
%{_qt6_libdir}/cmake/Qt63DQuickScene2D/*.cmake
|
%{_qt6_libdir}/cmake/Qt63DQuickScene2D/*.cmake
|
||||||
|
%{_qt6_libdir}/cmake/Qt63DQuickScene3D/*.cmake
|
||||||
%{_qt6_libdir}/cmake/Qt63DRender/*.cmake
|
%{_qt6_libdir}/cmake/Qt63DRender/*.cmake
|
||||||
%{_qt6_libdir}/cmake/Qt6Qml/QmlPlugins/*.cmake
|
%{_qt6_libdir}/cmake/Qt6Qml/QmlPlugins/*.cmake
|
||||||
%{_qt6_libdir}/libQt63DAnimation.prl
|
%{_qt6_libdir}/libQt63DAnimation.prl
|
||||||
@ -201,10 +204,13 @@ popd
|
|||||||
%{_qt6_libdir}/libQt63DQuickRender.so
|
%{_qt6_libdir}/libQt63DQuickRender.so
|
||||||
%{_qt6_libdir}/libQt63DQuickScene2D.prl
|
%{_qt6_libdir}/libQt63DQuickScene2D.prl
|
||||||
%{_qt6_libdir}/libQt63DQuickScene2D.so
|
%{_qt6_libdir}/libQt63DQuickScene2D.so
|
||||||
|
%{_qt6_libdir}/libQt63DQuickScene3D.prl
|
||||||
|
%{_qt6_libdir}/libQt63DQuickScene3D.so
|
||||||
%{_qt6_libdir}/libQt63DRender.prl
|
%{_qt6_libdir}/libQt63DRender.prl
|
||||||
%{_qt6_libdir}/libQt63DRender.so
|
%{_qt6_libdir}/libQt63DRender.so
|
||||||
%{_qt6_libdir}/qt6/metatypes/qt6*_metatypes.json
|
%{_qt6_libdir}/qt6/metatypes/qt6*_metatypes.json
|
||||||
%{_qt6_libdir}/qt6/modules/*.json
|
%{_qt6_libdir}/qt6/modules/*.json
|
||||||
|
%{_qt6_libdir}/qt6/sbom/%{qt_module}-*.spdx
|
||||||
%{_qt6_libdir}/pkgconfig/*.pc
|
%{_qt6_libdir}/pkgconfig/*.pc
|
||||||
|
|
||||||
%if 0%{?examples}
|
%if 0%{?examples}
|
||||||
@ -214,6 +220,12 @@ popd
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Dec 3 2024 Raven <raven@sysadmins.ws> - 6.8.1-1
|
||||||
|
- 6.8.1
|
||||||
|
|
||||||
|
* Thu Oct 10 2024 Raven <raven@sysadmins.ws> - 6.8.0-1
|
||||||
|
- 6.8.0
|
||||||
|
|
||||||
* Mon Sep 30 2024 Raven <raven@sysadmins.ws> - 6.7.3-1
|
* Mon Sep 30 2024 Raven <raven@sysadmins.ws> - 6.7.3-1
|
||||||
- 6.7.3
|
- 6.7.3
|
||||||
|
|
||||||
|
|||||||
@ -10,7 +10,7 @@
|
|||||||
|
|
||||||
Summary: Qt6 - Qt 5 Compatibility Libraries
|
Summary: Qt6 - Qt 5 Compatibility Libraries
|
||||||
Name: qt6-%{qt_module}
|
Name: qt6-%{qt_module}
|
||||||
Version: 6.7.3
|
Version: 6.8.1
|
||||||
Release: 1%{?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
|
||||||
@ -109,6 +109,7 @@ popd
|
|||||||
%{_qt6_archdatadir}/mkspecs/modules/*.pri
|
%{_qt6_archdatadir}/mkspecs/modules/*.pri
|
||||||
%{_qt6_libdir}/qt6/modules/*.json
|
%{_qt6_libdir}/qt6/modules/*.json
|
||||||
%{_qt6_libdir}/qt6/metatypes/qt6*_metatypes.json
|
%{_qt6_libdir}/qt6/metatypes/qt6*_metatypes.json
|
||||||
|
%{_qt6_libdir}/qt6/sbom/%{qt_module}-*.spdx
|
||||||
%{_qt6_libdir}/pkgconfig/*.pc
|
%{_qt6_libdir}/pkgconfig/*.pc
|
||||||
|
|
||||||
%if 0%{?examples}
|
%if 0%{?examples}
|
||||||
@ -117,6 +118,12 @@ popd
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Dec 3 2024 Raven <raven@sysadmins.ws> - 6.8.1-1
|
||||||
|
- 6.8.1
|
||||||
|
|
||||||
|
* Thu Oct 10 2024 Raven <raven@sysadmins.ws> - 6.8.0-1
|
||||||
|
- 6.8.0
|
||||||
|
|
||||||
* Mon Sep 30 2024 Raven <raven@sysadmins.ws> - 6.7.3-1
|
* Mon Sep 30 2024 Raven <raven@sysadmins.ws> - 6.7.3-1
|
||||||
- 6.7.3
|
- 6.7.3
|
||||||
|
|
||||||
|
|||||||
@ -49,7 +49,7 @@ BuildRequires: pkgconfig(libsystemd)
|
|||||||
|
|
||||||
Name: qt6-qtbase
|
Name: qt6-qtbase
|
||||||
Summary: Qt6 - QtBase components
|
Summary: Qt6 - QtBase components
|
||||||
Version: 6.7.3
|
Version: 6.8.1
|
||||||
Release: 1%{?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
|
||||||
@ -109,9 +109,7 @@ Patch100: qtbase-use-qgnomeplatform-as-default-platform-theme-on-gnome.patch
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
## upstream patches
|
## upstream patches
|
||||||
Patch200: qtbase-qgtk3theme-add-support-for-xdp-to-get-color-scheme.patch
|
|
||||||
|
|
||||||
## upstream patches
|
|
||||||
|
|
||||||
# Do not check any files in %%{_qt6_plugindir}/platformthemes/ for requires.
|
# Do not check any files in %%{_qt6_plugindir}/platformthemes/ for requires.
|
||||||
# Those themes are there for platform integration. If the required libraries are
|
# Those themes are there for platform integration. If the required libraries are
|
||||||
@ -605,6 +603,7 @@ make check -k ||:
|
|||||||
%dir %{_qt6_libdir}/cmake/Qt6EglFSDeviceIntegrationPrivate
|
%dir %{_qt6_libdir}/cmake/Qt6EglFSDeviceIntegrationPrivate
|
||||||
%dir %{_qt6_libdir}/cmake/Qt6EglFsKmsGbmSupportPrivate
|
%dir %{_qt6_libdir}/cmake/Qt6EglFsKmsGbmSupportPrivate
|
||||||
%dir %{_qt6_libdir}/cmake/Qt6EglFsKmsSupportPrivate
|
%dir %{_qt6_libdir}/cmake/Qt6EglFsKmsSupportPrivate
|
||||||
|
%dir %{_qt6_libdir}/cmake/Qt6ExamplesAssetDownloaderPrivate
|
||||||
%dir %{_qt6_libdir}/cmake/Qt6ExampleIconsPrivate
|
%dir %{_qt6_libdir}/cmake/Qt6ExampleIconsPrivate
|
||||||
%dir %{_qt6_libdir}/cmake/Qt6FbSupportPrivate
|
%dir %{_qt6_libdir}/cmake/Qt6FbSupportPrivate
|
||||||
%dir %{_qt6_libdir}/cmake/Qt6Gui
|
%dir %{_qt6_libdir}/cmake/Qt6Gui
|
||||||
@ -672,6 +671,7 @@ make check -k ||:
|
|||||||
%{_qt6_headerdir}/QtCore/
|
%{_qt6_headerdir}/QtCore/
|
||||||
%{_qt6_headerdir}/QtDBus/
|
%{_qt6_headerdir}/QtDBus/
|
||||||
%{_qt6_headerdir}/QtInputSupport
|
%{_qt6_headerdir}/QtInputSupport
|
||||||
|
%{_qt6_headerdir}/QtExamplesAssetDownloader
|
||||||
%{_qt6_headerdir}/QtExampleIcons
|
%{_qt6_headerdir}/QtExampleIcons
|
||||||
%{_qt6_headerdir}/QtGui/
|
%{_qt6_headerdir}/QtGui/
|
||||||
%{_qt6_headerdir}/QtNetwork/
|
%{_qt6_headerdir}/QtNetwork/
|
||||||
@ -734,9 +734,11 @@ make check -k ||:
|
|||||||
%{_qt6_libdir}/cmake/Qt6/3rdparty/extra-cmake-modules/find-modules/*.cmake
|
%{_qt6_libdir}/cmake/Qt6/3rdparty/extra-cmake-modules/find-modules/*.cmake
|
||||||
%{_qt6_libdir}/cmake/Qt6/3rdparty/extra-cmake-modules/modules/*.cmake
|
%{_qt6_libdir}/cmake/Qt6/3rdparty/extra-cmake-modules/modules/*.cmake
|
||||||
%{_qt6_libdir}/cmake/Qt6/3rdparty/extra-cmake-modules/qt_attribution.json
|
%{_qt6_libdir}/cmake/Qt6/3rdparty/extra-cmake-modules/qt_attribution.json
|
||||||
|
%{_qt6_libdir}/cmake/Qt6/3rdparty/extra-cmake-modules/REUSE.toml
|
||||||
%{_qt6_libdir}/cmake/Qt6/3rdparty/kwin/COPYING-CMAKE-SCRIPTS
|
%{_qt6_libdir}/cmake/Qt6/3rdparty/kwin/COPYING-CMAKE-SCRIPTS
|
||||||
%{_qt6_libdir}/cmake/Qt6/3rdparty/kwin/*.cmake
|
%{_qt6_libdir}/cmake/Qt6/3rdparty/kwin/*.cmake
|
||||||
%{_qt6_libdir}/cmake/Qt6/3rdparty/kwin/qt_attribution.json
|
%{_qt6_libdir}/cmake/Qt6/3rdparty/kwin/qt_attribution.json
|
||||||
|
%{_qt6_libdir}/cmake/Qt6/3rdparty/kwin/REUSE.toml
|
||||||
%{_qt6_libdir}/cmake/Qt6BuildInternals/*.cmake
|
%{_qt6_libdir}/cmake/Qt6BuildInternals/*.cmake
|
||||||
%{_qt6_libdir}/cmake/Qt6BuildInternals/QtStandaloneTestTemplateProject/CMakeLists.txt
|
%{_qt6_libdir}/cmake/Qt6BuildInternals/QtStandaloneTestTemplateProject/CMakeLists.txt
|
||||||
%{_qt6_libdir}/cmake/Qt6BuildInternals/StandaloneTests/QtBaseTestsConfig.cmake
|
%{_qt6_libdir}/cmake/Qt6BuildInternals/StandaloneTests/QtBaseTestsConfig.cmake
|
||||||
@ -752,6 +754,7 @@ make check -k ||:
|
|||||||
%{_qt6_libdir}/cmake/Qt6EglFSDeviceIntegrationPrivate/*.cmake
|
%{_qt6_libdir}/cmake/Qt6EglFSDeviceIntegrationPrivate/*.cmake
|
||||||
%{_qt6_libdir}/cmake/Qt6EglFsKmsGbmSupportPrivate/*.cmake
|
%{_qt6_libdir}/cmake/Qt6EglFsKmsGbmSupportPrivate/*.cmake
|
||||||
%{_qt6_libdir}/cmake/Qt6EglFsKmsSupportPrivate/*.cmake
|
%{_qt6_libdir}/cmake/Qt6EglFsKmsSupportPrivate/*.cmake
|
||||||
|
%{_qt6_libdir}/cmake/Qt6ExamplesAssetDownloaderPrivate/*.cmake
|
||||||
%{_qt6_libdir}/cmake/Qt6ExampleIconsPrivate/*.cmake
|
%{_qt6_libdir}/cmake/Qt6ExampleIconsPrivate/*.cmake
|
||||||
%{_qt6_libdir}/cmake/Qt6FbSupportPrivate/*.cmake
|
%{_qt6_libdir}/cmake/Qt6FbSupportPrivate/*.cmake
|
||||||
%{_qt6_libdir}/cmake/Qt6Gui/*.cmake
|
%{_qt6_libdir}/cmake/Qt6Gui/*.cmake
|
||||||
@ -772,6 +775,8 @@ make check -k ||:
|
|||||||
%{_qt6_libdir}/cmake/Qt6Xml/*.cmake
|
%{_qt6_libdir}/cmake/Qt6Xml/*.cmake
|
||||||
%{_qt6_libdir}/qt6/metatypes/*.json
|
%{_qt6_libdir}/qt6/metatypes/*.json
|
||||||
%{_qt6_libdir}/qt6/objects-RelWithDebInfo/ExampleIconsPrivate_resources_1/.qt/rcc/qrc_example_icons_init.cpp.o
|
%{_qt6_libdir}/qt6/objects-RelWithDebInfo/ExampleIconsPrivate_resources_1/.qt/rcc/qrc_example_icons_init.cpp.o
|
||||||
|
%{_qt6_libdir}/qt6/libexec/qt-android-runner.py
|
||||||
|
%{_qt6_libdir}/qt6/sbom/%{qt_module}-*.spdx
|
||||||
%{_qt6_libdir}/pkgconfig/*.pc
|
%{_qt6_libdir}/pkgconfig/*.pc
|
||||||
|
|
||||||
%if 0%{?egl}
|
%if 0%{?egl}
|
||||||
@ -788,6 +793,8 @@ make check -k ||:
|
|||||||
%{_qt6_headerdir}/QtDeviceDiscoverySupport
|
%{_qt6_headerdir}/QtDeviceDiscoverySupport
|
||||||
%{_qt6_libdir}/libQt6DeviceDiscoverySupport.*a
|
%{_qt6_libdir}/libQt6DeviceDiscoverySupport.*a
|
||||||
%{_qt6_libdir}/libQt6DeviceDiscoverySupport.prl
|
%{_qt6_libdir}/libQt6DeviceDiscoverySupport.prl
|
||||||
|
%{_qt6_libdir}/libQt6ExamplesAssetDownloader.a
|
||||||
|
%{_qt6_libdir}/libQt6ExamplesAssetDownloader.prl
|
||||||
%{_qt6_libdir}/libQt6ExampleIcons.a
|
%{_qt6_libdir}/libQt6ExampleIcons.a
|
||||||
%{_qt6_libdir}/libQt6ExampleIcons.prl
|
%{_qt6_libdir}/libQt6ExampleIcons.prl
|
||||||
%{_qt6_headerdir}/QtFbSupport
|
%{_qt6_headerdir}/QtFbSupport
|
||||||
@ -877,6 +884,12 @@ make check -k ||:
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Dec 3 2024 Raven <raven@sysadmins.ws> - 6.8.1-1
|
||||||
|
- 6.8.1
|
||||||
|
|
||||||
|
* Thu Oct 10 2024 Raven <raven@sysadmins.ws> - 6.8.0-1
|
||||||
|
- 6.8.0
|
||||||
|
|
||||||
* Mon Sep 30 2024 Raven <raven@sysadmins.ws> - 6.7.3-1
|
* Mon Sep 30 2024 Raven <raven@sysadmins.ws> - 6.7.3-1
|
||||||
- 6.7.3
|
- 6.7.3
|
||||||
|
|
||||||
|
|||||||
@ -10,7 +10,7 @@
|
|||||||
|
|
||||||
Summary: Qt6 - Charts component
|
Summary: Qt6 - Charts component
|
||||||
Name: qt6-%{qt_module}
|
Name: qt6-%{qt_module}
|
||||||
Version: 6.7.3
|
Version: 6.8.1
|
||||||
Release: 1%{?dist}
|
Release: 1%{?dist}
|
||||||
|
|
||||||
License: GPL-3.0-only WITH Qt-GPL-exception-1.0
|
License: GPL-3.0-only WITH Qt-GPL-exception-1.0
|
||||||
@ -93,6 +93,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
|
|||||||
%{_qt6_archdatadir}/mkspecs/modules/*
|
%{_qt6_archdatadir}/mkspecs/modules/*
|
||||||
%{_qt6_libdir}/qt6/metatypes/qt6*_metatypes.json
|
%{_qt6_libdir}/qt6/metatypes/qt6*_metatypes.json
|
||||||
%{_qt6_libdir}/qt6/modules/*.json
|
%{_qt6_libdir}/qt6/modules/*.json
|
||||||
|
%{_qt6_libdir}/qt6/sbom/%{qt_module}-*.spdx
|
||||||
%{_qt6_libdir}/pkgconfig/*.pc
|
%{_qt6_libdir}/pkgconfig/*.pc
|
||||||
|
|
||||||
%if 0%{?examples}
|
%if 0%{?examples}
|
||||||
@ -101,6 +102,12 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Dec 3 2024 Raven <raven@sysadmins.ws> - 6.8.1-1
|
||||||
|
- 6.8.1
|
||||||
|
|
||||||
|
* Thu Oct 10 2024 Raven <raven@sysadmins.ws> - 6.8.0-1
|
||||||
|
- 6.8.0
|
||||||
|
|
||||||
* Mon Sep 30 2024 Raven <raven@sysadmins.ws> - 6.7.3-1
|
* Mon Sep 30 2024 Raven <raven@sysadmins.ws> - 6.7.3-1
|
||||||
- 6.7.3
|
- 6.7.3
|
||||||
|
|
||||||
|
|||||||
@ -4,7 +4,7 @@
|
|||||||
|
|
||||||
Summary: Qt6 - CoAP component
|
Summary: Qt6 - CoAP component
|
||||||
Name: qt6-%{qt_module}
|
Name: qt6-%{qt_module}
|
||||||
Version: 6.7.3
|
Version: 6.8.1
|
||||||
Release: 1%{?dist}
|
Release: 1%{?dist}
|
||||||
|
|
||||||
License: GPL-3.0-only WITH Qt-GPL-exception-1.0
|
License: GPL-3.0-only WITH Qt-GPL-exception-1.0
|
||||||
@ -76,6 +76,7 @@ Requires: %{name}-devel%{?_isa} = %{version}-%{release}
|
|||||||
%{_qt6_archdatadir}/mkspecs/modules/*
|
%{_qt6_archdatadir}/mkspecs/modules/*
|
||||||
%{_qt6_libdir}/qt6/metatypes/qt6*_metatypes.json
|
%{_qt6_libdir}/qt6/metatypes/qt6*_metatypes.json
|
||||||
%{_qt6_libdir}/qt6/modules/*.json
|
%{_qt6_libdir}/qt6/modules/*.json
|
||||||
|
%{_qt6_libdir}/qt6/sbom/%{qt_module}-*.spdx
|
||||||
%{_qt6_libdir}/pkgconfig/*.pc
|
%{_qt6_libdir}/pkgconfig/*.pc
|
||||||
|
|
||||||
%if 0%{?examples}
|
%if 0%{?examples}
|
||||||
@ -84,6 +85,12 @@ Requires: %{name}-devel%{?_isa} = %{version}-%{release}
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Dec 3 2024 Raven <raven@sysadmins.ws> - 6.8.1-1
|
||||||
|
- 6.8.1
|
||||||
|
|
||||||
|
* Thu Oct 10 2024 Raven <raven@sysadmins.ws> - 6.8.0-1
|
||||||
|
- 6.8.0
|
||||||
|
|
||||||
* Mon Sep 30 2024 Raven <raven@sysadmins.ws> - 6.7.3-1
|
* Mon Sep 30 2024 Raven <raven@sysadmins.ws> - 6.7.3-1
|
||||||
- 6.7.3
|
- 6.7.3
|
||||||
|
|
||||||
|
|||||||
@ -10,7 +10,7 @@
|
|||||||
|
|
||||||
Summary: Qt6 - Connectivity components
|
Summary: Qt6 - Connectivity components
|
||||||
Name: qt6-%{qt_module}
|
Name: qt6-%{qt_module}
|
||||||
Version: 6.7.3
|
Version: 6.8.1
|
||||||
Release: 1%{?dist}
|
Release: 1%{?dist}
|
||||||
|
|
||||||
# See LICENSE.GPL3, respectively, for exception details
|
# See LICENSE.GPL3, respectively, for exception details
|
||||||
@ -114,6 +114,7 @@ popd
|
|||||||
%{_qt6_archdatadir}/mkspecs/modules/qt_lib_nfc*.pri
|
%{_qt6_archdatadir}/mkspecs/modules/qt_lib_nfc*.pri
|
||||||
%{_qt6_libdir}/qt6/modules/*.json
|
%{_qt6_libdir}/qt6/modules/*.json
|
||||||
%{_qt6_libdir}/qt6/metatypes/qt6*_metatypes.json
|
%{_qt6_libdir}/qt6/metatypes/qt6*_metatypes.json
|
||||||
|
%{_qt6_libdir}/qt6/sbom/%{qt_module}-*.spdx
|
||||||
%{_qt6_libdir}/pkgconfig/*.pc
|
%{_qt6_libdir}/pkgconfig/*.pc
|
||||||
|
|
||||||
%if 0%{?examples}
|
%if 0%{?examples}
|
||||||
@ -122,6 +123,12 @@ popd
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Dec 3 2024 Raven <raven@sysadmins.ws> - 6.8.1-1
|
||||||
|
- 6.8.1
|
||||||
|
|
||||||
|
* Thu Oct 10 2024 Raven <raven@sysadmins.ws> - 6.8.0-1
|
||||||
|
- 6.8.0
|
||||||
|
|
||||||
* Mon Sep 30 2024 Raven <raven@sysadmins.ws> - 6.7.3-1
|
* Mon Sep 30 2024 Raven <raven@sysadmins.ws> - 6.7.3-1
|
||||||
- 6.7.3
|
- 6.7.3
|
||||||
|
|
||||||
|
|||||||
@ -15,8 +15,8 @@
|
|||||||
|
|
||||||
Summary: Qt6 - QtDeclarative component
|
Summary: Qt6 - QtDeclarative component
|
||||||
Name: qt6-%{qt_module}
|
Name: qt6-%{qt_module}
|
||||||
Version: 6.7.3
|
Version: 6.8.1
|
||||||
Release: 1%{?dist}
|
Release: 2%{?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
|
||||||
@ -50,6 +50,7 @@ BuildRequires: ninja-build
|
|||||||
BuildRequires: qt6-rpm-macros
|
BuildRequires: qt6-rpm-macros
|
||||||
BuildRequires: qt6-qtbase-devel >= %{version}
|
BuildRequires: qt6-qtbase-devel >= %{version}
|
||||||
BuildRequires: qt6-qtbase-private-devel
|
BuildRequires: qt6-qtbase-private-devel
|
||||||
|
BuildRequires: qt6-qtbase-static >= %{version}
|
||||||
BuildRequires: qt6-qtlanguageserver-devel >= %{version}
|
BuildRequires: qt6-qtlanguageserver-devel >= %{version}
|
||||||
BuildRequires: qt6-qtshadertools-devel >= %{version}
|
BuildRequires: qt6-qtshadertools-devel >= %{version}
|
||||||
BuildRequires: qt6-qtsvg-devel >= %{version}
|
BuildRequires: qt6-qtsvg-devel >= %{version}
|
||||||
@ -115,7 +116,9 @@ export CXX=clang++
|
|||||||
%enable_devtoolset14
|
%enable_devtoolset14
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%cmake_qt6 -DQT_BUILD_EXAMPLES:BOOL=%{?examples:ON}%{!?examples:OFF}
|
%cmake_qt6 \
|
||||||
|
-DQT_BUILD_EXAMPLES:BOOL=%{?examples:ON}%{!?examples:OFF} \
|
||||||
|
-DQT_INSTALL_EXAMPLES_SOURCES=%{?examples:ON}%{!?examples:OFF}
|
||||||
|
|
||||||
%cmake_build
|
%cmake_build
|
||||||
|
|
||||||
@ -137,7 +140,7 @@ for i in * ; do
|
|||||||
case "${i}" in
|
case "${i}" in
|
||||||
qmlcachegen|qmlleasing|qmlformat|qmleasing|qmlimportscanner|qmllint| \
|
qmlcachegen|qmlleasing|qmlformat|qmleasing|qmlimportscanner|qmllint| \
|
||||||
qmlpreview|qmlscene|qmltestrunner|qmltyperegistrar|qmlplugindump| \
|
qmlpreview|qmlscene|qmltestrunner|qmltyperegistrar|qmlplugindump| \
|
||||||
qmlprofiler|qml|qmlbundle|qmlmin|qmltime|svgtoqml)
|
qmlaotstats|qmlprofiler|qml|qmlbundle|qmlmin|qmltime|svgtoqml)
|
||||||
ln -v ${i} %{buildroot}%{_bindir}/${i}-qt6
|
ln -v ${i} %{buildroot}%{_bindir}/${i}-qt6
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
@ -158,6 +161,15 @@ done
|
|||||||
popd
|
popd
|
||||||
|
|
||||||
|
|
||||||
|
# Copied from OpenSUSE packages
|
||||||
|
# CMake modules for plugins are not useful
|
||||||
|
rm %{buildroot}%{_qt6_libdir}/cmake/*/*Plugin{Config,ConfigVersion,Targets*}.cmake
|
||||||
|
|
||||||
|
# Drop QmlAssetDownloader
|
||||||
|
rm -fr %{buildroot}%{_qt6_libdir}/cmake/Qt6QmlAssetDownloader
|
||||||
|
rm -f %{buildroot}%{_qt6_libdir}/libQt6QmlAssetDownloader.{a,prl}
|
||||||
|
|
||||||
|
|
||||||
%check
|
%check
|
||||||
%if 0%{?tests}
|
%if 0%{?tests}
|
||||||
export CTEST_OUTPUT_ON_FAILURE=1
|
export CTEST_OUTPUT_ON_FAILURE=1
|
||||||
@ -177,6 +189,7 @@ make check -k -C tests ||:
|
|||||||
%license LICENSES/LGPL*
|
%license LICENSES/LGPL*
|
||||||
%{_qt6_libdir}/libQt6LabsAnimation.so.6*
|
%{_qt6_libdir}/libQt6LabsAnimation.so.6*
|
||||||
%{_qt6_libdir}/libQt6LabsFolderListModel.so.6*
|
%{_qt6_libdir}/libQt6LabsFolderListModel.so.6*
|
||||||
|
%{_qt6_libdir}/libQt6LabsPlatform.so.6*
|
||||||
%{_qt6_libdir}/libQt6LabsQmlModels.so.6*
|
%{_qt6_libdir}/libQt6LabsQmlModels.so.6*
|
||||||
%{_qt6_libdir}/libQt6LabsSettings.so.6*
|
%{_qt6_libdir}/libQt6LabsSettings.so.6*
|
||||||
%{_qt6_libdir}/libQt6LabsSharedImage.so.6*
|
%{_qt6_libdir}/libQt6LabsSharedImage.so.6*
|
||||||
@ -186,6 +199,7 @@ make check -k -C tests ||:
|
|||||||
%{_qt6_libdir}/libQt6Qml.so.6*
|
%{_qt6_libdir}/libQt6Qml.so.6*
|
||||||
%{_qt6_libdir}/libQt6QmlCompiler.so.*
|
%{_qt6_libdir}/libQt6QmlCompiler.so.*
|
||||||
%{_qt6_libdir}/libQt6QmlCore.so.6*
|
%{_qt6_libdir}/libQt6QmlCore.so.6*
|
||||||
|
%{_qt6_libdir}/libQt6QmlMeta.so.6*
|
||||||
%{_qt6_libdir}/libQt6QmlModels.so.6*
|
%{_qt6_libdir}/libQt6QmlModels.so.6*
|
||||||
%{_qt6_libdir}/libQt6QmlWorkerScript.so.6*
|
%{_qt6_libdir}/libQt6QmlWorkerScript.so.6*
|
||||||
%{_qt6_libdir}/libQt6Quick*.so.6*
|
%{_qt6_libdir}/libQt6Quick*.so.6*
|
||||||
@ -204,13 +218,13 @@ make check -k -C tests ||:
|
|||||||
%{_qt6_libdir}/libQt6QmlXmlListModel.so.6*
|
%{_qt6_libdir}/libQt6QmlXmlListModel.so.6*
|
||||||
%{_qt6_plugindir}/qmltooling/
|
%{_qt6_plugindir}/qmltooling/
|
||||||
%{_qt6_plugindir}/qmllint/
|
%{_qt6_plugindir}/qmllint/
|
||||||
|
%{_qt6_plugindir}/qmlls
|
||||||
%{_qt6_archdatadir}/qml/
|
%{_qt6_archdatadir}/qml/
|
||||||
|
|
||||||
%files devel
|
%files devel
|
||||||
%dir %{_qt6_libdir}/cmake/Qt6PacketProtocolPrivate
|
%dir %{_qt6_libdir}/cmake/Qt6PacketProtocolPrivate
|
||||||
%dir %{_qt6_libdir}/cmake/Qt6Qml
|
%dir %{_qt6_libdir}/cmake/Qt6Qml
|
||||||
%dir %{_qt6_libdir}/cmake/Qt6Qml/QmlPlugins
|
%dir %{_qt6_libdir}/cmake/Qt6Qml/QmlPlugins
|
||||||
%dir %{_qt6_libdir}/cmake/Qt6QmlBuiltins
|
|
||||||
%dir %{_qt6_libdir}/cmake/Qt6QmlCompiler
|
%dir %{_qt6_libdir}/cmake/Qt6QmlCompiler
|
||||||
%dir %{_qt6_libdir}/cmake/Qt6QmlCore
|
%dir %{_qt6_libdir}/cmake/Qt6QmlCore
|
||||||
%dir %{_qt6_libdir}/cmake/Qt6QmlDebugPrivate
|
%dir %{_qt6_libdir}/cmake/Qt6QmlDebugPrivate
|
||||||
@ -218,6 +232,7 @@ make check -k -C tests ||:
|
|||||||
%dir %{_qt6_libdir}/cmake/Qt6QmlImportScanner
|
%dir %{_qt6_libdir}/cmake/Qt6QmlImportScanner
|
||||||
%dir %{_qt6_libdir}/cmake/Qt6LabsAnimation
|
%dir %{_qt6_libdir}/cmake/Qt6LabsAnimation
|
||||||
%dir %{_qt6_libdir}/cmake/Qt6LabsFolderListModel
|
%dir %{_qt6_libdir}/cmake/Qt6LabsFolderListModel
|
||||||
|
%dir %{_qt6_libdir}/cmake/Qt6LabsPlatform
|
||||||
%dir %{_qt6_libdir}/cmake/Qt6LabsQmlModels
|
%dir %{_qt6_libdir}/cmake/Qt6LabsQmlModels
|
||||||
%dir %{_qt6_libdir}/cmake/Qt6LabsSettings
|
%dir %{_qt6_libdir}/cmake/Qt6LabsSettings
|
||||||
%dir %{_qt6_libdir}/cmake/Qt6LabsSharedImage
|
%dir %{_qt6_libdir}/cmake/Qt6LabsSharedImage
|
||||||
@ -232,9 +247,11 @@ make check -k -C tests ||:
|
|||||||
%dir %{_qt6_libdir}/cmake/Qt6QuickControls2MaterialStyleImpl
|
%dir %{_qt6_libdir}/cmake/Qt6QuickControls2MaterialStyleImpl
|
||||||
%dir %{_qt6_libdir}/cmake/Qt6QuickControls2Universal
|
%dir %{_qt6_libdir}/cmake/Qt6QuickControls2Universal
|
||||||
%dir %{_qt6_libdir}/cmake/Qt6QuickControls2UniversalStyleImpl
|
%dir %{_qt6_libdir}/cmake/Qt6QuickControls2UniversalStyleImpl
|
||||||
|
#dir %{_qt6_libdir}/cmake/Qt6QmlAssetDownloader
|
||||||
%dir %{_qt6_libdir}/cmake/Qt6QmlLSPrivate
|
%dir %{_qt6_libdir}/cmake/Qt6QmlLSPrivate
|
||||||
%dir %{_qt6_libdir}/cmake/Qt6QmlDomPrivate
|
%dir %{_qt6_libdir}/cmake/Qt6QmlDomPrivate
|
||||||
%dir %{_qt6_libdir}/cmake/Qt6QmlLocalStorage
|
%dir %{_qt6_libdir}/cmake/Qt6QmlLocalStorage
|
||||||
|
%dir %{_qt6_libdir}/cmake/Qt6QmlMeta
|
||||||
%dir %{_qt6_libdir}/cmake/Qt6QmlModels
|
%dir %{_qt6_libdir}/cmake/Qt6QmlModels
|
||||||
%dir %{_qt6_libdir}/cmake/Qt6QmlNetwork
|
%dir %{_qt6_libdir}/cmake/Qt6QmlNetwork
|
||||||
%dir %{_qt6_libdir}/cmake/Qt6QmlTools
|
%dir %{_qt6_libdir}/cmake/Qt6QmlTools
|
||||||
@ -244,6 +261,7 @@ make check -k -C tests ||:
|
|||||||
%dir %{_qt6_libdir}/cmake/Qt6QuickEffectsPrivate
|
%dir %{_qt6_libdir}/cmake/Qt6QuickEffectsPrivate
|
||||||
%dir %{_qt6_libdir}/cmake/Qt6Quick
|
%dir %{_qt6_libdir}/cmake/Qt6Quick
|
||||||
%dir %{_qt6_libdir}/cmake/Qt6QuickControls2
|
%dir %{_qt6_libdir}/cmake/Qt6QuickControls2
|
||||||
|
%dir %{_qt6_libdir}/cmake/Qt6QuickControls2FluentWinUI3StyleImpl
|
||||||
%dir %{_qt6_libdir}/cmake/Qt6QuickControls2Impl
|
%dir %{_qt6_libdir}/cmake/Qt6QuickControls2Impl
|
||||||
%dir %{_qt6_libdir}/cmake/Qt6QuickControlsTestUtilsPrivate
|
%dir %{_qt6_libdir}/cmake/Qt6QuickControlsTestUtilsPrivate
|
||||||
%dir %{_qt6_libdir}/cmake/Qt6QuickDialogs2
|
%dir %{_qt6_libdir}/cmake/Qt6QuickDialogs2
|
||||||
@ -255,12 +273,15 @@ make check -k -C tests ||:
|
|||||||
%dir %{_qt6_libdir}/cmake/Qt6QuickTest
|
%dir %{_qt6_libdir}/cmake/Qt6QuickTest
|
||||||
%dir %{_qt6_libdir}/cmake/Qt6QuickTestUtilsPrivate
|
%dir %{_qt6_libdir}/cmake/Qt6QuickTestUtilsPrivate
|
||||||
%dir %{_qt6_libdir}/cmake/Qt6QuickTemplates2
|
%dir %{_qt6_libdir}/cmake/Qt6QuickTemplates2
|
||||||
|
%dir %{_qt6_libdir}/cmake/Qt6QuickVectorImage
|
||||||
|
%dir %{_qt6_libdir}/cmake/Qt6QuickVectorImageGeneratorPrivate
|
||||||
%dir %{_qt6_libdir}/cmake/Qt6QmlXmlListModel
|
%dir %{_qt6_libdir}/cmake/Qt6QmlXmlListModel
|
||||||
%dir %{_qt6_libdir}/cmake/Qt6QuickTools
|
%dir %{_qt6_libdir}/cmake/Qt6QuickTools
|
||||||
%{_bindir}/qml*
|
%{_bindir}/qml*
|
||||||
%{_qt6_bindir}/qml*
|
%{_qt6_bindir}/qml*
|
||||||
%{_bindir}/svgtoqml-qt6
|
%{_bindir}/svgtoqml-qt6
|
||||||
%{_qt6_bindir}/svgtoqml
|
%{_qt6_bindir}/svgtoqml
|
||||||
|
%{_qt6_libexecdir}/qmlaotstats
|
||||||
%{_qt6_libexecdir}/qmlcachegen
|
%{_qt6_libexecdir}/qmlcachegen
|
||||||
%{_qt6_libexecdir}/qmlimportscanner
|
%{_qt6_libexecdir}/qmlimportscanner
|
||||||
%{_qt6_libexecdir}/qmltyperegistrar
|
%{_qt6_libexecdir}/qmltyperegistrar
|
||||||
@ -268,12 +289,14 @@ make check -k -C tests ||:
|
|||||||
%{_qt6_headerdir}/Qt*/
|
%{_qt6_headerdir}/Qt*/
|
||||||
%{_qt6_libdir}/libQt6LabsAnimation.so
|
%{_qt6_libdir}/libQt6LabsAnimation.so
|
||||||
%{_qt6_libdir}/libQt6LabsFolderListModel.so
|
%{_qt6_libdir}/libQt6LabsFolderListModel.so
|
||||||
|
%{_qt6_libdir}/libQt6LabsPlatform.so
|
||||||
%{_qt6_libdir}/libQt6LabsQmlModels.so
|
%{_qt6_libdir}/libQt6LabsQmlModels.so
|
||||||
%{_qt6_libdir}/libQt6LabsSettings.so
|
%{_qt6_libdir}/libQt6LabsSettings.so
|
||||||
%{_qt6_libdir}/libQt6LabsSharedImage.so
|
%{_qt6_libdir}/libQt6LabsSharedImage.so
|
||||||
%{_qt6_libdir}/libQt6LabsWavefrontMesh.so
|
%{_qt6_libdir}/libQt6LabsWavefrontMesh.so
|
||||||
%{_qt6_libdir}/libQt6QmlLocalStorage.so
|
%{_qt6_libdir}/libQt6QmlLocalStorage.so
|
||||||
%{_qt6_libdir}/libQt6Qml.so
|
%{_qt6_libdir}/libQt6Qml.so
|
||||||
|
%{_qt6_libdir}/libQt6QmlMeta.so
|
||||||
%{_qt6_libdir}/libQt6QmlNetwork.so
|
%{_qt6_libdir}/libQt6QmlNetwork.so
|
||||||
%{_qt6_libdir}/libQt6QmlCompiler.so
|
%{_qt6_libdir}/libQt6QmlCompiler.so
|
||||||
%{_qt6_libdir}/libQt6QmlCore.so
|
%{_qt6_libdir}/libQt6QmlCore.so
|
||||||
@ -290,7 +313,7 @@ make check -k -C tests ||:
|
|||||||
%{_qt6_libdir}/cmake/Qt6Qml/*.cmake*
|
%{_qt6_libdir}/cmake/Qt6Qml/*.cmake*
|
||||||
%{_qt6_libdir}/cmake/Qt6Qml/*.cpp.in
|
%{_qt6_libdir}/cmake/Qt6Qml/*.cpp.in
|
||||||
%{_qt6_libdir}/cmake/Qt6Qml/*.qrc.in
|
%{_qt6_libdir}/cmake/Qt6Qml/*.qrc.in
|
||||||
%{_qt6_libdir}/cmake/Qt6QmlBuiltins/*cmake
|
%{_qt6_libdir}/cmake/Qt6Qml/*.conf.in
|
||||||
%{_qt6_libdir}/cmake/Qt6Qml/QmlPlugins/*.cmake
|
%{_qt6_libdir}/cmake/Qt6Qml/QmlPlugins/*.cmake
|
||||||
%{_qt6_libdir}/cmake/Qt6QmlCompiler/*.cmake
|
%{_qt6_libdir}/cmake/Qt6QmlCompiler/*.cmake
|
||||||
%{_qt6_libdir}/cmake/Qt6QmlCore/*.cmake
|
%{_qt6_libdir}/cmake/Qt6QmlCore/*.cmake
|
||||||
@ -299,13 +322,16 @@ make check -k -C tests ||:
|
|||||||
%{_qt6_libdir}/cmake/Qt6QmlImportScanner/*.cmake
|
%{_qt6_libdir}/cmake/Qt6QmlImportScanner/*.cmake
|
||||||
%{_qt6_libdir}/cmake/Qt6LabsAnimation/*.cmake
|
%{_qt6_libdir}/cmake/Qt6LabsAnimation/*.cmake
|
||||||
%{_qt6_libdir}/cmake/Qt6LabsFolderListModel/*.cmake
|
%{_qt6_libdir}/cmake/Qt6LabsFolderListModel/*.cmake
|
||||||
|
%{_qt6_libdir}/cmake/Qt6LabsPlatform/*.cmake
|
||||||
%{_qt6_libdir}/cmake/Qt6LabsQmlModels/*.cmake
|
%{_qt6_libdir}/cmake/Qt6LabsQmlModels/*.cmake
|
||||||
%{_qt6_libdir}/cmake/Qt6LabsSettings/*.cmake
|
%{_qt6_libdir}/cmake/Qt6LabsSettings/*.cmake
|
||||||
%{_qt6_libdir}/cmake/Qt6LabsSharedImage/*.cmake
|
%{_qt6_libdir}/cmake/Qt6LabsSharedImage/*.cmake
|
||||||
%{_qt6_libdir}/cmake/Qt6LabsWavefrontMesh/*.cmake
|
%{_qt6_libdir}/cmake/Qt6LabsWavefrontMesh/*.cmake
|
||||||
|
#{_qt6_libdir}/cmake/Qt6QmlAssetDownloader/*.cmake
|
||||||
%{_qt6_libdir}/cmake/Qt6QmlLSPrivate/*.cmake
|
%{_qt6_libdir}/cmake/Qt6QmlLSPrivate/*.cmake
|
||||||
%{_qt6_libdir}/cmake/Qt6QmlDomPrivate/*.cmake
|
%{_qt6_libdir}/cmake/Qt6QmlDomPrivate/*.cmake
|
||||||
%{_qt6_libdir}/cmake/Qt6QmlLocalStorage/*.cmake
|
%{_qt6_libdir}/cmake/Qt6QmlLocalStorage/*.cmake
|
||||||
|
%{_qt6_libdir}/cmake/Qt6QmlMeta/*.cmake
|
||||||
%{_qt6_libdir}/cmake/Qt6QmlModels/*.cmake
|
%{_qt6_libdir}/cmake/Qt6QmlModels/*.cmake
|
||||||
%{_qt6_libdir}/cmake/Qt6QmlNetwork/*.cmake
|
%{_qt6_libdir}/cmake/Qt6QmlNetwork/*.cmake
|
||||||
%{_qt6_libdir}/cmake/Qt6QmlTools/*.cmake
|
%{_qt6_libdir}/cmake/Qt6QmlTools/*.cmake
|
||||||
@ -313,18 +339,19 @@ make check -k -C tests ||:
|
|||||||
%{_qt6_libdir}/cmake/Qt6QmlWorkerScript/*.cmake
|
%{_qt6_libdir}/cmake/Qt6QmlWorkerScript/*.cmake
|
||||||
%{_qt6_libdir}/cmake/Qt6QmlTypeRegistrarPrivate/*.cmake
|
%{_qt6_libdir}/cmake/Qt6QmlTypeRegistrarPrivate/*.cmake
|
||||||
%{_qt6_libdir}/cmake/Qt6QuickControls2Basic/*.cmake
|
%{_qt6_libdir}/cmake/Qt6QuickControls2Basic/*.cmake
|
||||||
%{_qt6_libdir}/cmake/Qt6QuickControls2BasicStyleImpl/*.cmake
|
%{_qt6_libdir}/cmake/Qt6QuickControls2BasicStyleImpl/*.cmake
|
||||||
%{_qt6_libdir}/cmake/Qt6QuickControls2Fusion/*.cmake
|
%{_qt6_libdir}/cmake/Qt6QuickControls2Fusion/*.cmake
|
||||||
%{_qt6_libdir}/cmake/Qt6QuickControls2FusionStyleImpl/*.cmake
|
%{_qt6_libdir}/cmake/Qt6QuickControls2FusionStyleImpl/*.cmake
|
||||||
%{_qt6_libdir}/cmake/Qt6QuickControls2Imagine/*.cmake
|
%{_qt6_libdir}/cmake/Qt6QuickControls2Imagine/*.cmake
|
||||||
%{_qt6_libdir}/cmake/Qt6QuickControls2ImagineStyleImpl/*.cmake
|
%{_qt6_libdir}/cmake/Qt6QuickControls2ImagineStyleImpl/*.cmake
|
||||||
%{_qt6_libdir}/cmake/Qt6QuickControls2Material/*.cmake
|
%{_qt6_libdir}/cmake/Qt6QuickControls2Material/*.cmake
|
||||||
%{_qt6_libdir}/cmake/Qt6QuickControls2MaterialStyleImpl/*.cmake
|
%{_qt6_libdir}/cmake/Qt6QuickControls2MaterialStyleImpl/*.cmake
|
||||||
%{_qt6_libdir}/cmake/Qt6QuickControls2Universal/*.cmake
|
%{_qt6_libdir}/cmake/Qt6QuickControls2Universal/*.cmake
|
||||||
%{_qt6_libdir}/cmake/Qt6QuickControls2UniversalStyleImpl/*.cmake
|
%{_qt6_libdir}/cmake/Qt6QuickControls2UniversalStyleImpl/*.cmake
|
||||||
%{_qt6_libdir}/cmake/Qt6QuickEffectsPrivate/*.cmake
|
%{_qt6_libdir}/cmake/Qt6QuickEffectsPrivate/*.cmake
|
||||||
%{_qt6_libdir}/cmake/Qt6Quick/*.cmake
|
%{_qt6_libdir}/cmake/Qt6Quick/*.cmake
|
||||||
%{_qt6_libdir}/cmake/Qt6QuickControls2/*.cmake
|
%{_qt6_libdir}/cmake/Qt6QuickControls2/*.cmake
|
||||||
|
%{_qt6_libdir}/cmake/Qt6QuickControls2FluentWinUI3StyleImpl/*.cmake
|
||||||
%{_qt6_libdir}/cmake/Qt6QuickControls2Impl/*.cmake
|
%{_qt6_libdir}/cmake/Qt6QuickControls2Impl/*.cmake
|
||||||
%{_qt6_libdir}/cmake/Qt6QuickControlsTestUtilsPrivate/*.cmake
|
%{_qt6_libdir}/cmake/Qt6QuickControlsTestUtilsPrivate/*.cmake
|
||||||
%{_qt6_libdir}/cmake/Qt6QuickDialogs2/*.cmake
|
%{_qt6_libdir}/cmake/Qt6QuickDialogs2/*.cmake
|
||||||
@ -336,29 +363,32 @@ make check -k -C tests ||:
|
|||||||
%{_qt6_libdir}/cmake/Qt6QuickTest/*.cmake
|
%{_qt6_libdir}/cmake/Qt6QuickTest/*.cmake
|
||||||
%{_qt6_libdir}/cmake/Qt6QuickTestUtilsPrivate/*.cmake
|
%{_qt6_libdir}/cmake/Qt6QuickTestUtilsPrivate/*.cmake
|
||||||
%{_qt6_libdir}/cmake/Qt6QuickTemplates2/*.cmake
|
%{_qt6_libdir}/cmake/Qt6QuickTemplates2/*.cmake
|
||||||
|
%{_qt6_libdir}/cmake/Qt6QuickVectorImage/*.cmake
|
||||||
|
%{_qt6_libdir}/cmake/Qt6QuickVectorImageGeneratorPrivate/*.cmake
|
||||||
%{_qt6_libdir}/cmake/Qt6QmlXmlListModel/*.cmake
|
%{_qt6_libdir}/cmake/Qt6QmlXmlListModel/*.cmake
|
||||||
%{_qt6_libdir}/cmake/Qt6QuickWidgets/*.cmake
|
%{_qt6_libdir}/cmake/Qt6QuickWidgets/*.cmake
|
||||||
%{_qt6_libdir}/cmake/Qt6QuickTools/*.cmake
|
%{_qt6_libdir}/cmake/Qt6QuickTools/*.cmake
|
||||||
%{_qt6_libdir}/qt6/modules/*.json
|
%{_qt6_libdir}/qt6/modules/*.json
|
||||||
|
%{_qt6_libdir}/qt6/sbom/%{qt_module}-*.spdx
|
||||||
%{_qt6_libdir}/pkgconfig/*.pc
|
%{_qt6_libdir}/pkgconfig/*.pc
|
||||||
# FIXME: should be in -static, but looks it's required for all modules
|
|
||||||
%{_qt6_libdir}/libQt6QmlBuiltins.a
|
|
||||||
|
|
||||||
%files static
|
%files static
|
||||||
%{_qt6_libdir}/libQt6LabsAnimation.prl
|
%{_qt6_libdir}/libQt6LabsAnimation.prl
|
||||||
%{_qt6_libdir}/libQt6LabsFolderListModel.prl
|
%{_qt6_libdir}/libQt6LabsFolderListModel.prl
|
||||||
|
%{_qt6_libdir}/libQt6LabsPlatform.prl
|
||||||
%{_qt6_libdir}/libQt6LabsQmlModels.prl
|
%{_qt6_libdir}/libQt6LabsQmlModels.prl
|
||||||
%{_qt6_libdir}/libQt6LabsSettings.prl
|
%{_qt6_libdir}/libQt6LabsSettings.prl
|
||||||
%{_qt6_libdir}/libQt6LabsSharedImage.prl
|
%{_qt6_libdir}/libQt6LabsSharedImage.prl
|
||||||
%{_qt6_libdir}/libQt6LabsWavefrontMesh.prl
|
%{_qt6_libdir}/libQt6LabsWavefrontMesh.prl
|
||||||
#{_qt6_libdir}/libQt6QmlBuiltins.a
|
#{_qt6_libdir}/libQt6QmlAssetDownloader.a
|
||||||
%{_qt6_libdir}/libQt6QmlBuiltins.prl
|
#{_qt6_libdir}/libQt6QmlAssetDownloader.prl
|
||||||
%{_qt6_libdir}/libQt6QmlCore.prl
|
%{_qt6_libdir}/libQt6QmlCore.prl
|
||||||
%{_qt6_libdir}/libQt6QmlDom.a
|
%{_qt6_libdir}/libQt6QmlDom.a
|
||||||
%{_qt6_libdir}/libQt6QmlDom.prl
|
%{_qt6_libdir}/libQt6QmlDom.prl
|
||||||
%{_qt6_libdir}/libQt6QmlLocalStorage.prl
|
%{_qt6_libdir}/libQt6QmlLocalStorage.prl
|
||||||
%{_qt6_libdir}/libQt6QmlLS.a
|
%{_qt6_libdir}/libQt6QmlLS.a
|
||||||
%{_qt6_libdir}/libQt6QmlLS.prl
|
%{_qt6_libdir}/libQt6QmlLS.prl
|
||||||
|
%{_qt6_libdir}/libQt6QmlMeta.prl
|
||||||
%{_qt6_libdir}/libQt6QmlNetwork.prl
|
%{_qt6_libdir}/libQt6QmlNetwork.prl
|
||||||
%{_qt6_libdir}/libQt6Quick*.prl
|
%{_qt6_libdir}/libQt6Quick*.prl
|
||||||
%{_qt6_libdir}/libQt6QmlWorkerScript.prl
|
%{_qt6_libdir}/libQt6QmlWorkerScript.prl
|
||||||
@ -383,6 +413,15 @@ make check -k -C tests ||:
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Sat Dec 21 2024 Raven <raven@sysadmins.ws> - 6.8.1-2
|
||||||
|
- drop QmlAssetDownloader
|
||||||
|
|
||||||
|
* Tue Dec 3 2024 Raven <raven@sysadmins.ws> - 6.8.1-1
|
||||||
|
- 6.8.1
|
||||||
|
|
||||||
|
* Thu Oct 10 2024 Raven <raven@sysadmins.ws> - 6.8.0-1
|
||||||
|
- 6.8.0
|
||||||
|
|
||||||
* Mon Sep 30 2024 Raven <raven@sysadmins.ws> - 6.7.3-1
|
* Mon Sep 30 2024 Raven <raven@sysadmins.ws> - 6.7.3-1
|
||||||
- 6.7.3
|
- 6.7.3
|
||||||
|
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
%global qt_module qtgraphs
|
%global qt_module qtgraphs
|
||||||
|
|
||||||
Name: qt6-qtgraphs
|
Name: qt6-qtgraphs
|
||||||
Version: 6.7.3
|
Version: 6.8.1
|
||||||
Release: 1%{?dist}
|
Release: 1%{?dist}
|
||||||
|
|
||||||
%global examples 1
|
%global examples 1
|
||||||
@ -83,19 +83,29 @@ popd
|
|||||||
%files
|
%files
|
||||||
%license LICENSES/BSD-3-Clause.txt LICENSES/GFDL*.txt LICENSES/GPL-*.txt
|
%license LICENSES/BSD-3-Clause.txt LICENSES/GFDL*.txt LICENSES/GPL-*.txt
|
||||||
%{_qt6_libdir}/libQt6Graphs.so.6*
|
%{_qt6_libdir}/libQt6Graphs.so.6*
|
||||||
|
%{_qt6_libdir}/libQt6GraphsWidgets.so.6*
|
||||||
%{_qt6_libdir}/qt6/metatypes/qt6graphs_relwithdebinfo_metatypes.json
|
%{_qt6_libdir}/qt6/metatypes/qt6graphs_relwithdebinfo_metatypes.json
|
||||||
%{_qt6_libdir}/qt6/modules/Graphs.json
|
%{_qt6_libdir}/qt6/modules/Graphs.json
|
||||||
|
%{_qt6_libdir}/qt6/metatypes/qt6graphswidgets_relwithdebinfo_metatypes.json
|
||||||
|
%{_qt6_libdir}/qt6/modules/GraphsWidgets.json
|
||||||
%{_qt6_qmldir}/QtGraphs
|
%{_qt6_qmldir}/QtGraphs
|
||||||
|
|
||||||
%files devel
|
%files devel
|
||||||
%{_qt6_headerdir}/QtGraphs
|
%{_qt6_headerdir}/QtGraphs
|
||||||
|
%{_qt6_headerdir}/QtGraphsWidgets
|
||||||
%{_qt6_libdir}/cmake/Qt6BuildInternals/StandaloneTests/QtGraphsTestsConfig.cmake
|
%{_qt6_libdir}/cmake/Qt6BuildInternals/StandaloneTests/QtGraphsTestsConfig.cmake
|
||||||
%{_qt6_libdir}/cmake/Qt6Graphs
|
%{_qt6_libdir}/cmake/Qt6Graphs
|
||||||
|
%{_qt6_libdir}/cmake/Qt6GraphsWidgets
|
||||||
%{_qt6_libdir}/cmake/Qt6Qml/QmlPlugins/Qt6Graphsplugin*.cmake
|
%{_qt6_libdir}/cmake/Qt6Qml/QmlPlugins/Qt6Graphsplugin*.cmake
|
||||||
%{_qt6_libdir}/libQt6Graphs.so
|
|
||||||
%{_qt6_libdir}/pkgconfig/Qt6Graphs.pc
|
|
||||||
%{_qt6_libdir}/libQt6Graphs.prl
|
%{_qt6_libdir}/libQt6Graphs.prl
|
||||||
|
%{_qt6_libdir}/libQt6Graphs.so
|
||||||
|
%{_qt6_libdir}/libQt6GraphsWidgets.prl
|
||||||
|
%{_qt6_libdir}/libQt6GraphsWidgets.so
|
||||||
|
%{_qt6_libdir}/pkgconfig/Qt6GraphsWidgets.pc
|
||||||
|
%{_qt6_libdir}/pkgconfig/Qt6Graphs.pc
|
||||||
%{_qt6_libdir}/qt6/mkspecs/modules/qt_lib_graphs*.pri
|
%{_qt6_libdir}/qt6/mkspecs/modules/qt_lib_graphs*.pri
|
||||||
|
%{_qt6_libdir}/qt6/sbom/%{qt_module}-*.spdx
|
||||||
|
|
||||||
|
|
||||||
%if 0%{?examples}
|
%if 0%{?examples}
|
||||||
%files examples
|
%files examples
|
||||||
@ -103,6 +113,12 @@ popd
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Dec 3 2024 Raven <raven@sysadmins.ws> - 6.8.1-1
|
||||||
|
- 6.8.1
|
||||||
|
|
||||||
|
* Thu Oct 10 2024 Raven <raven@sysadmins.ws> - 6.8.0-1
|
||||||
|
- 6.8.0
|
||||||
|
|
||||||
* Mon Sep 30 2024 Raven <raven@sysadmins.ws> - 6.7.3-1
|
* Mon Sep 30 2024 Raven <raven@sysadmins.ws> - 6.7.3-1
|
||||||
- 6.7.3
|
- 6.7.3
|
||||||
|
|
||||||
|
|||||||
@ -4,7 +4,7 @@
|
|||||||
%global examples 1
|
%global examples 1
|
||||||
|
|
||||||
Name: qt6-qthttpserver
|
Name: qt6-qthttpserver
|
||||||
Version: 6.7.3
|
Version: 6.8.1
|
||||||
Release: 1%{?dist}
|
Release: 1%{?dist}
|
||||||
Summary: Library to facilitate the creation of an http server with Qt
|
Summary: Library to facilitate the creation of an http server with Qt
|
||||||
|
|
||||||
@ -85,6 +85,7 @@ to the usage of %{name}.
|
|||||||
%{_qt6_libdir}/qt6/mkspecs/modules/qt_lib_httpserver.pri
|
%{_qt6_libdir}/qt6/mkspecs/modules/qt_lib_httpserver.pri
|
||||||
%{_qt6_libdir}/qt6/mkspecs/modules/qt_lib_httpserver_private.pri
|
%{_qt6_libdir}/qt6/mkspecs/modules/qt_lib_httpserver_private.pri
|
||||||
%{_qt6_libdir}/qt6/modules/HttpServer.json
|
%{_qt6_libdir}/qt6/modules/HttpServer.json
|
||||||
|
%{_qt6_libdir}/qt6/sbom/%{qt_module}-*.spdx
|
||||||
|
|
||||||
%if 0%{?examples}
|
%if 0%{?examples}
|
||||||
%files examples
|
%files examples
|
||||||
@ -92,6 +93,12 @@ to the usage of %{name}.
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Dec 3 2024 Raven <raven@sysadmins.ws> - 6.8.1-1
|
||||||
|
- 6.8.1
|
||||||
|
|
||||||
|
* Thu Oct 10 2024 Raven <raven@sysadmins.ws> - 6.8.0-1
|
||||||
|
- 6.8.0
|
||||||
|
|
||||||
* Mon Sep 30 2024 Raven <raven@sysadmins.ws> - 6.7.3-1
|
* Mon Sep 30 2024 Raven <raven@sysadmins.ws> - 6.7.3-1
|
||||||
- 6.7.3
|
- 6.7.3
|
||||||
|
|
||||||
|
|||||||
@ -8,7 +8,7 @@
|
|||||||
|
|
||||||
Summary: Qt6 - QtImageFormats component
|
Summary: Qt6 - QtImageFormats component
|
||||||
Name: qt6-%{qt_module}
|
Name: qt6-%{qt_module}
|
||||||
Version: 6.7.3
|
Version: 6.8.1
|
||||||
Release: 1%{?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
|
||||||
@ -83,9 +83,16 @@ rm -rv src/3rdparty
|
|||||||
%{_qt6_plugindir}/imageformats/libqwebp.so
|
%{_qt6_plugindir}/imageformats/libqwebp.so
|
||||||
%{_qt6_libdir}/cmake/Qt6/*.cmake
|
%{_qt6_libdir}/cmake/Qt6/*.cmake
|
||||||
%{_qt6_libdir}/cmake/Qt6Gui/*.cmake
|
%{_qt6_libdir}/cmake/Qt6Gui/*.cmake
|
||||||
|
%{_qt6_libdir}/qt6/sbom/%{qt_module}-*.spdx
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Dec 3 2024 Raven <raven@sysadmins.ws> - 6.8.1-1
|
||||||
|
- 6.8.1
|
||||||
|
|
||||||
|
* Thu Oct 10 2024 Raven <raven@sysadmins.ws> - 6.8.0-1
|
||||||
|
- 6.8.0
|
||||||
|
|
||||||
* Mon Sep 30 2024 Raven <raven@sysadmins.ws> - 6.7.3-1
|
* Mon Sep 30 2024 Raven <raven@sysadmins.ws> - 6.7.3-1
|
||||||
- 6.7.3
|
- 6.7.3
|
||||||
|
|
||||||
|
|||||||
@ -8,7 +8,7 @@
|
|||||||
|
|
||||||
Summary: Qt6 - LanguageServer component
|
Summary: Qt6 - LanguageServer component
|
||||||
Name: qt6-%{qt_module}
|
Name: qt6-%{qt_module}
|
||||||
Version: 6.7.3
|
Version: 6.8.1
|
||||||
Release: 1%{?dist}
|
Release: 1%{?dist}
|
||||||
|
|
||||||
License: GPL-3.0-only WITH Qt-GPL-exception-1.0
|
License: GPL-3.0-only WITH Qt-GPL-exception-1.0
|
||||||
@ -25,7 +25,7 @@ Source0: https://download.qt.io/official_releases/qt/%{majmin}/%{version}/submod
|
|||||||
## upstreamable patches
|
## upstreamable patches
|
||||||
|
|
||||||
BuildRequires: cmake
|
BuildRequires: cmake
|
||||||
BuildRequires: gcc-c++
|
BuildRequires: gcc-toolset-14-gcc-c++
|
||||||
BuildRequires: ninja-build
|
BuildRequires: ninja-build
|
||||||
BuildRequires: qt6-qtbase-devel >= %{version}
|
BuildRequires: qt6-qtbase-devel >= %{version}
|
||||||
BuildRequires: qt6-qtbase-private-devel
|
BuildRequires: qt6-qtbase-private-devel
|
||||||
@ -48,6 +48,8 @@ Requires: qt6-qtbase-devel%{?_isa}
|
|||||||
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
|
%enable_devtoolset14
|
||||||
|
|
||||||
%cmake_qt6
|
%cmake_qt6
|
||||||
|
|
||||||
%cmake_build
|
%cmake_build
|
||||||
@ -59,16 +61,15 @@ Requires: qt6-qtbase-devel%{?_isa}
|
|||||||
|
|
||||||
%files
|
%files
|
||||||
%license LICENSES/*
|
%license LICENSES/*
|
||||||
%{_qt6_libdir}/libQt6JsonRpc.so.6*
|
|
||||||
%{_qt6_libdir}/libQt6LanguageServer.so.6*
|
|
||||||
|
|
||||||
%files devel
|
%files devel
|
||||||
%{_qt6_headerdir}/QtJsonRpc/
|
%{_qt6_headerdir}/QtJsonRpc/
|
||||||
%{_qt6_headerdir}/QtLanguageServer/
|
%{_qt6_headerdir}/QtLanguageServer/
|
||||||
|
%{_qt6_libdir}/libQt6JsonRpc.a
|
||||||
%{_qt6_libdir}/libQt6JsonRpc.prl
|
%{_qt6_libdir}/libQt6JsonRpc.prl
|
||||||
%{_qt6_libdir}/libQt6JsonRpc.so
|
%{_qt6_libdir}/libQt6LanguageServer.a
|
||||||
%{_qt6_libdir}/libQt6LanguageServer.prl
|
%{_qt6_libdir}/libQt6LanguageServer.prl
|
||||||
%{_qt6_libdir}/libQt6LanguageServer.so
|
|
||||||
%{_qt6_libdir}/cmake/Qt6BuildInternals/StandaloneTests/QtLanguageServer*
|
%{_qt6_libdir}/cmake/Qt6BuildInternals/StandaloneTests/QtLanguageServer*
|
||||||
%{_qt6_libdir}/cmake/Qt6JsonRpcPrivate/
|
%{_qt6_libdir}/cmake/Qt6JsonRpcPrivate/
|
||||||
%{_qt6_libdir}/cmake/Qt6LanguageServerPrivate/
|
%{_qt6_libdir}/cmake/Qt6LanguageServerPrivate/
|
||||||
@ -77,10 +78,16 @@ Requires: qt6-qtbase-devel%{?_isa}
|
|||||||
%{_qt6_libdir}/qt6/metatypes/qt6*_metatypes.json
|
%{_qt6_libdir}/qt6/metatypes/qt6*_metatypes.json
|
||||||
%{_qt6_libdir}/qt6/modules/JsonRpcPrivate.json
|
%{_qt6_libdir}/qt6/modules/JsonRpcPrivate.json
|
||||||
%{_qt6_libdir}/qt6/modules/LanguageServerPrivate.json
|
%{_qt6_libdir}/qt6/modules/LanguageServerPrivate.json
|
||||||
#{_qt6_libdir}/pkgconfig/*.pc
|
%{_qt6_libdir}/qt6/sbom/qtlanguageserver-6.8.1.spdx
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Dec 3 2024 Raven <raven@sysadmins.ws> - 6.8.1-1
|
||||||
|
- 6.8.1
|
||||||
|
|
||||||
|
* Thu Oct 10 2024 Raven <raven@sysadmins.ws> - 6.8.0-1
|
||||||
|
- 6.8.0
|
||||||
|
|
||||||
* Mon Sep 30 2024 Raven <raven@sysadmins.ws> - 6.7.3-1
|
* Mon Sep 30 2024 Raven <raven@sysadmins.ws> - 6.7.3-1
|
||||||
- 6.7.3
|
- 6.7.3
|
||||||
|
|
||||||
|
|||||||
@ -10,7 +10,7 @@
|
|||||||
|
|
||||||
Summary: Qt6 - Location Libraries
|
Summary: Qt6 - Location Libraries
|
||||||
Name: qt6-%{qt_module}
|
Name: qt6-%{qt_module}
|
||||||
Version: 6.7.3
|
Version: 6.8.1
|
||||||
Release: 1%{?dist}
|
Release: 1%{?dist}
|
||||||
|
|
||||||
# Rest of the licenses are for Qt code in src/location and src/plugins
|
# Rest of the licenses are for Qt code in src/location and src/plugins
|
||||||
@ -117,6 +117,7 @@ popd
|
|||||||
%{_qt6_archdatadir}/mkspecs/modules/qt_lib_location*.pri
|
%{_qt6_archdatadir}/mkspecs/modules/qt_lib_location*.pri
|
||||||
%{_qt6_libdir}/qt6/metatypes/qt6*_metatypes.json
|
%{_qt6_libdir}/qt6/metatypes/qt6*_metatypes.json
|
||||||
%{_qt6_libdir}/qt6/modules/*.json
|
%{_qt6_libdir}/qt6/modules/*.json
|
||||||
|
%{_qt6_libdir}/qt6/sbom/%{qt_module}-*.spdx
|
||||||
%{_qt6_libdir}/pkgconfig/*.pc
|
%{_qt6_libdir}/pkgconfig/*.pc
|
||||||
|
|
||||||
%if 0%{?examples}
|
%if 0%{?examples}
|
||||||
@ -125,6 +126,12 @@ popd
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Dec 3 2024 Raven <raven@sysadmins.ws> - 6.8.1-1
|
||||||
|
- 6.8.1
|
||||||
|
|
||||||
|
* Thu Oct 10 2024 Raven <raven@sysadmins.ws> - 6.8.0-1
|
||||||
|
- 6.8.0
|
||||||
|
|
||||||
* Mon Sep 30 2024 Raven <raven@sysadmins.ws> - 6.7.3-1
|
* Mon Sep 30 2024 Raven <raven@sysadmins.ws> - 6.7.3-1
|
||||||
- 6.7.3
|
- 6.7.3
|
||||||
|
|
||||||
|
|||||||
@ -8,7 +8,7 @@
|
|||||||
|
|
||||||
Summary: Qt6 - Lottie Animation
|
Summary: Qt6 - Lottie Animation
|
||||||
Name: qt6-%{qt_module}
|
Name: qt6-%{qt_module}
|
||||||
Version: 6.7.3
|
Version: 6.8.1
|
||||||
Release: 1%{?dist}
|
Release: 1%{?dist}
|
||||||
|
|
||||||
License: GPL-3.0-only WITH Qt-GPL-exception-1.0
|
License: GPL-3.0-only WITH Qt-GPL-exception-1.0
|
||||||
@ -76,9 +76,16 @@ Requires: qt6-qtbase-devel%{?_isa}
|
|||||||
%{_qt6_archdatadir}/mkspecs/modules/*
|
%{_qt6_archdatadir}/mkspecs/modules/*
|
||||||
%{_qt6_libdir}/qt6/metatypes/qt6*_metatypes.json
|
%{_qt6_libdir}/qt6/metatypes/qt6*_metatypes.json
|
||||||
%{_qt6_libdir}/qt6/modules/*.json
|
%{_qt6_libdir}/qt6/modules/*.json
|
||||||
|
%{_qt6_libdir}/qt6/sbom/%{qt_module}-*.spdx
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Dec 3 2024 Raven <raven@sysadmins.ws> - 6.8.1-1
|
||||||
|
- 6.8.1
|
||||||
|
|
||||||
|
* Thu Oct 10 2024 Raven <raven@sysadmins.ws> - 6.8.0-1
|
||||||
|
- 6.8.0
|
||||||
|
|
||||||
* Mon Sep 30 2024 Raven <raven@sysadmins.ws> - 6.7.3-1
|
* Mon Sep 30 2024 Raven <raven@sysadmins.ws> - 6.7.3-1
|
||||||
- 6.7.3
|
- 6.7.3
|
||||||
|
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
%global qt_module qtmqtt
|
%global qt_module qtmqtt
|
||||||
|
|
||||||
Name: qt6-%{qt_module}
|
Name: qt6-%{qt_module}
|
||||||
Version: 6.7.3
|
Version: 6.8.1
|
||||||
Release: 1%{?dist}
|
Release: 1%{?dist}
|
||||||
Summary: Qt6 - Mqtt module
|
Summary: Qt6 - Mqtt module
|
||||||
|
|
||||||
@ -62,6 +62,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
|
|||||||
%{_qt6_headerdir}/QtMqtt/*
|
%{_qt6_headerdir}/QtMqtt/*
|
||||||
%{_qt6_libdir}/qt6/modules/*.json
|
%{_qt6_libdir}/qt6/modules/*.json
|
||||||
%{_qt6_libdir}/qt6/metatypes/qt6*_metatypes.json
|
%{_qt6_libdir}/qt6/metatypes/qt6*_metatypes.json
|
||||||
|
%{_qt6_libdir}/qt6/sbom/%{qt_module}-*.spdx
|
||||||
%dir %{_qt6_libdir}/cmake/Qt6Mqtt/
|
%dir %{_qt6_libdir}/cmake/Qt6Mqtt/
|
||||||
%dir %{_qt6_headerdir}/QtMqtt
|
%dir %{_qt6_headerdir}/QtMqtt
|
||||||
|
|
||||||
@ -69,6 +70,12 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
|
|||||||
%{_qt6_examplesdir}
|
%{_qt6_examplesdir}
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Dec 3 2024 Raven <raven@sysadmins.ws> - 6.8.1-1
|
||||||
|
- 6.8.1
|
||||||
|
|
||||||
|
* Thu Oct 10 2024 Raven <raven@sysadmins.ws> - 6.8.0-1
|
||||||
|
- 6.8.0
|
||||||
|
|
||||||
* Mon Sep 30 2024 Raven <raven@sysadmins.ws> - 6.7.3-1
|
* Mon Sep 30 2024 Raven <raven@sysadmins.ws> - 6.7.3-1
|
||||||
- 6.7.3
|
- 6.7.3
|
||||||
|
|
||||||
|
|||||||
@ -16,7 +16,7 @@
|
|||||||
|
|
||||||
Summary: Qt6 - Multimedia support
|
Summary: Qt6 - Multimedia support
|
||||||
Name: qt6-%{qt_module}
|
Name: qt6-%{qt_module}
|
||||||
Version: 6.7.3
|
Version: 6.8.1
|
||||||
Release: 1%{?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
|
||||||
@ -30,6 +30,8 @@ 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-fix-pkgconfig-path.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)$
|
||||||
|
|
||||||
@ -116,7 +118,10 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
|
|||||||
%enable_devtoolset14
|
%enable_devtoolset14
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%cmake_qt6 -DQT_BUILD_EXAMPLES:BOOL=%{?examples:ON}%{!?examples:OFF}
|
%cmake_qt6 \
|
||||||
|
-DQT_BUILD_EXAMPLES:BOOL=%{?examples:ON}%{!?examples:OFF} \
|
||||||
|
-DINPUT_gstreamer:BOOL=TRUE \
|
||||||
|
-DINPUT_ffmpeg:BOOL=TRUE
|
||||||
|
|
||||||
%cmake_build
|
%cmake_build
|
||||||
|
|
||||||
@ -150,23 +155,24 @@ popd
|
|||||||
%dir %{_qt6_archdatadir}/qml/QtQuick3D/SpatialAudio
|
%dir %{_qt6_archdatadir}/qml/QtQuick3D/SpatialAudio
|
||||||
%{_qt6_archdatadir}/qml/QtQuick3D/SpatialAudio/
|
%{_qt6_archdatadir}/qml/QtQuick3D/SpatialAudio/
|
||||||
%dir %{_qt6_plugindir}/multimedia
|
%dir %{_qt6_plugindir}/multimedia
|
||||||
%{_qt6_plugindir}/multimedia/libgstreamermediaplugin.so
|
#{_qt6_plugindir}/multimedia/libgstreamermediaplugin.so
|
||||||
%if %{with ffmpeg}
|
%if %{with ffmpeg}
|
||||||
%{_qt6_plugindir}/multimedia/libffmpegmediaplugin.so
|
%{_qt6_plugindir}/multimedia/libffmpegmediaplugin.so
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%files devel
|
%files devel
|
||||||
%{_qt6_headerdir}/QtQGstreamerMediaPluginImpl/
|
#{_qt6_headerdir}/QtQGstreamerMediaPluginImpl/
|
||||||
%{_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_headerdir}/QtMultimediaTestLib/
|
||||||
%{_qt6_libdir}/libQt6BundledResonanceAudio.a
|
%{_qt6_libdir}/libQt6BundledResonanceAudio.a
|
||||||
%{_qt6_libdir}/libQt6Multimedia.so
|
%{_qt6_libdir}/libQt6Multimedia.so
|
||||||
%{_qt6_libdir}/libQt6Multimedia.prl
|
%{_qt6_libdir}/libQt6Multimedia.prl
|
||||||
%{_qt6_libdir}/libQt6QGstreamerMediaPluginImpl.a
|
#{_qt6_libdir}/libQt6QGstreamerMediaPluginImpl.a
|
||||||
%{_qt6_libdir}/libQt6QGstreamerMediaPluginImpl.prl
|
#{_qt6_libdir}/libQt6QGstreamerMediaPluginImpl.prl
|
||||||
%{_qt6_libdir}/libQt6MultimediaQuick.so
|
%{_qt6_libdir}/libQt6MultimediaQuick.so
|
||||||
%{_qt6_libdir}/libQt6MultimediaQuick.prl
|
%{_qt6_libdir}/libQt6MultimediaQuick.prl
|
||||||
%{_qt6_libdir}/libQt6MultimediaWidgets.so
|
%{_qt6_libdir}/libQt6MultimediaWidgets.so
|
||||||
@ -175,12 +181,14 @@ popd
|
|||||||
%{_qt6_libdir}/libQt6SpatialAudio.prl
|
%{_qt6_libdir}/libQt6SpatialAudio.prl
|
||||||
%{_qt6_libdir}/libQt6Quick3DSpatialAudio.so
|
%{_qt6_libdir}/libQt6Quick3DSpatialAudio.so
|
||||||
%{_qt6_libdir}/libQt6Quick3DSpatialAudio.prl
|
%{_qt6_libdir}/libQt6Quick3DSpatialAudio.prl
|
||||||
|
%{_qt6_libdir}/libQt6MultimediaTestLib.a
|
||||||
|
%{_qt6_libdir}/libQt6MultimediaTestLib.prl
|
||||||
%{_qt6_libdir}/cmake/Qt6/*.cmake
|
%{_qt6_libdir}/cmake/Qt6/*.cmake
|
||||||
%{_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/Qt6QGstreamerMediaPluginImplPrivate/
|
#dir %{_qt6_libdir}/cmake/Qt6QGstreamerMediaPluginImplPrivate/
|
||||||
%{_qt6_libdir}/cmake/Qt6QGstreamerMediaPluginImplPrivate/*.cmake
|
#{_qt6_libdir}/cmake/Qt6QGstreamerMediaPluginImplPrivate/*.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
|
||||||
@ -193,9 +201,12 @@ popd
|
|||||||
%{_qt6_libdir}/cmake/Qt6Quick3DSpatialAudioPrivate/*cmake
|
%{_qt6_libdir}/cmake/Qt6Quick3DSpatialAudioPrivate/*cmake
|
||||||
%dir %{_qt6_libdir}/cmake/Qt6Qml/QmlPlugins
|
%dir %{_qt6_libdir}/cmake/Qt6Qml/QmlPlugins
|
||||||
%{_qt6_libdir}/cmake/Qt6Qml/QmlPlugins/*.cmake
|
%{_qt6_libdir}/cmake/Qt6Qml/QmlPlugins/*.cmake
|
||||||
|
%dir %{_qt6_libdir}/cmake/Qt6MultimediaTestLibPrivate/
|
||||||
|
%{_qt6_libdir}/cmake/Qt6MultimediaTestLibPrivate/*.cmake
|
||||||
%{_qt6_archdatadir}/mkspecs/modules/*.pri
|
%{_qt6_archdatadir}/mkspecs/modules/*.pri
|
||||||
%{_qt6_libdir}/qt6/metatypes/qt6*_metatypes.json
|
%{_qt6_libdir}/qt6/metatypes/qt6*_metatypes.json
|
||||||
%{_qt6_libdir}/qt6/modules/*.json
|
%{_qt6_libdir}/qt6/modules/*.json
|
||||||
|
%{_qt6_libdir}/qt6/sbom/%{qt_module}-*.spdx
|
||||||
%{_qt6_libdir}/pkgconfig/*.pc
|
%{_qt6_libdir}/pkgconfig/*.pc
|
||||||
|
|
||||||
|
|
||||||
@ -206,6 +217,12 @@ popd
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Dec 3 2024 Raven <raven@sysadmins.ws> - 6.8.1-1
|
||||||
|
- 6.8.1
|
||||||
|
|
||||||
|
* Thu Oct 10 2024 Raven <raven@sysadmins.ws> - 6.8.0-1
|
||||||
|
- 6.8.0
|
||||||
|
|
||||||
* Mon Sep 30 2024 Raven <raven@sysadmins.ws> - 6.7.3-1
|
* Mon Sep 30 2024 Raven <raven@sysadmins.ws> - 6.7.3-1
|
||||||
- 6.7.3
|
- 6.7.3
|
||||||
|
|
||||||
|
|||||||
@ -0,0 +1,12 @@
|
|||||||
|
diff -Naur a/cmake/FindFFmpeg.cmake b/cmake/FindFFmpeg.cmake
|
||||||
|
--- a/cmake/FindFFmpeg.cmake 2024-11-22 13:31:25.000000000 +0600
|
||||||
|
+++ b/cmake/FindFFmpeg.cmake 2024-12-26 18:07:25.822311829 +0600
|
||||||
|
@@ -255,7 +255,7 @@
|
||||||
|
|
||||||
|
# The pkgconfig directory is always in lib/pkgconfig/, even on Windows
|
||||||
|
# where libs and dlls are in bin/
|
||||||
|
- set(PC_FILE ${${_component}_LIBRARY_DIR}/../lib/pkgconfig/lib${lib}.pc)
|
||||||
|
+ set(PC_FILE ${${_component}_LIBRARY_DIR}/pkgconfig/lib${lib}.pc)
|
||||||
|
|
||||||
|
if(EXISTS ${PC_FILE})
|
||||||
|
file(READ ${PC_FILE} pcfile)
|
||||||
@ -10,7 +10,7 @@
|
|||||||
|
|
||||||
Summary: Qt6 - NetworkAuth component
|
Summary: Qt6 - NetworkAuth component
|
||||||
Name: qt6-%{qt_module}
|
Name: qt6-%{qt_module}
|
||||||
Version: 6.7.3
|
Version: 6.8.1
|
||||||
Release: 1%{?dist}
|
Release: 1%{?dist}
|
||||||
|
|
||||||
License: GPL-3.0-only WITH Qt-GPL-exception-1.0
|
License: GPL-3.0-only WITH Qt-GPL-exception-1.0
|
||||||
@ -100,6 +100,7 @@ popd
|
|||||||
%{_qt6_archdatadir}/mkspecs/modules/qt_lib_networkauth*.pri
|
%{_qt6_archdatadir}/mkspecs/modules/qt_lib_networkauth*.pri
|
||||||
%{_qt6_libdir}/qt6/modules/*.json
|
%{_qt6_libdir}/qt6/modules/*.json
|
||||||
%{_qt6_libdir}/qt6/metatypes/qt6*_metatypes.json
|
%{_qt6_libdir}/qt6/metatypes/qt6*_metatypes.json
|
||||||
|
%{_qt6_libdir}/qt6/sbom/%{qt_module}-*.spdx
|
||||||
%{_qt6_libdir}/pkgconfig/*.pc
|
%{_qt6_libdir}/pkgconfig/*.pc
|
||||||
|
|
||||||
%if 0%{?examples}
|
%if 0%{?examples}
|
||||||
@ -109,6 +110,12 @@ popd
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Dec 3 2024 Raven <raven@sysadmins.ws> - 6.8.1-1
|
||||||
|
- 6.8.1
|
||||||
|
|
||||||
|
* Thu Oct 10 2024 Raven <raven@sysadmins.ws> - 6.8.0-1
|
||||||
|
- 6.8.0
|
||||||
|
|
||||||
* Mon Sep 30 2024 Raven <raven@sysadmins.ws> - 6.7.3-1
|
* Mon Sep 30 2024 Raven <raven@sysadmins.ws> - 6.7.3-1
|
||||||
- 6.7.3
|
- 6.7.3
|
||||||
|
|
||||||
|
|||||||
@ -4,7 +4,7 @@
|
|||||||
|
|
||||||
Summary: Qt6 - OPC UA component
|
Summary: Qt6 - OPC UA component
|
||||||
Name: qt6-%{qt_module}
|
Name: qt6-%{qt_module}
|
||||||
Version: 6.7.3
|
Version: 6.8.1
|
||||||
Release: 1%{?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
|
||||||
@ -16,8 +16,9 @@ Source0: https://github.com/qt/%{qt_module}/archive/refs/tags/v%{version}/%{qt_m
|
|||||||
|
|
||||||
## upstreamable patches
|
## upstreamable patches
|
||||||
|
|
||||||
|
|
||||||
BuildRequires: cmake
|
BuildRequires: cmake
|
||||||
BuildRequires: gcc-toolset-11-gcc-c++
|
BuildRequires: gcc-toolset-14-gcc-c++
|
||||||
BuildRequires: ninja-build
|
BuildRequires: ninja-build
|
||||||
BuildRequires: qt6-rpm-macros
|
BuildRequires: qt6-rpm-macros
|
||||||
BuildRequires: qt6-qtbase-devel >= %{version}
|
BuildRequires: qt6-qtbase-devel >= %{version}
|
||||||
@ -91,6 +92,7 @@ Requires: %{name}-devel%{?_isa} = %{version}-%{release}
|
|||||||
%{_qt6_archdatadir}/mkspecs/modules/*
|
%{_qt6_archdatadir}/mkspecs/modules/*
|
||||||
%{_qt6_libdir}/qt6/metatypes/qt6*_metatypes.json
|
%{_qt6_libdir}/qt6/metatypes/qt6*_metatypes.json
|
||||||
%{_qt6_libdir}/qt6/modules/*.json
|
%{_qt6_libdir}/qt6/modules/*.json
|
||||||
|
%{_qt6_libdir}/qt6/sbom/%{qt_module}-*.spdx
|
||||||
%{_qt6_libdir}/pkgconfig/*.pc
|
%{_qt6_libdir}/pkgconfig/*.pc
|
||||||
|
|
||||||
%if 0%{?examples}
|
%if 0%{?examples}
|
||||||
@ -100,6 +102,12 @@ Requires: %{name}-devel%{?_isa} = %{version}-%{release}
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Dec 3 2024 Raven <raven@sysadmins.ws> - 6.8.1-1
|
||||||
|
- 6.8.1
|
||||||
|
|
||||||
|
* Thu Oct 10 2024 Raven <raven@sysadmins.ws> - 6.8.0-1
|
||||||
|
- 6.8.0
|
||||||
|
|
||||||
* Mon Sep 30 2024 Raven <raven@sysadmins.ws> - 6.7.3-1
|
* Mon Sep 30 2024 Raven <raven@sysadmins.ws> - 6.7.3-1
|
||||||
- 6.7.3
|
- 6.7.3
|
||||||
|
|
||||||
|
|||||||
@ -10,7 +10,7 @@
|
|||||||
|
|
||||||
Summary: Qt6 - Positioning component
|
Summary: Qt6 - Positioning component
|
||||||
Name: qt6-%{qt_module}
|
Name: qt6-%{qt_module}
|
||||||
Version: 6.7.3
|
Version: 6.8.1
|
||||||
Release: 1%{?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
|
||||||
@ -140,6 +140,7 @@ popd
|
|||||||
%{_qt6_archdatadir}/mkspecs/modules/qt_lib_positioning*.pri
|
%{_qt6_archdatadir}/mkspecs/modules/qt_lib_positioning*.pri
|
||||||
%{_qt6_libdir}/qt6/metatypes/qt6*_metatypes.json
|
%{_qt6_libdir}/qt6/metatypes/qt6*_metatypes.json
|
||||||
%{_qt6_libdir}/qt6/modules/*.json
|
%{_qt6_libdir}/qt6/modules/*.json
|
||||||
|
%{_qt6_libdir}/qt6/sbom/%{qt_module}-*.spdx
|
||||||
%{_qt6_libdir}/pkgconfig/*.pc
|
%{_qt6_libdir}/pkgconfig/*.pc
|
||||||
|
|
||||||
%if 0%{?examples}
|
%if 0%{?examples}
|
||||||
@ -148,6 +149,12 @@ popd
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Dec 3 2024 Raven <raven@sysadmins.ws> - 6.8.1-1
|
||||||
|
- 6.8.1
|
||||||
|
|
||||||
|
* Thu Oct 10 2024 Raven <raven@sysadmins.ws> - 6.8.0-1
|
||||||
|
- 6.8.0
|
||||||
|
|
||||||
* Mon Sep 30 2024 Raven <raven@sysadmins.ws> - 6.7.3-1
|
* Mon Sep 30 2024 Raven <raven@sysadmins.ws> - 6.7.3-1
|
||||||
- 6.7.3
|
- 6.7.3
|
||||||
|
|
||||||
|
|||||||
@ -10,7 +10,7 @@
|
|||||||
|
|
||||||
Summary: Qt6 - Quick3D Libraries and utilities
|
Summary: Qt6 - Quick3D Libraries and utilities
|
||||||
Name: qt6-%{qt_module}
|
Name: qt6-%{qt_module}
|
||||||
Version: 6.7.3
|
Version: 6.8.1
|
||||||
Release: 1%{?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
|
||||||
@ -40,6 +40,7 @@ BuildRequires: qt6-qtdeclarative-devel
|
|||||||
BuildRequires: qt6-qtdeclarative-static
|
BuildRequires: qt6-qtdeclarative-static
|
||||||
BuildRequires: qt6-qtquicktimeline-devel
|
BuildRequires: qt6-qtquicktimeline-devel
|
||||||
BuildRequires: qt6-qtshadertools-devel
|
BuildRequires: qt6-qtshadertools-devel
|
||||||
|
BuildRequires: cmake(OpenXR)
|
||||||
|
|
||||||
#if 0{?fedora}
|
#if 0{?fedora}
|
||||||
# BuildRequires: pkgconfig(assimp) >= 5.0.0
|
# BuildRequires: pkgconfig(assimp) >= 5.0.0
|
||||||
@ -148,6 +149,7 @@ popd
|
|||||||
%{_qt6_libdir}/libQt6Quick3DHelpersImpl.so*
|
%{_qt6_libdir}/libQt6Quick3DHelpersImpl.so*
|
||||||
%{_qt6_libdir}/libQt6Quick3DParticleEffects.so.6*
|
%{_qt6_libdir}/libQt6Quick3DParticleEffects.so.6*
|
||||||
%{_qt6_libdir}/libQt6Quick3DGlslParser.so.6*
|
%{_qt6_libdir}/libQt6Quick3DGlslParser.so.6*
|
||||||
|
%{_qt6_libdir}/libQt6Quick3DXr.so.6*
|
||||||
%dir %{_qt6_qmldir}/QtQuick3D/
|
%dir %{_qt6_qmldir}/QtQuick3D/
|
||||||
%{_qt6_qmldir}/QtQuick3D/
|
%{_qt6_qmldir}/QtQuick3D/
|
||||||
%{_qt6_plugindir}/assetimporters/*.so
|
%{_qt6_plugindir}/assetimporters/*.so
|
||||||
@ -169,6 +171,7 @@ popd
|
|||||||
%{_qt6_bindir}/shapegen
|
%{_qt6_bindir}/shapegen
|
||||||
%{_qt6_archdatadir}/mkspecs/modules/*.pri
|
%{_qt6_archdatadir}/mkspecs/modules/*.pri
|
||||||
%{_qt6_libdir}/qt6/modules/*.json
|
%{_qt6_libdir}/qt6/modules/*.json
|
||||||
|
#%{_qt6_includedir}/QtOpenXR
|
||||||
%{_qt6_includedir}/QtQuick3D
|
%{_qt6_includedir}/QtQuick3D
|
||||||
%{_qt6_includedir}/QtQuick3DAssetImport
|
%{_qt6_includedir}/QtQuick3DAssetImport
|
||||||
%{_qt6_includedir}/QtQuick3DIblBaker
|
%{_qt6_includedir}/QtQuick3DIblBaker
|
||||||
@ -179,6 +182,14 @@ popd
|
|||||||
%{_qt6_includedir}/QtQuick3DHelpers
|
%{_qt6_includedir}/QtQuick3DHelpers
|
||||||
%{_qt6_includedir}/QtQuick3DHelpersImpl
|
%{_qt6_includedir}/QtQuick3DHelpersImpl
|
||||||
%{_qt6_includedir}/QtQuick3DGlslParser
|
%{_qt6_includedir}/QtQuick3DGlslParser
|
||||||
|
%{_qt6_includedir}/QtQuick3DXr
|
||||||
|
%{_qt6_libdir}/cmake/Qt6/FindWrapBundledOpenXRConfigExtra.cmake
|
||||||
|
%{_qt6_libdir}/cmake/Qt6/FindWrapOpenXR.cmake
|
||||||
|
%{_qt6_libdir}/cmake/Qt6/FindWrapSystemOpenXR.cmake
|
||||||
|
#dir %{_qt6_libdir}/cmake/Qt6BundledOpenXR
|
||||||
|
#{_qt6_libdir}/cmake/Qt6BundledOpenXR/*.cmake
|
||||||
|
#dir %{_qt6_libdir}/cmake/Qt6OpenXRPrivate
|
||||||
|
#{_qt6_libdir}/cmake/Qt6OpenXRPrivate/*.cmake
|
||||||
%dir %{_qt6_libdir}/cmake/Qt6Quick3DIblBaker
|
%dir %{_qt6_libdir}/cmake/Qt6Quick3DIblBaker
|
||||||
%{_qt6_libdir}/cmake/Qt6Quick3DIblBaker/*.cmake
|
%{_qt6_libdir}/cmake/Qt6Quick3DIblBaker/*.cmake
|
||||||
%dir %{_qt6_libdir}/cmake/Qt6Quick3DParticles
|
%dir %{_qt6_libdir}/cmake/Qt6Quick3DParticles
|
||||||
@ -214,8 +225,11 @@ popd
|
|||||||
%{_qt6_libdir}/cmake/Qt6Quick3DGlslParserPrivate/*.cmake
|
%{_qt6_libdir}/cmake/Qt6Quick3DGlslParserPrivate/*.cmake
|
||||||
%dir %{_qt6_libdir}/cmake/Qt6Quick3DParticleEffects
|
%dir %{_qt6_libdir}/cmake/Qt6Quick3DParticleEffects
|
||||||
%{_qt6_libdir}/cmake/Qt6Quick3DParticleEffects/*.cmake
|
%{_qt6_libdir}/cmake/Qt6Quick3DParticleEffects/*.cmake
|
||||||
%ifarch x86_64 aarch64
|
%dir %{_qt6_libdir}/cmake/Qt6Quick3DXr
|
||||||
|
%{_qt6_libdir}/cmake/Qt6Quick3DXr/*.cmake
|
||||||
%{_qt6_libdir}/libQt6BundledEmbree.a
|
%{_qt6_libdir}/libQt6BundledEmbree.a
|
||||||
|
%ifarch x86_64 aarch64
|
||||||
|
#{_qt6_libdir}/libQt6BundledOpenXR.a
|
||||||
%endif
|
%endif
|
||||||
%{_qt6_libdir}/libQt6Quick3D.prl
|
%{_qt6_libdir}/libQt6Quick3D.prl
|
||||||
%{_qt6_libdir}/libQt6Quick3D.so
|
%{_qt6_libdir}/libQt6Quick3D.so
|
||||||
@ -241,7 +255,10 @@ popd
|
|||||||
%{_qt6_libdir}/libQt6Quick3DGlslParser.so
|
%{_qt6_libdir}/libQt6Quick3DGlslParser.so
|
||||||
%{_qt6_libdir}/libQt6Quick3DParticleEffects.prl
|
%{_qt6_libdir}/libQt6Quick3DParticleEffects.prl
|
||||||
%{_qt6_libdir}/libQt6Quick3DParticleEffects.so
|
%{_qt6_libdir}/libQt6Quick3DParticleEffects.so
|
||||||
|
%{_qt6_libdir}/libQt6Quick3DXr.prl
|
||||||
|
%{_qt6_libdir}/libQt6Quick3DXr.so
|
||||||
%{_qt6_libdir}/qt6/metatypes/qt6*_metatypes.json
|
%{_qt6_libdir}/qt6/metatypes/qt6*_metatypes.json
|
||||||
|
%{_qt6_libdir}/qt6/sbom/%{qt_module}-*.spdx
|
||||||
%{_qt6_plugindir}/qmltooling/libqmldbg_quick3dprofiler.so
|
%{_qt6_plugindir}/qmltooling/libqmldbg_quick3dprofiler.so
|
||||||
%{_qt6_libdir}/pkgconfig/*.pc
|
%{_qt6_libdir}/pkgconfig/*.pc
|
||||||
|
|
||||||
@ -254,6 +271,12 @@ popd
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Dec 3 2024 Raven <raven@sysadmins.ws> - 6.8.1-1
|
||||||
|
- 6.8.1
|
||||||
|
|
||||||
|
* Thu Oct 10 2024 Raven <raven@sysadmins.ws> - 6.8.0-1
|
||||||
|
- 6.8.0
|
||||||
|
|
||||||
* Mon Sep 30 2024 Raven <raven@sysadmins.ws> - 6.7.3-1
|
* Mon Sep 30 2024 Raven <raven@sysadmins.ws> - 6.7.3-1
|
||||||
- 6.7.3
|
- 6.7.3
|
||||||
|
|
||||||
|
|||||||
@ -8,7 +8,7 @@
|
|||||||
|
|
||||||
Summary: Qt6 - QuickTimeline plugin
|
Summary: Qt6 - QuickTimeline plugin
|
||||||
Name: qt6-%{qt_module}
|
Name: qt6-%{qt_module}
|
||||||
Version: 6.7.3
|
Version: 6.8.1
|
||||||
Release: 1%{?dist}
|
Release: 1%{?dist}
|
||||||
|
|
||||||
License: GPL-3.0-only WITH Qt-GPL-exception-1.0
|
License: GPL-3.0-only WITH Qt-GPL-exception-1.0
|
||||||
@ -92,9 +92,16 @@ Requires: qt6-qtdeclarative-devel%{?_isa}
|
|||||||
%{_qt6_archdatadir}/mkspecs/modules/*.pri
|
%{_qt6_archdatadir}/mkspecs/modules/*.pri
|
||||||
%{_qt6_libdir}/qt6/metatypes/qt6*_metatypes.json
|
%{_qt6_libdir}/qt6/metatypes/qt6*_metatypes.json
|
||||||
%{_qt6_libdir}/qt6/modules/*.json
|
%{_qt6_libdir}/qt6/modules/*.json
|
||||||
|
%{_qt6_libdir}/qt6/sbom/%{qt_module}-*.spdx
|
||||||
%{_qt6_libdir}/pkgconfig/*.pc
|
%{_qt6_libdir}/pkgconfig/*.pc
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Dec 3 2024 Raven <raven@sysadmins.ws> - 6.8.1-1
|
||||||
|
- 6.8.1
|
||||||
|
|
||||||
|
* Thu Oct 10 2024 Raven <raven@sysadmins.ws> - 6.8.0-1
|
||||||
|
- 6.8.0
|
||||||
|
|
||||||
* Mon Sep 30 2024 Raven <raven@sysadmins.ws> - 6.7.3-1
|
* Mon Sep 30 2024 Raven <raven@sysadmins.ws> - 6.7.3-1
|
||||||
- 6.7.3
|
- 6.7.3
|
||||||
|
|
||||||
|
|||||||
@ -10,7 +10,7 @@
|
|||||||
|
|
||||||
Summary: Qt6 - Qt Remote Objects
|
Summary: Qt6 - Qt Remote Objects
|
||||||
Name: qt6-%{qt_module}
|
Name: qt6-%{qt_module}
|
||||||
Version: 6.7.3
|
Version: 6.8.1
|
||||||
Release: 1%{?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
|
||||||
@ -101,6 +101,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
|
|||||||
%{_qt6_archdatadir}/mkspecs/modules/*
|
%{_qt6_archdatadir}/mkspecs/modules/*
|
||||||
%{_qt6_libdir}/qt6/metatypes/qt6*_metatypes.json
|
%{_qt6_libdir}/qt6/metatypes/qt6*_metatypes.json
|
||||||
%{_qt6_libdir}/qt6/modules/*.json
|
%{_qt6_libdir}/qt6/modules/*.json
|
||||||
|
%{_qt6_libdir}/qt6/sbom/%{qt_module}-*.spdx
|
||||||
%{_qt6_libdir}/pkgconfig/*.pc
|
%{_qt6_libdir}/pkgconfig/*.pc
|
||||||
|
|
||||||
%if 0%{?examples}
|
%if 0%{?examples}
|
||||||
@ -110,6 +111,12 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Dec 3 2024 Raven <raven@sysadmins.ws> - 6.8.1-1
|
||||||
|
- 6.8.1
|
||||||
|
|
||||||
|
* Thu Oct 10 2024 Raven <raven@sysadmins.ws> - 6.8.0-1
|
||||||
|
- 6.8.0
|
||||||
|
|
||||||
* Mon Sep 30 2024 Raven <raven@sysadmins.ws> - 6.7.3-1
|
* Mon Sep 30 2024 Raven <raven@sysadmins.ws> - 6.7.3-1
|
||||||
- 6.7.3
|
- 6.7.3
|
||||||
|
|
||||||
|
|||||||
@ -10,7 +10,7 @@
|
|||||||
|
|
||||||
Summary: Qt6 - ScXml component
|
Summary: Qt6 - ScXml component
|
||||||
Name: qt6-%{qt_module}
|
Name: qt6-%{qt_module}
|
||||||
Version: 6.7.3
|
Version: 6.8.1
|
||||||
Release: 1%{?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
|
||||||
@ -110,6 +110,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
|
|||||||
%{_qt6_archdatadir}/mkspecs/modules/*
|
%{_qt6_archdatadir}/mkspecs/modules/*
|
||||||
%{_qt6_libdir}/qt6/modules/*.json
|
%{_qt6_libdir}/qt6/modules/*.json
|
||||||
%{_qt6_libdir}/qt6/metatypes/qt6*_metatypes.json
|
%{_qt6_libdir}/qt6/metatypes/qt6*_metatypes.json
|
||||||
|
%{_qt6_libdir}/qt6/sbom/%{qt_module}-*.spdx
|
||||||
%{_qt6_libdir}/pkgconfig/*.pc
|
%{_qt6_libdir}/pkgconfig/*.pc
|
||||||
|
|
||||||
%if 0%{?examples}
|
%if 0%{?examples}
|
||||||
@ -119,6 +120,12 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Dec 3 2024 Raven <raven@sysadmins.ws> - 6.8.1-1
|
||||||
|
- 6.8.1
|
||||||
|
|
||||||
|
* Thu Oct 10 2024 Raven <raven@sysadmins.ws> - 6.8.0-1
|
||||||
|
- 6.8.0
|
||||||
|
|
||||||
* Mon Sep 30 2024 Raven <raven@sysadmins.ws> - 6.7.3-1
|
* Mon Sep 30 2024 Raven <raven@sysadmins.ws> - 6.7.3-1
|
||||||
- 6.7.3
|
- 6.7.3
|
||||||
|
|
||||||
|
|||||||
@ -10,7 +10,7 @@
|
|||||||
|
|
||||||
Summary: Qt6 - Sensors component
|
Summary: Qt6 - Sensors component
|
||||||
Name: qt6-%{qt_module}
|
Name: qt6-%{qt_module}
|
||||||
Version: 6.7.3
|
Version: 6.8.1
|
||||||
Release: 1%{?dist}
|
Release: 1%{?dist}
|
||||||
|
|
||||||
# See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
|
# See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
|
||||||
@ -121,6 +121,7 @@ popd
|
|||||||
%{_qt6_archdatadir}/mkspecs/modules/qt_lib_sensors*.pri
|
%{_qt6_archdatadir}/mkspecs/modules/qt_lib_sensors*.pri
|
||||||
%{_qt6_libdir}/qt6/metatypes/qt6*_metatypes.json
|
%{_qt6_libdir}/qt6/metatypes/qt6*_metatypes.json
|
||||||
%{_qt6_libdir}/qt6/modules/*.json
|
%{_qt6_libdir}/qt6/modules/*.json
|
||||||
|
%{_qt6_libdir}/qt6/sbom/%{qt_module}-*.spdx
|
||||||
%{_qt6_libdir}/pkgconfig/*.pc
|
%{_qt6_libdir}/pkgconfig/*.pc
|
||||||
|
|
||||||
%if 0%{?examples}
|
%if 0%{?examples}
|
||||||
@ -129,6 +130,12 @@ popd
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Dec 3 2024 Raven <raven@sysadmins.ws> - 6.8.1-1
|
||||||
|
- 6.8.1
|
||||||
|
|
||||||
|
* Thu Oct 10 2024 Raven <raven@sysadmins.ws> - 6.8.0-1
|
||||||
|
- 6.8.0
|
||||||
|
|
||||||
* Mon Sep 30 2024 Raven <raven@sysadmins.ws> - 6.7.3-1
|
* Mon Sep 30 2024 Raven <raven@sysadmins.ws> - 6.7.3-1
|
||||||
- 6.7.3
|
- 6.7.3
|
||||||
|
|
||||||
|
|||||||
@ -10,7 +10,7 @@
|
|||||||
|
|
||||||
Summary: Qt6 - SerialBus component
|
Summary: Qt6 - SerialBus component
|
||||||
Name: qt6-%{qt_module}
|
Name: qt6-%{qt_module}
|
||||||
Version: 6.7.3
|
Version: 6.8.1
|
||||||
Release: 1%{?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
|
||||||
@ -97,6 +97,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
|
|||||||
%{_qt6_archdatadir}/mkspecs/modules/*
|
%{_qt6_archdatadir}/mkspecs/modules/*
|
||||||
%{_qt6_libdir}/qt6/metatypes/qt6*_metatypes.json
|
%{_qt6_libdir}/qt6/metatypes/qt6*_metatypes.json
|
||||||
%{_qt6_libdir}/qt6/modules/*.json
|
%{_qt6_libdir}/qt6/modules/*.json
|
||||||
|
%{_qt6_libdir}/qt6/sbom/%{qt_module}-*.spdx
|
||||||
%{_qt6_libdir}/pkgconfig/*.pc
|
%{_qt6_libdir}/pkgconfig/*.pc
|
||||||
|
|
||||||
%if 0%{?examples}
|
%if 0%{?examples}
|
||||||
@ -106,6 +107,12 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Dec 3 2024 Raven <raven@sysadmins.ws> - 6.8.1-1
|
||||||
|
- 6.8.1
|
||||||
|
|
||||||
|
* Thu Oct 10 2024 Raven <raven@sysadmins.ws> - 6.8.0-1
|
||||||
|
- 6.8.0
|
||||||
|
|
||||||
* Mon Sep 30 2024 Raven <raven@sysadmins.ws> - 6.7.3-1
|
* Mon Sep 30 2024 Raven <raven@sysadmins.ws> - 6.7.3-1
|
||||||
- 6.7.3
|
- 6.7.3
|
||||||
|
|
||||||
|
|||||||
@ -10,7 +10,7 @@
|
|||||||
|
|
||||||
Summary: Qt6 - SerialPort component
|
Summary: Qt6 - SerialPort component
|
||||||
Name: qt6-%{qt_module}
|
Name: qt6-%{qt_module}
|
||||||
Version: 6.7.3
|
Version: 6.8.1
|
||||||
Release: 1%{?dist}
|
Release: 1%{?dist}
|
||||||
|
|
||||||
# See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
|
# See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
|
||||||
@ -101,6 +101,7 @@ popd
|
|||||||
%{_qt6_archdatadir}/mkspecs/modules/qt_lib_serialport*.pri
|
%{_qt6_archdatadir}/mkspecs/modules/qt_lib_serialport*.pri
|
||||||
%{_qt6_libdir}/qt6/metatypes/qt6*_metatypes.json
|
%{_qt6_libdir}/qt6/metatypes/qt6*_metatypes.json
|
||||||
%{_qt6_libdir}/qt6/modules/*.json
|
%{_qt6_libdir}/qt6/modules/*.json
|
||||||
|
%{_qt6_libdir}/qt6/sbom/%{qt_module}-*.spdx
|
||||||
%{_qt6_libdir}/pkgconfig/*.pc
|
%{_qt6_libdir}/pkgconfig/*.pc
|
||||||
|
|
||||||
%if 0%{?examples}
|
%if 0%{?examples}
|
||||||
@ -109,6 +110,12 @@ popd
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Dec 3 2024 Raven <raven@sysadmins.ws> - 6.8.1-1
|
||||||
|
- 6.8.1
|
||||||
|
|
||||||
|
* Thu Oct 10 2024 Raven <raven@sysadmins.ws> - 6.8.0-1
|
||||||
|
- 6.8.0
|
||||||
|
|
||||||
* Mon Sep 30 2024 Raven <raven@sysadmins.ws> - 6.7.3-1
|
* Mon Sep 30 2024 Raven <raven@sysadmins.ws> - 6.7.3-1
|
||||||
- 6.7.3
|
- 6.7.3
|
||||||
|
|
||||||
|
|||||||
@ -8,7 +8,7 @@
|
|||||||
|
|
||||||
Summary: Qt6 - Qt Shader Tools module builds on the SPIR-V Open Source Ecosystem
|
Summary: Qt6 - Qt Shader Tools module builds on the SPIR-V Open Source Ecosystem
|
||||||
Name: qt6-%{qt_module}
|
Name: qt6-%{qt_module}
|
||||||
Version: 6.7.3
|
Version: 6.8.1
|
||||||
Release: 1%{?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
|
||||||
@ -109,9 +109,16 @@ popd
|
|||||||
%dir %{_qt6_libdir}/cmake/Qt6ShaderToolsTools/
|
%dir %{_qt6_libdir}/cmake/Qt6ShaderToolsTools/
|
||||||
%{_qt6_libdir}/cmake/Qt6ShaderToolsTools/*.cmake
|
%{_qt6_libdir}/cmake/Qt6ShaderToolsTools/*.cmake
|
||||||
%{_qt6_libdir}/qt6/metatypes/qt6*_metatypes.json
|
%{_qt6_libdir}/qt6/metatypes/qt6*_metatypes.json
|
||||||
|
%{_qt6_libdir}/qt6/sbom/qtshadertools-6.8.1.spdx
|
||||||
%{_qt6_libdir}/pkgconfig/Qt6ShaderTools.pc
|
%{_qt6_libdir}/pkgconfig/Qt6ShaderTools.pc
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Dec 3 2024 Raven <raven@sysadmins.ws> - 6.8.1-1
|
||||||
|
- 6.8.1
|
||||||
|
|
||||||
|
* Thu Oct 10 2024 Raven <raven@sysadmins.ws> - 6.8.0-1
|
||||||
|
- 6.8.0
|
||||||
|
|
||||||
* Mon Sep 30 2024 Raven <raven@sysadmins.ws> - 6.7.3-1
|
* Mon Sep 30 2024 Raven <raven@sysadmins.ws> - 6.7.3-1
|
||||||
- 6.7.3
|
- 6.7.3
|
||||||
|
|
||||||
|
|||||||
@ -10,7 +10,7 @@
|
|||||||
|
|
||||||
Summary: Qt6 - Speech component
|
Summary: Qt6 - Speech component
|
||||||
Name: qt6-%{qt_module}
|
Name: qt6-%{qt_module}
|
||||||
Version: 6.7.3
|
Version: 6.8.1
|
||||||
Release: 1%{?dist}
|
Release: 1%{?dist}
|
||||||
|
|
||||||
# Code can be either LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only
|
# Code can be either LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only
|
||||||
@ -141,12 +141,19 @@ popd
|
|||||||
%{_qt6_archdatadir}/mkspecs/modules/qt_lib_texttospeech*.pri
|
%{_qt6_archdatadir}/mkspecs/modules/qt_lib_texttospeech*.pri
|
||||||
%{_qt6_libdir}/qt6/modules/*.json
|
%{_qt6_libdir}/qt6/modules/*.json
|
||||||
%{_qt6_libdir}/qt6/metatypes/*.json
|
%{_qt6_libdir}/qt6/metatypes/*.json
|
||||||
|
%{_qt6_libdir}/qt6/sbom/%{qt_module}-*.spdx
|
||||||
|
|
||||||
%files examples
|
%files examples
|
||||||
%{_qt6_examplesdir}/
|
%{_qt6_examplesdir}/
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Dec 3 2024 Raven <raven@sysadmins.ws> - 6.8.1-1
|
||||||
|
- 6.8.1
|
||||||
|
|
||||||
|
* Thu Oct 10 2024 Raven <raven@sysadmins.ws> - 6.8.0-1
|
||||||
|
- 6.8.0
|
||||||
|
|
||||||
* Mon Sep 30 2024 Raven <raven@sysadmins.ws> - 6.7.3-1
|
* Mon Sep 30 2024 Raven <raven@sysadmins.ws> - 6.7.3-1
|
||||||
- 6.7.3
|
- 6.7.3
|
||||||
|
|
||||||
|
|||||||
@ -10,7 +10,7 @@
|
|||||||
|
|
||||||
Summary: Qt6 - Support for rendering and displaying SVG
|
Summary: Qt6 - Support for rendering and displaying SVG
|
||||||
Name: qt6-%{qt_module}
|
Name: qt6-%{qt_module}
|
||||||
Version: 6.7.3
|
Version: 6.8.1
|
||||||
Release: 1%{?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
|
||||||
@ -111,6 +111,7 @@ popd
|
|||||||
%{_qt6_libdir}/cmake/Qt6SvgWidgets/*.cmake
|
%{_qt6_libdir}/cmake/Qt6SvgWidgets/*.cmake
|
||||||
%{_qt6_libdir}/qt6/metatypes/qt6*_metatypes.json
|
%{_qt6_libdir}/qt6/metatypes/qt6*_metatypes.json
|
||||||
%{_qt6_libdir}/qt6/modules/*.json
|
%{_qt6_libdir}/qt6/modules/*.json
|
||||||
|
%{_qt6_libdir}/qt6/sbom/%{qt_module}-*.spdx
|
||||||
%{_qt6_libdir}/pkgconfig/*.pc
|
%{_qt6_libdir}/pkgconfig/*.pc
|
||||||
|
|
||||||
%if 0%{?examples}
|
%if 0%{?examples}
|
||||||
@ -119,6 +120,12 @@ popd
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Dec 3 2024 Raven <raven@sysadmins.ws> - 6.8.1-1
|
||||||
|
- 6.8.1
|
||||||
|
|
||||||
|
* Thu Oct 10 2024 Raven <raven@sysadmins.ws> - 6.8.0-1
|
||||||
|
- 6.8.0
|
||||||
|
|
||||||
* Mon Sep 30 2024 Raven <raven@sysadmins.ws> - 6.7.3-1
|
* Mon Sep 30 2024 Raven <raven@sysadmins.ws> - 6.7.3-1
|
||||||
- 6.7.3
|
- 6.7.3
|
||||||
|
|
||||||
|
|||||||
@ -9,7 +9,7 @@
|
|||||||
|
|
||||||
Summary: Qt6 - QtTool components
|
Summary: Qt6 - QtTool components
|
||||||
Name: qt6-qttools
|
Name: qt6-qttools
|
||||||
Version: 6.7.3
|
Version: 6.8.1
|
||||||
Release: 1%{?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
|
||||||
@ -30,8 +30,6 @@ Patch1: qttools-run-qttools-with-qt6-suffix.patch
|
|||||||
# 32-bit MIPS needs explicit -latomic
|
# 32-bit MIPS needs explicit -latomic
|
||||||
Patch2: qttools-add-libatomic.patch
|
Patch2: qttools-add-libatomic.patch
|
||||||
|
|
||||||
Patch3: qttools-llvm19.patch
|
|
||||||
|
|
||||||
## upstream patches
|
## upstream patches
|
||||||
|
|
||||||
Source20: assistant.desktop
|
Source20: assistant.desktop
|
||||||
@ -152,8 +150,6 @@ Requires: %{name}-common = %{version}-%{release}
|
|||||||
%patch2 -p1 -b .libatomic
|
%patch2 -p1 -b .libatomic
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%patch3 -p1 -b .llvm19
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%enable_devtoolset14
|
%enable_devtoolset14
|
||||||
|
|
||||||
@ -250,6 +246,8 @@ popd
|
|||||||
|
|
||||||
%files libs-help
|
%files libs-help
|
||||||
%{_qt6_libdir}/libQt6Help.so.6*
|
%{_qt6_libdir}/libQt6Help.so.6*
|
||||||
|
%{_qt6_plugindir}/help/*
|
||||||
|
|
||||||
|
|
||||||
%files -n qt6-assistant
|
%files -n qt6-assistant
|
||||||
%{_bindir}/assistant-qt6
|
%{_bindir}/assistant-qt6
|
||||||
@ -353,6 +351,7 @@ popd
|
|||||||
%{_qt6_archdatadir}/mkspecs/modules/qt_lib_uitools_private.pri
|
%{_qt6_archdatadir}/mkspecs/modules/qt_lib_uitools_private.pri
|
||||||
%{_qt6_libdir}/qt6/metatypes/qt6*_metatypes.json
|
%{_qt6_libdir}/qt6/metatypes/qt6*_metatypes.json
|
||||||
%{_qt6_libdir}/qt6/modules/*.json
|
%{_qt6_libdir}/qt6/modules/*.json
|
||||||
|
%{_qt6_libdir}/qt6/sbom/%{qt_module}-*.spdx
|
||||||
%{_qt6_libdir}/pkgconfig/*.pc
|
%{_qt6_libdir}/pkgconfig/*.pc
|
||||||
|
|
||||||
%files static
|
%files static
|
||||||
@ -367,6 +366,12 @@ popd
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Dec 3 2024 Raven <raven@sysadmins.ws> - 6.8.1-1
|
||||||
|
- 6.8.1
|
||||||
|
|
||||||
|
* Thu Oct 10 2024 Raven <raven@sysadmins.ws> - 6.8.0-1
|
||||||
|
- 6.8.0
|
||||||
|
|
||||||
* Mon Sep 30 2024 Raven <raven@sysadmins.ws> - 6.7.3-1
|
* Mon Sep 30 2024 Raven <raven@sysadmins.ws> - 6.7.3-1
|
||||||
- 6.7.3
|
- 6.7.3
|
||||||
|
|
||||||
|
|||||||
@ -1,201 +0,0 @@
|
|||||||
From 687fc1601863ae7a67897bc3590b33bd3bdcc3bc Mon Sep 17 00:00:00 2001
|
|
||||||
From: Joerg Bornemann <joerg.bornemann@qt.io>
|
|
||||||
Date: Mon, 15 Jul 2024 15:17:04 +0200
|
|
||||||
Subject: [PATCH] lupdate/clang: Fix deprecation warning with llvm 18
|
|
||||||
|
|
||||||
Change-Id: Ib22dda34bfdf7a1cd0e9932eec0f6f13a912a688
|
|
||||||
Reviewed-by: Lucie Gerard <lucie.gerard@qt.io>
|
|
||||||
---
|
|
||||||
src/linguist/lupdate/clangtoolastreader.cpp | 6 ++++++
|
|
||||||
1 file changed, 6 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/src/linguist/lupdate/clangtoolastreader.cpp b/src/linguist/lupdate/clangtoolastreader.cpp
|
|
||||||
index 6b85c6ccb3..3db9e0d64a 100644
|
|
||||||
--- a/src/linguist/lupdate/clangtoolastreader.cpp
|
|
||||||
+++ b/src/linguist/lupdate/clangtoolastreader.cpp
|
|
||||||
@@ -782,8 +782,14 @@ bool LupdateVisitor::VisitNamedDecl(clang::NamedDecl *namedDeclaration)
|
|
||||||
if (!fullLocation.isValid() || !fullLocation.getFileEntry())
|
|
||||||
return true;
|
|
||||||
|
|
||||||
+#if (LUPDATE_CLANG_VERSION >= LUPDATE_CLANG_VERSION_CHECK(18,0,0))
|
|
||||||
+ auto fileEntry = fullLocation.getFileEntryRef();
|
|
||||||
+ if (fileEntry && !LupdatePrivate::isFileSignificant(fileEntry->getName().str()))
|
|
||||||
+ return true;
|
|
||||||
+#else
|
|
||||||
if (!LupdatePrivate::isFileSignificant(fullLocation.getFileEntry()->getName().str()))
|
|
||||||
return true;
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
qCDebug(lcClang) << "NamedDecl Name: " << QString::fromStdString(namedDeclaration->getQualifiedNameAsString());
|
|
||||||
qCDebug(lcClang) << "NamedDecl source: " << QString::fromStdString(namedDeclaration->getSourceRange().printToString(
|
|
||||||
---
|
|
||||||
|
|
||||||
From a2f478b20f369132de1e67b30716d5f070d7bf80 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Paul Wicking <paul.wicking@qt.io>
|
|
||||||
Date: Mon, 16 Sep 2024 11:30:02 +0200
|
|
||||||
Subject: [PATCH] QDoc: Adapt clang/AST/QualTypeNames.h to upstream changes
|
|
||||||
MIME-Version: 1.0
|
|
||||||
Content-Type: text/plain; charset=UTF-8
|
|
||||||
Content-Transfer-Encoding: 8bit
|
|
||||||
|
|
||||||
For compatibility reasons, QDoc carries a custom implementation of
|
|
||||||
`llvm-project.git/clang/lib/AST/QualTypeNames.cpp`. When QDoc is built
|
|
||||||
against Clang libraries from LLVM 19, a segmentation fault occurs when
|
|
||||||
generating the documentation for the Qt 3D module as part of a qt5.git
|
|
||||||
super-module documentation build.
|
|
||||||
|
|
||||||
The segmentation fault is the result of a `nullptr` being passed to
|
|
||||||
`clang::TypeName::getFullyQualifiedNestedNameSpecifier` for the
|
|
||||||
`Scope` parameter.
|
|
||||||
|
|
||||||
Upon investigation, it became clear that two changes have been made
|
|
||||||
upstream to the implementation QDoc carries a customized version of,
|
|
||||||
one of which adds a `nullptr` check. Due to the small footprint of
|
|
||||||
both changes, this patch applies both of them to QDoc's
|
|
||||||
`clang/AST/QualTypeNames.h`:
|
|
||||||
|
|
||||||
- The upstream change 16832eb58563f77d917198ad9f86db1c2ee162c9 adds a
|
|
||||||
`nullptr` check, see https://github.com/llvm/llvm-project/pull/94084
|
|
||||||
for details.
|
|
||||||
- The upstream change 35bfbb3b21e9874d03b730e8ce4eb98b1dcd2d28
|
|
||||||
replaces `dyn_cast_or_null<T>(foo)` with `dyn_cast<T>(foo)` for
|
|
||||||
never-null arguments. See
|
|
||||||
https://github.com/llvm/llvm-project/commit/35bfbb3b21e9874d03b730e8ce4eb98b1dcd2d28
|
|
||||||
for details.
|
|
||||||
|
|
||||||
The changes apply also when QDoc is built against Clang libraries from
|
|
||||||
LLVM 17 and 18, with both end-to-end tests passing. Given the nature of
|
|
||||||
the changes, this means these adaptations do not require being wrapped
|
|
||||||
in `#if LIBCLANG_VERSION_MAJOR` checks.
|
|
||||||
|
|
||||||
Fixes: QTBUG-128926
|
|
||||||
Pick-to: 6.8
|
|
||||||
Change-Id: I5863ca213a35042ed325971b42de2bc1e86c6457
|
|
||||||
Reviewed-by: Luca Di Sera <luca.disera@qt.io>
|
|
||||||
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
|
|
||||||
---
|
|
||||||
src/qdoc/qdoc/src/qdoc/clang/AST/QualTypeNames.h | 9 +++++----
|
|
||||||
1 file changed, 5 insertions(+), 4 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/src/qdoc/qdoc/src/qdoc/clang/AST/QualTypeNames.h b/src/qdoc/qdoc/src/qdoc/clang/AST/QualTypeNames.h
|
|
||||||
index c6d331ea86..29a9250dea 100644
|
|
||||||
--- a/src/qdoc/qdoc/src/qdoc/clang/AST/QualTypeNames.h
|
|
||||||
+++ b/src/qdoc/qdoc/src/qdoc/clang/AST/QualTypeNames.h
|
|
||||||
@@ -84,8 +84,9 @@ static inline bool getFullyQualifiedTemplateName(const ASTContext &Ctx,
|
|
||||||
assert(ArgTDecl != nullptr);
|
|
||||||
QualifiedTemplateName *QTName = TName.getAsQualifiedTemplateName();
|
|
||||||
|
|
||||||
- if (QTName && !QTName->hasTemplateKeyword()) {
|
|
||||||
- NNS = QTName->getQualifier();
|
|
||||||
+ if (QTName &&
|
|
||||||
+ !QTName->hasTemplateKeyword() &&
|
|
||||||
+ (NNS = QTName->getQualifier())) {
|
|
||||||
NestedNameSpecifier *QNNS = getFullyQualifiedNestedNameSpecifier(
|
|
||||||
Ctx, NNS, WithGlobalNsPrefix);
|
|
||||||
if (QNNS != NNS) {
|
|
||||||
@@ -288,8 +289,8 @@ static inline NestedNameSpecifier *createNestedNameSpecifierForScopeOf(
|
|
||||||
assert(Decl);
|
|
||||||
|
|
||||||
const DeclContext *DC = Decl->getDeclContext()->getRedeclContext();
|
|
||||||
- const auto *Outer = dyn_cast_or_null<NamedDecl>(DC);
|
|
||||||
- const auto *OuterNS = dyn_cast_or_null<NamespaceDecl>(DC);
|
|
||||||
+ const auto *Outer = dyn_cast<NamedDecl>(DC);
|
|
||||||
+ const auto *OuterNS = dyn_cast<NamespaceDecl>(DC);
|
|
||||||
if (Outer && !(OuterNS && OuterNS->isAnonymousNamespace())) {
|
|
||||||
if (OuterNS) {
|
|
||||||
return createNestedNameSpecifier(Ctx, OuterNS, WithGlobalNsPrefix);
|
|
||||||
---
|
|
||||||
|
|
||||||
From 4a368a06afa5929d8674d2e94c2d7cbd6ad85d4e Mon Sep 17 00:00:00 2001
|
|
||||||
From: Paul Wicking <paul.wicking@qt.io>
|
|
||||||
Date: Fri, 13 Sep 2024 14:37:38 +0200
|
|
||||||
Subject: [PATCH] QDoc: Adapt to breaking changes in LLVM 19
|
|
||||||
MIME-Version: 1.0
|
|
||||||
Content-Type: text/plain; charset=UTF-8
|
|
||||||
Content-Transfer-Encoding: 8bit
|
|
||||||
|
|
||||||
Due to upstream changes in LLVM 19, QDoc fails to compile when linked
|
|
||||||
against Clang libraries from this version of LLVM. Three issues arise;
|
|
||||||
|
|
||||||
- Two cases of passing an argument of wrong type to a function.
|
|
||||||
- One case of accessing a non-existing member of an enumeration.
|
|
||||||
|
|
||||||
One upstream change (see [0]) is responsible for two of the issues:
|
|
||||||
|
|
||||||
- `get_expression_as_string()` is modified such that it correctly
|
|
||||||
obtains the parameter type when calling
|
|
||||||
`get_fully_qualified_type_name()`, by appending
|
|
||||||
`.getArgument().getAsType()` to the call to `getDefaultArgument()`.
|
|
||||||
- `get_default_value_initializer_as_string()` is modified such that it
|
|
||||||
correctly passes the source expression to
|
|
||||||
`get_expression_as_string()`, by appending `.getSourceExpression()`
|
|
||||||
to the call to `getDefaultArgument()`.
|
|
||||||
|
|
||||||
Both of these changes are is incompatible with QDoc built against
|
|
||||||
Clang libraries from earlier versions of LLVM, and are therefore
|
|
||||||
wrapped in #if-ery.
|
|
||||||
|
|
||||||
Finally, LLVM 19 drops a value used in QDoc from the enumeration
|
|
||||||
`clang::TemplateName::Qualified`, see [1]. The enum value `Fully` is
|
|
||||||
removed without replacement. The enum is left with two values,
|
|
||||||
`AsWritten` and `None`. QDoc is modified such that it relies on the
|
|
||||||
former of the two. This change doesn't cause any change in output from
|
|
||||||
QDoc when built against Clang libraries from LLVM 17 and 18, and the
|
|
||||||
change is therefore not wrapped in #if-ery.
|
|
||||||
|
|
||||||
[0] - https://github.com/llvm/llvm-project/commit/e42b799bb28815431f2c5a95f7e13fde3f1b36a1
|
|
||||||
[1] - https://github.com/llvm/llvm-project/commit/9c4a716c12920
|
|
||||||
|
|
||||||
Done-with: Khem Raj <raj.khem@gmail.com>
|
|
||||||
Fixes: QTBUG-128644
|
|
||||||
Pick-to: 6.8
|
|
||||||
Change-Id: I34fbb46cf28b5676b4adda5e563d6d59fc40f602
|
|
||||||
Reviewed-by: Luca Di Sera <luca.disera@qt.io>
|
|
||||||
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
|
|
||||||
---
|
|
||||||
src/qdoc/qdoc/src/qdoc/clangcodeparser.cpp | 13 ++++++++++++-
|
|
||||||
1 file changed, 12 insertions(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/src/qdoc/qdoc/src/qdoc/clangcodeparser.cpp b/src/qdoc/qdoc/src/qdoc/clangcodeparser.cpp
|
|
||||||
index eb3a781bc..385d651ec 100644
|
|
||||||
--- a/src/qdoc/qdoc/src/qdoc/clangcodeparser.cpp
|
|
||||||
+++ b/src/qdoc/qdoc/src/qdoc/clangcodeparser.cpp
|
|
||||||
@@ -207,9 +207,15 @@ static std::string get_expression_as_string(const clang::Expr* expression, const
|
|
||||||
* If the parameter has no default value the empty string will be returned.
|
|
||||||
*/
|
|
||||||
static std::string get_default_value_initializer_as_string(const clang::TemplateTypeParmDecl* parameter) {
|
|
||||||
+#if LIBCLANG_VERSION_MAJOR >= 19
|
|
||||||
+ return (parameter && parameter->hasDefaultArgument()) ?
|
|
||||||
+ get_fully_qualified_type_name(parameter->getDefaultArgument().getArgument().getAsType(), parameter->getASTContext()) :
|
|
||||||
+ "";
|
|
||||||
+#else
|
|
||||||
return (parameter && parameter->hasDefaultArgument()) ?
|
|
||||||
get_fully_qualified_type_name(parameter->getDefaultArgument(), parameter->getASTContext()) :
|
|
||||||
"";
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -223,8 +229,13 @@ static std::string get_default_value_initializer_as_string(const clang::Template
|
|
||||||
* If the parameter as no default value the empty string will be returned.
|
|
||||||
*/
|
|
||||||
static std::string get_default_value_initializer_as_string(const clang::NonTypeTemplateParmDecl* parameter) {
|
|
||||||
+#if LIBCLANG_VERSION_MAJOR >= 19
|
|
||||||
+ return (parameter && parameter->hasDefaultArgument()) ?
|
|
||||||
+ get_expression_as_string(parameter->getDefaultArgument().getSourceExpression(), parameter->getASTContext()) : "";
|
|
||||||
+#else
|
|
||||||
return (parameter && parameter->hasDefaultArgument()) ?
|
|
||||||
get_expression_as_string(parameter->getDefaultArgument(), parameter->getASTContext()) : "";
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -244,7 +255,7 @@ static std::string get_default_value_initializer_as_string(const clang::Template
|
|
||||||
const clang::TemplateName template_name = parameter->getDefaultArgument().getArgument().getAsTemplate();
|
|
||||||
|
|
||||||
llvm::raw_string_ostream ss{default_value};
|
|
||||||
- template_name.print(ss, parameter->getASTContext().getPrintingPolicy(), clang::TemplateName::Qualified::Fully);
|
|
||||||
+ template_name.print(ss, parameter->getASTContext().getPrintingPolicy(), clang::TemplateName::Qualified::AsWritten);
|
|
||||||
}
|
|
||||||
|
|
||||||
return default_value;
|
|
||||||
@ -7,7 +7,7 @@
|
|||||||
|
|
||||||
Summary: Qt6 - QtTranslations module
|
Summary: Qt6 - QtTranslations module
|
||||||
Name: qt6-%{qt_module}
|
Name: qt6-%{qt_module}
|
||||||
Version: 6.7.3
|
Version: 6.8.1
|
||||||
Release: 1%{?dist}
|
Release: 1%{?dist}
|
||||||
|
|
||||||
License: GPL-3.0-only WITH Qt-GPL-exception-1.0
|
License: GPL-3.0-only WITH Qt-GPL-exception-1.0
|
||||||
@ -127,6 +127,12 @@ Provides: %{_qt6}-zh_TW = %{version}-%{release}
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Dec 3 2024 Raven <raven@sysadmins.ws> - 6.8.1-1
|
||||||
|
- 6.8.1
|
||||||
|
|
||||||
|
* Thu Oct 10 2024 Raven <raven@sysadmins.ws> - 6.8.0-1
|
||||||
|
- 6.8.0
|
||||||
|
|
||||||
* Mon Sep 30 2024 Raven <raven@sysadmins.ws> - 6.7.3-1
|
* Mon Sep 30 2024 Raven <raven@sysadmins.ws> - 6.7.3-1
|
||||||
- 6.7.3
|
- 6.7.3
|
||||||
|
|
||||||
|
|||||||
@ -10,7 +10,7 @@
|
|||||||
|
|
||||||
Summary: Qt6 - VirtualKeyboard component
|
Summary: Qt6 - VirtualKeyboard component
|
||||||
Name: qt6-%{qt_module}
|
Name: qt6-%{qt_module}
|
||||||
Version: 6.7.3
|
Version: 6.8.1
|
||||||
Release: 1%{?dist}
|
Release: 1%{?dist}
|
||||||
|
|
||||||
License: GPL-3.0-only WITH Qt-GPL-exception-1.0
|
License: GPL-3.0-only WITH Qt-GPL-exception-1.0
|
||||||
@ -120,6 +120,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
|
|||||||
%{_qt6_archdatadir}/mkspecs/modules/qt_lib_virtualkeyboard*.pri
|
%{_qt6_archdatadir}/mkspecs/modules/qt_lib_virtualkeyboard*.pri
|
||||||
%{_qt6_libdir}/qt6/modules/*.json
|
%{_qt6_libdir}/qt6/modules/*.json
|
||||||
%{_qt6_libdir}/qt6/metatypes/qt6*_metatypes.json
|
%{_qt6_libdir}/qt6/metatypes/qt6*_metatypes.json
|
||||||
|
%{_qt6_libdir}/qt6/sbom/%{qt_module}-*.spdx
|
||||||
%{_qt6_libdir}/pkgconfig/*.pc
|
%{_qt6_libdir}/pkgconfig/*.pc
|
||||||
|
|
||||||
%if 0%{?examples}
|
%if 0%{?examples}
|
||||||
@ -128,6 +129,12 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Dec 3 2024 Raven <raven@sysadmins.ws> - 6.8.1-1
|
||||||
|
- 6.8.1
|
||||||
|
|
||||||
|
* Thu Oct 10 2024 Raven <raven@sysadmins.ws> - 6.8.0-1
|
||||||
|
- 6.8.0
|
||||||
|
|
||||||
* Mon Sep 30 2024 Raven <raven@sysadmins.ws> - 6.7.3-1
|
* Mon Sep 30 2024 Raven <raven@sysadmins.ws> - 6.7.3-1
|
||||||
- 6.7.3
|
- 6.7.3
|
||||||
|
|
||||||
|
|||||||
@ -9,7 +9,7 @@
|
|||||||
|
|
||||||
Summary: Qt6 - Wayland platform support and QtCompositor module
|
Summary: Qt6 - Wayland platform support and QtCompositor module
|
||||||
Name: qt6-%{qt_module}
|
Name: qt6-%{qt_module}
|
||||||
Version: 6.7.3
|
Version: 6.8.1
|
||||||
Release: 1%{?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
|
||||||
@ -29,6 +29,7 @@ Source0: https://download.qt.io/official_releases/qt/%{majmin}/%{version}/submod
|
|||||||
|
|
||||||
Patch0: qtwayland-use-adwaita-decorations-by-default.patch
|
Patch0: qtwayland-use-adwaita-decorations-by-default.patch
|
||||||
|
|
||||||
|
|
||||||
# filter qml provides
|
# filter qml provides
|
||||||
%global __provides_exclude_from ^%{_qt6_archdatadir}/qml/.*\\.so$
|
%global __provides_exclude_from ^%{_qt6_archdatadir}/qml/.*\\.so$
|
||||||
|
|
||||||
@ -113,6 +114,10 @@ popd
|
|||||||
%{_qt6_libdir}/libQt6WaylandCompositor.so.6*
|
%{_qt6_libdir}/libQt6WaylandCompositor.so.6*
|
||||||
%{_qt6_libdir}/libQt6WaylandClient.so.6*
|
%{_qt6_libdir}/libQt6WaylandClient.so.6*
|
||||||
%{_qt6_libdir}/libQt6WaylandCompositor.so.6*
|
%{_qt6_libdir}/libQt6WaylandCompositor.so.6*
|
||||||
|
%{_qt6_libdir}/libQt6WaylandCompositorIviapplication.so.6*
|
||||||
|
%{_qt6_libdir}/libQt6WaylandCompositorPresentationTime.so.6*
|
||||||
|
%{_qt6_libdir}/libQt6WaylandCompositorWLShell.so.6*
|
||||||
|
%{_qt6_libdir}/libQt6WaylandCompositorXdgShell.so.6*
|
||||||
%{_qt6_libdir}/libQt6WaylandClient.so.6*
|
%{_qt6_libdir}/libQt6WaylandClient.so.6*
|
||||||
%{_qt6_libdir}/libQt6WaylandEglClientHwIntegration.so.6*
|
%{_qt6_libdir}/libQt6WaylandEglClientHwIntegration.so.6*
|
||||||
%{_qt6_libdir}/libQt6WaylandEglCompositorHwIntegration.so.6*
|
%{_qt6_libdir}/libQt6WaylandEglCompositorHwIntegration.so.6*
|
||||||
@ -123,24 +128,34 @@ popd
|
|||||||
%{_qt6_plugindir}/wayland-shell-integration
|
%{_qt6_plugindir}/wayland-shell-integration
|
||||||
%{_qt6_plugindir}/platforms/libqwayland-egl.so
|
%{_qt6_plugindir}/platforms/libqwayland-egl.so
|
||||||
%{_qt6_plugindir}/platforms/libqwayland-generic.so
|
%{_qt6_plugindir}/platforms/libqwayland-generic.so
|
||||||
#{_qt6_plugindir}/platforms/libqwayland-xcomposite-egl.so
|
|
||||||
#{_qt6_plugindir}/platforms/libqwayland-xcomposite-glx.so
|
|
||||||
%{_qt6_qmldir}/QtWayland/
|
%{_qt6_qmldir}/QtWayland/
|
||||||
|
|
||||||
%files devel
|
%files devel
|
||||||
%{_qt6_libexecdir}/qtwaylandscanner
|
%{_qt6_libexecdir}/qtwaylandscanner
|
||||||
%{_qt6_headerdir}/QtWaylandCompositor/
|
%{_qt6_headerdir}/QtWaylandCompositor/
|
||||||
|
%{_qt6_headerdir}/QtWaylandCompositorIviapplication/
|
||||||
|
%{_qt6_headerdir}/QtWaylandCompositorPresentationTime/
|
||||||
|
%{_qt6_headerdir}/QtWaylandCompositorWLShell/
|
||||||
|
%{_qt6_headerdir}/QtWaylandCompositorXdgShell/
|
||||||
%{_qt6_headerdir}/QtWaylandClient/
|
%{_qt6_headerdir}/QtWaylandClient/
|
||||||
%{_qt6_headerdir}/QtWaylandEglClientHwIntegration/
|
%{_qt6_headerdir}/QtWaylandEglClientHwIntegration/
|
||||||
%{_qt6_headerdir}/QtWaylandEglCompositorHwIntegration/
|
%{_qt6_headerdir}/QtWaylandEglCompositorHwIntegration/
|
||||||
%{_qt6_headerdir}/QtWlShellIntegration/
|
%{_qt6_headerdir}/QtWlShellIntegration/
|
||||||
%{_qt6_headerdir}/QtWaylandGlobal/
|
%{_qt6_headerdir}/QtWaylandGlobal/
|
||||||
%{_qt6_libdir}/libQt6WaylandCompositor.so
|
%{_qt6_libdir}/libQt6WaylandCompositor.so
|
||||||
|
%{_qt6_libdir}/libQt6WaylandCompositorIviapplication.so
|
||||||
|
%{_qt6_libdir}/libQt6WaylandCompositorPresentationTime.so
|
||||||
|
%{_qt6_libdir}/libQt6WaylandCompositorWLShell.so
|
||||||
|
%{_qt6_libdir}/libQt6WaylandCompositorXdgShell.so
|
||||||
%{_qt6_libdir}/libQt6WaylandClient.so
|
%{_qt6_libdir}/libQt6WaylandClient.so
|
||||||
%{_qt6_libdir}/libQt6WaylandEglClientHwIntegration.so
|
%{_qt6_libdir}/libQt6WaylandEglClientHwIntegration.so
|
||||||
%{_qt6_libdir}/libQt6WaylandEglCompositorHwIntegration.so
|
%{_qt6_libdir}/libQt6WaylandEglCompositorHwIntegration.so
|
||||||
%{_qt6_libdir}/libQt6WlShellIntegration.so
|
%{_qt6_libdir}/libQt6WlShellIntegration.so
|
||||||
%{_qt6_libdir}/libQt6WaylandCompositor.prl
|
%{_qt6_libdir}/libQt6WaylandCompositor.prl
|
||||||
|
%{_qt6_libdir}/libQt6WaylandCompositorIviapplication.prl
|
||||||
|
%{_qt6_libdir}/libQt6WaylandCompositorPresentationTime.prl
|
||||||
|
%{_qt6_libdir}/libQt6WaylandCompositorWLShell.prl
|
||||||
|
%{_qt6_libdir}/libQt6WaylandCompositorXdgShell.prl
|
||||||
%{_qt6_libdir}/libQt6WaylandClient.prl
|
%{_qt6_libdir}/libQt6WaylandClient.prl
|
||||||
%{_qt6_libdir}/libQt6WaylandEglClientHwIntegration.prl
|
%{_qt6_libdir}/libQt6WaylandEglClientHwIntegration.prl
|
||||||
%{_qt6_libdir}/libQt6WaylandEglCompositorHwIntegration.prl
|
%{_qt6_libdir}/libQt6WaylandEglCompositorHwIntegration.prl
|
||||||
@ -153,6 +168,14 @@ popd
|
|||||||
%{_qt6_libdir}/cmake/Qt6Qml/QmlPlugins/*.cmake
|
%{_qt6_libdir}/cmake/Qt6Qml/QmlPlugins/*.cmake
|
||||||
%dir %{_qt6_libdir}/cmake/Qt6WaylandCompositor/
|
%dir %{_qt6_libdir}/cmake/Qt6WaylandCompositor/
|
||||||
%{_qt6_libdir}/cmake/Qt6WaylandCompositor/
|
%{_qt6_libdir}/cmake/Qt6WaylandCompositor/
|
||||||
|
%dir %{_qt6_libdir}/cmake/Qt6WaylandCompositorIviapplication/
|
||||||
|
%{_qt6_libdir}/cmake/Qt6WaylandCompositorIviapplication/
|
||||||
|
%dir %{_qt6_libdir}/cmake/Qt6WaylandCompositorPresentationTime/
|
||||||
|
%{_qt6_libdir}/cmake/Qt6WaylandCompositorPresentationTime/
|
||||||
|
%dir %{_qt6_libdir}/cmake/Qt6WaylandCompositorWLShell/
|
||||||
|
%{_qt6_libdir}/cmake/Qt6WaylandCompositorWLShell/
|
||||||
|
%dir %{_qt6_libdir}/cmake/Qt6WaylandCompositorXdgShell/
|
||||||
|
%{_qt6_libdir}/cmake/Qt6WaylandCompositorXdgShell/
|
||||||
%dir %{_qt6_libdir}/cmake/Qt6WaylandClient/
|
%dir %{_qt6_libdir}/cmake/Qt6WaylandClient/
|
||||||
%{_qt6_libdir}/cmake/Qt6WaylandClient/
|
%{_qt6_libdir}/cmake/Qt6WaylandClient/
|
||||||
%dir %{_qt6_libdir}/cmake/Qt6WaylandScannerTools/
|
%dir %{_qt6_libdir}/cmake/Qt6WaylandScannerTools/
|
||||||
@ -167,6 +190,7 @@ popd
|
|||||||
%{_qt6_libdir}/cmake/Qt6WaylandGlobalPrivate/
|
%{_qt6_libdir}/cmake/Qt6WaylandGlobalPrivate/
|
||||||
%{_qt6_libdir}/qt6/metatypes/qt6*_metatypes.json
|
%{_qt6_libdir}/qt6/metatypes/qt6*_metatypes.json
|
||||||
%{_qt6_libdir}/qt6/modules/*.json
|
%{_qt6_libdir}/qt6/modules/*.json
|
||||||
|
%{_qt6_libdir}/qt6/sbom/%{qt_module}-*.spdx
|
||||||
%{_qt6_libdir}/pkgconfig/*.pc
|
%{_qt6_libdir}/pkgconfig/*.pc
|
||||||
|
|
||||||
|
|
||||||
@ -176,6 +200,12 @@ popd
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Dec 3 2024 Raven <raven@sysadmins.ws> - 6.8.1-1
|
||||||
|
- 6.8.1
|
||||||
|
|
||||||
|
* Thu Oct 10 2024 Raven <raven@sysadmins.ws> - 6.8.0-1
|
||||||
|
- 6.8.0
|
||||||
|
|
||||||
* Mon Sep 30 2024 Raven <raven@sysadmins.ws> - 6.7.3-1
|
* Mon Sep 30 2024 Raven <raven@sysadmins.ws> - 6.7.3-1
|
||||||
- 6.7.3
|
- 6.7.3
|
||||||
|
|
||||||
|
|||||||
@ -10,7 +10,7 @@
|
|||||||
|
|
||||||
Summary: Qt6 - WebChannel component
|
Summary: Qt6 - WebChannel component
|
||||||
Name: qt6-%{qt_module}
|
Name: qt6-%{qt_module}
|
||||||
Version: 6.7.3
|
Version: 6.8.1
|
||||||
Release: 1%{?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
|
||||||
@ -114,6 +114,7 @@ popd
|
|||||||
%{_qt6_archdatadir}/mkspecs/modules/qt_lib_webchannel*.pri
|
%{_qt6_archdatadir}/mkspecs/modules/qt_lib_webchannel*.pri
|
||||||
%{_qt6_libdir}/qt6/metatypes/qt6*_metatypes.json
|
%{_qt6_libdir}/qt6/metatypes/qt6*_metatypes.json
|
||||||
%{_qt6_libdir}/qt6/modules/*.json
|
%{_qt6_libdir}/qt6/modules/*.json
|
||||||
|
%{_qt6_libdir}/qt6/sbom/%{qt_module}-*.spdx
|
||||||
%{_qt6_libdir}/pkgconfig/*.pc
|
%{_qt6_libdir}/pkgconfig/*.pc
|
||||||
|
|
||||||
%if 0%{?examples}
|
%if 0%{?examples}
|
||||||
@ -123,6 +124,12 @@ popd
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Dec 3 2024 Raven <raven@sysadmins.ws> - 6.8.1-1
|
||||||
|
- 6.8.1
|
||||||
|
|
||||||
|
* Thu Oct 10 2024 Raven <raven@sysadmins.ws> - 6.8.0-1
|
||||||
|
- 6.8.0
|
||||||
|
|
||||||
* Mon Sep 30 2024 Raven <raven@sysadmins.ws> - 6.7.3-1
|
* Mon Sep 30 2024 Raven <raven@sysadmins.ws> - 6.7.3-1
|
||||||
- 6.7.3
|
- 6.7.3
|
||||||
|
|
||||||
|
|||||||
@ -0,0 +1,11 @@
|
|||||||
|
--- a/src/3rdparty/chromium/build/linux/strip_binary.gni
|
||||||
|
+++ b/src/3rdparty/chromium/build/linux/strip_binary.gni
|
||||||
|
@@ -20,7 +20,7 @@ template("strip_binary") {
|
||||||
|
"testonly",
|
||||||
|
])
|
||||||
|
action("${target_name}") {
|
||||||
|
- eu_strip_binary = "//buildtools/third_party/eu-strip/bin/eu-strip"
|
||||||
|
+ eu_strip_binary = "/usr/bin/eu-strip"
|
||||||
|
script = "//build/linux/strip_binary.py"
|
||||||
|
|
||||||
|
if (defined(invoker.stripped_binary_output)) {
|
||||||
@ -0,0 +1,25 @@
|
|||||||
|
description: use system libevent
|
||||||
|
author: Michael Gilbert <mgilbert@debian.org>
|
||||||
|
|
||||||
|
--- a/src/3rdparty/chromium/third_party/webrtc/rtc_base/task_queue_libevent.cc
|
||||||
|
+++ b/src/3rdparty/chromium/third_party/webrtc/rtc_base/task_queue_libevent.cc
|
||||||
|
@@ -36,7 +36,7 @@
|
||||||
|
#include "rtc_base/synchronization/mutex.h"
|
||||||
|
#include "rtc_base/thread_annotations.h"
|
||||||
|
#include "rtc_base/time_utils.h"
|
||||||
|
-#include "third_party/libevent/event.h"
|
||||||
|
+#include <event.h>
|
||||||
|
|
||||||
|
namespace webrtc {
|
||||||
|
namespace {
|
||||||
|
--- a/src/3rdparty/chromium/base/message_loop/message_pump_libevent.cc
|
||||||
|
+++ b/src/3rdparty/chromium/base/message_loop/message_pump_libevent.cc
|
||||||
|
@@ -20,7 +20,7 @@
|
||||||
|
#include "base/time/time.h"
|
||||||
|
#include "base/trace_event/base_tracing.h"
|
||||||
|
#include "build/build_config.h"
|
||||||
|
-#include "third_party/libevent/event.h"
|
||||||
|
+#include <event.h>
|
||||||
|
|
||||||
|
#if BUILDFLAG(ENABLE_MESSAGE_PUMP_EPOLL)
|
||||||
|
#include "base/message_loop/message_pump_epoll.h"
|
||||||
11
base/qt6/qt6-qtwebengine/chromium-force-system-opus.patch
Normal file
11
base/qt6/qt6-qtwebengine/chromium-force-system-opus.patch
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
--- a/src/3rdparty/chromium/media/audio/audio_opus_encoder.h
|
||||||
|
+++ b/src/3rdparty/chromium/media/audio/audio_opus_encoder.h
|
||||||
|
@@ -12,7 +12,7 @@
|
||||||
|
#include "media/base/audio_converter.h"
|
||||||
|
#include "media/base/audio_encoder.h"
|
||||||
|
#include "media/base/audio_timestamp_helper.h"
|
||||||
|
-#include "third_party/opus/src/include/opus.h"
|
||||||
|
+#include <opus/opus.h>
|
||||||
|
|
||||||
|
namespace media {
|
||||||
|
|
||||||
32
base/qt6/qt6-qtwebengine/chromium-force-system-zlib.patch
Normal file
32
base/qt6/qt6-qtwebengine/chromium-force-system-zlib.patch
Normal file
@ -0,0 +1,32 @@
|
|||||||
|
description: use system zlib library instead of embedded lzma in courgette
|
||||||
|
author: Michael Gilbert <mgilbert@debian.org>
|
||||||
|
|
||||||
|
--- a/src/3rdparty/chromium/courgette/BUILD.gn
|
||||||
|
+++ b/src/3rdparty/chromium/courgette/BUILD.gn
|
||||||
|
@@ -58,7 +58,6 @@ static_library("courgette_lib") {
|
||||||
|
|
||||||
|
deps = [
|
||||||
|
"//base",
|
||||||
|
- "//third_party/lzma_sdk",
|
||||||
|
]
|
||||||
|
|
||||||
|
public_deps = [
|
||||||
|
@@ -79,7 +78,6 @@ source_set("courgette_common") {
|
||||||
|
]
|
||||||
|
deps = [
|
||||||
|
"//base",
|
||||||
|
- "//third_party/lzma_sdk",
|
||||||
|
]
|
||||||
|
}
|
||||||
|
|
||||||
|
--- a/src/3rdparty/chromium/courgette/crc.cc
|
||||||
|
+++ b/src/3rdparty/chromium/courgette/crc.cc
|
||||||
|
@@ -7,6 +7,8 @@
|
||||||
|
#include <stdint.h>
|
||||||
|
#include <stddef.h>
|
||||||
|
|
||||||
|
+#define COURGETTE_USE_CRC_LIB
|
||||||
|
+
|
||||||
|
#ifdef COURGETTE_USE_CRC_LIB
|
||||||
|
# include "zlib.h"
|
||||||
|
#else
|
||||||
@ -11,10 +11,12 @@
|
|||||||
|
|
||||||
%global use_system_ffmpeg 1
|
%global use_system_ffmpeg 1
|
||||||
|
|
||||||
%if 0%{?rhel} == 8
|
|
||||||
# need libvpx >= 1.12.0
|
# Build with system libvpx is broken at the moment
|
||||||
%global use_system_libvpx 1
|
#if 0%{?rhel} == 8
|
||||||
%endif
|
# need libvpx >= 1.13.0
|
||||||
|
#global use_system_libvpx 1
|
||||||
|
#endif
|
||||||
|
|
||||||
%if 0%{?rhel} >= 9
|
%if 0%{?rhel} >= 9
|
||||||
%global use_system_tiff 1
|
%global use_system_tiff 1
|
||||||
@ -62,16 +64,18 @@
|
|||||||
|
|
||||||
Summary: Qt6 - QtWebEngine components
|
Summary: Qt6 - QtWebEngine components
|
||||||
Name: qt6-qtwebengine
|
Name: qt6-qtwebengine
|
||||||
Version: 6.7.3
|
Version: 6.8.1
|
||||||
Release: 1%{?dist}
|
Release: 1%{?dist}
|
||||||
|
|
||||||
|
%global majmin %(echo %{version} | cut -d. -f1-2)
|
||||||
|
|
||||||
# See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details
|
# See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details
|
||||||
# See also http://qt-project.org/doc/qt-6.0/qtdoc/licensing.html
|
# See also http://qt-project.org/doc/qt-6.0/qtdoc/licensing.html
|
||||||
# The other licenses are from Chromium and the code it bundles
|
# The other licenses are from Chromium and the code it bundles
|
||||||
License: (LGPLv2 with exceptions or GPLv3 with exceptions) and BSD and LGPLv2+ and ASL 2.0 and IJG and MIT and GPLv2+ and ISC and OpenSSL and (MPLv1.1 or GPLv2 or LGPLv2)
|
License: (LGPLv2 with exceptions or GPLv3 with exceptions) and BSD and LGPLv2+ and ASL 2.0 and IJG and MIT and GPLv2+ and ISC and OpenSSL and (MPLv1.1 or GPLv2 or LGPLv2)
|
||||||
URL: http://www.qt.io
|
URL: http://www.qt.io
|
||||||
|
|
||||||
Source0: qtwebengine-everywhere-src-%{version}.tar.xz
|
Source0: https://download.qt.io/official_releases/qt/%{majmin}/%{version}/submodules/qtwebengine-everywhere-src-%{version}.tar.xz
|
||||||
# macros
|
# macros
|
||||||
Source10: macros.qt6-qtwebengine
|
Source10: macros.qt6-qtwebengine
|
||||||
|
|
||||||
@ -96,10 +100,10 @@ Patch50: qtwebengine-fix-build.patch
|
|||||||
Patch110: qtwebengine-webrtc-system-openh264.patch
|
Patch110: qtwebengine-webrtc-system-openh264.patch
|
||||||
Patch111: qtwebengine-blink-system-openh264.patch
|
Patch111: qtwebengine-blink-system-openh264.patch
|
||||||
Patch112: qtwebengine-media-system-openh264.patch
|
Patch112: qtwebengine-media-system-openh264.patch
|
||||||
Patch113: qtwebengine-ffmpeg-7.patch
|
Patch113: qtwebengine-fix-vpx-deps.patch
|
||||||
Patch114: qtwebengine-proprietary-codecs.patch
|
Patch114: qtwebengine-proprietary-codecs.patch
|
||||||
|
|
||||||
Patch500: qtwebengine-everywhere-src-6.7.0-flags-1.patch
|
Patch500: qtwebengine-everywhere-src-6.8.1-flags-1.patch
|
||||||
|
|
||||||
BuildRequires: make
|
BuildRequires: make
|
||||||
BuildRequires: qt6-qtbase-devel
|
BuildRequires: qt6-qtbase-devel
|
||||||
@ -135,9 +139,9 @@ BuildRequires: /usr/bin/gn
|
|||||||
BuildRequires: ninja-build
|
BuildRequires: ninja-build
|
||||||
BuildRequires: cmake >= 3.19
|
BuildRequires: cmake >= 3.19
|
||||||
BuildRequires: bison
|
BuildRequires: bison
|
||||||
BuildRequires: flex
|
BuildRequires: flex elfutils
|
||||||
%if %{with clang}
|
%if %{with clang}
|
||||||
BuildRequires: clang
|
BuildRequires: clang >= 19.0
|
||||||
%else
|
%else
|
||||||
%if 0%{?rhel} && 0%{?rhel} < 10
|
%if 0%{?rhel} && 0%{?rhel} < 10
|
||||||
BuildRequires: gcc-toolset-14-gcc-plugin-annobin
|
BuildRequires: gcc-toolset-14-gcc-plugin-annobin
|
||||||
@ -149,6 +153,7 @@ BuildRequires: gcc-c++ gcc
|
|||||||
%endif
|
%endif
|
||||||
# gn links statically (for now)
|
# gn links statically (for now)
|
||||||
BuildRequires: libstdc++-static
|
BuildRequires: libstdc++-static
|
||||||
|
BuildRequires: libatomic-static
|
||||||
BuildRequires: git-core
|
BuildRequires: git-core
|
||||||
BuildRequires: gperf
|
BuildRequires: gperf
|
||||||
BuildRequires: krb5-devel
|
BuildRequires: krb5-devel
|
||||||
@ -272,7 +277,7 @@ BuildRequires: pkgconfig(vpx) >= 1.12.0
|
|||||||
# see dist/changes-5.10.1 for the version numbers (base, security fixes) and for
|
# see dist/changes-5.10.1 for the version numbers (base, security fixes) and for
|
||||||
# a list of CVEs fixed by the added security backports
|
# a list of CVEs fixed by the added security backports
|
||||||
# See Patch101 for additional fixes applied (up to version 65.0.3325.146)
|
# See Patch101 for additional fixes applied (up to version 65.0.3325.146)
|
||||||
Provides: bundled(chromium) = 129.0.6668.58
|
Provides: bundled(chromium) = 129.0.6668.70
|
||||||
|
|
||||||
# Bundled in src/3rdparty/chromium/third_party:
|
# Bundled in src/3rdparty/chromium/third_party:
|
||||||
# Check src/3rdparty/chromium/third_party/*/README.chromium for version numbers,
|
# Check src/3rdparty/chromium/third_party/*/README.chromium for version numbers,
|
||||||
@ -290,7 +295,7 @@ Provides: bundled(boringssl)
|
|||||||
Provides: bundled(brotli)
|
Provides: bundled(brotli)
|
||||||
%if !0%{?use_system_ffmpeg}
|
%if !0%{?use_system_ffmpeg}
|
||||||
# see src/3rdparty/chromium/third_party/ffmpeg/Changelog for the version number
|
# see src/3rdparty/chromium/third_party/ffmpeg/Changelog for the version number
|
||||||
Provides: bundled(ffmpeg) = 6.0.1
|
Provides: bundled(ffmpeg) = 6.1.0
|
||||||
%endif
|
%endif
|
||||||
Provides: bundled(hunspell) = 1.6.0
|
Provides: bundled(hunspell) = 1.6.0
|
||||||
Provides: bundled(iccjpeg)
|
Provides: bundled(iccjpeg)
|
||||||
@ -303,28 +308,24 @@ Provides: bundled(libjingle)
|
|||||||
# see src/3rdparty/chromium/third_party/libsrtp/CHANGES for the version number
|
# see src/3rdparty/chromium/third_party/libsrtp/CHANGES for the version number
|
||||||
Provides: bundled(libsrtp) = 2.4.0
|
Provides: bundled(libsrtp) = 2.4.0
|
||||||
%if !0%{?use_system_libvpx}
|
%if !0%{?use_system_libvpx}
|
||||||
# claims "Version: 1.6.0", but according to the fine print, this is actually a
|
Provides: bundled(libvpx) = 1.13.1
|
||||||
# snapshot from master from after the 1.6.1 release
|
|
||||||
Provides: bundled(libvpx) = 1.12.0
|
|
||||||
%endif
|
%endif
|
||||||
%if !0%{?use_system_libwebp}
|
%if !0%{?use_system_libwebp}
|
||||||
Provides: bundled(libwebp) = 1.3.0
|
Provides: bundled(libwebp) = 1.3.2
|
||||||
%endif
|
%endif
|
||||||
%if !0%{?use_system_harfbuzz}
|
%if !0%{?use_system_harfbuzz}
|
||||||
Provides: bundled(harfbuzz)
|
Provides: bundled(harfbuzz) = 8.3.0
|
||||||
%endif
|
%endif
|
||||||
# bundled as "libxml"
|
# bundled as "libxml"
|
||||||
# see src/3rdparty/chromium/third_party/libxml/linux/include/libxml/xmlversion.h
|
# see src/3rdparty/chromium/third_party/libxml/linux/include/libxml/xmlversion.h
|
||||||
Provides: bundled(libxml2) = 2.12.0
|
Provides: bundled(libxml2) = 2.12.3
|
||||||
# see src/3rdparty/chromium/third_party/libxslt/linux/config.h for version
|
# see src/3rdparty/chromium/third_party/libxslt/linux/config.h for version
|
||||||
Provides: bundled(libxslt) = 1.1.3
|
Provides: bundled(libxslt) = 1.1.39
|
||||||
Provides: bundled(libXNVCtrl) = 302.17
|
Provides: bundled(libXNVCtrl) = 302.17
|
||||||
Provides: bundled(libyuv) = 1819
|
Provides: bundled(libyuv) = 1819
|
||||||
Provides: bundled(modp_b64)
|
Provides: bundled(modp_b64)
|
||||||
Provides: bundled(openmax_dl)
|
Provides: bundled(openmax_dl)
|
||||||
Provides: bundled(ots)
|
Provides: bundled(ots)
|
||||||
# see src/3rdparty/chromium/third_party/libsrtp/CHANGES for the version number
|
|
||||||
Provides: bundled(libsrtp) = 2.4.0
|
|
||||||
# see src/3rdparty/chromium/third_party/protobuf/CHANGES.txt for the version
|
# see src/3rdparty/chromium/third_party/protobuf/CHANGES.txt for the version
|
||||||
Provides: bundled(protobuf) = 3.20.3
|
Provides: bundled(protobuf) = 3.20.3
|
||||||
Provides: bundled(qcms) = 4
|
Provides: bundled(qcms) = 4
|
||||||
@ -332,7 +333,7 @@ Provides: bundled(sfntly)
|
|||||||
Provides: bundled(skia)
|
Provides: bundled(skia)
|
||||||
# bundled as "smhasher"
|
# bundled as "smhasher"
|
||||||
Provides: bundled(SMHasher) = 0-147
|
Provides: bundled(SMHasher) = 0-147
|
||||||
Provides: bundled(sqlite) = 3.42.0
|
Provides: bundled(sqlite) = 3.43.2
|
||||||
Provides: bundled(usrsctp)
|
Provides: bundled(usrsctp)
|
||||||
Provides: bundled(webrtc) = 90
|
Provides: bundled(webrtc) = 90
|
||||||
|
|
||||||
@ -370,7 +371,7 @@ Provides: bundled(nsURLParsers)
|
|||||||
# Bundled outside of third_party, apparently not considered as such by Chromium:
|
# Bundled outside of third_party, apparently not considered as such by Chromium:
|
||||||
Provides: bundled(mojo)
|
Provides: bundled(mojo)
|
||||||
# see src/3rdparty/chromium/v8/include/v8_version.h for the version number
|
# see src/3rdparty/chromium/v8/include/v8_version.h for the version number
|
||||||
Provides: bundled(v8) = 11.8.172.18
|
Provides: bundled(v8) = 12.2.281.28
|
||||||
# bundled by v8 (src/3rdparty/chromium/v8/src/base/ieee754.cc)
|
# bundled by v8 (src/3rdparty/chromium/v8/src/base/ieee754.cc)
|
||||||
# The version number is 5.3, the last version that upstream released, years ago:
|
# The version number is 5.3, the last version that upstream released, years ago:
|
||||||
# http://www.netlib.org/fdlibm/readme
|
# http://www.netlib.org/fdlibm/readme
|
||||||
@ -438,8 +439,8 @@ install -m0644 %SOURCE100 src/core/common/extensions/extensions_api_provider_qt.
|
|||||||
%patch111 -p1 -b .blink-system-openh264
|
%patch111 -p1 -b .blink-system-openh264
|
||||||
%patch112 -p1 -b .media-system-openh264
|
%patch112 -p1 -b .media-system-openh264
|
||||||
|
|
||||||
%if 0%{?use_system_ffmpeg}
|
%if 0%{?use_system_libvpx}
|
||||||
%patch113 -p1 -b .ffmpeg7
|
#patch113 -p1 -b .build-fix
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%patch114 -p1 -b .codecs
|
%patch114 -p1 -b .codecs
|
||||||
@ -543,13 +544,13 @@ export LDFLAGS="-L/opt/rx/%{_lib}/ -Wl,-rpath=/opt/rx/%{_lib}/ %{__global_ldflag
|
|||||||
-DPython3_EXECUTABLE:FILEPATH=%{_bindir}/python3.11 \
|
-DPython3_EXECUTABLE:FILEPATH=%{_bindir}/python3.11 \
|
||||||
%endif
|
%endif
|
||||||
-DFEATURE_webengine_system_ninja:BOOL=ON \
|
-DFEATURE_webengine_system_ninja:BOOL=ON \
|
||||||
|
-DFEATURE_webengine_vulkan:BOOL=ON \
|
||||||
-DFEATURE_pdf_v8:BOOL=ON \
|
-DFEATURE_pdf_v8:BOOL=ON \
|
||||||
-DFEATURE_pdf_xfa:BOOL=ON \
|
-DFEATURE_pdf_xfa:BOOL=ON \
|
||||||
-DFEATURE_pdf_xfa_bmp:BOOL=ON \
|
-DFEATURE_pdf_xfa_bmp:BOOL=ON \
|
||||||
-DFEATURE_pdf_xfa_gif:BOOL=ON \
|
-DFEATURE_pdf_xfa_gif:BOOL=ON \
|
||||||
-DFEATURE_pdf_xfa_png:BOOL=ON \
|
-DFEATURE_pdf_xfa_png:BOOL=ON \
|
||||||
-DFEATURE_pdf_xfa_tiff:BOOL=ON \
|
-DFEATURE_pdf_xfa_tiff:BOOL=ON
|
||||||
.
|
|
||||||
|
|
||||||
%cmake_build
|
%cmake_build
|
||||||
|
|
||||||
@ -619,6 +620,7 @@ rm -fr %{buildroot}%{_qt6_libdir}/cmake/Qt6BuildInternals
|
|||||||
%{_qt6_mkspecsdir}/modules/*.pri
|
%{_qt6_mkspecsdir}/modules/*.pri
|
||||||
%{_qt6_libdir}/qt6/metatypes/*.json
|
%{_qt6_libdir}/qt6/metatypes/*.json
|
||||||
%{_qt6_libdir}/qt6/modules/*.json
|
%{_qt6_libdir}/qt6/modules/*.json
|
||||||
|
%{_qt6_libdir}/qt6/sbom/%{qt_module}-*.spdx
|
||||||
%{_libdir}/pkgconfig/Qt6*.pc
|
%{_libdir}/pkgconfig/Qt6*.pc
|
||||||
|
|
||||||
%files devtools
|
%files devtools
|
||||||
@ -626,6 +628,12 @@ rm -fr %{buildroot}%{_qt6_libdir}/cmake/Qt6BuildInternals
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Dec 3 2024 Raven <raven@sysadmins.ws> - 6.8.1-1
|
||||||
|
- 6.8.1
|
||||||
|
|
||||||
|
* Thu Oct 10 2024 Raven <raven@sysadmins.ws> - 6.8.0-1
|
||||||
|
- 6.8.0
|
||||||
|
|
||||||
* Mon Sep 30 2024 Raven <raven@sysadmins.ws> - 6.7.3-1
|
* Mon Sep 30 2024 Raven <raven@sysadmins.ws> - 6.7.3-1
|
||||||
- 6.7.3
|
- 6.7.3
|
||||||
|
|
||||||
|
|||||||
@ -1,19 +1,17 @@
|
|||||||
diff --git a/src/3rdparty/chromium/third_party/blink/renderer/modules/mediarecorder/BUILD.gn b/src/3rdparty/chromium/third_party/blink/renderer/modules/mediarecorder/BUILD.gn
|
diff --git a/src/3rdparty/chromium/third_party/blink/renderer/modules/mediarecorder/BUILD.gn b/src/3rdparty/chromium/third_party/blink/renderer/modules/mediarecorder/BUILD.gn
|
||||||
index 0be70ed4b..bec344dec 100644
|
index f05ad3eb2..8c73aa08e 100644
|
||||||
--- a/src/3rdparty/chromium/third_party/blink/renderer/modules/mediarecorder/BUILD.gn
|
--- a/src/3rdparty/chromium/third_party/blink/renderer/modules/mediarecorder/BUILD.gn
|
||||||
+++ b/src/3rdparty/chromium/third_party/blink/renderer/modules/mediarecorder/BUILD.gn
|
+++ b/src/3rdparty/chromium/third_party/blink/renderer/modules/mediarecorder/BUILD.gn
|
||||||
@@ -3,6 +3,7 @@
|
@@ -3,9 +3,19 @@
|
||||||
# found in the LICENSE file.
|
# found in the LICENSE file.
|
||||||
|
|
||||||
import("//build/buildflag_header.gni")
|
import("//build/buildflag_header.gni")
|
||||||
+import("//build/config/linux/pkg_config.gni")
|
+import("//build/config/linux/pkg_config.gni")
|
||||||
import("//media/media_options.gni")
|
import("//media/media_options.gni")
|
||||||
import("//third_party/blink/renderer/modules/modules.gni")
|
import("//third_party/blink/renderer/modules/modules.gni")
|
||||||
import("//third_party/libaom/options.gni")
|
import("//third_party/libaom/options.gni")
|
||||||
@@ -13,6 +14,14 @@ buildflag_header("buildflags") {
|
+import("//third_party/webrtc/webrtc.gni")
|
||||||
flags = [ "RTC_USE_H264=$rtc_use_h264" ]
|
+
|
||||||
}
|
|
||||||
|
|
||||||
+if (rtc_use_h264 && rtc_use_system_openh264) {
|
+if (rtc_use_h264 && rtc_use_system_openh264) {
|
||||||
+ pkg_config("openh264") {
|
+ pkg_config("openh264") {
|
||||||
+ packages = [
|
+ packages = [
|
||||||
@ -21,14 +19,13 @@ index 0be70ed4b..bec344dec 100644
|
|||||||
+ ]
|
+ ]
|
||||||
+ }
|
+ }
|
||||||
+}
|
+}
|
||||||
+
|
|
||||||
blink_modules_sources("mediarecorder") {
|
blink_modules_sources("mediarecorder") {
|
||||||
sources = [
|
sources = [
|
||||||
"audio_track_encoder.cc",
|
@@ -56,7 +66,11 @@ blink_modules_sources("mediarecorder") {
|
||||||
@@ -62,7 +71,11 @@ blink_modules_sources("mediarecorder") {
|
|
||||||
"h264_encoder.h",
|
"h264_encoder.h",
|
||||||
]
|
]
|
||||||
|
|
||||||
- deps += [ "//third_party/openh264:encoder" ]
|
- deps += [ "//third_party/openh264:encoder" ]
|
||||||
+ if (rtc_use_system_openh264) {
|
+ if (rtc_use_system_openh264) {
|
||||||
+ configs += [":openh264"]
|
+ configs += [":openh264"]
|
||||||
@ -36,16 +33,16 @@ index 0be70ed4b..bec344dec 100644
|
|||||||
+ deps += [ "//third_party/openh264:encoder" ]
|
+ deps += [ "//third_party/openh264:encoder" ]
|
||||||
+ }
|
+ }
|
||||||
}
|
}
|
||||||
|
|
||||||
if (enable_libaom) {
|
if (enable_libaom) {
|
||||||
diff --git a/src/3rdparty/chromium/third_party/blink/renderer/modules/webcodecs/BUILD.gn b/src/3rdparty/chromium/third_party/blink/renderer/modules/webcodecs/BUILD.gn
|
diff --git a/src/3rdparty/chromium/third_party/blink/renderer/modules/webcodecs/BUILD.gn b/src/3rdparty/chromium/third_party/blink/renderer/modules/webcodecs/BUILD.gn
|
||||||
index 28205ad14..def86bc8f 100644
|
index 1ad082fe7..7bf84b932 100644
|
||||||
--- a/src/3rdparty/chromium/third_party/blink/renderer/modules/webcodecs/BUILD.gn
|
--- a/src/3rdparty/chromium/third_party/blink/renderer/modules/webcodecs/BUILD.gn
|
||||||
+++ b/src/3rdparty/chromium/third_party/blink/renderer/modules/webcodecs/BUILD.gn
|
+++ b/src/3rdparty/chromium/third_party/blink/renderer/modules/webcodecs/BUILD.gn
|
||||||
@@ -2,11 +2,21 @@
|
@@ -2,11 +2,21 @@
|
||||||
# Use of this source code is governed by a BSD-style license that can be
|
# Use of this source code is governed by a BSD-style license that can be
|
||||||
# found in the LICENSE file.
|
# found in the LICENSE file.
|
||||||
|
|
||||||
+import("//build/config/linux/pkg_config.gni")
|
+import("//build/config/linux/pkg_config.gni")
|
||||||
import("//media/media_options.gni")
|
import("//media/media_options.gni")
|
||||||
import("//third_party/blink/renderer/modules/modules.gni")
|
import("//third_party/blink/renderer/modules/modules.gni")
|
||||||
@ -61,10 +58,10 @@ index 28205ad14..def86bc8f 100644
|
|||||||
+ ]
|
+ ]
|
||||||
+ }
|
+ }
|
||||||
+}
|
+}
|
||||||
|
|
||||||
blink_modules_sources("webcodecs") {
|
blink_modules_sources("webcodecs") {
|
||||||
sources = [
|
sources = [
|
||||||
@@ -115,7 +125,11 @@ blink_modules_sources("webcodecs") {
|
@@ -117,7 +127,11 @@ blink_modules_sources("webcodecs") {
|
||||||
deps += [ "//third_party/libvpx" ]
|
deps += [ "//third_party/libvpx" ]
|
||||||
}
|
}
|
||||||
if (media_use_openh264) {
|
if (media_use_openh264) {
|
||||||
|
|||||||
@ -73,19 +73,25 @@ be a straight forward to use as an alternative and be fragile.
|
|||||||
platform, host, options, args_list,
|
platform, host, options, args_list,
|
||||||
--- a/src/gn/CMakeLists.txt
|
--- a/src/gn/CMakeLists.txt
|
||||||
+++ b/src/gn/CMakeLists.txt
|
+++ b/src/gn/CMakeLists.txt
|
||||||
@@ -35,4 +35,5 @@
|
@@ -39,6 +39,7 @@
|
||||||
|
set(GN_EXECUTABLE gn)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
+separate_arguments(NINJAFLAGS UNIX_COMMAND "$ENV{NINJAFLAGS}")
|
+separate_arguments(NINJAFLAGS UNIX_COMMAND "$ENV{NINJAFLAGS}")
|
||||||
file(MAKE_DIRECTORY ${GN_BINARY_DIR})
|
file(MAKE_DIRECTORY ${GN_BINARY_DIR})
|
||||||
|
|
||||||
@@ -63,7 +64,8 @@
|
if((UNIX AND NOT APPLE) AND
|
||||||
|
@@ -70,11 +71,12 @@
|
||||||
|
--platform ${platform}
|
||||||
--ar ${CMAKE_AR}
|
--ar ${CMAKE_AR}
|
||||||
--qt-version "${QT_REPO_MODULE_VERSION}.qtwebengine.qt.io"
|
--qt-version "${QT_REPO_MODULE_VERSION}.qtwebengine.qt.io"
|
||||||
+ --no-static-libstdc++
|
+ --no-static-libstdc++
|
||||||
$<$<PLATFORM_ID:Darwin>:--isysroot>
|
$<$<PLATFORM_ID:Darwin>:--isysroot>
|
||||||
$<$<PLATFORM_ID:Darwin>:${CMAKE_OSX_SYSROOT}>
|
$<$<PLATFORM_ID:Darwin>:${CMAKE_OSX_SYSROOT}>
|
||||||
|
$<$<AND:$<PLATFORM_ID:Darwin>,$<BOOL:${OSX_ARCH}>>:--osx-architectures>
|
||||||
|
$<$<AND:$<PLATFORM_ID:Darwin>,$<BOOL:${OSX_ARCH}>>:${OSX_ARCH}>
|
||||||
- COMMAND Ninja::ninja -C ${GN_BINARY_DIR}/$<CONFIG> ${GN_EXECUTABLE}
|
- COMMAND Ninja::ninja -C ${GN_BINARY_DIR}/$<CONFIG> ${GN_EXECUTABLE}
|
||||||
+ COMMAND Ninja::ninja ${NINJAFLAGS} -C ${GN_BINARY_DIR}/$<CONFIG> ${GN_EXECUTABLE}
|
+ COMMAND Ninja::ninja ${NINJAFLAGS} -C ${GN_BINARY_DIR}/$<CONFIG> ${GN_EXECUTABLE}
|
||||||
VERBATIM
|
VERBATIM
|
||||||
USES_TERMINAL
|
USES_TERMINAL
|
||||||
|
COMMAND_EXPAND_LISTS
|
||||||
@ -1,586 +0,0 @@
|
|||||||
From 6e554a30893150793c2638e3689cf208ffc8e375 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Dale Curtis <dalecurtis@chromium.org>
|
|
||||||
Date: Sat, 2 Apr 2022 05:13:53 +0000
|
|
||||||
Subject: [PATCH] Roll src/third_party/ffmpeg/ 574c39cce..32b2d1d526 (1125
|
|
||||||
commits)
|
|
||||||
|
|
||||||
https://chromium.googlesource.com/chromium/third_party/ffmpeg.git/+log/574c39cce323..32b2d1d526
|
|
||||||
|
|
||||||
Created with:
|
|
||||||
roll-dep src/third_party/ffmpeg
|
|
||||||
|
|
||||||
Fixed: 1293918
|
|
||||||
Cq-Include-Trybots: luci.chromium.try:mac_chromium_asan_rel_ng,linux_chromium_asan_rel_ng,linux_chromium_chromeos_asan_rel_ng
|
|
||||||
Change-Id: I41945d0f963e3d1f65940067bac22f63b68e37d2
|
|
||||||
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3565647
|
|
||||||
Auto-Submit: Dale Curtis <dalecurtis@chromium.org>
|
|
||||||
Reviewed-by: Dan Sanders <sandersd@chromium.org>
|
|
||||||
Commit-Queue: Dale Curtis <dalecurtis@chromium.org>
|
|
||||||
Cr-Commit-Position: refs/heads/main@{#988253}
|
|
||||||
---
|
|
||||||
.../clear_key_cdm/ffmpeg_cdm_audio_decoder.cc | 29 ++++++++++---------
|
|
||||||
media/ffmpeg/ffmpeg_common.cc | 11 +++----
|
|
||||||
media/filters/audio_file_reader.cc | 9 +++---
|
|
||||||
media/filters/audio_file_reader_unittest.cc | 6 ++--
|
|
||||||
.../filters/audio_video_metadata_extractor.cc | 11 +++++--
|
|
||||||
.../filters/ffmpeg_aac_bitstream_converter.cc | 7 +++--
|
|
||||||
...ffmpeg_aac_bitstream_converter_unittest.cc | 2 +-
|
|
||||||
media/filters/ffmpeg_audio_decoder.cc | 13 +++++----
|
|
||||||
8 files changed, 51 insertions(+), 37 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/src/3rdparty/chromium/media/cdm/library_cdm/clear_key_cdm/ffmpeg_cdm_audio_decoder.cc b/src/3rdparty/chromium/media/cdm/library_cdm/clear_key_cdm/ffmpeg_cdm_audio_decoder.cc
|
|
||||||
index e4fc3f460e2..9b1ad9f7675 100644
|
|
||||||
--- a/src/3rdparty/chromium/media/cdm/library_cdm/clear_key_cdm/ffmpeg_cdm_audio_decoder.cc
|
|
||||||
+++ b/src/3rdparty/chromium/media/cdm/library_cdm/clear_key_cdm/ffmpeg_cdm_audio_decoder.cc
|
|
||||||
@@ -74,7 +74,7 @@ void CdmAudioDecoderConfigToAVCodecContext(
|
|
||||||
codec_context->sample_fmt = AV_SAMPLE_FMT_NONE;
|
|
||||||
}
|
|
||||||
|
|
||||||
- codec_context->channels = config.channel_count;
|
|
||||||
+ codec_context->ch_layout.nb_channels = config.channel_count;
|
|
||||||
codec_context->sample_rate = config.samples_per_second;
|
|
||||||
|
|
||||||
if (config.extra_data) {
|
|
||||||
@@ -124,8 +124,8 @@ void CopySamples(cdm::AudioFormat cdm_format,
|
|
||||||
case cdm::kAudioFormatPlanarS16:
|
|
||||||
case cdm::kAudioFormatPlanarF32: {
|
|
||||||
const int decoded_size_per_channel =
|
|
||||||
- decoded_audio_size / av_frame.channels;
|
|
||||||
- for (int i = 0; i < av_frame.channels; ++i) {
|
|
||||||
+ decoded_audio_size / av_frame.ch_layout.nb_channels;
|
|
||||||
+ for (int i = 0; i < av_frame.ch_layout.nb_channels; ++i) {
|
|
||||||
memcpy(output_buffer, av_frame.extended_data[i],
|
|
||||||
decoded_size_per_channel);
|
|
||||||
output_buffer += decoded_size_per_channel;
|
|
||||||
@@ -185,13 +185,14 @@ bool FFmpegCdmAudioDecoder::Initialize(
|
|
||||||
// Success!
|
|
||||||
decoding_loop_ = std::make_unique<FFmpegDecodingLoop>(codec_context_.get());
|
|
||||||
samples_per_second_ = config.samples_per_second;
|
|
||||||
- bytes_per_frame_ = codec_context_->channels * config.bits_per_channel / 8;
|
|
||||||
+ bytes_per_frame_ =
|
|
||||||
+ codec_context_->ch_layout.nb_channels * config.bits_per_channel / 8;
|
|
||||||
output_timestamp_helper_ =
|
|
||||||
std::make_unique<AudioTimestampHelper>(config.samples_per_second);
|
|
||||||
is_initialized_ = true;
|
|
||||||
|
|
||||||
// Store initial values to guard against midstream configuration changes.
|
|
||||||
- channels_ = codec_context_->channels;
|
|
||||||
+ channels_ = codec_context_->ch_layout.nb_channels;
|
|
||||||
av_sample_format_ = codec_context_->sample_fmt;
|
|
||||||
|
|
||||||
return true;
|
|
||||||
@@ -291,18 +292,19 @@ cdm::Status FFmpegCdmAudioDecoder::DecodeBuffer(
|
|
||||||
for (auto& frame : audio_frames) {
|
|
||||||
int decoded_audio_size = 0;
|
|
||||||
if (frame->sample_rate != samples_per_second_ ||
|
|
||||||
- frame->channels != channels_ || frame->format != av_sample_format_) {
|
|
||||||
+ frame->ch_layout.nb_channels != channels_ ||
|
|
||||||
+ frame->format != av_sample_format_) {
|
|
||||||
DLOG(ERROR) << "Unsupported midstream configuration change!"
|
|
||||||
<< " Sample Rate: " << frame->sample_rate << " vs "
|
|
||||||
<< samples_per_second_
|
|
||||||
<< ", Channels: " << frame->ch_layout.nb_channels << " vs "
|
|
||||||
<< channels_ << ", Sample Format: " << frame->format << " vs "
|
|
||||||
<< av_sample_format_;
|
|
||||||
return cdm::kDecodeError;
|
|
||||||
}
|
|
||||||
|
|
||||||
decoded_audio_size = av_samples_get_buffer_size(
|
|
||||||
- nullptr, codec_context_->channels, frame->nb_samples,
|
|
||||||
+ nullptr, codec_context_->ch_layout.nb_channels, frame->nb_samples,
|
|
||||||
codec_context_->sample_fmt, 1);
|
|
||||||
if (!decoded_audio_size)
|
|
||||||
continue;
|
|
||||||
@@ -320,9 +323,9 @@ bool FFmpegCdmAudioDecoder::OnNewFrame(
|
|
||||||
size_t* total_size,
|
|
||||||
std::vector<std::unique_ptr<AVFrame, ScopedPtrAVFreeFrame>>* audio_frames,
|
|
||||||
AVFrame* frame) {
|
|
||||||
- *total_size += av_samples_get_buffer_size(
|
|
||||||
- nullptr, codec_context_->channels, frame->nb_samples,
|
|
||||||
- codec_context_->sample_fmt, 1);
|
|
||||||
+ *total_size += av_samples_get_buffer_size(
|
|
||||||
+ nullptr, codec_context_->ch_layout.nb_channels, frame->nb_samples,
|
|
||||||
+ codec_context_->sample_fmt, 1);
|
|
||||||
audio_frames->emplace_back(av_frame_clone(frame));
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
diff --git a/src/3rdparty/chromium/media/ffmpeg/ffmpeg_common.cc b/src/3rdparty/chromium/media/ffmpeg/ffmpeg_common.cc
|
|
||||||
index 87ca8969626..76f03d6608e 100644
|
|
||||||
--- a/src/3rdparty/chromium/media/ffmpeg/ffmpeg_common.cc
|
|
||||||
+++ b/src/3rdparty/chromium/media/ffmpeg/ffmpeg_common.cc
|
|
||||||
@@ -336,10 +336,12 @@
|
|
||||||
codec_context->sample_fmt, codec_context->codec_id);
|
|
||||||
|
|
||||||
ChannelLayout channel_layout =
|
|
||||||
- codec_context->channels > 8
|
|
||||||
+ codec_context->ch_layout.nb_channels > 8
|
|
||||||
? CHANNEL_LAYOUT_DISCRETE
|
|
||||||
- : ChannelLayoutToChromeChannelLayout(codec_context->channel_layout,
|
|
||||||
- codec_context->channels);
|
|
||||||
+ : ChannelLayoutToChromeChannelLayout(
|
|
||||||
+ codec_context->ch_layout.u.mask,
|
|
||||||
+ codec_context->ch_layout.nb_channels);
|
|
||||||
+
|
|
||||||
|
|
||||||
switch (codec) {
|
|
||||||
// For AC3/EAC3 we enable only demuxing, but not decoding, so FFmpeg does
|
|
||||||
@@ -391,7 +393,7 @@
|
|
||||||
extra_data, encryption_scheme, seek_preroll,
|
|
||||||
codec_context->delay);
|
|
||||||
if (channel_layout == CHANNEL_LAYOUT_DISCRETE)
|
|
||||||
- config->SetChannelsForDiscrete(codec_context->channels);
|
|
||||||
+ config->SetChannelsForDiscrete(codec_context->ch_layout.nb_channels);
|
|
||||||
|
|
||||||
#if BUILDFLAG(ENABLE_PLATFORM_AC3_EAC3_AUDIO)
|
|
||||||
// These are bitstream formats unknown to ffmpeg, so they don't have
|
|
||||||
@@ -460,7 +462,7 @@
|
|
||||||
|
|
||||||
// TODO(scherkus): should we set |channel_layout|? I'm not sure if FFmpeg uses
|
|
||||||
// said information to decode.
|
|
||||||
- codec_context->channels = config.channels();
|
|
||||||
+ codec_context->ch_layout.nb_channels = config.channels();
|
|
||||||
codec_context->sample_rate = config.samples_per_second();
|
|
||||||
|
|
||||||
if (config.extra_data().empty()) {
|
|
||||||
diff --git a/src/3rdparty/chromium/media/filters/audio_file_reader.cc b/src/3rdparty/chromium/media/filters/audio_file_reader.cc
|
|
||||||
index 5f257bdfaa6..e1be5aa9a5b 100644
|
|
||||||
--- a/src/3rdparty/chromium/media/filters/audio_file_reader.cc
|
|
||||||
+++ b/src/3rdparty/chromium/media/filters/audio_file_reader.cc
|
|
||||||
@@ -113,14 +113,15 @@ bool AudioFileReader::OpenDecoder() {
|
|
||||||
|
|
||||||
// Verify the channel layout is supported by Chrome. Acts as a sanity check
|
|
||||||
// against invalid files. See http://crbug.com/171962
|
|
||||||
- if (ChannelLayoutToChromeChannelLayout(codec_context_->channel_layout,
|
|
||||||
- codec_context_->channels) ==
|
|
||||||
+ if (ChannelLayoutToChromeChannelLayout(
|
|
||||||
+ codec_context_->ch_layout.u.mask,
|
|
||||||
+ codec_context_->ch_layout.nb_channels) ==
|
|
||||||
CHANNEL_LAYOUT_UNSUPPORTED) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Store initial values to guard against midstream configuration changes.
|
|
||||||
- channels_ = codec_context_->channels;
|
|
||||||
+ channels_ = codec_context_->ch_layout.nb_channels;
|
|
||||||
audio_codec_ = CodecIDToAudioCodec(codec_context_->codec_id);
|
|
||||||
sample_rate_ = codec_context_->sample_rate;
|
|
||||||
av_sample_format_ = codec_context_->sample_fmt;
|
|
||||||
@@ -223,7 +224,7 @@ bool AudioFileReader::OnNewFrame(
|
|
||||||
if (frames_read < 0)
|
|
||||||
return false;
|
|
||||||
|
|
||||||
- const int channels = frame->channels;
|
|
||||||
+ const int channels = frame->ch_layout.nb_channels;
|
|
||||||
if (frame->sample_rate != sample_rate_ || channels != channels_ ||
|
|
||||||
frame->format != av_sample_format_) {
|
|
||||||
DLOG(ERROR) << "Unsupported midstream configuration change!"
|
|
||||||
diff --git a/src/3rdparty/chromium/media/filters/ffmpeg_aac_bitstream_converter.cc b/src/3rdparty/chromium/media/filters/ffmpeg_aac_bitstream_converter.cc
|
|
||||||
index 6f231c85729..ca5e5fb927d 100644
|
|
||||||
--- a/src/3rdparty/chromium/media/filters/ffmpeg_aac_bitstream_converter.cc
|
|
||||||
+++ b/src/3rdparty/chromium/media/filters/ffmpeg_aac_bitstream_converter.cc
|
|
||||||
@@ -195,14 +195,15 @@ bool FFmpegAACBitstreamConverter::ConvertPacket(AVPacket* packet) {
|
|
||||||
if (!header_generated_ || codec_ != stream_codec_parameters_->codec_id ||
|
|
||||||
audio_profile_ != stream_codec_parameters_->profile ||
|
|
||||||
sample_rate_index_ != sample_rate_index ||
|
|
||||||
- channel_configuration_ != stream_codec_parameters_->channels ||
|
|
||||||
+ channel_configuration_ !=
|
|
||||||
+ stream_codec_parameters_->ch_layout.nb_channels ||
|
|
||||||
frame_length_ != header_plus_packet_size) {
|
|
||||||
header_generated_ =
|
|
||||||
GenerateAdtsHeader(stream_codec_parameters_->codec_id,
|
|
||||||
0, // layer
|
|
||||||
stream_codec_parameters_->profile, sample_rate_index,
|
|
||||||
0, // private stream
|
|
||||||
- stream_codec_parameters_->channels,
|
|
||||||
+ stream_codec_parameters_->ch_layout.nb_channels,
|
|
||||||
0, // originality
|
|
||||||
0, // home
|
|
||||||
0, // copyrighted_stream
|
|
||||||
@@ -214,7 +215,7 @@ bool FFmpegAACBitstreamConverter::ConvertPacket(AVPacket* packet) {
|
|
||||||
codec_ = stream_codec_parameters_->codec_id;
|
|
||||||
audio_profile_ = stream_codec_parameters_->profile;
|
|
||||||
sample_rate_index_ = sample_rate_index;
|
|
||||||
- channel_configuration_ = stream_codec_parameters_->channels;
|
|
||||||
+ channel_configuration_ = stream_codec_parameters_->ch_layout.nb_channels;
|
|
||||||
frame_length_ = header_plus_packet_size;
|
|
||||||
}
|
|
||||||
|
|
||||||
diff --git a/src/3rdparty/chromium/media/filters/ffmpeg_aac_bitstream_converter_unittest.cc b/src/3rdparty/chromium/media/filters/ffmpeg_aac_bitstream_converter_unittest.cc
|
|
||||||
index 1fd4c5ccd7d..f59bcd8fdaf 100644
|
|
||||||
--- a/src/3rdparty/chromium/media/filters/ffmpeg_aac_bitstream_converter_unittest.cc
|
|
||||||
+++ b/src/3rdparty/chromium/media/filters/ffmpeg_aac_bitstream_converter_unittest.cc
|
|
||||||
@@ -34,7 +34,7 @@ class FFmpegAACBitstreamConverterTest : public testing::Test {
|
|
||||||
memset(&test_parameters_, 0, sizeof(AVCodecParameters));
|
|
||||||
test_parameters_.codec_id = AV_CODEC_ID_AAC;
|
|
||||||
test_parameters_.profile = FF_PROFILE_AAC_MAIN;
|
|
||||||
- test_parameters_.channels = 2;
|
|
||||||
+ test_parameters_.ch_layout.nb_channels = 2;
|
|
||||||
test_parameters_.extradata = extradata_header_;
|
|
||||||
test_parameters_.extradata_size = sizeof(extradata_header_);
|
|
||||||
}
|
|
||||||
diff --git a/src/3rdparty/chromium/media/filters/ffmpeg_audio_decoder.cc b/src/3rdparty/chromium/media/filters/ffmpeg_audio_decoder.cc
|
|
||||||
index 6a56c675f7d..4615fdeb3fb 100644
|
|
||||||
--- a/src/3rdparty/chromium/media/filters/ffmpeg_audio_decoder.cc
|
|
||||||
+++ b/src/3rdparty/chromium/media/filters/ffmpeg_audio_decoder.cc
|
|
||||||
@@ -28,7 +28,7 @@ namespace media {
|
|
||||||
|
|
||||||
// Return the number of channels from the data in |frame|.
|
|
||||||
static inline int DetermineChannels(AVFrame* frame) {
|
|
||||||
- return frame->channels;
|
|
||||||
+ return frame->ch_layout.nb_channels;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Called by FFmpeg's allocation routine to allocate a buffer. Uses
|
|
||||||
@@ -231,7 +231,7 @@ bool FFmpegAudioDecoder::OnNewFrame(const DecoderBuffer& buffer,
|
|
||||||
// Translate unsupported into discrete layouts for discrete configurations;
|
|
||||||
// ffmpeg does not have a labeled discrete configuration internally.
|
|
||||||
ChannelLayout channel_layout = ChannelLayoutToChromeChannelLayout(
|
|
||||||
- codec_context_->channel_layout, codec_context_->channels);
|
|
||||||
+ codec_context_->ch_layout.u.mask, codec_context_->ch_layout.nb_channels);
|
|
||||||
if (channel_layout == CHANNEL_LAYOUT_UNSUPPORTED &&
|
|
||||||
config_.channel_layout() == CHANNEL_LAYOUT_DISCRETE) {
|
|
||||||
channel_layout = CHANNEL_LAYOUT_DISCRETE;
|
|
||||||
@@ -348,11 +348,11 @@ bool FFmpegAudioDecoder::ConfigureDecoder(const AudioDecoderConfig& config) {
|
|
||||||
// Success!
|
|
||||||
av_sample_format_ = codec_context_->sample_fmt;
|
|
||||||
|
|
||||||
- if (codec_context_->channels != config.channels()) {
|
|
||||||
+ if (codec_context_->ch_layout.nb_channels != config.channels()) {
|
|
||||||
MEDIA_LOG(ERROR, media_log_)
|
|
||||||
<< "Audio configuration specified " << config.channels()
|
|
||||||
<< " channels, but FFmpeg thinks the file contains "
|
|
||||||
- << codec_context_->channels << " channels";
|
|
||||||
+ << codec_context_->ch_layout.nb_channels << " channels";
|
|
||||||
ReleaseFFmpegResources();
|
|
||||||
state_ = DecoderState::kUninitialized;
|
|
||||||
return false;
|
|
||||||
@@ -403,7 +403,7 @@ int FFmpegAudioDecoder::GetAudioBuffer(struct AVCodecContext* s,
|
|
||||||
if (frame->nb_samples <= 0)
|
|
||||||
return AVERROR(EINVAL);
|
|
||||||
|
|
||||||
- if (s->channels != channels) {
|
|
||||||
+ if (s->ch_layout.nb_channels != channels) {
|
|
||||||
DLOG(ERROR) << "AVCodecContext and AVFrame disagree on channel count.";
|
|
||||||
return AVERROR(EINVAL);
|
|
||||||
}
|
|
||||||
@@ -436,7 +436,8 @@ int FFmpegAudioDecoder::GetAudioBuffer(struct AVCodecContext* s,
|
|
||||||
ChannelLayout channel_layout =
|
|
||||||
config_.channel_layout() == CHANNEL_LAYOUT_DISCRETE
|
|
||||||
? CHANNEL_LAYOUT_DISCRETE
|
|
||||||
- : ChannelLayoutToChromeChannelLayout(s->channel_layout, s->channels);
|
|
||||||
+ : ChannelLayoutToChromeChannelLayout(s->ch_layout.u.mask,
|
|
||||||
+ s->ch_layout.nb_channels);
|
|
||||||
|
|
||||||
if (channel_layout == CHANNEL_LAYOUT_UNSUPPORTED) {
|
|
||||||
DLOG(ERROR) << "Unsupported channel layout.";
|
|
||||||
commit 62274859104bd828373ae406aa9309e610449ac5
|
|
||||||
Author: Ted Meyer <tmathmeyer@chromium.org>
|
|
||||||
Date: Fri Mar 22 19:56:55 2024 +0000
|
|
||||||
|
|
||||||
Replace deprecated use of AVCodecContext::reordered_opaque
|
|
||||||
|
|
||||||
We can use the AV_CODEC_FLAG_COPY_OPAQUE flag on the codec context
|
|
||||||
now to trigger timestamp propagation.
|
|
||||||
|
|
||||||
Bug: 330573128
|
|
||||||
Change-Id: I6bc57241a35ab5283742aad8d42acb4dc5e85858
|
|
||||||
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5384308
|
|
||||||
Commit-Queue: Ted (Chromium) Meyer <tmathmeyer@chromium.org>
|
|
||||||
Reviewed-by: Dan Sanders <sandersd@chromium.org>
|
|
||||||
Cr-Commit-Position: refs/heads/main@{#1277051}
|
|
||||||
|
|
||||||
diff --git a/src/3rdparty/chromium/media/filters/ffmpeg_video_decoder.cc b/src/3rdparty/chromium/media/filters/ffmpeg_video_decoder.cc
|
|
||||||
index bd75477feeabb..8a658a58caac5 100644
|
|
||||||
--- a/src/3rdparty/chromium/media/filters/ffmpeg_video_decoder.cc
|
|
||||||
+++ b/src/3rdparty/chromium/media/filters/ffmpeg_video_decoder.cc
|
|
||||||
@@ -125,7 +125,7 @@
|
|
||||||
}
|
|
||||||
|
|
||||||
FFmpegVideoDecoder::FFmpegVideoDecoder(MediaLog* media_log)
|
|
||||||
- : media_log_(media_log) {
|
|
||||||
+ : media_log_(media_log), timestamp_map_(128) {
|
|
||||||
DVLOG(1) << __func__;
|
|
||||||
DETACH_FROM_SEQUENCE(sequence_checker_);
|
|
||||||
}
|
|
||||||
@@ -354,8 +354,10 @@
|
|
||||||
DCHECK(packet->data);
|
|
||||||
DCHECK_GT(packet->size, 0);
|
|
||||||
|
|
||||||
- // Let FFmpeg handle presentation timestamp reordering.
|
|
||||||
- codec_context_->reordered_opaque = buffer.timestamp().InMicroseconds();
|
|
||||||
+ const int64_t timestamp = buffer.timestamp().InMicroseconds();
|
|
||||||
+ const TimestampId timestamp_id = timestamp_id_generator_.GenerateNextId();
|
|
||||||
+ timestamp_map_.Put(std::make_pair(timestamp_id, timestamp));
|
|
||||||
+ packet->opaque = reinterpret_cast<void*>(timestamp_id.GetUnsafeValue());
|
|
||||||
}
|
|
||||||
FFmpegDecodingLoop::DecodeStatus decode_status = decoding_loop_->DecodePacket(
|
|
||||||
packet, base::BindRepeating(&FFmpegVideoDecoder::OnNewFrame,
|
|
||||||
@@ -414,7 +416,12 @@
|
|
||||||
}
|
|
||||||
gfx::Size natural_size = aspect_ratio.GetNaturalSize(visible_rect);
|
|
||||||
|
|
||||||
- const auto pts = base::Microseconds(frame->reordered_opaque);
|
|
||||||
+ const auto ts_id = TimestampId(reinterpret_cast<size_t>(frame->opaque));
|
|
||||||
+ const auto ts_lookup = timestamp_map_.Get(ts_id);
|
|
||||||
+ if (ts_lookup == timestamp_map_.end()) {
|
|
||||||
+ return false;
|
|
||||||
+ }
|
|
||||||
+ const auto pts = base::Microseconds(std::get<1>(*ts_lookup));
|
|
||||||
auto video_frame = VideoFrame::WrapExternalDataWithLayout(
|
|
||||||
opaque->layout, visible_rect, natural_size, opaque->data, opaque->size,
|
|
||||||
pts);
|
|
||||||
@@ -489,8 +496,10 @@
|
|
||||||
codec_context_->thread_count = GetFFmpegVideoDecoderThreadCount(config);
|
|
||||||
codec_context_->thread_type =
|
|
||||||
FF_THREAD_SLICE | (low_delay ? 0 : FF_THREAD_FRAME);
|
|
||||||
+
|
|
||||||
codec_context_->opaque = this;
|
|
||||||
codec_context_->get_buffer2 = GetVideoBufferImpl;
|
|
||||||
+ codec_context_->flags |= AV_CODEC_FLAG_COPY_OPAQUE;
|
|
||||||
|
|
||||||
if (decode_nalus_)
|
|
||||||
codec_context_->flags2 |= AV_CODEC_FLAG2_CHUNKS;
|
|
||||||
diff --git a/src/3rdparty/chromium/media/filters/ffmpeg_video_decoder.h b/src/3rdparty/chromium/media/filters/ffmpeg_video_decoder.h
|
|
||||||
index d02cb89c3ddf7..0a2de1c623fff 100644
|
|
||||||
--- a/src/3rdparty/chromium/media/filters/ffmpeg_video_decoder.h
|
|
||||||
+++ b/src/3rdparty/chromium/media/filters/ffmpeg_video_decoder.h
|
|
||||||
@@ -7,10 +7,12 @@
|
|
||||||
|
|
||||||
#include <memory>
|
|
||||||
|
|
||||||
+#include "base/containers/lru_cache.h"
|
|
||||||
#include "base/functional/callback.h"
|
|
||||||
#include "base/memory/raw_ptr.h"
|
|
||||||
#include "base/memory/scoped_refptr.h"
|
|
||||||
#include "base/sequence_checker.h"
|
|
||||||
+#include "base/types/id_type.h"
|
|
||||||
#include "media/base/supported_video_decoder_config.h"
|
|
||||||
#include "media/base/video_decoder.h"
|
|
||||||
#include "media/base/video_decoder_config.h"
|
|
||||||
@@ -87,6 +89,20 @@ class MEDIA_EXPORT FFmpegVideoDecoder : public VideoDecoder {
|
|
||||||
// FFmpeg structures owned by this object.
|
|
||||||
std::unique_ptr<AVCodecContext, ScopedPtrAVFreeContext> codec_context_;
|
|
||||||
|
|
||||||
+ // The gist here is that timestamps need to be 64 bits to store microsecond
|
|
||||||
+ // precision. A 32 bit integer would overflow at ~35 minutes at this level of
|
|
||||||
+ // precision. We can't cast the timestamp to the void ptr object used by the
|
|
||||||
+ // opaque field in ffmpeg then, because it would lose data on a 32 bit build.
|
|
||||||
+ // However, we don't actually have 2^31 timestamped frames in a single
|
|
||||||
+ // playback, so it's fine to use the 32 bit value as a key in a map which
|
|
||||||
+ // contains the actual timestamps. Additionally, we've in the past set 128
|
|
||||||
+ // outstanding frames for re-ordering as a limit for cross-thread decoding
|
|
||||||
+ // tasks, so we'll do that here too with the LRU cache.
|
|
||||||
+ using TimestampId = base::IdType<int64_t, size_t, 0>;
|
|
||||||
+
|
|
||||||
+ TimestampId::Generator timestamp_id_generator_;
|
|
||||||
+ base::LRUCache<TimestampId, int64_t> timestamp_map_;
|
|
||||||
+
|
|
||||||
VideoDecoderConfig config_;
|
|
||||||
|
|
||||||
scoped_refptr<FrameBufferPool> frame_pool_;
|
|
||||||
diff --git a/src/3rdparty/chromium/media/ffmpeg/ffmpeg_common.cc b/src/3rdparty/chromium/media/ffmpeg/ffmpeg_common.cc
|
|
||||||
index 3331581a6fee6..69539fd6594ec 100644
|
|
||||||
--- a/src/3rdparty/chromium/media/ffmpeg/ffmpeg_common.cc
|
|
||||||
+++ b/src/3rdparty/chromium/media/ffmpeg/ffmpeg_common.cc
|
|
||||||
@@ -404,7 +404,9 @@ bool AVCodecContextToAudioDecoderConfig(const AVCodecContext* codec_context,
|
|
||||||
|
|
||||||
// TODO(dalecurtis): Just use the profile from the codec context if ffmpeg
|
|
||||||
// ever starts supporting xHE-AAC.
|
|
||||||
- if (codec_context->profile == FF_PROFILE_UNKNOWN) {
|
|
||||||
+ constexpr uint8_t kXHEAAc = 41;
|
|
||||||
+ if (codec_context->profile == FF_PROFILE_UNKNOWN ||
|
|
||||||
+ codec_context->profile == kXHEAAc) {
|
|
||||||
// Errors aren't fatal here, so just drop any MediaLog messages.
|
|
||||||
NullMediaLog media_log;
|
|
||||||
mp4::AAC aac_parser;
|
|
||||||
diff --git a/src/3rdparty/chromium/media/ffmpeg/ffmpeg_regression_tests.cc b/src/3rdparty/chromium/media/ffmpeg/ffmpeg_regression_tests.cc
|
|
||||||
index 05dcb1cd62c75..866f446698947 100644
|
|
||||||
--- a/src/3rdparty/chromium/media/ffmpeg/ffmpeg_regression_tests.cc
|
|
||||||
+++ b/src/3rdparty/chromium/media/ffmpeg/ffmpeg_regression_tests.cc
|
|
||||||
@@ -90,16 +90,16 @@ FFMPEG_TEST_CASE(Cr62127,
|
|
||||||
PIPELINE_ERROR_DECODE,
|
|
||||||
PIPELINE_ERROR_DECODE);
|
|
||||||
FFMPEG_TEST_CASE(Cr93620, "security/93620.ogg", PIPELINE_OK, PIPELINE_OK);
|
|
||||||
-FFMPEG_TEST_CASE(Cr100492,
|
|
||||||
- "security/100492.webm",
|
|
||||||
- DECODER_ERROR_NOT_SUPPORTED,
|
|
||||||
- DECODER_ERROR_NOT_SUPPORTED);
|
|
||||||
+FFMPEG_TEST_CASE(Cr100492, "security/100492.webm", PIPELINE_OK, PIPELINE_OK);
|
|
||||||
FFMPEG_TEST_CASE(Cr100543, "security/100543.webm", PIPELINE_OK, PIPELINE_OK);
|
|
||||||
FFMPEG_TEST_CASE(Cr101458,
|
|
||||||
"security/101458.webm",
|
|
||||||
PIPELINE_ERROR_DECODE,
|
|
||||||
PIPELINE_ERROR_DECODE);
|
|
||||||
-FFMPEG_TEST_CASE(Cr108416, "security/108416.webm", PIPELINE_OK, PIPELINE_OK);
|
|
||||||
+FFMPEG_TEST_CASE(Cr108416,
|
|
||||||
+ "security/108416.webm",
|
|
||||||
+ PIPELINE_ERROR_DECODE,
|
|
||||||
+ PIPELINE_ERROR_DECODE);
|
|
||||||
FFMPEG_TEST_CASE(Cr110849,
|
|
||||||
"security/110849.mkv",
|
|
||||||
DEMUXER_ERROR_COULD_NOT_OPEN,
|
|
||||||
@@ -154,7 +154,10 @@ FFMPEG_TEST_CASE(Cr234630b,
|
|
||||||
"security/234630b.mov",
|
|
||||||
DEMUXER_ERROR_NO_SUPPORTED_STREAMS,
|
|
||||||
DEMUXER_ERROR_NO_SUPPORTED_STREAMS);
|
|
||||||
-FFMPEG_TEST_CASE(Cr242786, "security/242786.webm", PIPELINE_OK, PIPELINE_OK);
|
|
||||||
+FFMPEG_TEST_CASE(Cr242786,
|
|
||||||
+ "security/242786.webm",
|
|
||||||
+ PIPELINE_OK,
|
|
||||||
+ PIPELINE_ERROR_DECODE);
|
|
||||||
// Test for out-of-bounds access with slightly corrupt file (detection logic
|
|
||||||
// thinks it's a MONO file, but actually contains STEREO audio).
|
|
||||||
FFMPEG_TEST_CASE(Cr275590,
|
|
||||||
@@ -372,8 +375,8 @@ FFMPEG_TEST_CASE(WEBM_2,
|
|
||||||
DEMUXER_ERROR_NO_SUPPORTED_STREAMS);
|
|
||||||
FFMPEG_TEST_CASE(WEBM_4,
|
|
||||||
"security/out.webm.68798.1929",
|
|
||||||
- DECODER_ERROR_NOT_SUPPORTED,
|
|
||||||
- DECODER_ERROR_NOT_SUPPORTED);
|
|
||||||
+ PIPELINE_OK,
|
|
||||||
+ PIPELINE_OK);
|
|
||||||
FFMPEG_TEST_CASE(WEBM_5, "frame_size_change.webm", PIPELINE_OK, PIPELINE_OK);
|
|
||||||
|
|
||||||
// General MKV test cases.
|
|
||||||
diff --git a/src/3rdparty/chromium/media/filters/audio_decoder_unittest.cc b/src/3rdparty/chromium/media/filters/audio_decoder_unittest.cc
|
|
||||||
index a31823cfe3b58..e43f408b79e5c 100644
|
|
||||||
--- a/src/3rdparty/chromium/media/filters/audio_decoder_unittest.cc
|
|
||||||
+++ b/src/3rdparty/chromium/media/filters/audio_decoder_unittest.cc
|
|
||||||
@@ -484,7 +484,7 @@ constexpr TestParams kXheAacTestParams[] = {
|
|
||||||
}},
|
|
||||||
0,
|
|
||||||
29400,
|
|
||||||
- CHANNEL_LAYOUT_MONO,
|
|
||||||
+ CHANNEL_LAYOUT_UNSUPPORTED,
|
|
||||||
AudioCodecProfile::kXHE_AAC},
|
|
||||||
#endif
|
|
||||||
{AudioCodec::kAAC,
|
|
||||||
diff --git a/src/3rdparty/chromium/media/filters/audio_file_reader_unittest.cc b/src/3rdparty/chromium/media/filters/audio_file_reader_unittest.cc
|
|
||||||
index c0cc568d63019..edf9470f2f8b3 100644
|
|
||||||
--- a/src/3rdparty/chromium/media/filters/audio_file_reader_unittest.cc
|
|
||||||
+++ b/src/3rdparty/chromium/media/filters/audio_file_reader_unittest.cc
|
|
||||||
@@ -62,15 +62,14 @@ class AudioFileReaderTest : public testing::Test {
|
|
||||||
// Verify packets are consistent across demuxer runs. Reads the first few
|
|
||||||
// packets and then seeks back to the start timestamp and verifies that the
|
|
||||||
// hashes match on the packets just read.
|
|
||||||
- void VerifyPackets() {
|
|
||||||
- const int kReads = 3;
|
|
||||||
+ void VerifyPackets(int packet_reads) {
|
|
||||||
const int kTestPasses = 2;
|
|
||||||
|
|
||||||
AVPacket packet;
|
|
||||||
base::TimeDelta start_timestamp;
|
|
||||||
std::vector<std::string> packet_md5_hashes_;
|
|
||||||
for (int i = 0; i < kTestPasses; ++i) {
|
|
||||||
- for (int j = 0; j < kReads; ++j) {
|
|
||||||
+ for (int j = 0; j < packet_reads; ++j) {
|
|
||||||
ASSERT_TRUE(reader_->ReadPacketForTesting(&packet));
|
|
||||||
|
|
||||||
// On the first pass save the MD5 hash of each packet, on subsequent
|
|
||||||
@@ -99,7 +98,8 @@ class AudioFileReaderTest : public testing::Test {
|
|
||||||
int sample_rate,
|
|
||||||
base::TimeDelta duration,
|
|
||||||
int frames,
|
|
||||||
- int expected_frames) {
|
|
||||||
+ int expected_frames,
|
|
||||||
+ int packet_reads = 3) {
|
|
||||||
Initialize(fn);
|
|
||||||
ASSERT_TRUE(reader_->Open());
|
|
||||||
EXPECT_EQ(channels, reader_->channels());
|
|
||||||
@@ -113,7 +113,7 @@ class AudioFileReaderTest : public testing::Test {
|
|
||||||
EXPECT_EQ(reader_->HasKnownDuration(), false);
|
|
||||||
}
|
|
||||||
if (!packet_verification_disabled_)
|
|
||||||
- ASSERT_NO_FATAL_FAILURE(VerifyPackets());
|
|
||||||
+ ASSERT_NO_FATAL_FAILURE(VerifyPackets(packet_reads));
|
|
||||||
ReadAndVerify(hash, expected_frames);
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -220,7 +220,7 @@ TEST_F(AudioFileReaderTest, AAC_ADTS) {
|
|
||||||
}
|
|
||||||
|
|
||||||
TEST_F(AudioFileReaderTest, MidStreamConfigChangesFail) {
|
|
||||||
- RunTestFailingDecode("midstream_config_change.mp3", 42624);
|
|
||||||
+ RunTestFailingDecode("midstream_config_change.mp3", 0);
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
@@ -230,7 +230,7 @@ TEST_F(AudioFileReaderTest, VorbisInvalidChannelLayout) {
|
|
||||||
|
|
||||||
TEST_F(AudioFileReaderTest, WaveValidFourChannelLayout) {
|
|
||||||
RunTest("4ch.wav", "131.71,38.02,130.31,44.89,135.98,42.52,", 4, 44100,
|
|
||||||
- base::Microseconds(100001), 4411, 4410);
|
|
||||||
+ base::Microseconds(100001), 4411, 4410, /*packet_reads=*/2);
|
|
||||||
}
|
|
||||||
|
|
||||||
TEST_F(AudioFileReaderTest, ReadPartialMP3) {
|
|
||||||
diff --git a/src/3rdparty/chromium/media/filters/ffmpeg_video_decoder.cc b/src/3rdparty/chromium/media/filters/ffmpeg_video_decoder.cc
|
|
||||||
index 8a658a58caac5..9d6ed8aeb5c48 100644
|
|
||||||
--- a/src/3rdparty/chromium/media/filters/ffmpeg_video_decoder.cc
|
|
||||||
+++ b/src/3rdparty/chromium/media/filters/ffmpeg_video_decoder.cc
|
|
||||||
@@ -213,10 +213,6 @@ int FFmpegVideoDecoder::GetVideoBuffer(struct AVCodecContext* codec_context,
|
|
||||||
frame->linesize[plane] = layout->planes()[plane].stride;
|
|
||||||
}
|
|
||||||
|
|
||||||
- // This seems unsafe, given threaded decoding. However, `reordered_opaque` is
|
|
||||||
- // also going away upstream, so we need a whole new mechanism either way.
|
|
||||||
- frame->reordered_opaque = codec_context->reordered_opaque;
|
|
||||||
-
|
|
||||||
// This will be freed by `ReleaseVideoBufferImpl`.
|
|
||||||
auto* opaque = new OpaqueData(fb_priv, frame_pool_, data, allocation_size,
|
|
||||||
std::move(*layout));
|
|
||||||
diff --git a/src/3rdparty/chromium/media/filters/audio_file_reader.cc b/src/3rdparty/chromium/media/filters/audio_file_reader.cc
|
|
||||||
index e1be5aa9a5b13..951c003956fb5 100644
|
|
||||||
--- a/src/3rdparty/chromium/media/filters/audio_file_reader.cc
|
|
||||||
+++ b/src/3rdparty/chromium/media/filters/audio_file_reader.cc
|
|
||||||
@@ -243,18 +243,10 @@ bool AudioFileReader::OnNewFrame(
|
|
||||||
// silence from being output. In the case where we are also discarding some
|
|
||||||
// portion of the packet (as indicated by a negative pts), we further want to
|
|
||||||
// adjust the duration downward by however much exists before zero.
|
|
||||||
-#if BUILDFLAG(USE_SYSTEM_FFMPEG)
|
|
||||||
- if (audio_codec_ == AudioCodec::kAAC && frame->pkt_duration) {
|
|
||||||
-#else
|
|
||||||
if (audio_codec_ == AudioCodec::kAAC && frame->duration) {
|
|
||||||
-#endif // BUILDFLAG(USE_SYSTEM_FFMPEG)
|
|
||||||
const base::TimeDelta pkt_duration = ConvertFromTimeBase(
|
|
||||||
glue_->format_context()->streams[stream_index_]->time_base,
|
|
||||||
-#if BUILDFLAG(USE_SYSTEM_FFMPEG)
|
|
||||||
- frame->pkt_duration + std::min(static_cast<int64_t>(0), frame->pts));
|
|
||||||
-#else
|
|
||||||
frame->duration + std::min(static_cast<int64_t>(0), frame->pts));
|
|
||||||
-#endif // BUILDFLAG(USE_SYSTEM_FFMPEG)
|
|
||||||
const base::TimeDelta frame_duration =
|
|
||||||
base::Seconds(frames_read / static_cast<double>(sample_rate_));
|
|
||||||
|
|
||||||
diff --git a/src/3rdparty/chromium/chromium/third_party/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.cc b/src/3rdparty/chromium/chromium/third_party/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.cc
|
|
||||||
index c6446c2..805b95b 100644
|
|
||||||
--- a/src/3rdparty/chromium/third_party/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.cc
|
|
||||||
+++ b/src/3rdparty/chromium/third_party/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.cc
|
|
||||||
@@ -233,7 +233,6 @@
|
|
||||||
int total_size = y_size + 2 * uv_size;
|
|
||||||
|
|
||||||
av_frame->format = context->pix_fmt;
|
|
||||||
- av_frame->reordered_opaque = context->reordered_opaque;
|
|
||||||
|
|
||||||
// Create a VideoFrame object, to keep a reference to the buffer.
|
|
||||||
// TODO(nisse): The VideoFrame's timestamp and rotation info is not used.
|
|
||||||
@@ -381,8 +380,6 @@
|
|
||||||
return WEBRTC_VIDEO_CODEC_ERROR;
|
|
||||||
}
|
|
||||||
packet->size = static_cast<int>(input_image.size());
|
|
||||||
- int64_t frame_timestamp_us = input_image.ntp_time_ms_ * 1000; // ms -> μs
|
|
||||||
- av_context_->reordered_opaque = frame_timestamp_us;
|
|
||||||
|
|
||||||
int result = avcodec_send_packet(av_context_.get(), packet.get());
|
|
||||||
|
|
||||||
@@ -399,10 +396,6 @@
|
|
||||||
return WEBRTC_VIDEO_CODEC_ERROR;
|
|
||||||
}
|
|
||||||
|
|
||||||
- // We don't expect reordering. Decoded frame timestamp should match
|
|
||||||
- // the input one.
|
|
||||||
- RTC_DCHECK_EQ(av_frame_->reordered_opaque, frame_timestamp_us);
|
|
||||||
-
|
|
||||||
// TODO(sakal): Maybe it is possible to get QP directly from FFmpeg.
|
|
||||||
h264_bitstream_parser_.ParseBitstream(input_image);
|
|
||||||
absl::optional<int> qp = h264_bitstream_parser_.GetLastSliceQp();
|
|
||||||
@ -1,5 +1,5 @@
|
|||||||
diff --git a/src/3rdparty/chromium/base/debug/profiler.h b/src/3rdparty/chromium/base/debug/profiler.h
|
diff --git a/src/3rdparty/chromium/base/debug/profiler.h b/src/3rdparty/chromium/base/debug/profiler.h
|
||||||
index 035affc7c..d8e1a5346 100644
|
index 035affc..d8e1a53 100644
|
||||||
--- a/src/3rdparty/chromium/base/debug/profiler.h
|
--- a/src/3rdparty/chromium/base/debug/profiler.h
|
||||||
+++ b/src/3rdparty/chromium/base/debug/profiler.h
|
+++ b/src/3rdparty/chromium/base/debug/profiler.h
|
||||||
@@ -5,6 +5,7 @@
|
@@ -5,6 +5,7 @@
|
||||||
@ -11,7 +11,7 @@ index 035affc7c..d8e1a5346 100644
|
|||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
|
|
||||||
diff --git a/src/3rdparty/chromium/cc/trees/target_property.cc b/src/3rdparty/chromium/cc/trees/target_property.cc
|
diff --git a/src/3rdparty/chromium/cc/trees/target_property.cc b/src/3rdparty/chromium/cc/trees/target_property.cc
|
||||||
index 7d73467a9..be4febd9a 100644
|
index 7d73467..be4febd 100644
|
||||||
--- a/src/3rdparty/chromium/cc/trees/target_property.cc
|
--- a/src/3rdparty/chromium/cc/trees/target_property.cc
|
||||||
+++ b/src/3rdparty/chromium/cc/trees/target_property.cc
|
+++ b/src/3rdparty/chromium/cc/trees/target_property.cc
|
||||||
@@ -8,6 +8,8 @@
|
@@ -8,6 +8,8 @@
|
||||||
@ -24,7 +24,7 @@ index 7d73467a9..be4febd9a 100644
|
|||||||
|
|
||||||
static_assert(TargetProperty::LAST_TARGET_PROPERTY <
|
static_assert(TargetProperty::LAST_TARGET_PROPERTY <
|
||||||
diff --git a/src/3rdparty/chromium/device/base/synchronization/one_writer_seqlock.cc b/src/3rdparty/chromium/device/base/synchronization/one_writer_seqlock.cc
|
diff --git a/src/3rdparty/chromium/device/base/synchronization/one_writer_seqlock.cc b/src/3rdparty/chromium/device/base/synchronization/one_writer_seqlock.cc
|
||||||
index c62a00ee0..af54520b7 100644
|
index c62a00e..af54520 100644
|
||||||
--- a/src/3rdparty/chromium/device/base/synchronization/one_writer_seqlock.cc
|
--- a/src/3rdparty/chromium/device/base/synchronization/one_writer_seqlock.cc
|
||||||
+++ b/src/3rdparty/chromium/device/base/synchronization/one_writer_seqlock.cc
|
+++ b/src/3rdparty/chromium/device/base/synchronization/one_writer_seqlock.cc
|
||||||
@@ -6,6 +6,8 @@
|
@@ -6,6 +6,8 @@
|
||||||
@ -37,7 +37,7 @@ index c62a00ee0..af54520b7 100644
|
|||||||
|
|
||||||
OneWriterSeqLock::OneWriterSeqLock() : sequence_(0) {}
|
OneWriterSeqLock::OneWriterSeqLock() : sequence_(0) {}
|
||||||
diff --git a/src/3rdparty/chromium/extensions/common/constants.h b/src/3rdparty/chromium/extensions/common/constants.h
|
diff --git a/src/3rdparty/chromium/extensions/common/constants.h b/src/3rdparty/chromium/extensions/common/constants.h
|
||||||
index adbcfa540..5923bd2fe 100644
|
index b5823c7..c152482 100644
|
||||||
--- a/src/3rdparty/chromium/extensions/common/constants.h
|
--- a/src/3rdparty/chromium/extensions/common/constants.h
|
||||||
+++ b/src/3rdparty/chromium/extensions/common/constants.h
|
+++ b/src/3rdparty/chromium/extensions/common/constants.h
|
||||||
@@ -13,6 +13,8 @@
|
@@ -13,6 +13,8 @@
|
||||||
@ -50,7 +50,7 @@ index adbcfa540..5923bd2fe 100644
|
|||||||
|
|
||||||
// Scheme we serve extension content from.
|
// Scheme we serve extension content from.
|
||||||
diff --git a/src/3rdparty/chromium/gpu/config/gpu_util.h b/src/3rdparty/chromium/gpu/config/gpu_util.h
|
diff --git a/src/3rdparty/chromium/gpu/config/gpu_util.h b/src/3rdparty/chromium/gpu/config/gpu_util.h
|
||||||
index 8edbfbe7d..467ebd65e 100644
|
index 8edbfbe..467ebd6 100644
|
||||||
--- a/src/3rdparty/chromium/gpu/config/gpu_util.h
|
--- a/src/3rdparty/chromium/gpu/config/gpu_util.h
|
||||||
+++ b/src/3rdparty/chromium/gpu/config/gpu_util.h
|
+++ b/src/3rdparty/chromium/gpu/config/gpu_util.h
|
||||||
@@ -5,6 +5,8 @@
|
@@ -5,6 +5,8 @@
|
||||||
@ -63,11 +63,11 @@ index 8edbfbe7d..467ebd65e 100644
|
|||||||
#include "gpu/config/gpu_feature_info.h"
|
#include "gpu/config/gpu_feature_info.h"
|
||||||
#include "gpu/gpu_export.h"
|
#include "gpu/gpu_export.h"
|
||||||
diff --git a/src/3rdparty/chromium/net/base/parse_number.h b/src/3rdparty/chromium/net/base/parse_number.h
|
diff --git a/src/3rdparty/chromium/net/base/parse_number.h b/src/3rdparty/chromium/net/base/parse_number.h
|
||||||
index f923b18a7..8f3c6ef78 100644
|
index f70619a..5c4eee7 100644
|
||||||
--- a/src/3rdparty/chromium/net/base/parse_number.h
|
--- a/src/3rdparty/chromium/net/base/parse_number.h
|
||||||
+++ b/src/3rdparty/chromium/net/base/parse_number.h
|
+++ b/src/3rdparty/chromium/net/base/parse_number.h
|
||||||
@@ -10,6 +10,8 @@
|
@@ -10,6 +10,8 @@
|
||||||
#include "base/strings/string_piece.h"
|
|
||||||
#include "net/base/net_export.h"
|
#include "net/base/net_export.h"
|
||||||
|
|
||||||
+#include <cstdint>
|
+#include <cstdint>
|
||||||
@ -76,7 +76,7 @@ index f923b18a7..8f3c6ef78 100644
|
|||||||
// network protocols.
|
// network protocols.
|
||||||
//
|
//
|
||||||
diff --git a/src/3rdparty/chromium/ppapi/utility/completion_callback_factory_thread_traits.h b/src/3rdparty/chromium/ppapi/utility/completion_callback_factory_thread_traits.h
|
diff --git a/src/3rdparty/chromium/ppapi/utility/completion_callback_factory_thread_traits.h b/src/3rdparty/chromium/ppapi/utility/completion_callback_factory_thread_traits.h
|
||||||
index 7c0dcdecb..97054d476 100644
|
index 7c0dcde..97054d4 100644
|
||||||
--- a/src/3rdparty/chromium/ppapi/utility/completion_callback_factory_thread_traits.h
|
--- a/src/3rdparty/chromium/ppapi/utility/completion_callback_factory_thread_traits.h
|
||||||
+++ b/src/3rdparty/chromium/ppapi/utility/completion_callback_factory_thread_traits.h
|
+++ b/src/3rdparty/chromium/ppapi/utility/completion_callback_factory_thread_traits.h
|
||||||
@@ -38,6 +38,10 @@ namespace pp {
|
@@ -38,6 +38,10 @@ namespace pp {
|
||||||
@ -100,10 +100,10 @@ index 7c0dcdecb..97054d476 100644
|
|||||||
|
|
||||||
/// The non-thread-safe version of thread traits. Using this class as the
|
/// The non-thread-safe version of thread traits. Using this class as the
|
||||||
diff --git a/src/3rdparty/chromium/third_party/dawn/src/dawn/native/CacheKey.h b/src/3rdparty/chromium/third_party/dawn/src/dawn/native/CacheKey.h
|
diff --git a/src/3rdparty/chromium/third_party/dawn/src/dawn/native/CacheKey.h b/src/3rdparty/chromium/third_party/dawn/src/dawn/native/CacheKey.h
|
||||||
index 6cec3b6b8..541bba5b1 100644
|
index a65ea9a..ba967c0 100644
|
||||||
--- a/src/3rdparty/chromium/third_party/dawn/src/dawn/native/CacheKey.h
|
--- a/src/3rdparty/chromium/third_party/dawn/src/dawn/native/CacheKey.h
|
||||||
+++ b/src/3rdparty/chromium/third_party/dawn/src/dawn/native/CacheKey.h
|
+++ b/src/3rdparty/chromium/third_party/dawn/src/dawn/native/CacheKey.h
|
||||||
@@ -15,6 +15,7 @@
|
@@ -28,6 +28,7 @@
|
||||||
#ifndef SRC_DAWN_NATIVE_CACHEKEY_H_
|
#ifndef SRC_DAWN_NATIVE_CACHEKEY_H_
|
||||||
#define SRC_DAWN_NATIVE_CACHEKEY_H_
|
#define SRC_DAWN_NATIVE_CACHEKEY_H_
|
||||||
|
|
||||||
@ -112,19 +112,19 @@ index 6cec3b6b8..541bba5b1 100644
|
|||||||
|
|
||||||
#include "dawn/native/stream/ByteVectorSink.h"
|
#include "dawn/native/stream/ByteVectorSink.h"
|
||||||
diff --git a/src/3rdparty/chromium/third_party/libgav1/src/src/utils/threadpool.cc b/src/3rdparty/chromium/third_party/libgav1/src/src/utils/threadpool.cc
|
diff --git a/src/3rdparty/chromium/third_party/libgav1/src/src/utils/threadpool.cc b/src/3rdparty/chromium/third_party/libgav1/src/src/utils/threadpool.cc
|
||||||
index e171db6c7..dfbd126b4 100644
|
index 6fa2e88..6b942ab 100644
|
||||||
--- a/src/3rdparty/chromium/third_party/libgav1/src/src/utils/threadpool.cc
|
--- a/src/3rdparty/chromium/third_party/libgav1/src/src/utils/threadpool.cc
|
||||||
+++ b/src/3rdparty/chromium/third_party/libgav1/src/src/utils/threadpool.cc
|
+++ b/src/3rdparty/chromium/third_party/libgav1/src/src/utils/threadpool.cc
|
||||||
@@ -30,6 +30,7 @@
|
@@ -31,6 +31,7 @@
|
||||||
#include <cstddef>
|
|
||||||
#include <cstdint>
|
#include <cstdint>
|
||||||
|
#include <cstdio>
|
||||||
#include <cstring>
|
#include <cstring>
|
||||||
+#include <cstdio>
|
+#include <cstdio>
|
||||||
#include <new>
|
#include <new>
|
||||||
#include <utility>
|
#include <utility>
|
||||||
|
|
||||||
diff --git a/src/3rdparty/chromium/third_party/perfetto/src/trace_processor/importers/proto/proto_importer_module.h b/src/3rdparty/chromium/third_party/perfetto/src/trace_processor/importers/proto/proto_importer_module.h
|
diff --git a/src/3rdparty/chromium/third_party/perfetto/src/trace_processor/importers/proto/proto_importer_module.h b/src/3rdparty/chromium/third_party/perfetto/src/trace_processor/importers/proto/proto_importer_module.h
|
||||||
index cc2c3a2b3..8eb694e73 100644
|
index cc2c3a2..8eb694e 100644
|
||||||
--- a/src/3rdparty/chromium/third_party/perfetto/src/trace_processor/importers/proto/proto_importer_module.h
|
--- a/src/3rdparty/chromium/third_party/perfetto/src/trace_processor/importers/proto/proto_importer_module.h
|
||||||
+++ b/src/3rdparty/chromium/third_party/perfetto/src/trace_processor/importers/proto/proto_importer_module.h
|
+++ b/src/3rdparty/chromium/third_party/perfetto/src/trace_processor/importers/proto/proto_importer_module.h
|
||||||
@@ -22,6 +22,8 @@
|
@@ -22,6 +22,8 @@
|
||||||
@ -137,12 +137,12 @@ index cc2c3a2b3..8eb694e73 100644
|
|||||||
|
|
||||||
namespace protos {
|
namespace protos {
|
||||||
diff --git a/src/3rdparty/chromium/third_party/skia/src/utils/SkParseColor.cpp b/src/3rdparty/chromium/third_party/skia/src/utils/SkParseColor.cpp
|
diff --git a/src/3rdparty/chromium/third_party/skia/src/utils/SkParseColor.cpp b/src/3rdparty/chromium/third_party/skia/src/utils/SkParseColor.cpp
|
||||||
index 0101632c5..3f04a2dd2 100644
|
index ae6a412..5fe0370 100644
|
||||||
--- a/src/3rdparty/chromium/third_party/skia/src/utils/SkParseColor.cpp
|
--- a/src/3rdparty/chromium/third_party/skia/src/utils/SkParseColor.cpp
|
||||||
+++ b/src/3rdparty/chromium/third_party/skia/src/utils/SkParseColor.cpp
|
+++ b/src/3rdparty/chromium/third_party/skia/src/utils/SkParseColor.cpp
|
||||||
@@ -15,6 +15,10 @@
|
@@ -15,6 +15,10 @@
|
||||||
|
#include <cstring>
|
||||||
#include <iterator>
|
#include <iterator>
|
||||||
#include <string>
|
|
||||||
|
|
||||||
+#include <string.h>
|
+#include <string.h>
|
||||||
+#include <algorithm>
|
+#include <algorithm>
|
||||||
@ -152,20 +152,20 @@ index 0101632c5..3f04a2dd2 100644
|
|||||||
"aliceblue",
|
"aliceblue",
|
||||||
"antiquewhite",
|
"antiquewhite",
|
||||||
diff --git a/src/3rdparty/chromium/third_party/vulkan_memory_allocator/include/vk_mem_alloc.h b/src/3rdparty/chromium/third_party/vulkan_memory_allocator/include/vk_mem_alloc.h
|
diff --git a/src/3rdparty/chromium/third_party/vulkan_memory_allocator/include/vk_mem_alloc.h b/src/3rdparty/chromium/third_party/vulkan_memory_allocator/include/vk_mem_alloc.h
|
||||||
index b26de34cc..caa0df9f9 100644
|
index 0bbfeed..91f19f8 100644
|
||||||
--- a/src/3rdparty/chromium/third_party/vulkan_memory_allocator/include/vk_mem_alloc.h
|
--- a/src/3rdparty/chromium/third_party/vulkan_memory_allocator/include/vk_mem_alloc.h
|
||||||
+++ b/src/3rdparty/chromium/third_party/vulkan_memory_allocator/include/vk_mem_alloc.h
|
+++ b/src/3rdparty/chromium/third_party/vulkan_memory_allocator/include/vk_mem_alloc.h
|
||||||
@@ -105,6 +105,8 @@ Documentation of all members: vk_mem_alloc.h
|
@@ -122,6 +122,8 @@ See documentation chapter: \ref statistics.
|
||||||
- [Source repository on GitHub](https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator)
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
+#include <cstdio>
|
+#include <cstdio>
|
||||||
+
|
+
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
extern "C" {
|
extern "C" {
|
||||||
#endif
|
#endif
|
||||||
diff --git a/src/3rdparty/chromium/third_party/webrtc/modules/portal/xdg_session_details.h b/src/3rdparty/chromium/third_party/webrtc/modules/portal/xdg_session_details.h
|
diff --git a/src/3rdparty/chromium/third_party/webrtc/modules/portal/xdg_session_details.h b/src/3rdparty/chromium/third_party/webrtc/modules/portal/xdg_session_details.h
|
||||||
index ab52508c2..050229a2f 100644
|
index ab52508..050229a 100644
|
||||||
--- a/src/3rdparty/chromium/third_party/webrtc/modules/portal/xdg_session_details.h
|
--- a/src/3rdparty/chromium/third_party/webrtc/modules/portal/xdg_session_details.h
|
||||||
+++ b/src/3rdparty/chromium/third_party/webrtc/modules/portal/xdg_session_details.h
|
+++ b/src/3rdparty/chromium/third_party/webrtc/modules/portal/xdg_session_details.h
|
||||||
@@ -13,6 +13,7 @@
|
@@ -13,6 +13,7 @@
|
||||||
@ -177,7 +177,7 @@ index ab52508c2..050229a2f 100644
|
|||||||
|
|
||||||
namespace webrtc {
|
namespace webrtc {
|
||||||
diff --git a/src/3rdparty/chromium/ui/events/gesture_event_details.h b/src/3rdparty/chromium/ui/events/gesture_event_details.h
|
diff --git a/src/3rdparty/chromium/ui/events/gesture_event_details.h b/src/3rdparty/chromium/ui/events/gesture_event_details.h
|
||||||
index bdf840619..68f473f27 100644
|
index 857da97..e48e24d 100644
|
||||||
--- a/src/3rdparty/chromium/ui/events/gesture_event_details.h
|
--- a/src/3rdparty/chromium/ui/events/gesture_event_details.h
|
||||||
+++ b/src/3rdparty/chromium/ui/events/gesture_event_details.h
|
+++ b/src/3rdparty/chromium/ui/events/gesture_event_details.h
|
||||||
@@ -5,6 +5,7 @@
|
@@ -5,6 +5,7 @@
|
||||||
@ -189,7 +189,7 @@ index bdf840619..68f473f27 100644
|
|||||||
|
|
||||||
#include "base/check_op.h"
|
#include "base/check_op.h"
|
||||||
diff --git a/src/3rdparty/chromium/ui/gfx/geometry/linear_gradient.h b/src/3rdparty/chromium/ui/gfx/geometry/linear_gradient.h
|
diff --git a/src/3rdparty/chromium/ui/gfx/geometry/linear_gradient.h b/src/3rdparty/chromium/ui/gfx/geometry/linear_gradient.h
|
||||||
index d32766283..18b8a85e1 100644
|
index 7239ed5..975b88c 100644
|
||||||
--- a/src/3rdparty/chromium/ui/gfx/geometry/linear_gradient.h
|
--- a/src/3rdparty/chromium/ui/gfx/geometry/linear_gradient.h
|
||||||
+++ b/src/3rdparty/chromium/ui/gfx/geometry/linear_gradient.h
|
+++ b/src/3rdparty/chromium/ui/gfx/geometry/linear_gradient.h
|
||||||
@@ -7,6 +7,7 @@
|
@@ -7,6 +7,7 @@
|
||||||
@ -201,7 +201,7 @@ index d32766283..18b8a85e1 100644
|
|||||||
#include <cstddef>
|
#include <cstddef>
|
||||||
#include <cstdint>
|
#include <cstdint>
|
||||||
diff --git a/src/3rdparty/chromium/v8/src/base/macros.h b/src/3rdparty/chromium/v8/src/base/macros.h
|
diff --git a/src/3rdparty/chromium/v8/src/base/macros.h b/src/3rdparty/chromium/v8/src/base/macros.h
|
||||||
index f81258363..ec7d67550 100644
|
index 93a99ec..f6ddfe7 100644
|
||||||
--- a/src/3rdparty/chromium/v8/src/base/macros.h
|
--- a/src/3rdparty/chromium/v8/src/base/macros.h
|
||||||
+++ b/src/3rdparty/chromium/v8/src/base/macros.h
|
+++ b/src/3rdparty/chromium/v8/src/base/macros.h
|
||||||
@@ -5,6 +5,7 @@
|
@@ -5,6 +5,7 @@
|
||||||
@ -213,7 +213,7 @@ index f81258363..ec7d67550 100644
|
|||||||
#include <type_traits>
|
#include <type_traits>
|
||||||
|
|
||||||
diff --git a/src/core/browsing_data_remover_delegate_qt.h b/src/core/browsing_data_remover_delegate_qt.h
|
diff --git a/src/core/browsing_data_remover_delegate_qt.h b/src/core/browsing_data_remover_delegate_qt.h
|
||||||
index d33af4acb..ce864b6bd 100644
|
index d33af4a..ce864b6 100644
|
||||||
--- a/src/core/browsing_data_remover_delegate_qt.h
|
--- a/src/core/browsing_data_remover_delegate_qt.h
|
||||||
+++ b/src/core/browsing_data_remover_delegate_qt.h
|
+++ b/src/core/browsing_data_remover_delegate_qt.h
|
||||||
@@ -8,6 +8,8 @@
|
@@ -8,6 +8,8 @@
|
||||||
|
|||||||
11
base/qt6/qt6-qtwebengine/qtwebengine-fix-vpx-deps.patch
Normal file
11
base/qt6/qt6-qtwebengine/qtwebengine-fix-vpx-deps.patch
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
--- a/src/3rdparty/chromium/third_party/libvpx/source/libvpx/vpx_util/vpx_thread.h 2024-10-15 18:03:24.753508573 +0600
|
||||||
|
+++ b/src/3rdparty/chromium/third_party/libvpx/source/libvpx/vpx_util/vpx_thread.h 2024-10-15 18:03:53.571336483 +0600
|
||||||
|
@@ -15,7 +15,7 @@
|
||||||
|
#ifndef VPX_VPX_UTIL_VPX_THREAD_H_
|
||||||
|
#define VPX_VPX_UTIL_VPX_THREAD_H_
|
||||||
|
|
||||||
|
-#include "./vpx_config.h"
|
||||||
|
+#include "vpx/vpx_config.h"
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
extern "C" {
|
||||||
@ -10,7 +10,7 @@
|
|||||||
|
|
||||||
Summary: Qt6 - WebSockets component
|
Summary: Qt6 - WebSockets component
|
||||||
Name: qt6-%{qt_module}
|
Name: qt6-%{qt_module}
|
||||||
Version: 6.7.3
|
Version: 6.8.1
|
||||||
Release: 1%{?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
|
||||||
@ -108,6 +108,7 @@ popd
|
|||||||
%{_qt6_archdatadir}/mkspecs/modules/qt_lib_websockets*.pri
|
%{_qt6_archdatadir}/mkspecs/modules/qt_lib_websockets*.pri
|
||||||
%{_qt6_libdir}/qt6/metatypes/qt6*_metatypes.json
|
%{_qt6_libdir}/qt6/metatypes/qt6*_metatypes.json
|
||||||
%{_qt6_libdir}/qt6/modules/*.json
|
%{_qt6_libdir}/qt6/modules/*.json
|
||||||
|
%{_qt6_libdir}/qt6/sbom/%{qt_module}-*.spdx
|
||||||
%{_qt6_libdir}/pkgconfig/*.pc
|
%{_qt6_libdir}/pkgconfig/*.pc
|
||||||
|
|
||||||
%if 0%{?examples}
|
%if 0%{?examples}
|
||||||
@ -117,6 +118,12 @@ popd
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Dec 3 2024 Raven <raven@sysadmins.ws> - 6.8.1-1
|
||||||
|
- 6.8.1
|
||||||
|
|
||||||
|
* Thu Oct 10 2024 Raven <raven@sysadmins.ws> - 6.8.0-1
|
||||||
|
- 6.8.0
|
||||||
|
|
||||||
* Mon Sep 30 2024 Raven <raven@sysadmins.ws> - 6.7.3-1
|
* Mon Sep 30 2024 Raven <raven@sysadmins.ws> - 6.7.3-1
|
||||||
- 6.7.3
|
- 6.7.3
|
||||||
|
|
||||||
|
|||||||
@ -4,7 +4,7 @@
|
|||||||
|
|
||||||
Summary: Qt6 - WebView component
|
Summary: Qt6 - WebView component
|
||||||
Name: qt6-%{qt_module}
|
Name: qt6-%{qt_module}
|
||||||
Version: 6.7.3
|
Version: 6.8.1
|
||||||
Release: 1%{?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
|
||||||
@ -92,6 +92,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
|
|||||||
%{_qt6_libdir}/pkgconfig/Qt6WebViewQuick.pc
|
%{_qt6_libdir}/pkgconfig/Qt6WebViewQuick.pc
|
||||||
%{_qt6_archdatadir}/mkspecs/modules/*.pri
|
%{_qt6_archdatadir}/mkspecs/modules/*.pri
|
||||||
%{_qt6_libdir}/qt6/metatypes/*.json
|
%{_qt6_libdir}/qt6/metatypes/*.json
|
||||||
|
%{_qt6_libdir}/qt6/sbom/%{qt_module}-*.spdx
|
||||||
%{_qt6_libdir}/qt6/modules/*.json
|
%{_qt6_libdir}/qt6/modules/*.json
|
||||||
|
|
||||||
%if 0%{?examples}
|
%if 0%{?examples}
|
||||||
@ -101,6 +102,12 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Dec 3 2024 Raven <raven@sysadmins.ws> - 6.8.1-1
|
||||||
|
- 6.8.1
|
||||||
|
|
||||||
|
* Thu Oct 10 2024 Raven <raven@sysadmins.ws> - 6.8.0-1
|
||||||
|
- 6.8.0
|
||||||
|
|
||||||
* Mon Sep 30 2024 Raven <raven@sysadmins.ws> - 6.7.3-1
|
* Mon Sep 30 2024 Raven <raven@sysadmins.ws> - 6.7.3-1
|
||||||
- 6.7.3
|
- 6.7.3
|
||||||
|
|
||||||
|
|||||||
@ -41,6 +41,7 @@
|
|||||||
%qmake_qt6_wrapper @@QMAKE_QT6_WRAPPER@@
|
%qmake_qt6_wrapper @@QMAKE_QT6_WRAPPER@@
|
||||||
|
|
||||||
%cmake_qt6 \
|
%cmake_qt6 \
|
||||||
|
%undefine __cmake_in_source_build \
|
||||||
%cmake -DCMAKE_BUILD_TYPE=%{_qt6_build_type} \\\
|
%cmake -DCMAKE_BUILD_TYPE=%{_qt6_build_type} \\\
|
||||||
-DCMAKE_INSTALL_PREFIX=%{_qt6_prefix} \\\
|
-DCMAKE_INSTALL_PREFIX=%{_qt6_prefix} \\\
|
||||||
%if "%_qt6_build_tool" == "ninja" \
|
%if "%_qt6_build_tool" == "ninja" \
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
|
|
||||||
Name: qt6
|
Name: qt6
|
||||||
Version: 6.7.3
|
Version: 6.8.1
|
||||||
Release: 1%{?dist}
|
Release: 1%{?dist}
|
||||||
Summary: Qt6 meta package
|
Summary: Qt6 meta package
|
||||||
License: GPL-3.0-only
|
License: GPL-3.0-only
|
||||||
@ -148,6 +148,12 @@ echo "- Qt6 devel meta package" > %{buildroot}%{_docdir}/qt6-devel/README
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Dec 3 2024 Raven <raven@sysadmins.ws> - 6.8.1-1
|
||||||
|
- 6.8.1
|
||||||
|
|
||||||
|
* Thu Oct 10 2024 Raven <raven@sysadmins.ws> - 6.8.0-1
|
||||||
|
- 6.8.0
|
||||||
|
|
||||||
* Mon Sep 30 2024 Raven <raven@sysadmins.ws> - 6.7.3-1
|
* Mon Sep 30 2024 Raven <raven@sysadmins.ws> - 6.7.3-1
|
||||||
- 6.7.3
|
- 6.7.3
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user
