public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Than Ngo <than@redhat.com>
To: git-commits@fedoraproject.org
Subject: [rpms/chromium] epel9-next: - fix build error on epel9 anf fedora 37 with old ffmpeg 5.x
Date: Fri, 07 Aug 2026 16:05:37 GMT	[thread overview]
Message-ID: <178611873786.1.9615745705274651528.rpms-chromium-c57568677a6e@fedoraproject.org> (raw)

            A new commit has been pushed.

            Repo   : rpms/chromium
            Branch : epel9-next
            Commit : c57568677a6e9bf6524360d978a13e08d02d5940
            Author : Than Ngo <than@redhat.com>
            Date   : 2023-11-02T08:43:26+01:00
            Stats  : +24/-2 in 2 file(s)
            URL    : https://src.fedoraproject.org/rpms/chromium/c/c57568677a6e9bf6524360d978a13e08d02d5940?branch=epel9-next

            Log:
            - fix build error on epel9 anf fedora 37 with old ffmpeg 5.x
- add workaround for broken gn on epel 8/9

---
diff --git a/chromium-107-ffmpeg-5.x-duration.patch b/chromium-107-ffmpeg-5.x-duration.patch
new file mode 100644
index 0000000..ee01cd9
--- /dev/null
+++ b/chromium-107-ffmpeg-5.x-duration.patch
@@ -0,0 +1,16 @@
+diff -up chromium-107.0.5304.121/media/filters/audio_file_reader.cc.me chromium-107.0.5304.121/media/filters/audio_file_reader.cc
+--- chromium-107.0.5304.121/media/filters/audio_file_reader.cc.me	2022-12-17 08:27:12.204753071 +0100
++++ chromium-107.0.5304.121/media/filters/audio_file_reader.cc	2022-12-17 08:28:40.908211808 +0100
+@@ -243,10 +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 (audio_codec_ == AudioCodec::kAAC && frame->duration) {
++  if (audio_codec_ == AudioCodec::kAAC && frame->pkt_duration) {
+     const base::TimeDelta pkt_duration = ConvertFromTimeBase(
+         glue_->format_context()->streams[stream_index_]->time_base,
+-        frame->duration + std::min(static_cast<int64_t>(0), frame->pts));
++        frame->pkt_duration + std::min(static_cast<int64_t>(0), frame->pts));
+     const base::TimeDelta frame_duration =
+         base::Seconds(frames_read / static_cast<double>(sample_rate_));
+ 

diff --git a/chromium.spec b/chromium.spec
index 980fd23..2bc8816 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -26,8 +26,8 @@
 
 # enable|disble bootstrap
 %global bootstrap 0
-# workaround for broken gn on epel9
-%if 0%{?rhel} == 9
+# workaround for broken gn on epel 8/9
+%if 0%{?rhel} == 8 || 0%{?rhel} == 9
 %global bootstrap 1
 %endif
 
@@ -353,6 +353,9 @@ Patch111: chromium-116-constexpr.patch
 Patch112: chromium-117-el7-default_constructor.patch
 
 # system ffmpeg
+# need for old ffmpeg 5.x on epel9 and fedora 37
+Patch114: chromium-107-ffmpeg-5.x-duration.patch
+# disable the check
 Patch115: chromium-107-proprietary-codecs.patch
 # drop av_stream_get_first_dts from internal ffmpeg
 Patch116: chromium-112-ffmpeg-first_dts.patch
@@ -946,6 +949,9 @@ udev.
 %endif
 
 %if ! %{bundleffmpegfree}
+%if 0%{?rhel} == 9 || 0%{?fedora} == 37
+%patch -P114 -p1 -b .ffmpeg-5.x-duration
+%endif
 %patch -P115 -p1 -b .prop-codecs
 %patch -P116 -p1 -b .first_dts
 %patch -P117 -p1 -b .sigtrap_system_ffmpeg

                 reply	other threads:[~2026-08-07 16:05 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=178611873786.1.9615745705274651528.rpms-chromium-c57568677a6e@fedoraproject.org \
    --to=than@redhat.com \
    --cc=git-commits@fedoraproject.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox