From f8eb54566e80de847b992acf8f91f4909de3f010 Mon Sep 17 00:00:00 2001
From: Automatic Build System <autodist@openmamba.org>
Date: Sat, 8 Feb 2025 14:31:09 +0100
Subject: [PATCH] automatic version update by autodist [release
 6.8.2-1mamba;Thu Feb 06 2025]

---
 ...ine-6.8.2-disable-ffmpeg-allow-lists.patch | 13 +++++++++++
 qt6-qtwebengine.spec                          | 23 +++++++++++++------
 2 files changed, 29 insertions(+), 7 deletions(-)
 create mode 100644 qt6-qtwebengine-6.8.2-disable-ffmpeg-allow-lists.patch

diff --git a/qt6-qtwebengine-6.8.2-disable-ffmpeg-allow-lists.patch b/qt6-qtwebengine-6.8.2-disable-ffmpeg-allow-lists.patch
new file mode 100644
index 0000000..4e0adc6
--- /dev/null
+++ b/qt6-qtwebengine-6.8.2-disable-ffmpeg-allow-lists.patch
@@ -0,0 +1,13 @@
+diff --git a/chromium/media/base/media_switches.cc b/chromium/media/base/media_switches.cc
+index 0dfbbd9e38f..fb7bc05cda8 100644
+--- a/chromium/media/base/media_switches.cc
++++ b/chromium/media/base/media_switches.cc
+@@ -1712,7 +1712,7 @@ BASE_FEATURE(kUseWindowBoundsForPip,
+ // Enables FFmpeg allow lists for supported codecs / containers.
+ BASE_FEATURE(kFFmpegAllowLists,
+              "FFmpegAllowLists",
+-             base::FEATURE_ENABLED_BY_DEFAULT);
++             base::FEATURE_DISABLED_BY_DEFAULT);
+ 
+ // Enables sending MediaLog to the log stream, which is useful for easier
+ // development by ensuring logs can be seen without a remote desktop session.
diff --git a/qt6-qtwebengine.spec b/qt6-qtwebengine.spec
index 30a3435..fc8e7e5 100644
--- a/qt6-qtwebengine.spec
+++ b/qt6-qtwebengine.spec
@@ -1,6 +1,6 @@
 %define majver %(echo %version | cut -d. -f1-2)
 Name:          qt6-qtwebengine
-Version:       6.8.1
+Version:       6.8.2
 Release:       1mamba
 Summary:       Qt6 WebEngine component
 Group:         System/Libraries
@@ -11,8 +11,9 @@ URL:           https://www.qt.io/
 Source:        https://download.qt.io/official_releases/qt/%{majver}/%{version}/submodules/qtwebengine-everywhere-src-%{version}.tar.xz
 Patch0:        qt6-qtwebengine-6.7.0-ninja-1.12.0.patch
 Patch1:        qt6-qtwebengine-6.7.0-ninja-1.12.0-2.patch
-Patch3:        qt6-qtwebengine-6.7.2-no-h264.patch
-Patch4:        qt6-qtwebengine-6.8.0-arm-fix-build.patch
+Patch2:        qt6-qtwebengine-6.7.2-no-h264.patch
+Patch3:        qt6-qtwebengine-6.8.0-arm-fix-build.patch
+Patch4:        qt6-qtwebengine-6.8.2-disable-ffmpeg-allow-lists.patch
 License:       GPL
 ## AUTOBUILDREQ-BEGIN
 BuildRequires: glibc-devel
@@ -91,7 +92,6 @@ Requires:      %{name} = %{?epoch:%epoch:}%{version}-%{release}
 %description devel
 This package contains libraries and header files for developing applications that use %{name}.
 
-%debug_package
 
 # Don't clean build at the end
 %global __spec_rmbuild_cmd /bin/true
@@ -104,10 +104,13 @@ This package contains libraries and header files for developing applications tha
 #:<< _EOF
 %patch 0 -p1
 %patch 1 -p1
-%patch 3 -p1 -b .no-h264
+%patch 2 -p1 -b .no-h264
 %ifarch aarch64
-%patch 4 -p1
+%patch 3 -p1
 %endif
+cd src/3rdparty
+%patch 4 -p1 -b .disable-ffmpeg-allow-lists
+cd ../..
 
 %build
 #:<< _EOF
@@ -126,9 +129,12 @@ export CXXFLAGS+="%{optflags} -fPIC -fno-delete-null-pointer-checks -fno-lifetim
 
 %cmake -d build \
   -G Ninja \
+  -DCMAKE_MESSAGE_LOG_LEVEL=STATUS \
+  -DCMAKE_TOOLCHAIN_FILE=%{_libdir}/cmake/Qt6/qt.toolchain.cmake \
   -DQT_FEATURE_webengine_system_ffmpeg=ON \
   -DQT_FEATURE_webengine_system_icu=ON \
   -DQT_FEATURE_webengine_system_libevent=ON \
+  -DQT_FEATURE_webengine_system_re2=ON \
   -DQT_FEATURE_webengine_proprietary_codecs=ON \
   -DQT_FEATURE_webengine_kerberos=ON \
   -DQT_FEATURE_webengine_webrtc_pipewire=ON \
@@ -169,7 +175,7 @@ DESTDIR="%{buildroot}" cmake --install build
 %{_libdir}/qt6/metatypes/qt6*.json
 %{_libdir}/qt6/modules/*.json
 %{_datadir}/qt6/translations/qtwebengine_locales/*.pak
-%{_qt6_archdatadir}/sbom/qtwebengine-%{version}.spdx
+%{_qt6_archdatadir}/sbom/qt*-%{version}.spdx
 %doc LICENSES LICENSE.Chromium
 
 %files devel
@@ -195,6 +201,9 @@ DESTDIR="%{buildroot}" cmake --install build
 %{_libdir}/pkgconfig/Qt6*.pc
 
 %changelog
+* Thu Feb 06 2025 Automatic Build System <autodist@openmamba.org> 6.8.2-1mamba
+- automatic version update by autodist
+
 * Sat Dec 07 2024 Automatic Build System <autodist@openmamba.org> 6.8.1-1mamba
 - automatic version update by autodist