pkgs/raven-rhel8
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qt6: update to 6.7.3

Browse Source
This commit is contained in:
Raven 2024-10-10 09:08:34 +06:00
parent 69f1804a47
commit d89e245bc3
44 changed files with 1204 additions and 175 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
base/qt6/python-pyqt6-sip/python-pyqt6-sip.spec
View File

@ -5,8 +5,8 @@
%global _sip_api %{_sip_api_major}.%{_sip_api_minor}
Name: python-%{pkg_name}
Version: 13.6.0
Release: 2%{?dist}
Version: 13.8.0
Release: 1%{?dist}
Summary: The sip module support for PyQt6
License: GPLv2 or GPLv3
@ -45,12 +45,15 @@ Provides: python%{python3_pkgversion}-pyqt6-sip-api(%{_sip_api_major})%{?_isa} =
%files -n python%{python3_pkgversion}-%{pkg_name}
%doc README
%license LICENSE LICENSE-GPL3
%license LICENSE
%{python3_sitearch}/PyQt6_sip*
%{python3_sitearch}/PyQt6/
%changelog
* Mon Sep 30 2024 Raven <raven@sysadmins.ws> - 13.8.0-1
- 13.8.0
* Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 13.4.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild

11
base/qt6/python-pyqt6/python-pyqt6.spec
View File

@ -6,8 +6,8 @@
Summary: PyQt6 is Python bindings for Qt6
Name: python-pyqt6
Version: 6.7.0
Release: 3%{?snap:^%{snap}}%{?dist}
Version: 6.7.1
Release: 1%{?snap:^%{snap}}%{?dist}
License: gpl-3.0-only
Url: http://www.riverbankcomputing.com/software/pyqt/
@ -18,7 +18,7 @@ BuildRequires: make
BuildRequires: chrpath
BuildRequires: findutils
BuildRequires: cmake
BuildRequires: gcc-toolset-13-gcc-c++
BuildRequires: gcc-toolset-14-gcc-c++
BuildRequires: pkgconfig(dbus-1)
BuildRequires: pkgconfig(dbus-python)
BuildRequires: pkgconfig(libpulse-mainloop-glib)
@ -117,7 +117,7 @@ BuildArch: noarch
%autosetup -n PyQt6-%{version}%{?snap:.%{snap}} -p1
%build
%enable_devtoolset13
%enable_devtoolset14
PATH=%{_qt6_bindir}:$PATH ; export PATH
@ -242,6 +242,9 @@ sed -i \
%changelog
* Mon Sep 30 2024 Raven <raven@sysadmins.ws> - 6.7.1-1
- Update to 6.7.1
* Mon May 27 2024 Raven <raven@sysadmins.ws> - 6.7.0-3
- rebuilt for qt 6.7.2

10
base/qt6/qcoro/qcoro.spec
View File

@ -51,9 +51,9 @@ BuildRequires: qt6-qtbase-private-devel
BuildRequires: cmake
BuildRequires: dbus-x11
%if 0%{?rhel} < 9
BuildRequires: gcc-toolset-13-gcc-c++
BuildRequires: gcc-toolset-13-gcc-plugin-annobin
%if 0%{?rhel} < 10
BuildRequires: gcc-toolset-14-gcc-c++
BuildRequires: gcc-toolset-14-gcc-plugin-annobin
%else
BuildRequires: gcc-c++
%endif
@ -95,8 +95,8 @@ Requires: qt6-qtbase-devel%{?_isa}
%autosetup -p1
%build
%if 0%{?rhel} < 9
. /opt/rh/gcc-toolset-13/enable
%if 0%{?rhel} < 10
%enable_devtoolset14
%endif
%if 0%{?use_qt5}

16
base/qt6/qt6-qt3d/qt6-qt3d.spec
View File

@ -1,3 +1,4 @@
%bcond_with clang
%global qt_module qt3d
@ -8,8 +9,8 @@
Summary: Qt6 - Qt3D QML bindings and C++ APIs
Name: qt6-%{qt_module}
Version: 6.7.2
Release: 2%{?dist}
Version: 6.7.3
Release: 1%{?dist}
%global examples 1
@ -27,10 +28,10 @@ Source1: qt3dcore-config-multilib_p.h
Patch0: qt3d-assimp-fix-build.patch
%if 0%{?use_clang}
%if %{with clang}
BuildRequires: clang
%else
BuildRequires: gcc-toolset-13-gcc-c++
BuildRequires: gcc-toolset-14-gcc-c++
%endif
BuildRequires: cmake
BuildRequires: ninja-build
@ -77,11 +78,11 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
# Disable LTO
%define _lto_cflags %{nil}
%if 0%{?use_clang}
%if %{with clang}
export CC=clang
export CXX=clang++
%else
%enable_devtoolset13
%enable_devtoolset14
%endif
%cmake_qt6 \
@ -213,6 +214,9 @@ popd
%changelog
* Mon Sep 30 2024 Raven <raven@sysadmins.ws> - 6.7.3-1
- 6.7.3
* Thu Jun 27 2024 Raven <raven@sysadmins.ws> - 6.7.2-2
- rebuild (libxkbcommon)

11
base/qt6/qt6-qt5compat/qt6-qt5compat.spec
View File

@ -10,8 +10,8 @@
Summary: Qt6 - Qt 5 Compatibility Libraries
Name: qt6-%{qt_module}
Version: 6.7.2
Release: 2%{?dist}
Version: 6.7.3
Release: 1%{?dist}
License: LGPL-3.0-only OR GPL-3.0-only WITH Qt-GPL-exception-1.0
Url: http://www.qt.io
@ -28,7 +28,7 @@ Source0: https://download.qt.io/official_releases/qt/%{majmin}/%{version}/submod
# Upstreamable patches
BuildRequires: gcc-toolset-13-gcc-c++
BuildRequires: gcc-toolset-14-gcc-c++
BuildRequires: cmake
BuildRequires: ninja-build
BuildRequires: qt6-qtbase-devel >= %{version}
@ -64,7 +64,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
%build
%enable_devtoolset13
%enable_devtoolset14
%cmake_qt6 \
-DQT_BUILD_EXAMPLES:BOOL=%{?examples:ON}%{!?examples:OFF} \
@ -117,6 +117,9 @@ popd
%endif
%changelog
* Mon Sep 30 2024 Raven <raven@sysadmins.ws> - 6.7.3-1
- 6.7.3
* Thu Jun 27 2024 Raven <raven@sysadmins.ws> - 6.7.2-2
- rebuild (libxkbcommon)

11
base/qt6/qt6-qtbase/qt6-qtbase.spec
View File

@ -49,8 +49,8 @@ BuildRequires: pkgconfig(libsystemd)
Name: qt6-qtbase
Summary: Qt6 - QtBase components
Version: 6.7.2
Release: 3%{?dist}
Version: 6.7.3
Release: 1%{?dist}
License: LGPL-3.0-only OR GPL-3.0-only WITH Qt-GPL-exception-1.0
Url: http://qt-project.org/
@ -125,7 +125,7 @@ Patch200: qtbase-qgtk3theme-add-support-for-xdp-to-get-color-scheme.patch
%if 0%{?use_clang}
BuildRequires: clang >= 6.0.0
%else
BuildRequires: gcc-toolset-13-gcc-c++
BuildRequires: gcc-toolset-14-gcc-c++
%endif
BuildRequires: cmake
BuildRequires: ninja-build
@ -376,7 +376,7 @@ RPM_OPT_FLAGS=`echo "$RPM_OPT_FLAGS -Qunused-arguments" | sed 's|-fno-delete-nul
export CC=clang
export CXX=clang++
%else
%enable_devtoolset13
%enable_devtoolset14
%endif
export CFLAGS="$CFLAGS $RPM_OPT_FLAGS"
export CXXFLAGS="$CXXFLAGS $RPM_OPT_FLAGS"
@ -877,6 +877,9 @@ make check -k ||:
%changelog
* Mon Sep 30 2024 Raven <raven@sysadmins.ws> - 6.7.3-1
- 6.7.3
* Fri Sep 13 2024 Raven <raven@sysadmins.ws> - 6.7.2-3
- rebuild (OpenSSL)

11
base/qt6/qt6-qtcharts/qt6-qtcharts.spec
View File

@ -10,8 +10,8 @@
Summary: Qt6 - Charts component
Name: qt6-%{qt_module}
Version: 6.7.2
Release: 2%{?dist}
Version: 6.7.3
Release: 1%{?dist}
License: GPL-3.0-only WITH Qt-GPL-exception-1.0
Url: http://www.qt.io
@ -25,7 +25,7 @@ Source0: https://download.qt.io/official_releases/qt/%{majmin}/%{version}/submod
%endif
BuildRequires: cmake
BuildRequires: gcc-toolset-13-gcc-c++
BuildRequires: gcc-toolset-14-gcc-c++
BuildRequires: ninja-build
BuildRequires: qt6-qtbase-devel >= %{version}
BuildRequires: qt6-qtbase-private-devel
@ -59,7 +59,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
%build
%enable_devtoolset13
%enable_devtoolset14
%cmake_qt6 \
-DQT_BUILD_EXAMPLES:BOOL=%{?examples:ON}%{!?examples:OFF} \
@ -101,6 +101,9 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
%endif
%changelog
* Mon Sep 30 2024 Raven <raven@sysadmins.ws> - 6.7.3-1
- 6.7.3
* Thu Jun 27 2024 Raven <raven@sysadmins.ws> - 6.7.2-2
- rebuild (libxkbcommon)

11
base/qt6/qt6-qtcoap/qt6-qtcoap.spec
View File

@ -4,8 +4,8 @@
Summary: Qt6 - CoAP component
Name: qt6-%{qt_module}
Version: 6.7.2
Release: 2%{?dist}
Version: 6.7.3
Release: 1%{?dist}
License: GPL-3.0-only WITH Qt-GPL-exception-1.0
Url: http://www.qt.io
@ -17,7 +17,7 @@ Source0: https://github.com/qt/%{qt_module}/archive/refs/tags/v%{version}/%{qt_m
## upstreamable patches
BuildRequires: cmake
BuildRequires: gcc-toolset-13-gcc-c++
BuildRequires: gcc-toolset-14-gcc-c++
BuildRequires: ninja-build
BuildRequires: qt6-rpm-macros
BuildRequires: qt6-qtbase-devel >= %{version}
@ -49,7 +49,7 @@ Requires: %{name}-devel%{?_isa} = %{version}-%{release}
%build
%enable_devtoolset13
%enable_devtoolset14
%cmake_qt6 \
-DQT_BUILD_EXAMPLES=%{?examples:ON}%{!?examples:OFF} \
@ -84,6 +84,9 @@ Requires: %{name}-devel%{?_isa} = %{version}-%{release}
%endif
%changelog
* Mon Sep 30 2024 Raven <raven@sysadmins.ws> - 6.7.3-1
- 6.7.3
* Thu Jun 27 2024 Raven <raven@sysadmins.ws> - 6.7.2-2
- rebuild (libxkbcommon)

11
base/qt6/qt6-qtconnectivity/qt6-qtconnectivity.spec
View File

@ -10,8 +10,8 @@
Summary: Qt6 - Connectivity components
Name: qt6-%{qt_module}
Version: 6.7.2
Release: 2%{?dist}
Version: 6.7.3
Release: 1%{?dist}
# See LICENSE.GPL3, respectively, for exception details
License: LGPL-3.0-only OR GPL-3.0-only WITH Qt-GPL-exception-1.0
@ -29,7 +29,7 @@ Source0: https://download.qt.io/official_releases/qt/%{majmin}/%{version}/submod
%global __provides_exclude_from ^%{_qt6_archdatadir}/qml/.*\\.so$
BuildRequires: cmake
BuildRequires: gcc-toolset-13-gcc-c++
BuildRequires: gcc-toolset-14-gcc-c++
BuildRequires: ninja-build
BuildRequires: qt6-rpm-macros
BuildRequires: qt6-qtbase-devel >= %{version}
@ -63,7 +63,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
%build
%enable_devtoolset13
%enable_devtoolset14
%cmake_qt6 \
-DQT_BUILD_EXAMPLES:BOOL=%{?examples:ON}%{!?examples:OFF} \
@ -122,6 +122,9 @@ popd
%endif
%changelog
* Mon Sep 30 2024 Raven <raven@sysadmins.ws> - 6.7.3-1
- 6.7.3
* Thu Jun 27 2024 Raven <raven@sysadmins.ws> - 6.7.2-2
- rebuild (libxkbcommon)

11
base/qt6/qt6-qtdeclarative/qt6-qtdeclarative.spec
View File

@ -15,8 +15,8 @@
Summary: Qt6 - QtDeclarative component
Name: qt6-%{qt_module}
Version: 6.7.2
Release: 2%{?dist}
Version: 6.7.3
Release: 1%{?dist}
License: LGPL-3.0-only OR GPL-3.0-only WITH Qt-GPL-exception-1.0
Url: http://www.qt.io
@ -44,7 +44,7 @@ BuildRequires: cmake
%if 0%{?use_clang}
BuildRequires: clang
%else
BuildRequires: gcc-toolset-13-gcc-c++
BuildRequires: gcc-toolset-14-gcc-c++
%endif
BuildRequires: ninja-build
BuildRequires: qt6-rpm-macros
@ -112,7 +112,7 @@ export PATH=`pwd`:$PATH
export CC=clang
export CXX=clang++
%else
%enable_devtoolset13
%enable_devtoolset14
%endif
%cmake_qt6 -DQT_BUILD_EXAMPLES:BOOL=%{?examples:ON}%{!?examples:OFF}
@ -383,6 +383,9 @@ make check -k -C tests ||:
%endif
%changelog
* Mon Sep 30 2024 Raven <raven@sysadmins.ws> - 6.7.3-1
- 6.7.3
* Thu Jun 27 2024 Raven <raven@sysadmins.ws> - 6.7.2-2
- rebuild (libxkbcommon)

11
base/qt6/qt6-qtgraphs/qt6-qtgraphs.spec
View File

@ -1,8 +1,8 @@
%global qt_module qtgraphs
Name: qt6-qtgraphs
Version: 6.7.2
Release: 2%{?dist}
Version: 6.7.3
Release: 1%{?dist}
%global examples 1
@ -14,7 +14,7 @@ License: BSD-3-Clause AND GFDL-1.3-no-invariants-only AND GPL-3.0-only
URL: https://doc.qt.io/qt-6/qtgraphs-index.html
Source0: https://download.qt.io/official_releases/qt/%{majmin}/%{qt_version}/submodules/%{qt_module}-everywhere-src-%{qt_version}.tar.xz
BuildRequires: gcc-toolset-13-gcc-c++
BuildRequires: gcc-toolset-14-gcc-c++
BuildRequires: cmake
BuildRequires: ninja-build
@ -58,7 +58,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
%autosetup -n %{qt_module}-everywhere-src-%{qt_version} -p1
%build
%enable_devtoolset13
%enable_devtoolset14
%cmake_qt6 \
-DQT_BUILD_EXAMPLES:BOOL=%{?examples:ON}%{!?examples:OFF} \
-DQT_INSTALL_EXAMPLES_SOURCES=%{?examples:ON}%{!?examples:OFF}
@ -103,6 +103,9 @@ popd
%endif
%changelog
* Mon Sep 30 2024 Raven <raven@sysadmins.ws> - 6.7.3-1
- 6.7.3
* Thu Jun 27 2024 Raven <raven@sysadmins.ws> - 6.7.2-2
- rebuild (libxkbcommon)

11
base/qt6/qt6-qthttpserver/qt6-qthttpserver.spec
View File

@ -4,8 +4,8 @@
%global examples 1
Name: qt6-qthttpserver
Version: 6.7.2
Release: 2%{?dist}
Version: 6.7.3
Release: 1%{?dist}
Summary: Library to facilitate the creation of an http server with Qt
License: BSD-3-Clause AND GFDL-1.3-no-invariants-only AND GPL-3.0-only WITH Qt-GPL-exception-1.0
@ -21,7 +21,7 @@ Source0: https://download.qt.io/official_releases/qt/%{majmin}/%{version}/sub
BuildRequires: qt6-rpm-macros
BuildRequires: cmake
BuildRequires: gcc-toolset-13-gcc-c++
BuildRequires: gcc-toolset-14-gcc-c++
BuildRequires: ninja-build
BuildRequires: cmake(Qt6BuildInternals) = %{version}
BuildRequires: cmake(Qt6Core) = %{version}
@ -56,7 +56,7 @@ to the usage of %{name}.
%build
%enable_devtoolset13
%enable_devtoolset14
%cmake_qt6 \
-DQT_BUILD_EXAMPLES:BOOL=%{?examples:ON}%{!?examples:OFF} \
@ -92,6 +92,9 @@ to the usage of %{name}.
%endif
%changelog
* Mon Sep 30 2024 Raven <raven@sysadmins.ws> - 6.7.3-1
- 6.7.3
* Thu Jun 27 2024 Raven <raven@sysadmins.ws> - 6.7.2-2
- rebuild (libxkbcommon)

13
base/qt6/qt6-qtimageformats/qt6-qtimageformats.spec
View File

@ -8,8 +8,8 @@
Summary: Qt6 - QtImageFormats component
Name: qt6-%{qt_module}
Version: 6.7.2
Release: 2%{?dist}
Version: 6.7.3
Release: 1%{?dist}
License: LGPL-3.0-only OR GPL-3.0-only WITH Qt-GPL-exception-1.0
Url: http://www.qt.io
@ -25,8 +25,8 @@ Source0: https://download.qt.io/official_releases/qt/%{majmin}/%{version}/submod
Patch0: qtimageformats-fix-build.patch
BuildRequires: cmake
BuildRequires: gcc-toolset-13-gcc-c++
BuildRequires: ninja-build >= 1.11
BuildRequires: gcc-toolset-14-gcc-c++
BuildRequires: ninja-build
BuildRequires: qt6-qtbase-devel >= %{version}
BuildRequires: qt6-qtbase-private-devel
%{?_qt6:Requires: %{_qt6}%{?_isa} = %{_qt6_version}}
@ -60,7 +60,7 @@ rm -rv src/3rdparty
%build
%enable_devtoolset13
%enable_devtoolset14
%cmake_qt6 -DQT_FEATURE_mng=ON
@ -86,6 +86,9 @@ rm -rv src/3rdparty
%changelog
* Mon Sep 30 2024 Raven <raven@sysadmins.ws> - 6.7.3-1
- 6.7.3
* Thu Jun 27 2024 Raven <raven@sysadmins.ws> - 6.7.2-2
- rebuild (libxkbcommon)

7
base/qt6/qt6-qtlanguageserver/qt6-qtlanguageserver.spec
View File

@ -8,8 +8,8 @@
Summary: Qt6 - LanguageServer component
Name: qt6-%{qt_module}
Version: 6.7.2
Release: 2%{?dist}
Version: 6.7.3
Release: 1%{?dist}
License: GPL-3.0-only WITH Qt-GPL-exception-1.0
Url: http://qt.io
@ -81,6 +81,9 @@ Requires: qt6-qtbase-devel%{?_isa}
%changelog
* Mon Sep 30 2024 Raven <raven@sysadmins.ws> - 6.7.3-1
- 6.7.3
* Thu Jun 27 2024 Raven <raven@sysadmins.ws> - 6.7.2-2
- rebuild (libxkbcommon)

11
base/qt6/qt6-qtlocation/qt6-qtlocation.spec
View File

@ -10,8 +10,8 @@
Summary: Qt6 - Location Libraries
Name: qt6-%{qt_module}
Version: 6.7.2
Release: 2%{?dist}
Version: 6.7.3
Release: 1%{?dist}
# Rest of the licenses are for Qt code in src/location and src/plugins
License: LGPL-3.0-only OR GPL-3.0-only WITH Qt-GPL-exception-1.0
@ -29,7 +29,7 @@ Source0: https://download.qt.io/official_releases/qt/%{majmin}/%{version}/submod
%global __provides_exclude_from ^(%{_qt6_archdatadir}/qml/.*\\.so|%{_qt6_plugindir}/.*\\.so)$
BuildRequires: cmake
BuildRequires: gcc-toolset-13-gcc-c++
BuildRequires: gcc-toolset-14-gcc-c++
BuildRequires: ninja-build
BuildRequires: qt6-rpm-macros
BuildRequires: qt6-qtbase-devel >= %{version}
@ -67,7 +67,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
%build
%enable_devtoolset13
%enable_devtoolset14
# QT is known not to work properly with LTO at this point. Some of the issues
# are being worked on upstream and disabling LTO should be re-evaluated as
# we update this change. Until such time...
@ -125,6 +125,9 @@ popd
%endif
%changelog
* Mon Sep 30 2024 Raven <raven@sysadmins.ws> - 6.7.3-1
- 6.7.3
* Thu Jun 27 2024 Raven <raven@sysadmins.ws> - 6.7.2-2
- rebuild (libxkbcommon)

11
base/qt6/qt6-qtlottie/qt6-qtlottie.spec
View File

@ -8,8 +8,8 @@
Summary: Qt6 - Lottie Animation
Name: qt6-%{qt_module}
Version: 6.7.2
Release: 2%{?dist}
Version: 6.7.3
Release: 1%{?dist}
License: GPL-3.0-only WITH Qt-GPL-exception-1.0
Url: http://www.qt.io
@ -23,7 +23,7 @@ Source0: https://download.qt.io/official_releases/qt/%{majmin}/%{version}/submod
%endif
BuildRequires: cmake
BuildRequires: gcc-toolset-13-gcc-c++
BuildRequires: gcc-toolset-14-gcc-c++
BuildRequires: ninja-build
BuildRequires: qt6-qtbase-devel >= %{version}
BuildRequires: qt6-qtbase-private-devel
@ -49,7 +49,7 @@ Requires: qt6-qtbase-devel%{?_isa}
%build
%enable_devtoolset13
%enable_devtoolset14
%cmake_qt6
@ -79,6 +79,9 @@ Requires: qt6-qtbase-devel%{?_isa}
%changelog
* Mon Sep 30 2024 Raven <raven@sysadmins.ws> - 6.7.3-1
- 6.7.3
* Thu Jun 27 2024 Raven <raven@sysadmins.ws> - 6.7.2-2
- rebuild (libxkbcommon)

11
base/qt6/qt6-qtmqtt/qt6-qtmqtt.spec
View File

@ -1,8 +1,8 @@
%global qt_module qtmqtt
Name: qt6-%{qt_module}
Version: 6.7.2
Release: 2%{?dist}
Version: 6.7.3
Release: 1%{?dist}
Summary: Qt6 - Mqtt module
License: GPL-3.0-only WITH Qt-GPL-exception-1.0
@ -10,7 +10,7 @@ URL: https://github.com/qt/qtmqtt/
Source0: https://github.com/qt/qtmqtt/archive/refs/tags/v%{version}/%{qt_module}-%{version}.tar.gz
BuildRequires: cmake >= 3.16
BuildRequires: gcc-toolset-13-gcc-c++
BuildRequires: gcc-toolset-14-gcc-c++
BuildRequires: ninja-build
BuildRequires: qt6-qtbase-devel
BuildRequires: qt6-rpm-macros
@ -40,7 +40,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
%autosetup -n %{qt_module}-%{version}
%build
%enable_devtoolset13
%enable_devtoolset14
%cmake_qt6
%cmake_build
@ -69,6 +69,9 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
%{_qt6_examplesdir}
%changelog
* Mon Sep 30 2024 Raven <raven@sysadmins.ws> - 6.7.3-1
- 6.7.3
* Thu Jun 27 2024 Raven <raven@sysadmins.ws> - 6.7.2-2
- rebuild (libxkbcommon)

21
base/qt6/qt6-qtmultimedia/qt6-qtmultimedia.spec
View File

@ -16,8 +16,8 @@
Summary: Qt6 - Multimedia support
Name: qt6-%{qt_module}
Version: 6.7.2
Release: 2%{?dist}
Version: 6.7.3
Release: 1%{?dist}
License: LGPL-3.0-only OR GPL-3.0-only WITH Qt-GPL-exception-1.0
Url: http://www.qt.io
@ -36,7 +36,7 @@ Source0: https://download.qt.io/official_releases/qt/%{majmin}/%{version}/submod
BuildRequires: cmake
%if 0%{?rhel} && 0%{?rhel} < 10
BuildRequires: gcc-toolset-13-gcc-c++
BuildRequires: gcc-toolset-14-gcc-c++
%else
BuildRequires: gcc-c++
%endif
@ -113,7 +113,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
%build
%if 0%{?rhel} < 10
%enable_devtoolset13
%enable_devtoolset14
%endif
%cmake_qt6 -DQT_BUILD_EXAMPLES:BOOL=%{?examples:ON}%{!?examples:OFF}
@ -156,7 +156,7 @@ popd
%endif
%files devel
%{_qt6_headerdir}/QtQGstreamerMediaPlugin/
%{_qt6_headerdir}/QtQGstreamerMediaPluginImpl/
%{_qt6_headerdir}/QtMultimedia/
%{_qt6_headerdir}/QtMultimediaQuick/
%{_qt6_headerdir}/QtMultimediaWidgets/
@ -165,8 +165,8 @@ popd
%{_qt6_libdir}/libQt6BundledResonanceAudio.a
%{_qt6_libdir}/libQt6Multimedia.so
%{_qt6_libdir}/libQt6Multimedia.prl
%{_qt6_libdir}/libQt6QGstreamerMediaPlugin.a
%{_qt6_libdir}/libQt6QGstreamerMediaPlugin.prl
%{_qt6_libdir}/libQt6QGstreamerMediaPluginImpl.a
%{_qt6_libdir}/libQt6QGstreamerMediaPluginImpl.prl
%{_qt6_libdir}/libQt6MultimediaQuick.so
%{_qt6_libdir}/libQt6MultimediaQuick.prl
%{_qt6_libdir}/libQt6MultimediaWidgets.so
@ -179,8 +179,8 @@ popd
%{_qt6_libdir}/cmake/Qt6BuildInternals/StandaloneTests/*.cmake
%dir %{_qt6_libdir}/cmake/Qt6BundledResonanceAudio/
%{_qt6_libdir}/cmake/Qt6BundledResonanceAudio/*.cmake
%dir %{_qt6_libdir}/cmake/Qt6QGstreamerMediaPluginPrivate/
%{_qt6_libdir}/cmake/Qt6QGstreamerMediaPluginPrivate/*.cmake
%dir %{_qt6_libdir}/cmake/Qt6QGstreamerMediaPluginImplPrivate/
%{_qt6_libdir}/cmake/Qt6QGstreamerMediaPluginImplPrivate/*.cmake
%dir %{_qt6_libdir}/cmake/Qt6MultimediaQuickPrivate
%{_qt6_libdir}/cmake/Qt6MultimediaQuickPrivate/*.cmake
%dir %{_qt6_libdir}/cmake/Qt6Multimedia
@ -206,6 +206,9 @@ popd
%changelog
* Mon Sep 30 2024 Raven <raven@sysadmins.ws> - 6.7.3-1
- 6.7.3
* Thu Jun 27 2024 Raven <raven@sysadmins.ws> - 6.7.2-2
- rebuild (libxkbcommon)

11
base/qt6/qt6-qtnetworkauth/qt6-qtnetworkauth.spec
View File

@ -10,8 +10,8 @@
Summary: Qt6 - NetworkAuth component
Name: qt6-%{qt_module}
Version: 6.7.2
Release: 2%{?dist}
Version: 6.7.3
Release: 1%{?dist}
License: GPL-3.0-only WITH Qt-GPL-exception-1.0
Url: http://www.qt.io
@ -28,7 +28,7 @@ Source0: https://download.qt.io/official_releases/qt/%{majmin}/%{version}/submod
%global __provides_exclude_from ^(%{_qt6_archdatadir}/qml/.*\\.so|%{_qt6_plugindir}/.*\\.so)$
BuildRequires: cmake
BuildRequires: gcc-toolset-13-gcc-c++
BuildRequires: gcc-toolset-14-gcc-c++
BuildRequires: ninja-build
BuildRequires: qt6-qtbase-devel >= %{version}
BuildRequires: qt6-qtbase-private-devel
@ -58,7 +58,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
%build
%enable_devtoolset13
%enable_devtoolset14
%cmake_qt6 \
-DQT_BUILD_EXAMPLES:BOOL=%{?examples:ON}%{!?examples:OFF} \
@ -109,6 +109,9 @@ popd
%changelog
* Mon Sep 30 2024 Raven <raven@sysadmins.ws> - 6.7.3-1
- 6.7.3
* Thu Jun 27 2024 Raven <raven@sysadmins.ws> - 6.7.2-2
- rebuild (libxkbcommon)

11
base/qt6/qt6-qtopcua/qt6-qtopcua.spec
View File

@ -4,8 +4,8 @@
Summary: Qt6 - OPC UA component
Name: qt6-%{qt_module}
Version: 6.7.2
Release: 3%{?dist}
Version: 6.7.3
Release: 1%{?dist}
License: LGPL-3.0-only OR GPL-3.0-only WITH Qt-GPL-exception-1.0
Url: http://www.qt.io
@ -17,7 +17,7 @@ Source0: https://github.com/qt/%{qt_module}/archive/refs/tags/v%{version}/%{qt_m
## upstreamable patches
BuildRequires: cmake
BuildRequires: gcc-toolset-13-gcc-c++
BuildRequires: gcc-toolset-11-gcc-c++
BuildRequires: ninja-build
BuildRequires: qt6-rpm-macros
BuildRequires: qt6-qtbase-devel >= %{version}
@ -52,7 +52,7 @@ Requires: %{name}-devel%{?_isa} = %{version}-%{release}
%build
%enable_devtoolset13
%enable_devtoolset14
%cmake_qt6 \
-DQT_BUILD_EXAMPLES=%{?examples:ON}%{!?examples:OFF} \
-DQT_INSTALL_EXAMPLES_SOURCES=%{?examples:ON}%{!?examples:OFF}
@ -100,6 +100,9 @@ Requires: %{name}-devel%{?_isa} = %{version}-%{release}
%changelog
* Mon Sep 30 2024 Raven <raven@sysadmins.ws> - 6.7.3-1
- 6.7.3
* Fri Sep 13 2024 Raven <raven@sysadmins.ws> - 6.7.2-3
- rebuild (OpenSSL)

11
base/qt6/qt6-qtpositioning/qt6-qtpositioning.spec
View File

@ -10,8 +10,8 @@
Summary: Qt6 - Positioning component
Name: qt6-%{qt_module}
Version: 6.7.2
Release: 2%{?dist}
Version: 6.7.3
Release: 1%{?dist}
License: LGPL-3.0-only OR GPL-3.0-only WITH Qt-GPL-exception-1.0
Url: http://www.qt.io
@ -35,7 +35,7 @@ Source0: https://download.qt.io/official_releases/qt/%{majmin}/%{version}/submod
%global __provides_exclude_from ^(%{_qt6_archdatadir}/qml/.*\\.so|%{_qt6_plugindir}/.*\\.so)$
BuildRequires: cmake
BuildRequires: gcc-toolset-13-gcc-c++
BuildRequires: gcc-toolset-14-gcc-c++
BuildRequires: ninja-build
BuildRequires: qt6-rpm-macros
BuildRequires: qt6-qtbase-devel >= %{version}
@ -85,7 +85,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
# Disable LTO
%define _lto_cflags %{nil}
%enable_devtoolset13
%enable_devtoolset14
%cmake_qt6 \
@ -148,6 +148,9 @@ popd
%endif
%changelog
* Mon Sep 30 2024 Raven <raven@sysadmins.ws> - 6.7.3-1
- 6.7.3
* Thu Jun 27 2024 Raven <raven@sysadmins.ws> - 6.7.2-2
- rebuild (libxkbcommon)

11
base/qt6/qt6-qtquick3d/qt6-qtquick3d.spec
View File

@ -10,8 +10,8 @@
Summary: Qt6 - Quick3D Libraries and utilities
Name: qt6-%{qt_module}
Version: 6.7.2
Release: 2%{?dist}
Version: 6.7.3
Release: 1%{?dist}
License: LGPL-3.0-only OR GPL-3.0-only WITH Qt-GPL-exception-1.0
Url: http://www.qt.io
@ -29,7 +29,7 @@ BuildRequires: cmake
%if 0%{?rhel} >= 10
BuildRequires: gcc-c++
%else
BuildRequires: gcc-toolset-13-gcc-c++
BuildRequires: gcc-toolset-14-gcc-c++
%endif
BuildRequires: ninja-build
BuildRequires: qt6-rpm-macros >= %{version}
@ -80,7 +80,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
CXXFLAGS="$CXXFLAGS -mno-avx"
%endif
%else
%enable_devtoolset13
%enable_devtoolset14
%endif
# QT is known not to work properly with LTO at this point. Some of the issues
@ -254,6 +254,9 @@ popd
%endif
%changelog
* Mon Sep 30 2024 Raven <raven@sysadmins.ws> - 6.7.3-1
- 6.7.3
* Thu Jun 27 2024 Raven <raven@sysadmins.ws> - 6.7.2-2
- rebuild (libxkbcommon)

11
base/qt6/qt6-qtquicktimeline/qt6-qtquicktimeline.spec
View File

@ -8,8 +8,8 @@
Summary: Qt6 - QuickTimeline plugin
Name: qt6-%{qt_module}
Version: 6.7.2
Release: 2%{?dist}
Version: 6.7.3
Release: 1%{?dist}
License: GPL-3.0-only WITH Qt-GPL-exception-1.0
Url: http://www.qt.io
@ -26,7 +26,7 @@ BuildRequires: cmake
%if 0%{?rhel} >= 10
BuildRequires: gcc-c++
%else
BuildRequires: gcc-toolset-13-gcc-c++
BuildRequires: gcc-toolset-14-gcc-c++
%endif
BuildRequires: ninja-build
BuildRequires: qt6-rpm-macros >= %{version}
@ -55,7 +55,7 @@ Requires: qt6-qtdeclarative-devel%{?_isa}
%build
%if 0%{?rhel} < 10
%enable_devtoolset13
%enable_devtoolset14
%endif
%cmake_qt6
@ -95,6 +95,9 @@ Requires: qt6-qtdeclarative-devel%{?_isa}
%{_qt6_libdir}/pkgconfig/*.pc
%changelog
* Mon Sep 30 2024 Raven <raven@sysadmins.ws> - 6.7.3-1
- 6.7.3
* Thu Jun 27 2024 Raven <raven@sysadmins.ws> - 6.7.2-2
- rebuild (libxkbcommon)

11
base/qt6/qt6-qtremoteobjects/qt6-qtremoteobjects.spec
View File

@ -10,8 +10,8 @@
Summary: Qt6 - Qt Remote Objects
Name: qt6-%{qt_module}
Version: 6.7.2
Release: 2%{?dist}
Version: 6.7.3
Release: 1%{?dist}
License: LGPL-3.0-only OR GPL-3.0-only WITH Qt-GPL-exception-1.0
Url: http://www.qt.io
@ -25,7 +25,7 @@ Source0: https://download.qt.io/official_releases/qt/%{majmin}/%{version}/submod
%endif
BuildRequires: cmake
BuildRequires: gcc-toolset-13-gcc-c++
BuildRequires: gcc-toolset-14-gcc-c++
BuildRequires: ninja-build
BuildRequires: qt6-rpm-macros
BuildRequires: qt6-qtbase-devel >= %{version}
@ -59,7 +59,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
%build
%enable_devtoolset13
%enable_devtoolset14
%cmake_qt6 \
-DQT_BUILD_EXAMPLES:BOOL=%{?examples:ON}%{!?examples:OFF} \
@ -110,6 +110,9 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
%changelog
* Mon Sep 30 2024 Raven <raven@sysadmins.ws> - 6.7.3-1
- 6.7.3
* Thu Jun 27 2024 Raven <raven@sysadmins.ws> - 6.7.2-2
- rebuild (libxkbcommon)

11
base/qt6/qt6-qtscxml/qt6-qtscxml.spec
View File

@ -10,8 +10,8 @@
Summary: Qt6 - ScXml component
Name: qt6-%{qt_module}
Version: 6.7.2
Release: 2%{?dist}
Version: 6.7.3
Release: 1%{?dist}
License: LGPL-3.0-only OR GPL-3.0-only WITH Qt-GPL-exception-1.0
Url: http://www.qt.io
@ -25,7 +25,7 @@ Source0: https://download.qt.io/official_releases/qt/%{majmin}/%{version}/submod
%endif
BuildRequires: cmake
BuildRequires: gcc-toolset-13-gcc-c++
BuildRequires: gcc-toolset-14-gcc-c++
BuildRequires: ninja-build
BuildRequires: qt6-qtbase-devel >= %{version}
BuildRequires: qt6-qtbase-private-devel
@ -62,7 +62,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
%build
%enable_devtoolset13
%enable_devtoolset14
%cmake_qt6 \
-DQT_BUILD_EXAMPLES:BOOL=%{?examples:ON}%{!?examples:OFF} \
@ -119,6 +119,9 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
%changelog
* Mon Sep 30 2024 Raven <raven@sysadmins.ws> - 6.7.3-1
- 6.7.3
* Thu Jun 27 2024 Raven <raven@sysadmins.ws> - 6.7.2-2
- rebuild (libxkbcommon)

11
base/qt6/qt6-qtsensors/qt6-qtsensors.spec
View File

@ -10,8 +10,8 @@
Summary: Qt6 - Sensors component
Name: qt6-%{qt_module}
Version: 6.7.2
Release: 2%{?dist}
Version: 6.7.3
Release: 1%{?dist}
# See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
License: LGPL-3.0-only OR GPL-3.0-only WITH Qt-GPL-exception-1.0
@ -29,7 +29,7 @@ Source0: https://download.qt.io/official_releases/qt/%{majmin}/%{version}/submod
%global __provides_exclude_from ^(%{_qt6_archdatadir}/qml/.*\\.so|%{_qt6_plugindir}/.*\\.so)$
BuildRequires: cmake
BuildRequires: gcc-toolset-13-gcc-c++
BuildRequires: gcc-toolset-14-gcc-c++
BuildRequires: ninja-build
BuildRequires: qt6-rpm-macros
BuildRequires: qt6-qtbase-devel >= %{version}
@ -70,7 +70,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
%build
%enable_devtoolset13
%enable_devtoolset14
%cmake_qt6 \
-DQT_BUILD_EXAMPLES:BOOL=%{?examples:ON}%{!?examples:OFF} \
@ -129,6 +129,9 @@ popd
%endif
%changelog
* Mon Sep 30 2024 Raven <raven@sysadmins.ws> - 6.7.3-1
- 6.7.3
* Thu Jun 27 2024 Raven <raven@sysadmins.ws> - 6.7.2-2
- rebuild (libxkbcommon)

11
base/qt6/qt6-qtserialbus/qt6-qtserialbus.spec
View File

@ -10,8 +10,8 @@
Summary: Qt6 - SerialBus component
Name: qt6-%{qt_module}
Version: 6.7.2
Release: 2%{?dist}
Version: 6.7.3
Release: 1%{?dist}
License: LGPL-3.0-only OR GPL-3.0-only WITH Qt-GPL-exception-1.0
Url: http://www.qt.io
@ -29,7 +29,7 @@ Source0: https://download.qt.io/official_releases/qt/%{majmin}/%{version}/submod
Patch100: qtserialbus-everywhere-src-5.12.3-SIOCGSTAMP.patch
BuildRequires: cmake
BuildRequires: gcc-toolset-13-gcc-c++
BuildRequires: gcc-toolset-14-gcc-c++
BuildRequires: ninja-build
BuildRequires: qt6-rpm-macros
BuildRequires: qt6-qtbase-devel >= %{version}
@ -66,7 +66,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
%build
%enable_devtoolset13
%enable_devtoolset14
%cmake_qt6 \
-DQT_BUILD_EXAMPLES:BOOL=%{?examples:ON}%{!?examples:OFF} \
@ -106,6 +106,9 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
%changelog
* Mon Sep 30 2024 Raven <raven@sysadmins.ws> - 6.7.3-1
- 6.7.3
* Thu Jun 27 2024 Raven <raven@sysadmins.ws> - 6.7.2-2
- rebuild (libxkbcommon)

11
base/qt6/qt6-qtserialport/qt6-qtserialport.spec
View File

@ -10,8 +10,8 @@
Summary: Qt6 - SerialPort component
Name: qt6-%{qt_module}
Version: 6.7.2
Release: 2%{?dist}
Version: 6.7.3
Release: 1%{?dist}
# See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
License: LGPL-3.0-only OR GPL-3.0-only WITH Qt-GPL-exception-1.0
@ -26,7 +26,7 @@ Source0: https://download.qt.io/official_releases/qt/%{majmin}/%{version}/submod
%endif
BuildRequires: cmake
BuildRequires: gcc-toolset-13-gcc-c++
BuildRequires: gcc-toolset-14-gcc-c++
BuildRequires: ninja-build
BuildRequires: qt6-rpm-macros
BuildRequires: qt6-qtbase-devel >= %{version}
@ -60,7 +60,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
%build
%enable_devtoolset13
%enable_devtoolset14
%cmake_qt6 \
-DQT_BUILD_EXAMPLES:BOOL=%{?examples:ON}%{!?examples:OFF} \
@ -109,6 +109,9 @@ popd
%endif
%changelog
* Mon Sep 30 2024 Raven <raven@sysadmins.ws> - 6.7.3-1
- 6.7.3
* Thu Jun 27 2024 Raven <raven@sysadmins.ws> - 6.7.2-2
- rebuild (libxkbcommon)

11
base/qt6/qt6-qtshadertools/qt6-qtshadertools.spec
View File

@ -8,8 +8,8 @@
Summary: Qt6 - Qt Shader Tools module builds on the SPIR-V Open Source Ecosystem
Name: qt6-%{qt_module}
Version: 6.7.2
Release: 2%{?dist}
Version: 6.7.3
Release: 1%{?dist}
License: LGPL-3.0-only OR GPL-3.0-only WITH Qt-GPL-exception-1.0
Url: http://www.qt.io
@ -26,7 +26,7 @@ Source0: https://download.qt.io/official_releases/qt/%{majmin}/%{version}/submod
# Upstreamable patches
BuildRequires: gcc-toolset-13-gcc-c++
BuildRequires: gcc-toolset-14-gcc-c++
BuildRequires: cmake
BuildRequires: ninja-build
BuildRequires: qt6-qtbase-devel >= %{version}
@ -50,7 +50,7 @@ Requires: qt6-qtbase-devel%{?_isa}
%build
%enable_devtoolset13
%enable_devtoolset14
%cmake_qt6
@ -112,6 +112,9 @@ popd
%{_qt6_libdir}/pkgconfig/Qt6ShaderTools.pc
%changelog
* Mon Sep 30 2024 Raven <raven@sysadmins.ws> - 6.7.3-1
- 6.7.3
* Thu Jun 27 2024 Raven <raven@sysadmins.ws> - 6.7.2-2
- rebuild (libxkbcommon)

11
base/qt6/qt6-qtspeech/qt6-qtspeech.spec
View File

@ -10,8 +10,8 @@
Summary: Qt6 - Speech component
Name: qt6-%{qt_module}
Version: 6.7.2
Release: 2%{?dist}
Version: 6.7.3
Release: 1%{?dist}
# Code can be either LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only
# See e.g. src/plugins/speechdispatcher or src/tts
@ -21,7 +21,7 @@ Url: http://www.qt.io
%global majmin %(echo %{version} | cut -d. -f1-2)
Source0: https://download.qt.io/official_releases/qt/%{majmin}/%{version}/submodules/%{qt_module}-everywhere-src-%{version}.tar.xz
BuildRequires: gcc-toolset-13-gcc-c++
BuildRequires: gcc-toolset-14-gcc-c++
BuildRequires: cmake
BuildRequires: ninja-build
BuildRequires: qt6-qtbase-devel >= %{version}
@ -84,7 +84,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
%build
%enable_devtoolset13
%enable_devtoolset14
%cmake_qt6 -DQT_BUILD_EXAMPLES:BOOL=%{?examples:ON}%{!?examples:OFF}
@ -147,6 +147,9 @@ popd
%changelog
* Mon Sep 30 2024 Raven <raven@sysadmins.ws> - 6.7.3-1
- 6.7.3
* Thu Jun 27 2024 Raven <raven@sysadmins.ws> - 6.7.2-2
- rebuild (libxkbcommon)

11
base/qt6/qt6-qtsvg/qt6-qtsvg.spec
View File

@ -10,8 +10,8 @@
Summary: Qt6 - Support for rendering and displaying SVG
Name: qt6-%{qt_module}
Version: 6.7.2
Release: 2%{?dist}
Version: 6.7.3
Release: 1%{?dist}
License: LGPL-3.0-only OR GPL-3.0-only WITH Qt-GPL-exception-1.0
Url: http://www.qt.io
@ -27,7 +27,7 @@ Source0: https://download.qt.io/official_releases/qt/%{majmin}/%{version}/submod
# filter plugin provides
%global __provides_exclude_from ^%{_qt6_plugindir}/.*\\.so$
BuildRequires: gcc-toolset-13-gcc-c++
BuildRequires: gcc-toolset-14-gcc-c++
BuildRequires: cmake
BuildRequires: ninja-build
BuildRequires: qt6-qtbase-devel >= %{version}
@ -62,7 +62,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
%build
%enable_devtoolset13
%enable_devtoolset14
%cmake_qt6 \
@ -119,6 +119,9 @@ popd
%endif
%changelog
* Mon Sep 30 2024 Raven <raven@sysadmins.ws> - 6.7.3-1
- 6.7.3
* Thu Jun 27 2024 Raven <raven@sysadmins.ws> - 6.7.2-2
- rebuild (libxkbcommon)

15
base/qt6/qt6-qttools/qt6-qttools.spec
View File

@ -9,8 +9,8 @@
Summary: Qt6 - QtTool components
Name: qt6-qttools
Version: 6.7.2
Release: 2%{?dist}
Version: 6.7.3
Release: 1%{?dist}
License: LGPL-3.0-only OR GPL-3.0-only WITH Qt-GPL-exception-1.0
Url: http://www.qt.io
@ -30,6 +30,8 @@ Patch1: qttools-run-qttools-with-qt6-suffix.patch
# 32-bit MIPS needs explicit -latomic
Patch2: qttools-add-libatomic.patch
Patch3: qttools-llvm19.patch
## upstream patches
Source20: assistant.desktop
@ -37,7 +39,7 @@ Source21: designer.desktop
Source22: linguist.desktop
Source23: qdbusviewer.desktop
BuildRequires: gcc-toolset-13-gcc-c++
BuildRequires: gcc-toolset-14-gcc-c++
BuildRequires: cmake
BuildRequires: ninja-build
BuildRequires: desktop-file-utils
@ -150,8 +152,10 @@ Requires: %{name}-common = %{version}-%{release}
%patch2 -p1 -b .libatomic
%endif
%patch3 -p1 -b .llvm19
%build
%enable_devtoolset13
%enable_devtoolset14
%cmake_qt6 \
-DQT_BUILD_EXAMPLES:BOOL=%{?examples:ON}%{!?examples:OFF} \
@ -363,6 +367,9 @@ popd
%changelog
* Mon Sep 30 2024 Raven <raven@sysadmins.ws> - 6.7.3-1
- 6.7.3
* Thu Jun 27 2024 Raven <raven@sysadmins.ws> - 6.7.2-2
- rebuild (libxkbcommon)

201
base/qt6/qt6-qttools/qttools-llvm19.patch Normal file
View File

@ -0,0 +1,201 @@
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
base/qt6/qt6-qttranslations/qt6-qttranslations.spec
View File

@ -7,8 +7,8 @@
Summary: Qt6 - QtTranslations module
Name: qt6-%{qt_module}
Version: 6.7.2
Release: 2%{?dist}
Version: 6.7.3
Release: 1%{?dist}
License: GPL-3.0-only WITH Qt-GPL-exception-1.0
Url: http://www.qt.io
@ -127,6 +127,9 @@ Provides: %{_qt6}-zh_TW = %{version}-%{release}
%changelog
* Mon Sep 30 2024 Raven <raven@sysadmins.ws> - 6.7.3-1
- 6.7.3
* Thu Jun 27 2024 Raven <raven@sysadmins.ws> - 6.7.2-2
- rebuild (libxkbcommon)

11
base/qt6/qt6-qtvirtualkeyboard/qt6-qtvirtualkeyboard.spec
View File

@ -10,8 +10,8 @@
Summary: Qt6 - VirtualKeyboard component
Name: qt6-%{qt_module}
Version: 6.7.2
Release: 2%{?dist}
Version: 6.7.3
Release: 1%{?dist}
License: GPL-3.0-only WITH Qt-GPL-exception-1.0
Url: http://qt.io
@ -27,7 +27,7 @@ Source0: https://download.qt.io/official_releases/qt/%{majmin}/%{version}/submod
## upstreamable patches
BuildRequires: cmake
BuildRequires: gcc-toolset-13-gcc-c++
BuildRequires: gcc-toolset-14-gcc-c++
BuildRequires: ninja-build
BuildRequires: qt6-qtbase-devel >= %{version}
BuildRequires: qt6-qtbase-private-devel
@ -76,7 +76,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
%build
%enable_devtoolset13
%enable_devtoolset14
%cmake_qt6 \
-DQT_BUILD_EXAMPLES:BOOL=%{?examples:ON}%{!?examples:OFF} \
@ -128,6 +128,9 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
%endif
%changelog
* Mon Sep 30 2024 Raven <raven@sysadmins.ws> - 6.7.3-1
- 6.7.3
* Thu Jun 27 2024 Raven <raven@sysadmins.ws> - 6.7.2-2
- rebuild (libxkbcommon)

11
base/qt6/qt6-qtwayland/qt6-qtwayland.spec
View File

@ -9,8 +9,8 @@
Summary: Qt6 - Wayland platform support and QtCompositor module
Name: qt6-%{qt_module}
Version: 6.7.2
Release: 2%{?dist}
Version: 6.7.3
Release: 1%{?dist}
License: LGPL-3.0-only OR GPL-3.0-only WITH Qt-GPL-exception-1.0
Url: http://www.qt.io
@ -32,7 +32,7 @@ Patch0: qtwayland-use-adwaita-decorations-by-default.patch
# filter qml provides
%global __provides_exclude_from ^%{_qt6_archdatadir}/qml/.*\\.so$
BuildRequires: gcc-toolset-13-gcc-c++
BuildRequires: gcc-toolset-14-gcc-c++
BuildRequires: cmake
BuildRequires: ninja-build
BuildRequires: qt6-qtbase-devel >= %{version}
@ -82,7 +82,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
%build
%enable_devtoolset13
%enable_devtoolset14
%cmake_qt6 -DQT_BUILD_EXAMPLES:BOOL=%{?examples:ON}%{!?examples:OFF}
@ -176,6 +176,9 @@ popd
%endif
%changelog
* Mon Sep 30 2024 Raven <raven@sysadmins.ws> - 6.7.3-1
- 6.7.3
* Thu Jun 27 2024 Raven <raven@sysadmins.ws> - 6.7.2-2
- rebuild (libxkbcommon)

11
base/qt6/qt6-qtwebchannel/qt6-qtwebchannel.spec
View File

@ -10,8 +10,8 @@
Summary: Qt6 - WebChannel component
Name: qt6-%{qt_module}
Version: 6.7.2
Release: 2%{?dist}
Version: 6.7.3
Release: 1%{?dist}
License: LGPL-3.0-only OR GPL-3.0-only WITH Qt-GPL-exception-1.0
Url: http://qt.io
@ -25,7 +25,7 @@ Source0: https://download.qt.io/official_releases/qt/%{majmin}/%{version}/submod
%endif
BuildRequires: cmake
BuildRequires: gcc-toolset-13-gcc-c++
BuildRequires: gcc-toolset-14-gcc-c++
BuildRequires: ninja-build
BuildRequires: qt6-rpm-macros
BuildRequires: qt6-qtbase-devel >= %{version}
@ -64,7 +64,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
%build
%enable_devtoolset13
%enable_devtoolset14
%cmake_qt6 \
-DQT_BUILD_EXAMPLES:BOOL=%{?examples:ON}%{!?examples:OFF} \
@ -123,6 +123,9 @@ popd
%changelog
* Mon Sep 30 2024 Raven <raven@sysadmins.ws> - 6.7.3-1
- 6.7.3
* Thu Jun 27 2024 Raven <raven@sysadmins.ws> - 6.7.2-2
- rebuild (libxkbcommon)

81
base/qt6/qt6-qtwebengine/extensions_api_provider_qt.cpp Normal file
View File

@ -0,0 +1,81 @@
// Copyright (C) 2018 The Qt Company Ltd.
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
#include "extensions_api_provider_qt.h"
#include "chrome/common/extensions/permissions/chrome_api_permissions.h"
#include "chrome/common/extensions/api/generated_schemas.h"
#include "chrome/grit/common_resources.h"
//#include "extensions/common/api/api_features.h"
#include "extensions/common/api/behavior_features.h"
#include "extensions/common/api/generated_schemas.h"
#include "extensions/common/api/manifest_features.h"
#include "extensions/common/api/permission_features.h"
#include "extensions/common/common_manifest_handlers.h"
#include "extensions/common/features/feature_provider.h"
#include "extensions/common/features/json_feature_provider_source.h"
#include "extensions/common/permissions/permissions_info.h"
#include "extensions/grit/extensions_resources.h"
#include "qtwebengine/common/extensions/api/generated_schemas.h"
//#include "qt_api_features.h"
//#include "qt_behavior_features.h"
//#include "qt_permission_features.h"
//#include "qt_manifest_features.h"
namespace extensions {
ExtensionsAPIProviderQt::ExtensionsAPIProviderQt()
{
}
void ExtensionsAPIProviderQt::RegisterManifestHandlers()
{
}
void ExtensionsAPIProviderQt::AddAPIFeatures(FeatureProvider *provider)
{
// AddQtAPIFeatures(provider);
}
void ExtensionsAPIProviderQt::AddAPIJSONSources(JSONFeatureProviderSource *json_source)
{
json_source->LoadJSON(IDR_CHROME_EXTENSION_API_FEATURES);
}
void ExtensionsAPIProviderQt::AddPermissionFeatures(FeatureProvider *provider)
{
// AddQtPermissionFeatures(provider);
}
bool ExtensionsAPIProviderQt::IsAPISchemaGenerated(const std::string &name)
{
return api::GeneratedSchemas::IsGenerated(name) ||
api::ChromeGeneratedSchemas::IsGenerated(name) ||
api::QtWebEngineGeneratedSchemas::IsGenerated(name);
}
base::StringPiece ExtensionsAPIProviderQt::GetAPISchema(const std::string &name)
{
if (!api::GeneratedSchemas::Get(name).empty())
return api::GeneratedSchemas::Get(name);
if (!api::ChromeGeneratedSchemas::Get(name).empty())
return api::ChromeGeneratedSchemas::Get(name);
if (!api::QtWebEngineGeneratedSchemas::Get(name).empty())
return api::QtWebEngineGeneratedSchemas::Get(name);
return "";
}
void ExtensionsAPIProviderQt::RegisterPermissions(PermissionsInfo* permissions_info)
{
permissions_info->RegisterPermissions(
chrome_api_permissions::GetPermissionInfos(),
chrome_api_permissions::GetPermissionAliases());
}
}

56
base/qt6/qt6-qtwebengine/qt6-qtwebengine.spec
View File

@ -1,9 +1,9 @@
%global qt_module qtwebengine
%global _hardened_build 1
# use clang by default
# use clang
%bcond_without clang
%bcond_with optimize_size
%bcond_without optimize_size
%if %{with optimize_size}
%global _qt6_build_type MinSizeRel
@ -62,8 +62,8 @@
Summary: Qt6 - QtWebEngine components
Name: qt6-qtwebengine
Version: 6.7.2
Release: 2%{?dist}
Version: 6.7.3
Release: 1%{?dist}
# See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details
# See also http://qt-project.org/doc/qt-6.0/qtdoc/licensing.html
@ -80,7 +80,8 @@ Source10: macros.qt6-qtwebengine
# pulseaudio headers
Source20: pulseaudio-12.2-headers.tar.gz
Source100: extensions_api_provider_qt.cpp
# workaround FTBFS against kernel-headers-5.2.0+
Patch1: qtwebengine-SIOCGSTAMP.patch
Patch2: qtwebengine-link-pipewire.patch
@ -95,6 +96,8 @@ Patch50: qtwebengine-fix-build.patch
Patch110: qtwebengine-webrtc-system-openh264.patch
Patch111: qtwebengine-blink-system-openh264.patch
Patch112: qtwebengine-media-system-openh264.patch
Patch113: qtwebengine-ffmpeg-7.patch
Patch114: qtwebengine-proprietary-codecs.patch
Patch500: qtwebengine-everywhere-src-6.7.0-flags-1.patch
@ -137,7 +140,9 @@ BuildRequires: flex
BuildRequires: clang
%else
%if 0%{?rhel} && 0%{?rhel} < 10
BuildRequires: gcc-toolset-13-libatomic-devel
BuildRequires: gcc-toolset-14-gcc-plugin-annobin
BuildRequires: gcc-toolset-14-libatomic-devel
BuildRequires: gcc-toolset-14-gcc-c++
%else
BuildRequires: gcc-c++ gcc
%endif
@ -148,7 +153,8 @@ BuildRequires: git-core
BuildRequires: gperf
BuildRequires: krb5-devel
%if 0%{?use_system_libicu}
BuildRequires: pkgconfig(icu-io) >= 70
BuildRequires: pkgconfig(icu-io) >= 70.0
BuildRequires: pkgconfig(icu-i18n) >= 70.0
%endif
BuildRequires: libjpeg-devel
BuildRequires: nodejs >= 1:14.0
@ -223,7 +229,7 @@ BuildRequires: pkgconfig(libtiff-4) >= 4.2.0
BuildRequires: pkgconfig(openh264)
%if 0%{?use_system_ffmpeg}
BuildRequires: pkgconfig(libavcodec)
BuildRequires: pkgconfig(libavcodec) >= 7.0
BuildRequires: pkgconfig(libavformat)
BuildRequires: pkgconfig(libavutil)
%if 0%{?fedora} > 32 || 0%{?rhel} >= 8
@ -266,7 +272,7 @@ BuildRequires: pkgconfig(vpx) >= 1.12.0
# 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
# See Patch101 for additional fixes applied (up to version 65.0.3325.146)
Provides: bundled(chromium) = 125.0.6422.142
Provides: bundled(chromium) = 129.0.6668.58
# Bundled in src/3rdparty/chromium/third_party:
# Check src/3rdparty/chromium/third_party/*/README.chromium for version numbers,
@ -284,7 +290,7 @@ Provides: bundled(boringssl)
Provides: bundled(brotli)
%if !0%{?use_system_ffmpeg}
# see src/3rdparty/chromium/third_party/ffmpeg/Changelog for the version number
Provides: bundled(ffmpeg) = 6.0.0
Provides: bundled(ffmpeg) = 6.0.1
%endif
Provides: bundled(hunspell) = 1.6.0
Provides: bundled(iccjpeg)
@ -418,8 +424,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
mv pulse src/3rdparty/chromium/
pushd src/3rdparty/chromium
popd
install -m0644 %SOURCE100 src/core/common/extensions/extensions_api_provider_qt.cpp
%patch1 -p1 -b .SIOCGSTAMP
%patch2 -p1 -b .link-pipewire
@ -433,6 +438,12 @@ popd
%patch111 -p1 -b .blink-system-openh264
%patch112 -p1 -b .media-system-openh264
%if 0%{?use_system_ffmpeg}
%patch113 -p1 -b .ffmpeg7
%endif
%patch114 -p1 -b .codecs
%patch500 -p1 -b .flags
# delete all "toolprefix = " lines from build/toolchain/linux/BUILD.gn, as we
@ -470,8 +481,9 @@ export CC=clang
export CXX=clang++
%global optflags %(echo %{optflags}) -fpic -fno-semantic-interposition -Qunused-arguments
%else
. /opt/rh/gcc-toolset-13/enable
%global _gcc_bindir /opt/rh/gcc-toolset-13/root/usr/bin
%enable_devtoolset14
%global _gts_root /opt/rh/gcc-toolset-14/root/usr
%global optflags %(echo %optflags | sed -e 's/-g/-g1/')
%endif
export STRIP=strip
@ -486,7 +498,7 @@ export CXXFLAGS="-I/opt/rx/include %(echo %{optflags} | sed 's/-Werror=format-se
export LDFLAGS="-L/opt/rx/%{_lib}/ -Wl,-rpath=/opt/rx/%{_lib}/ %{__global_ldflags}"
%endif
%cmake_qt6 \
%cmake_qt6\
-DCMAKE_TOOLCHAIN_FILE:STRING="%{_qt6_libdir}/cmake/Qt6/qt.toolchain.cmake" \
-DCMAKE_C_FLAGS:STRING="$CFLAGS" \
-DCMAKE_CXX_FLAGS:STRING="$CXXFLAGS" \
@ -494,8 +506,8 @@ export LDFLAGS="-L/opt/rx/%{_lib}/ -Wl,-rpath=/opt/rx/%{_lib}/ %{__global_ldflag
-DCMAKE_C_COMPILER=clang \
-DCMAKE_CXX_COMPILER=clang++ \
%else
-DCMAKE_C_COMPILER=%{_gcc_bindir}/gcc \
-DCMAKE_CXX_COMPILER=%{_gcc_bindir}/c++ \
-DCMAKE_C_COMPILER=%{_gts_root}/bin/gcc \
-DCMAKE_CXX_COMPILER=%{_gts_root}/bin/c++ \
%endif
-DFEATURE_printer:BOOL=ON \
-DFEATURE_qtpdf_build:BOOL=ON \
@ -530,6 +542,13 @@ export LDFLAGS="-L/opt/rx/%{_lib}/ -Wl,-rpath=/opt/rx/%{_lib}/ %{__global_ldflag
%if 0%{?rhel} <= 9
-DPython3_EXECUTABLE:FILEPATH=%{_bindir}/python3.11 \
%endif
-DFEATURE_webengine_system_ninja:BOOL=ON \
-DFEATURE_pdf_v8:BOOL=ON \
-DFEATURE_pdf_xfa:BOOL=ON \
-DFEATURE_pdf_xfa_bmp:BOOL=ON \
-DFEATURE_pdf_xfa_gif:BOOL=ON \
-DFEATURE_pdf_xfa_png:BOOL=ON \
-DFEATURE_pdf_xfa_tiff:BOOL=ON \
.
%cmake_build
@ -607,6 +626,9 @@ rm -fr %{buildroot}%{_qt6_libdir}/cmake/Qt6BuildInternals
%changelog
* Mon Sep 30 2024 Raven <raven@sysadmins.ws> - 6.7.3-1
- 6.7.3
* Thu Jun 27 2024 Raven <raven@sysadmins.ws> - 6.7.2-2
- rebuild (libxkbcommon)

586
base/qt6/qt6-qtwebengine/qtwebengine-ffmpeg-7.patch Normal file
View File

@ -0,0 +1,586 @@
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();

20
base/qt6/qt6-qtwebengine/qtwebengine-proprietary-codecs.patch Normal file
View File

@ -0,0 +1,20 @@
diff -Naur a/src/3rdparty/chromium/media/BUILD.gn b/src/3rdparty/chromium/media/BUILD.gn
--- a/src/3rdparty/chromium/media/BUILD.gn 2024-09-20 01:47:34.000000000 +0600
+++ b/src/3rdparty/chromium/media/BUILD.gn 2024-10-03 11:48:07.473961019 +0600
@@ -77,11 +77,11 @@
}
}
-if (proprietary_codecs && media_use_ffmpeg) {
- assert(
- ffmpeg_branding != "Chromium",
- "proprietary codecs and ffmpeg_branding set to Chromium are incompatible")
-}
+#if (proprietary_codecs && media_use_ffmpeg) {
+# assert(
+# ffmpeg_branding != "Chromium",
+# "proprietary codecs and ffmpeg_branding set to Chromium are incompatible")
+#}
# Common configuration for targets in the media directory; these must not be
# exported since things like USE_NEON and USE_CRAS have different meanings

11
base/qt6/qt6-qtwebsockets/qt6-qtwebsockets.spec
View File

@ -10,8 +10,8 @@
Summary: Qt6 - WebSockets component
Name: qt6-%{qt_module}
Version: 6.7.2
Release: 2%{?dist}
Version: 6.7.3
Release: 1%{?dist}
License: LGPL-3.0-only OR GPL-3.0-only WITH Qt-GPL-exception-1.0
Url: http://qt-project.org/
@ -28,7 +28,7 @@ Source0: https://download.qt.io/official_releases/qt/%{majmin}/%{version}/submod
%global __provides_exclude_from ^%{_qt6_archdatadir}/qml/.*\\.so$
BuildRequires: cmake
BuildRequires: gcc-toolset-13-gcc-c++
BuildRequires: gcc-toolset-14-gcc-c++
BuildRequires: ninja-build
BuildRequires: qt6-rpm-macros
BuildRequires: qt6-qtbase-devel >= %{version}
@ -65,7 +65,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
%build
%enable_devtoolset13
%enable_devtoolset14
%cmake_qt6 \
-DQT_BUILD_EXAMPLES:BOOL=%{?examples:ON}%{!?examples:OFF} \
@ -117,6 +117,9 @@ popd
%changelog
* Mon Sep 30 2024 Raven <raven@sysadmins.ws> - 6.7.3-1
- 6.7.3
* Thu Jun 27 2024 Raven <raven@sysadmins.ws> - 6.7.2-2
- rebuild (libxkbcommon)

11
base/qt6/qt6-qtwebview/qt6-qtwebview.spec
View File

@ -4,8 +4,8 @@
Summary: Qt6 - WebView component
Name: qt6-%{qt_module}
Version: 6.7.2
Release: 2%{?dist}
Version: 6.7.3
Release: 1%{?dist}
License: LGPL-3.0-only OR GPL-3.0-only WITH Qt-GPL-exception-1.0
Url: http://www.qt.io
@ -16,7 +16,7 @@ Source0: https://download.qt.io/official_releases/qt/%{majmin}/%{version}/submod
# 32-bit arches not supported (https://bugreports.qt.io/browse/QTBUG-102143)
ExclusiveArch: aarch64 x86_64
BuildRequires: gcc-toolset-13-gcc-c++
BuildRequires: gcc-toolset-14-gcc-c++
BuildRequires: cmake
BuildRequires: ninja-build
BuildRequires: qt6-qtbase-devel >= %{version}
@ -52,7 +52,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
%build
%enable_devtoolset13
%enable_devtoolset14
%cmake_qt6 \
-DQT_BUILD_EXAMPLES:BOOL=%{?examples:ON}%{!?examples:OFF} \
@ -101,6 +101,9 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
%changelog
* Mon Sep 30 2024 Raven <raven@sysadmins.ws> - 6.7.3-1
- 6.7.3
* Thu Jun 27 2024 Raven <raven@sysadmins.ws> - 6.7.2-2
- rebuild (libxkbcommon)

7
base/qt6/qt6/qt6.spec
View File

@ -1,6 +1,6 @@
Name: qt6
Version: 6.7.2
Version: 6.7.3
Release: 1%{?dist}
Summary: Qt6 meta package
License: GPL-3.0-only
@ -90,7 +90,7 @@ Requires: qt6-rpm-macros
Summary: RPM macros for building Qt6 and KDE Frameworks 5 packages
Requires: cmake
Requires: ninja-build
Requires: gcc-toolset-13-gcc-c++ gcc-toolset-13-gcc-plugin-annobin
Requires: gcc-toolset-14-gcc-c++ gcc-toolset-14-gcc-plugin-annobin
%description rpm-macros
%{summary}.
@ -148,6 +148,9 @@ echo "- Qt6 devel meta package" > %{buildroot}%{_docdir}/qt6-devel/README
%changelog
* Mon Sep 30 2024 Raven <raven@sysadmins.ws> - 6.7.3-1
- 6.7.3
* Wed Jun 26 2024 Raven <raven@sysadmins.ws> - 6.7.2-1
- 6.7.2