[rpms/chromium] epel9-next: fix tab crash with SIGTRAP when using system ffmpeg

[rpms/chromium] epel9-next: fix tab crash with SIGTRAP when using system ffmpeg

[Than Ngo]

A new commit has been pushed.

Repo   : rpms/chromium
Branch : epel9-next
Commit : 18e3cfe6d99a85ac8b2f0f75e816de19c5993900
Author : Than Ngo <than@redhat.com>
Date   : 2023-10-16T18:32:02+02:00
Stats  : +23/-1 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/chromium/c/18e3cfe6d99a85ac8b2f0f75e816de19c5993900?branch=epel9-next

Log:
fix tab crash with SIGTRAP when using system ffmpeg

---
diff --git a/chromium-118-sigtrap_system_ffmpeg.patch b/chromium-118-sigtrap_system_ffmpeg.patch
new file mode 100644
index 0000000..053e59e
--- /dev/null
+++ b/chromium-118-sigtrap_system_ffmpeg.patch
@@ -0,0 +1,16 @@
+fix tab crash with SIGTRAP when opening website like ge.globo.com
+
+author: Than Ngo <than@redhat.com>
+
+diff -up chromium-118.0.5993.70/media/filters/ffmpeg_glue.cc.me chromium-118.0.5993.70/media/filters/ffmpeg_glue.cc
+--- chromium-118.0.5993.70/media/filters/ffmpeg_glue.cc.me	2023-10-16 12:52:01.716573884 +0200
++++ chromium-118.0.5993.70/media/filters/ffmpeg_glue.cc	2023-10-16 12:56:03.476075446 +0200
+@@ -157,7 +157,7 @@ bool FFmpegGlue::OpenContext(bool is_loc
+     container_ = container_names::MediaContainerName::kContainerAVI;
+ 
+   // For a successfully opened file, we will get a container we've compiled in.
+-  CHECK_NE(container_, container_names::MediaContainerName::kContainerUnknown);
++  DCHECK_NE(container_, container_names::MediaContainerName::kContainerUnknown);
+   LogContainer(is_local_file, container_);
+ 
+   return true;

diff --git a/chromium.spec b/chromium.spec
index 145d230..364170d 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -249,7 +249,7 @@
 
 Name:	chromium%{chromium_channel}
 Version: 118.0.5993.70
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: A WebKit (Blink) powered web browser that Google doesn't want you to use
 Url: http://www.chromium.org/Home
 License: BSD-3-Clause AND LGPL-2.1-or-later AND Apache-2.0 AND IJG AND MIT AND GPL-2.0-or-later AND ISC AND OpenSSL AND (MPL-1.1 OR GPL-2.0-only OR LGPL-2.0-only)
@@ -348,6 +348,8 @@ Patch114: chromium-107-ffmpeg-duration.patch
 Patch115: chromium-107-proprietary-codecs.patch
 # drop av_stream_get_first_dts from internal ffmpeg
 Patch116: chromium-112-ffmpeg-first_dts.patch
+# fix tab crash with SIGTRAP error when using system ffmpeg
+Patch117: chromium-118-sigtrap_system_ffmpeg.patch
 
 # revert AV1 VAAPI video encode due to old libva on el9
 Patch130: chromium-114-revert-av1enc-el9.patch
@@ -946,6 +948,7 @@ udev.
 %patch -P114 -p1 -b .system-ffmppeg
 %patch -P115 -p1 -b .prop-codecs
 %patch -P116 -p1 -b .first_dts
+%patch -P117 -p1 -b .sigtrap_system_ffmpeg
 %endif
 
 # EPEL specific patches
@@ -1693,6 +1696,9 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt
 %{chromium_path}/chromedriver
 
 %changelog
+* Mon Oct 16 2023 Than Ngo <than@redhat.com> - 118.0.5993.70-2
+- fix tab crash with SIGTRAP when using system ffmpeg
+
 * Wed Oct 11 2023 Than Ngo <than@redhat.com> - 118.0.5993.70-1
 - update to 118.0.5993.70
     - CVE-2023-5218: Use after free in Site Isolation.