public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/chromium] rawhide: Fix FTBFS with old system ffmpeg-5.x on el9
@ 2026-08-01 13:18 Than Ngo
  0 siblings, 0 replies; only message in thread
From: Than Ngo @ 2026-08-01 13:18 UTC (permalink / raw)
  To: git-commits

          A new commit has been pushed.

          Repo   : rpms/chromium
          Branch : rawhide
          Commit : 537a88b1f1bbc142a4e40d60e4f8f870456c3072
          Author : Than Ngo <than@redhat.com>
          Date   : 2026-08-01T15:17:01+02:00
          Stats  : +31/-0 in 2 file(s)
          URL    : https://src.fedoraproject.org/rpms/chromium/c/537a88b1f1bbc142a4e40d60e4f8f870456c3072?branch=rawhide

          Log:
          Fix FTBFS with old system ffmpeg-5.x on el9

error: use of undeclared identifier 'AV_SPHERICAL_HALF_EQUIRECTANGULAR'

---
diff --git a/chromium-151-el9-build-error-system-ffmpeg5.patch b/chromium-151-el9-build-error-system-ffmpeg5.patch
new file mode 100644
index 0000000..4d07064
--- /dev/null
+++ b/chromium-151-el9-build-error-system-ffmpeg5.patch
@@ -0,0 +1,29 @@
+Fix FTBFS with ffmpeg-5.x
+../../media/ffmpeg/ffmpeg_common.cc:911:16: error: use of undeclared identifier 'AV_SPHERICAL_HALF_EQUIRECTANGULAR'; did you mean 'AV_SPHERICAL_EQUIRECTANGULAR'?
+  911 |           case AV_SPHERICAL_HALF_EQUIRECTANGULAR:
+      |                ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+      |                AV_SPHERICAL_EQUIRECTANGULAR
+/usr/include/ffmpeg/libavutil/spherical.h:56:5: note: 'AV_SPHERICAL_EQUIRECTANGULAR' declared here
+   56 |     AV_SPHERICAL_EQUIRECTANGULAR,
+      |     ^
+../../media/ffmpeg/ffmpeg_common.cc:911:16: error: duplicate case value 'AV_SPHERICAL_EQUIRECTANGULAR'
+  911 |           case AV_SPHERICAL_HALF_EQUIRECTANGULAR:
+      |                ^
+../../media/ffmpeg/ffmpeg_common.cc:908:16: note: previous case defined here
+  908 |           case AV_SPHERICAL_EQUIRECTANGULAR:
+
+diff -up chromium-151.0.7922.71/media/ffmpeg/ffmpeg_common.cc.me chromium-151.0.7922.71/media/ffmpeg/ffmpeg_common.cc
+--- chromium-151.0.7922.71/media/ffmpeg/ffmpeg_common.cc.me	2026-08-01 07:16:39.987060192 -0400
++++ chromium-151.0.7922.71/media/ffmpeg/ffmpeg_common.cc	2026-08-01 07:25:18.201727436 -0400
+@@ -908,9 +908,11 @@ bool AVStreamToVideoDecoderConfig(const
+           case AV_SPHERICAL_EQUIRECTANGULAR:
+             spatial_format.projection_type = VideoProjectionType::kEquirect360;
+             break;
++	#ifdef AV_SPHERICAL_HALF_EQUIRECTANGULAR
+           case AV_SPHERICAL_HALF_EQUIRECTANGULAR:
+             spatial_format.projection_type = VideoProjectionType::kEquirect180;
+             break;
++	#endif
+           case AV_SPHERICAL_EQUIRECTANGULAR_TILE: {
+             const uint32_t kEquirect180Threshold = 0x30000000;
+             if (spherical->bound_left >= kEquirect180Threshold &&

diff --git a/chromium.spec b/chromium.spec
index db2844d..c4187a7 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -335,6 +335,7 @@ Patch131: chromium-107-proprietary-codecs.patch
 Patch132: chromium-118-sigtrap_system_ffmpeg.patch
 # need for old ffmpeg 6.0/5.x on epel9 and fedora < 40
 Patch133: chromium-151-el9-ffmpeg-5.1.x.patch
+Patch134: chromium-151-el9-build-error-system-ffmpeg5.patch
 # revert, it causes build error: use of undeclared identifier 'AVFMT_FLAG_NOH264PARSE'
 Patch135: chromium-133-disable-H.264-video-parser-during-demuxing.patch
 # Workaround for youtube stop working
@@ -1102,6 +1103,7 @@ Qt6 UI for chromium.
 %patch -P130 -p1 -b .el9-ffmpeg-build-error
 %patch -P133 -p1 -b .el9-ffmpeg-5.1.x
 %endif
+%patch -P134 -p1 -b .el9-ffmpeg-5.1.x
 %patch -P131 -p1 -b .prop-codecs
 %patch -P132 -p1 -b .sigtrap_system_ffmpeg
 %patch -P135 -p1 -b .disable-H.264-video-parser-during-demuxing

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2026-08-01 13:18 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-08-01 13:18 [rpms/chromium] rawhide: Fix FTBFS with old system ffmpeg-5.x on el9 Than Ngo

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox