Accepting request 1301735 from KDE:Qt6

Update to 6.9.2 (forwarded request 1301562 from krop) OBS-URL: https://build.opensuse.org/request/show/1301735 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/qt6-webengine?expand=0&rev=45
Update to 6.9.2
2025-08-29 16:35:20 +00:00 · 2025-08-28 07:28:21 +00:00 · 2025-06-05 18:32:44 +00:00 · 2025-06-04 07:59:02 +00:00 · 2025-05-07 17:15:06 +00:00 · 2025-05-06 13:13:47 +00:00
7 changed files with 287 additions and 679 deletions
--- a/QtWebEngine_6.8_skip_xnnpack.patch
+++ b/QtWebEngine_6.8_skip_xnnpack.patch
@@ -0,0 +1,19 @@
+Don't use xnnpack on ARM with QtWebEngine 6.8.0
+
+Bug ref: https://bugreports.qt.io/browse/QTBUG-129985
+
+diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
+index 9b9be814d..7f76ec696 100644
+--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
+@@ -566,6 +566,10 @@ foreach(arch ${archs})
+                     list(APPEND gnArgArg libyuv_use_sve=false)
+                 endif()
+             endif()
+            if(cpu MATCHES "arm.*")
+                # https://bugreports.qt.io/browse/QTBUG-129985
+                list(APPEND gnArgArg build_webnn_with_xnnpack=false)
+            endif()
+             unset(cpu)
+         endif()
+ 
--- a/qt6-webengine.changes
+++ b/qt6-webengine.changes
@@ -1,3 +1,107 @@
+-------------------------------------------------------------------
+Wed Aug 27 07:16:09 UTC 2025 - Christophe Marin <christophe@krop.fr>
+
+- Update to 6.9.2:
+  * https://www.qt.io/blog/qt-6.9.2-released
+  * Patched with security patches up to Chromium version up
+    to 139.0.7258.67
+
+-------------------------------------------------------------------
+Tue Jun  3 07:49:35 UTC 2025 - Christophe Marin <christophe@krop.fr>
+
+- Update to 6.9.1:
+  * https://www.qt.io/blog/qt-6.9.1-released
+- Drop patches, merged upstream:
+  * 0001-Do-not-force-gl-egl-ANGLE-backend-on-Linux.patch
+  * 0001-Do-not-list-GLX-frame-buffer-configurations-unnecess.patch
+  * 0001-NativeSkiaOutputDeviceOpenGL-Fix-leaking-X11-Pixmap.patch
+  * 0001-NativeSkiaOutputDeviceVulkan-Use-minimal-set-of-usag.patch
+  * 0001-Add-default-and-gl-ANGLE-implementation-support-to-O.patch
+  * 0001-Avoid-crash-due-to-long-dictionary-commands.patch
+  * 0001-angle-Always-use-primary-GPU.patch
+  * 0001-gbm-Add-fallback-for-drmPrimeHandleToFD.patch
+  * qtwebengine-glibc_2.41.patch
+  * qtwebengine-pipewire-1.4.patch
+
+-------------------------------------------------------------------
+Tue May  6 09:02:19 UTC 2025 - Christophe Marin <christophe@krop.fr>
+
+- Add upstream fixes:
+  * 0001-Do-not-force-gl-egl-ANGLE-backend-on-Linux.patch (QTBUG-135786)
+  * 0001-gbm-Add-fallback-for-drmPrimeHandleToFD.patch (QTBUG-135935)
+  * 0001-Do-not-list-GLX-frame-buffer-configurations-unnecess.patch (QTBUG-135647)
+  * 0001-angle-Always-use-primary-GPU.patch
+  * 0001-NativeSkiaOutputDeviceOpenGL-Fix-leaking-X11-Pixmap.patch (QTBUG-135047)
+  * 0001-NativeSkiaOutputDeviceVulkan-Use-minimal-set-of-usag.patch (QTBUG-123607)
+  * 0001-Add-default-and-gl-ANGLE-implementation-support-to-O.patch (QTBUG-129769)
+  * 0001-Avoid-crash-due-to-long-dictionary-commands.patch
+
+-------------------------------------------------------------------
+Fri Apr  4 07:57:10 UTC 2025 - Christophe Marin <christophe@krop.fr>
+
+- openjpeg2 is too old for Leap 15 builds, use the embedded one
+
+-------------------------------------------------------------------
+Wed Apr  2 11:03:45 UTC 2025 - Christophe Marin <christophe@krop.fr>
+
+- Update to 6.9.0:
+  * https://www.qt.io/blog/qt-6.9-released
+- Drop patches, merged upstream:
+  * 0001-Build-system-remove-libxml2-compilation-test.patch
+  * qtwebengine-ffmpeg-playback-fix.patch
+- Add patch:
+  * qtwebengine-pipewire-1.4.patch
+
+-------------------------------------------------------------------
+Sat Mar 15 09:39:07 UTC 2025 - Christophe Marin <christophe@krop.fr>
+
+- Add patches:
+  * qtwebengine-glibc_2.41.patch (boo#1238826)
+  * qtwebengine-ffmpeg-playback-fix.patch (QTBUG-130273, QTBUG-132762)
+
+-------------------------------------------------------------------
+Sun Mar  9 22:51:10 UTC 2025 - Christophe Marin <christophe@krop.fr>
+
+- Ignore private QML imports
+
+-------------------------------------------------------------------
+Fri Jan 31 10:23:03 UTC 2025 - Christophe Marin <christophe@krop.fr>
+
+- Update to 6.8.2
+  https://www.qt.io/blog/qt-6.8.2-released
+
+-------------------------------------------------------------------
+Thu Dec 26 12:14:18 UTC 2024 - Christophe Marin <christophe@krop.fr>
+
+- Add patch to avoid CVE-2024-40896 (boo#1234820)
+  * 0001-Build-system-remove-libxml2-compilation-test.patch
+
+-------------------------------------------------------------------
+Mon Dec  2 13:02:17 UTC 2024 - Christophe Marin <christophe@krop.fr>
+
+- Update to 6.8.1:
+  * https://www.qt.io/blog/qt-6.8.1-released
+
+-------------------------------------------------------------------
+Sun Oct 13 16:56:37 UTC 2024 - Christophe Marin <christophe@krop.fr>
+
+- Add patch to avoid a build failure on ARM (QTBUG-129985):
+  * QtWebEngine_6.8_skip_xnnpack.patch
+
+-------------------------------------------------------------------
+Tue Oct  8 09:29:57 UTC 2024 - Christophe Marin <christophe@krop.fr>
+
+- Update to 6.8.0:
+  * https://www.qt.io/blog/qt-6.8-released
+- Drop patch:
+  * qtwebengine-ffmpeg-7.patch
+
+-------------------------------------------------------------------
+Sat Sep 28 08:23:12 UTC 2024 - Christophe Marin <christophe@krop.fr>
+
+- Update to 6.7.3
+  * https://www.qt.io/blog/qt-6.7.3-released
+
 -------------------------------------------------------------------
 Wed Aug  7 12:39:11 UTC 2024 - Christophe Marin <christophe@krop.fr>

--- a/qt6-webengine.spec
+++ b/qt6-webengine.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package qt6-webengine
 #
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2025 SUSE LLC and contributors
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,8 +16,8 @@
 #


-%define real_version 6.7.2
-%define short_version 6.7
+%define real_version 6.9.2
+%define short_version 6.9
 %define tar_name qtwebengine-everywhere-src
 %define tar_suffix %{nil}
 #
@@ -28,6 +28,9 @@
 %define pkg_suffix -docs
 %endif
 #
+# Private QML imports
+%global __requires_exclude qt6qmlimport\\((BrowserUtils|frequencymonitor|FrequencyMonitor|performancemonitor).*
+#
 %if 0%{?suse_version} > 1500
 # The antique version in Leap 15 is too old for building chromium
 %bcond_without system_harfbuzz
@@ -35,9 +38,24 @@
 %bcond_without system_icu
 # and so is tiff...
 %bcond_without system_tiff
+# Leap 15's ffmpeg is too old since 6.8.0
+%bcond_without system_ffmpeg
+# openjpeg2 is too old and doesn't know opj_decoder_set_strict_mode
+%bcond_without system_openjpeg2
+# and python 3.6 is also too old for this QtWE version
+%define pyver python3
+%else
+%{?sle15_python_module_pythons}
+%define pyver python311
 %endif
+#
+# Note about required versions:
+# qtwebengine supports building against the latest LTS release. This (potentially) allows submitting
+# updates to Leap
+%global lts_version 6.8.0
+#
 Name:           qt6-webengine%{?pkg_suffix}
-Version:        6.7.2
+Version:        6.9.2
 Release:        0
 Summary:        Web browser engine for Qt applications
 License:        GPL-2.0-only OR LGPL-3.0-only OR GPL-3.0-only
@@ -47,16 +65,17 @@ Source99:       qt6-webengine-rpmlintrc
 # Patches 0-100 are upstream patches #
 # Patches 100-200 are openSUSE and/or non-upstream(able) patches #
 Patch100:       rtc-dont-use-h264.patch
-Patch101:       qtwebengine-ffmpeg-7.patch
-#
-# Chromium/blink don't support PowerPC and zSystems and build fails on
-# 32 bits archs (https://bugreports.qt.io/browse/QTBUG-102143)
-ExclusiveArch:  aarch64 x86_64 %x86_64 riscv64
+Patch101:       QtWebEngine_6.8_skip_xnnpack.patch
+BuildRequires:  %{pyver}
+BuildRequires:  %{pyver}-devel
+BuildRequires:  %{pyver}-html5lib
+BuildRequires:  %{pyver}-importlib-metadata
 BuildRequires:  Mesa-KHR-devel
 BuildRequires:  bison
 # Not pulled automatically on Leap
 BuildRequires:  cups-config
 BuildRequires:  cups-devel
+BuildRequires:  fdupes
 BuildRequires:  flex
 BuildRequires:  gperf
 BuildRequires:  krb5-devel
@@ -66,37 +85,37 @@ BuildRequires:  memory-constraints
 BuildRequires:  nodejs-default
 BuildRequires:  pipewire-devel
 BuildRequires:  pkgconfig
-BuildRequires:  python3-devel
-BuildRequires:  python3-html5lib
-BuildRequires:  python3-importlib-metadata
-BuildRequires:  qt6-core-private-devel
-BuildRequires:  qt6-gui-private-devel
-BuildRequires:  qt6-qml-private-devel
-BuildRequires:  qt6-quick-private-devel
-BuildRequires:  qt6-quickwidgets-private-devel
-BuildRequires:  qt6-widgets-private-devel
+BuildRequires:  qt6-core-private-devel >= %{lts_version}
+BuildRequires:  qt6-gui-private-devel >= %{lts_version}
+BuildRequires:  qt6-qml-private-devel >= %{lts_version}
+BuildRequires:  qt6-quick-private-devel >= %{lts_version}
+BuildRequires:  qt6-quickwidgets-private-devel >= %{lts_version}
+BuildRequires:  qt6-widgets-private-devel >= %{lts_version}
 BuildRequires:  snappy-devel
-BuildRequires:  cmake(Qt6Core) = %{real_version}
-BuildRequires:  cmake(Qt6Designer) = %{real_version}
-BuildRequires:  cmake(Qt6Gui) = %{real_version}
-BuildRequires:  cmake(Qt6GuiTools) = %{real_version}
-BuildRequires:  cmake(Qt6Network) = %{real_version}
-BuildRequires:  cmake(Qt6OpenGL) = %{real_version}
-BuildRequires:  cmake(Qt6OpenGLWidgets) = %{real_version}
-BuildRequires:  cmake(Qt6Positioning) = %{real_version}
-BuildRequires:  cmake(Qt6PrintSupport) = %{real_version}
-BuildRequires:  cmake(Qt6Qml) = %{real_version}
-BuildRequires:  cmake(Qt6QmlModels) = %{real_version}
-BuildRequires:  cmake(Qt6QmlTools) = %{real_version}
-BuildRequires:  cmake(Qt6Quick) = %{real_version}
-BuildRequires:  cmake(Qt6QuickControls2) = %{real_version}
-BuildRequires:  cmake(Qt6QuickTest) = %{real_version}
-BuildRequires:  cmake(Qt6QuickWidgets) = %{real_version}
-BuildRequires:  cmake(Qt6WebChannel) = %{real_version}
-BuildRequires:  cmake(Qt6WebChannelQuick) = %{real_version}
-BuildRequires:  cmake(Qt6WebSockets) = %{real_version}
-BuildRequires:  cmake(Qt6Widgets) = %{real_version}
-BuildRequires:  cmake(Qt6WidgetsTools) = %{real_version}
+BuildRequires:  cmake(Qt6Core) >= %{lts_version}
+BuildRequires:  cmake(Qt6Designer) >= %{lts_version}
+BuildRequires:  cmake(Qt6Gui) >= %{lts_version}
+BuildRequires:  cmake(Qt6GuiTools) >= %{lts_version}
+# Only needed for tests, no need to have it
+# BuildRequires:  cmake(Qt6HttpServer)
+BuildRequires:  cmake(Qt6Network) >= %{lts_version}
+BuildRequires:  cmake(Qt6OpenGL) >= %{lts_version}
+BuildRequires:  cmake(Qt6OpenGLWidgets) >= %{lts_version}
+BuildRequires:  cmake(Qt6Positioning) >= %{lts_version}
+BuildRequires:  cmake(Qt6PrintSupport) >= %{lts_version}
+BuildRequires:  cmake(Qt6Qml) >= %{lts_version}
+BuildRequires:  cmake(Qt6QmlModels) >= %{lts_version}
+BuildRequires:  cmake(Qt6QmlTools) >= %{lts_version}
+BuildRequires:  cmake(Qt6Quick) >= %{lts_version}
+BuildRequires:  cmake(Qt6QuickControls2) >= %{lts_version}
+BuildRequires:  cmake(Qt6QuickTest) >= %{lts_version}
+BuildRequires:  cmake(Qt6QuickWidgets) >= %{lts_version}
+BuildRequires:  cmake(Qt6Svg) >= %{lts_version}
+BuildRequires:  cmake(Qt6WebChannel) >= %{lts_version}
+BuildRequires:  cmake(Qt6WebChannelQuick) >= %{lts_version}
+BuildRequires:  cmake(Qt6WebSockets) >= %{lts_version}
+BuildRequires:  cmake(Qt6Widgets) >= %{lts_version}
+BuildRequires:  cmake(Qt6WidgetsTools) >= %{lts_version}
 BuildRequires:  pkgconfig(alsa)
 BuildRequires:  pkgconfig(dbus-1)
 BuildRequires:  pkgconfig(epoxy)
@@ -107,20 +126,24 @@ BuildRequires:  pkgconfig(gio-2.0)
 BuildRequires:  pkgconfig(glib-2.0) >= 2.32.0
 BuildRequires:  pkgconfig(glproto)
 %if %{with system_harfbuzz}
-BuildRequires:  pkgconfig(harfbuzz)
+BuildRequires:  pkgconfig(harfbuzz) >= 4.3.0
 %endif
 %if %{with system_icu}
 BuildRequires:  pkgconfig(icu-i18n) >= 71
 BuildRequires:  pkgconfig(icu-uc) >= 71
 %endif
 BuildRequires:  pkgconfig(lcms2)
-BuildRequires:  pkgconfig(libavcodec)
-BuildRequires:  pkgconfig(libavformat)
-BuildRequires:  pkgconfig(libavutil)
+%if %{with system_ffmpeg}
+BuildRequires:  pkgconfig(libavcodec) >= 60.31.102
+BuildRequires:  pkgconfig(libavformat) >= 60.16.100
+BuildRequires:  pkgconfig(libavutil) >= 58.29.100
+%endif
 BuildRequires:  pkgconfig(libcrypto)
 BuildRequires:  pkgconfig(libdrm)
 BuildRequires:  pkgconfig(libevent)
+%if %{with system_openjpeg2}
 BuildRequires:  pkgconfig(libopenjp2)
+%endif
 BuildRequires:  pkgconfig(libpci)
 BuildRequires:  pkgconfig(libpulse) >= 0.9.10
 %if %{with system_tiff}
@@ -155,8 +178,10 @@ BuildRequires:  pkgconfig(xshmfence)
 BuildRequires:  pkgconfig(xt)
 BuildRequires:  pkgconfig(xtst)
 BuildRequires:  pkgconfig(zlib)
-# Picked from chromium.spec
-BuildRequires:  (python3 >= 3.7 or python3-dataclasses)
+# Chromium/blink don't support PowerPC and zSystems and build fails on
+# 32 bits archs (https://bugreports.qt.io/browse/QTBUG-102143)
+ExclusiveArch:  aarch64 x86_64 %{x86_64} riscv64
+
 %if "%{qt6_flavor}" == "docs"
 BuildRequires:  qt6-tools
 %{qt6_doc_packages}
@@ -194,8 +219,8 @@ QML files and plugins from the Qt 6 Pdf module
 %package -n qt6-pdf-devel
 Summary:        Development files for the Qt 6 Pdf library
 Requires:       libQt6Pdf6 = %{version}
-Requires:       cmake(Qt6Gui) = %{real_version}
-Requires:       cmake(Qt6Network) = %{real_version}
+Requires:       cmake(Qt6Gui) >= %{lts_version}
+Requires:       cmake(Qt6Network) >= %{lts_version}

 %description -n qt6-pdf-devel
 Development files for the Qt 6 Pdf library.
@@ -217,11 +242,11 @@ The Qt6 PdfQuick library.
 %package -n qt6-pdfquick-devel
 Summary:        Development files for the Qt 6 PdfQuick library
 Requires:       libQt6PdfQuick6 = %{version}
-Requires:       qt6-pdf-private-devel = %{version}
-Requires:       cmake(Qt6Gui) = %{real_version}
-Requires:       cmake(Qt6Qml) = %{real_version}
-Requires:       cmake(Qt6Quick) = %{real_version}
-%requires_eq    qt6-quick-private-devel
+Requires:       qt6-quick-private-devel >= %{lts_version}
+Requires:       cmake(Qt6Gui) >= %{lts_version}
+Requires:       cmake(Qt6PdfPrivate) = %{real_version}
+Requires:       cmake(Qt6Qml) >= %{lts_version}
+Requires:       cmake(Qt6Quick) >= %{lts_version}

 %description -n qt6-pdfquick-devel
 Development files for the Qt 6 PdfQuick library.
@@ -243,9 +268,9 @@ The Qt6 PdfWidgets library.
 %package -n qt6-pdfwidgets-devel
 Summary:        Development files for the Qt 6 PdfWidgets library
 Requires:       libQt6PdfWidgets6 = %{version}
-Requires:       cmake(Qt6Gui) = %{real_version}
+Requires:       cmake(Qt6Gui) >= %{lts_version}
 Requires:       cmake(Qt6Pdf) = %{real_version}
-Requires:       cmake(Qt6Widgets) = %{real_version}
+Requires:       cmake(Qt6Widgets) >= %{lts_version}

 %description -n qt6-pdfwidgets-devel
 Development files for the Qt 6 PdfWidgets library.
@@ -268,11 +293,11 @@ The Qt6 WebEngineCore library.
 %package -n qt6-webenginecore-devel
 Summary:        Development files for the Qt 6 WebEngineCore library
 Requires:       libQt6WebEngineCore6 = %{version}
-Requires:       cmake(Qt6Gui) = %{real_version}
-Requires:       cmake(Qt6Network) = %{real_version}
-Requires:       cmake(Qt6Positioning) = %{real_version}
-Requires:       cmake(Qt6Quick) = %{real_version}
-Requires:       cmake(Qt6WebChannel) = %{real_version}
+Requires:       cmake(Qt6Gui) >= %{lts_version}
+Requires:       cmake(Qt6Network) >= %{lts_version}
+Requires:       cmake(Qt6Positioning) >= %{lts_version}
+Requires:       cmake(Qt6Quick) >= %{lts_version}
+Requires:       cmake(Qt6WebChannel) >= %{lts_version}

 %description -n qt6-webenginecore-devel
 Development files for the Qt 6 WebEngineCore library.
@@ -295,10 +320,10 @@ The Qt6 WebEngineQuick library.
 %package -n qt6-webenginequick-devel
 Summary:        Development files for the Qt 6 WebEngineQuick library
 Requires:       libQt6WebEngineQuick6 = %{version}
-Requires:       cmake(Qt6Gui) = %{real_version}
-Requires:       cmake(Qt6Qml) = %{real_version}
-Requires:       cmake(Qt6Quick) = %{real_version}
-Requires:       cmake(Qt6WebChannelQuick) = %{real_version}
+Requires:       cmake(Qt6Gui) >= %{lts_version}
+Requires:       cmake(Qt6Qml) >= %{lts_version}
+Requires:       cmake(Qt6Quick) >= %{lts_version}
+Requires:       cmake(Qt6WebChannelQuick) >= %{lts_version}
 Requires:       cmake(Qt6WebEngineCore) = %{real_version}

 %description -n qt6-webenginequick-devel
@@ -321,12 +346,12 @@ The Qt6 WebEngineWidgets library.
 %package -n qt6-webenginewidgets-devel
 Summary:        Development files for the Qt 6 WebEngineWidgets library
 Requires:       libQt6WebEngineWidgets6 = %{version}
-Requires:       cmake(Qt6Gui) = %{real_version}
-Requires:       cmake(Qt6PrintSupport) = %{real_version}
-Requires:       cmake(Qt6Quick) = %{real_version}
-Requires:       cmake(Qt6QuickWidgets) = %{real_version}
+Requires:       cmake(Qt6Gui) >= %{lts_version}
+Requires:       cmake(Qt6PrintSupport) >= %{lts_version}
+Requires:       cmake(Qt6Quick) >= %{lts_version}
+Requires:       cmake(Qt6QuickWidgets) >= %{lts_version}
 Requires:       cmake(Qt6WebEngineCore) = %{real_version}
-Requires:       cmake(Qt6Widgets) = %{real_version}
+Requires:       cmake(Qt6Widgets) >= %{lts_version}

 %description -n qt6-webenginewidgets-devel
 Development files for the Qt 6 WebEngineWidgets library.
@@ -346,11 +371,6 @@ ABI or API guarantees.
 %prep
 %autosetup -p1 -n %{tar_name}-%{real_version}%{tar_suffix}

-%if %{pkg_vcmp pkgconfig(libavcodec) <= 5}
-# The ffmpeg 7 compatibility patch would break build with older ffmpeg
-%patch -P101 -p1 -R
-%endif
-
 %build
 %if %{no_flavor}
 # Determine the right number of parallel processes based on the available memory
@@ -364,27 +384,38 @@ export NINJAFLAGS="%{?_smp_mflags}"

 %cmake_qt6 \
  -DCMAKE_TOOLCHAIN_FILE:STRING="%{_qt6_cmakedir}/Qt6/qt.toolchain.cmake" \
-  -DFEATURE_qtpdf_build:BOOL=ON \
-  -DFEATURE_webengine_developer_build:BOOL=OFF \
-  -DFEATURE_webengine_embedded_build:BOOL=OFF \
-  -DFEATURE_webengine_extensions:BOOL=ON \
-  -DFEATURE_webengine_kerberos:BOOL=ON \
-  -DFEATURE_webengine_native_spellchecker:BOOL=OFF \
-  -DFEATURE_webengine_printing_and_pdf:BOOL=ON \
-  -DFEATURE_webengine_proprietary_codecs:BOOL=ON \
-  -DFEATURE_webengine_system_ffmpeg:BOOL=ON \
+%if 0%{?suse_version} == 1500
+  -DPython3_EXECUTABLE=%{_bindir}/python3.11 \
+%endif
+  -DFEATURE_qtpdf_build:BOOL=TRUE \
+  -DFEATURE_webengine_developer_build:BOOL=FALSE \
+  -DFEATURE_webengine_embedded_build:BOOL=FALSE \
+  -DFEATURE_webengine_extensions:BOOL=TRUE \
+  -DFEATURE_webengine_kerberos:BOOL=TRUE \
+  -DFEATURE_webengine_native_spellchecker:BOOL=FALSE \
+  -DFEATURE_webengine_printing_and_pdf:BOOL=TRUE \
+  -DFEATURE_webengine_proprietary_codecs:BOOL=TRUE \
+%if %{with system_ffmpeg}
+  -DFEATURE_webengine_system_ffmpeg:BOOL=TRUE \
+%else
+  -DFEATURE_webengine_system_ffmpeg:BOOL=FALSE \
+%endif
 %if %{without system_harfbuzz}
-  -DFEATURE_webengine-system-harfbuzz:BOOL=OFF \
+  -DFEATURE_webengine_system_harfbuzz:BOOL=FALSE \
 %endif
 %if %{with system_icu}
-  -DFEATURE_webengine_system_icu:BOOL=ON \
+  -DFEATURE_webengine_system_icu:BOOL=TRUE \
 %else
-  -DFEATURE_webengine_system_icu:BOOL=OFF \
+  -DFEATURE_webengine_system_icu:BOOL=FALSE \
 %endif
-  -DFEATURE_webengine_system_libevent:BOOL=ON \
-  -DFEATURE_webengine_webrtc:BOOL=ON \
-  -DFEATURE_webengine_webrtc_pipewire:BOOL=ON \
-  -DQT_BUILD_EXAMPLES:BOOL=ON
+%if %{without system_openjpeg2}
+  -DFEATURE_webengine_system_libopenjpeg2:BOOL=FALSE \
+%endif
+  -DFEATURE_webengine_system_libevent:BOOL=TRUE \
+  -DFEATURE_webengine_webrtc:BOOL=TRUE \
+  -DFEATURE_webengine_webrtc_pipewire:BOOL=TRUE \
+  -DQT_BUILD_EXAMPLES:BOOL=TRUE \
+  -DQT_GENERATE_SBOM:BOOL=FALSE

 %{qt6_build}

@@ -401,6 +432,12 @@ rm -r %{buildroot}%{_qt6_cmakedir}/Qt6Qml/QmlPlugins
 # This shouldn't be needed
 rm -r %{buildroot}%{_qt6_cmakedir}/Qt6BuildInternals

+# E: files-duplicated-waste
+%fdupes %{buildroot}%{_qt6_examplesdir}
+
+# Hunspell dictionaries will be converted and added there when installing the package
+mkdir -p %{buildroot}%{_qt6_datadir}/qtwebengine_dictionaries
+
 %ldconfig_scriptlets -n libQt6Pdf6
 %ldconfig_scriptlets -n libQt6PdfQuick6
 %ldconfig_scriptlets -n libQt6PdfWidgets6
@@ -408,13 +445,26 @@ rm -r %{buildroot}%{_qt6_cmakedir}/Qt6BuildInternals
 %ldconfig_scriptlets -n libQt6WebEngineQuick6
 %ldconfig_scriptlets -n libQt6WebEngineWidgets6

+%filetriggerin -- %{_datadir}/hunspell
+# Convert Hunspell dictionaries on package installation
+while read filename ; do
+  case "$filename" in
+    *.dic)
+      bdicname=%{_qt6_datadir}/qtwebengine_dictionaries/`basename -s .dic "$filename"`.bdic
+      %{_qt6_libexecdir}/qwebengine_convert_dict "$filename" "$bdicname" &> /dev/null || :
+      ;;
+  esac
+done
+
 %files
+%dir %{_qt6_datadir}/qtwebengine_dictionaries
 %dir %{_qt6_pluginsdir}/designer
 %{_qt6_datadir}/resources/
-%{_qt6_translationsdir}/qtwebengine_locales/
 %{_qt6_libexecdir}/QtWebEngineProcess
+%{_qt6_libexecdir}/qwebengine_convert_dict
 %{_qt6_libexecdir}/webenginedriver
 %{_qt6_pluginsdir}/designer/libqwebengineview.so
+%{_qt6_translationsdir}/qtwebengine_locales/

 %files imports
 %{_qt6_qmldir}/QtWebEngine/
@@ -440,6 +490,7 @@ rm -r %{buildroot}%{_qt6_cmakedir}/Qt6BuildInternals
 %exclude %{_qt6_includedir}/QtPdf/%{real_version}

 %files -n qt6-pdf-private-devel
+%{_qt6_cmakedir}/Qt6PdfPrivate/
 %{_qt6_includedir}/QtPdf/%{real_version}/
 %{_qt6_mkspecsdir}/modules/qt_lib_pdf_private.pri

@@ -458,6 +509,7 @@ rm -r %{buildroot}%{_qt6_cmakedir}/Qt6BuildInternals
 %exclude %{_qt6_includedir}/QtPdfQuick/%{real_version}

 %files -n qt6-pdfquick-private-devel
+%{_qt6_cmakedir}/Qt6PdfQuickPrivate/
 %{_qt6_includedir}/QtPdfQuick/%{real_version}/
 %{_qt6_mkspecsdir}/modules/qt_lib_pdfquick_private.pri

@@ -476,6 +528,7 @@ rm -r %{buildroot}%{_qt6_cmakedir}/Qt6BuildInternals
 %exclude %{_qt6_includedir}/QtPdfWidgets/%{real_version}

 %files -n qt6-pdfwidgets-private-devel
+%{_qt6_cmakedir}/Qt6PdfWidgetsPrivate/
 %{_qt6_includedir}/QtPdfWidgets/%{real_version}/
 %{_qt6_mkspecsdir}/modules/qt_lib_pdfwidgets_private.pri

@@ -497,13 +550,13 @@ rm -r %{buildroot}%{_qt6_cmakedir}/Qt6BuildInternals
 %{_qt6_libdir}/libQt6WebEngineCore.prl
 %{_qt6_libdir}/libQt6WebEngineCore.so
 %{_qt6_libexecdir}/gn
-%{_qt6_libexecdir}/qwebengine_convert_dict
 %{_qt6_metatypesdir}/qt6webenginecore_*_metatypes.json
 %{_qt6_mkspecsdir}/modules/qt_lib_webenginecore.pri
 %{_qt6_pkgconfigdir}/Qt6WebEngineCore.pc
 %exclude %{_qt6_includedir}/QtWebEngineCore/%{real_version}

 %files -n qt6-webenginecore-private-devel
+%{_qt6_cmakedir}/Qt6WebEngineCore*Private/
 %{_qt6_includedir}/QtWebEngineCore/%{real_version}/
 %{_qt6_mkspecsdir}/modules/qt_lib_webenginecore_private.pri

@@ -530,6 +583,7 @@ rm -r %{buildroot}%{_qt6_cmakedir}/Qt6BuildInternals
 %exclude %{_qt6_includedir}/QtWebEngineQuick/%{real_version}

 %files -n qt6-webenginequick-private-devel
+%{_qt6_cmakedir}/Qt6WebEngineQuick*Private/
 %{_qt6_includedir}/QtWebEngineQuick/%{real_version}/
 %{_qt6_mkspecsdir}/modules/qt_lib_webenginequick_private.pri
 %{_qt6_mkspecsdir}/modules/qt_lib_webenginequickdelegatesqml_private.pri
@@ -549,6 +603,7 @@ rm -r %{buildroot}%{_qt6_cmakedir}/Qt6BuildInternals
 %exclude %{_qt6_includedir}/QtWebEngineWidgets/%{real_version}

 %files -n qt6-webenginewidgets-private-devel
+%{_qt6_cmakedir}/Qt6WebEngineWidgetsPrivate/
 %{_qt6_includedir}/QtWebEngineWidgets/%{real_version}/
 %{_qt6_mkspecsdir}/modules/qt_lib_webenginewidgets_private.pri

--- a/qtwebengine-everywhere-src-6.7.2.tar.xz
+++ b/qtwebengine-everywhere-src-6.7.2.tar.xz
--- a/qtwebengine-everywhere-src-6.9.2.tar.xz
+++ b/qtwebengine-everywhere-src-6.9.2.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:99cb0792abc2e39b299d73d8e2aa076b9ebcd55c3f4a4b5fd514eef5a62d03ab
+size 672191852
--- a/qtwebengine-ffmpeg-7.patch
+++ b/qtwebengine-ffmpeg-7.patch
@@ -1,574 +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 c535d2b..62ddbc8 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,7 +292,8 @@ 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_
-@@ -302,7 +304,7 @@ cdm::Status FFmpegCdmAudioDecoder::DecodeBuffer(
-     }
- 
-     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;
-@@ -322,7 +324,7 @@ bool FFmpegCdmAudioDecoder::OnNewFrame(
-     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,
-+      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 2665355..910f9ad 100644
--- a/src/3rdparty/chromium/media/ffmpeg/ffmpeg_common.cc
-+++ b/src/3rdparty/chromium/media/ffmpeg/ffmpeg_common.cc
-@@ -336,10 +336,11 @@ bool AVCodecContextToAudioDecoderConfig(const AVCodecContext* codec_context,
-       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 +392,7 @@ bool AVCodecContextToAudioDecoderConfig(const AVCodecContext* codec_context,
-                      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 +461,7 @@ void AudioDecoderConfigToAVCodecContext(const AudioDecoderConfig& config,
- 
-   // 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 777eabc..2b58dd7 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 76b41aa..e26b6cd 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 3b46f7f..1897eb0 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 bf3ed00..d564ee9 100644
--- a/src/3rdparty/chromium/media/filters/ffmpeg_audio_decoder.cc
-+++ b/src/3rdparty/chromium/media/filters/ffmpeg_audio_decoder.cc
-@@ -29,7 +29,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
-@@ -243,7 +243,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;
-@@ -360,11 +360,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;
-@@ -415,7 +415,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);
-   }
-@@ -448,7 +448,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/ffmpeg/ffmpeg_common.cc b/src/3rdparty/chromium/media/ffmpeg/ffmpeg_common.cc
-index 910f9ad..8be165c 100644
--- a/src/3rdparty/chromium/media/ffmpeg/ffmpeg_common.cc
-+++ b/src/3rdparty/chromium/media/ffmpeg/ffmpeg_common.cc
-@@ -411,7 +411,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 05dcb1c..866f446 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 a7b2533..ba3c308 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.cc b/src/3rdparty/chromium/media/filters/audio_file_reader.cc
-index 2b58dd7..9d37f32 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/media/filters/audio_file_reader_unittest.cc b/src/3rdparty/chromium/media/filters/audio_file_reader_unittest.cc
-index a1c633d..5784fe1 100644
--- a/src/3rdparty/chromium/media/filters/audio_file_reader_unittest.cc
-+++ b/src/3rdparty/chromium/media/filters/audio_file_reader_unittest.cc
-@@ -61,15 +61,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
-@@ -98,7 +97,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());
-@@ -112,7 +112,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);
-   }
- 
-@@ -219,7 +219,7 @@ TEST_F(AudioFileReaderTest, AAC_ADTS) {
- }
- 
- TEST_F(AudioFileReaderTest, MidStreamConfigChangesFail) {
-  RunTestFailingDecode("midstream_config_change.mp3", 42624);
-+  RunTestFailingDecode("midstream_config_change.mp3", 0);
- }
- #endif
- 
-@@ -229,7 +229,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 e62b2af..ab39796 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 @@ bool FFmpegVideoDecoder::IsCodecSupported(VideoCodec codec) {
- }
- 
- FFmpegVideoDecoder::FFmpegVideoDecoder(MediaLog* media_log)
-    : media_log_(media_log) {
-+    : media_log_(media_log), timestamp_map_(128) {
-   DVLOG(1) << __func__;
-   DETACH_FROM_SEQUENCE(sequence_checker_);
- }
-@@ -204,10 +204,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));
-@@ -354,8 +350,10 @@ bool FFmpegVideoDecoder::FFmpegDecode(const DecoderBuffer& buffer) {
-     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 +412,12 @@ bool FFmpegVideoDecoder::OnNewFrame(AVFrame* frame) {
-   }
-   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 +492,10 @@ bool FFmpegVideoDecoder::ConfigureDecoder(const VideoDecoderConfig& config,
-   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 60cb9d5..4fa8628 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/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
-index f67718c..fe42aef 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
-@@ -229,7 +229,6 @@ int H264DecoderImpl::AVGetBuffer2(AVCodecContext* context,
-   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.
-@@ -377,8 +376,6 @@ int32_t H264DecoderImpl::Decode(const EncodedImage& input_image,
-     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());
- 
-@@ -395,10 +392,6 @@ int32_t H264DecoderImpl::Decode(const EncodedImage& input_image,
-     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();
--- a/rtc-dont-use-h264.patch
+++ b/rtc-dont-use-h264.patch
@@ -4,20 +4,24 @@ Subject: Don't require open264 when proprietary_codecs are supported
 Amended on 2024-01-30: also disable h265

 diff --git a/src/3rdparty/chromium/third_party/webrtc/webrtc.gni b/src/3rdparty/chromium/third_party/webrtc/webrtc.gni
-index 5a1c43c8888..d867f7e5330 100644
+index 66ed8434ff0..cbd78d582e6 100644
 --- a/src/3rdparty/chromium/third_party/webrtc/webrtc.gni
 +++ b/src/3rdparty/chromium/third_party/webrtc/webrtc.gni
-@@ -186,11 +186,10 @@ declare_args() {
-   #
+@@ -184,7 +184,7 @@ declare_args() {
   # Enabling H264 when building with MSVC is currently not supported, see
   # bugs.webrtc.org/9213#c13 for more info.
-  rtc_use_h264 =
+   rtc_use_h264 =
 -      proprietary_codecs && !is_android && !is_ios && !(is_win && !is_clang)
-+  rtc_use_h264 = false
-
-   # Enable to use H265
-  rtc_use_h265 = proprietary_codecs
-+  rtc_use_h265 = false
-
+      false
+ 
+   # Use system OpenH264
+   rtc_system_openh264 = false
+@@ -193,7 +193,7 @@ declare_args() {
+   if (build_with_chromium) {
+     rtc_use_h265 = enable_hevc_parser_and_hw_decoder
+   } else {
+-    rtc_use_h265 = proprietary_codecs
+    rtc_use_h265 = false
+   }
+ 
   # Enable this flag to make webrtc::Mutex be implemented by absl::Mutex.
-   rtc_use_absl_mutex = false