[arch-commits] Commit in chromium/trunk (3 files)

[Evangelos Foutras]

    Date: Thursday, February 17, 2022 @ 17:40:46
  Author: foutrelis
Revision: 437613

Remove ffmpeg 4.4 patches

Modified:
  chromium/trunk/PKGBUILD
Deleted:
  chromium/trunk/chromium-93-ffmpeg-4.4.patch
  chromium/trunk/unbundle-ffmpeg-av_stream_get_first_dts.patch

-----------------------------------------------+
 PKGBUILD                                      |   15 ----------
 chromium-93-ffmpeg-4.4.patch                  |   36 ------------------------
 unbundle-ffmpeg-av_stream_get_first_dts.patch |   12 --------
 3 files changed, 63 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-02-17 16:18:20 UTC (rev 437612)
+++ PKGBUILD	2022-02-17 17:40:46 UTC (rev 437613)
@@ -31,8 +31,6 @@
         breakpad-fix-for-non-constant-SIGSTKSZ.patch
         use-FT_Done_MM_Var-in-CFX_Font-AdjustMMParams.patch
         sql-make-VirtualCursor-standard-layout-type.patch
-        chromium-93-ffmpeg-4.4.patch
-        unbundle-ffmpeg-av_stream_get_first_dts.patch
         use-oauth2-client-switches-as-default.patch)
 sha256sums=('415b47e912766cd07f9f52e95bc6470b835acf1d6f566ae32e66ba8be608f33e'
             '213e50f48b67feb4441078d50b0fd431df34323be15be97c55302d3fdac4483a'
@@ -43,8 +41,6 @@
             'b4d28867c1fabde6c50a2cfa3f784730446c4d86e5191e0f0000fbf7b0f91ecf'
             '9c9c280be968f06d269167943680fb72a26fbb05d8c15f60507e316e8a9075d5'
             'b94b2e88f63cfb7087486508b8139599c89f96d7a4181c61fec4b4e250ca327a'
-            '1a9e074f417f8ffd78bcd6874d8e2e74a239905bf662f76a7755fa40dc476b57'
-            '1f0c1a7a1eb67d91765c9f28df815f58e1c6dc7b37d0acd4d68cac8e5515786c'
             'e393174d7695d0bafed69e868c5fbfecf07aa6969f3b64596d0bae8b067e1711')
 
 # Possible replacements are listed in build/linux/unbundle/replace_gn_files.py
@@ -100,17 +96,6 @@
   # runtime -- this allows signing into Chromium without baked-in values
   patch -Np1 -i ../use-oauth2-client-switches-as-default.patch
 
-  # Patches to build with ffmpeg 4.4; remove when ffmpeg 5.0 moves to stable
-  if ! pkg-config --atleast-version 59 libavformat; then
-    # Fix build with older ffmpeg
-    patch -Np1 -i ../chromium-93-ffmpeg-4.4.patch
-
-    # Substitute the custom function 'av_stream_get_first_dts' for ffmpeg 4.4;
-    # drop this for ffmpeg 5.0 which is patched to include the above function.
-    # https://crbug.com/1251779
-    patch -Np1 -i ../unbundle-ffmpeg-av_stream_get_first_dts.patch
-  fi
-
   # Upstream fixes
   patch -Np1 -F3 -i ../downgrade-duplicate-peer-error-to-dvlog.patch
   patch -Np1 -i ../fix-build-break-with-system-libdrm.patch

Deleted: chromium-93-ffmpeg-4.4.patch
===================================================================
--- chromium-93-ffmpeg-4.4.patch	2022-02-17 16:18:20 UTC (rev 437612)
+++ chromium-93-ffmpeg-4.4.patch	2022-02-17 17:40:46 UTC (rev 437613)
@@ -1,36 +0,0 @@
-diff --git a/media/filters/ffmpeg_demuxer.cc b/media/filters/ffmpeg_demuxer.cc
-index ac4713b07268..492a9a37d096 100644
---- a/media/filters/ffmpeg_demuxer.cc
-+++ b/media/filters/ffmpeg_demuxer.cc
-@@ -427,11 +427,11 @@ void FFmpegDemuxerStream::EnqueuePacket(ScopedAVPacket packet) {
-   scoped_refptr<DecoderBuffer> buffer;
- 
-   if (type() == DemuxerStream::TEXT) {
--    size_t id_size = 0;
-+    int id_size = 0;
-     uint8_t* id_data = av_packet_get_side_data(
-         packet.get(), AV_PKT_DATA_WEBVTT_IDENTIFIER, &id_size);
- 
--    size_t settings_size = 0;
-+    int settings_size = 0;
-     uint8_t* settings_data = av_packet_get_side_data(
-         packet.get(), AV_PKT_DATA_WEBVTT_SETTINGS, &settings_size);
- 
-@@ -443,7 +443,7 @@ void FFmpegDemuxerStream::EnqueuePacket(ScopedAVPacket packet) {
-     buffer = DecoderBuffer::CopyFrom(packet->data, packet->size,
-                                      side_data.data(), side_data.size());
-   } else {
--    size_t side_data_size = 0;
-+    int side_data_size = 0;
-     uint8_t* side_data = av_packet_get_side_data(
-         packet.get(), AV_PKT_DATA_MATROSKA_BLOCKADDITIONAL, &side_data_size);
- 
-@@ -504,7 +504,7 @@ void FFmpegDemuxerStream::EnqueuePacket(ScopedAVPacket packet) {
-                                        packet->size - data_offset);
-     }
- 
--    size_t skip_samples_size = 0;
-+    int skip_samples_size = 0;
-     const uint32_t* skip_samples_ptr =
-         reinterpret_cast<const uint32_t*>(av_packet_get_side_data(
-             packet.get(), AV_PKT_DATA_SKIP_SAMPLES, &skip_samples_size));

Deleted: unbundle-ffmpeg-av_stream_get_first_dts.patch
===================================================================
--- unbundle-ffmpeg-av_stream_get_first_dts.patch	2022-02-17 16:18:20 UTC (rev 437612)
+++ unbundle-ffmpeg-av_stream_get_first_dts.patch	2022-02-17 17:40:46 UTC (rev 437613)
@@ -1,12 +0,0 @@
-diff --git a/build/linux/unbundle/ffmpeg.gn b/build/linux/unbundle/ffmpeg.gn
-index 16e20744706..6a079b32221 100644
---- a/build/linux/unbundle/ffmpeg.gn
-+++ b/build/linux/unbundle/ffmpeg.gn
-@@ -12,6 +12,7 @@ pkg_config("system_ffmpeg") {
-     "libavformat",
-     "libavutil",
-   ]
-+  defines = [ "av_stream_get_first_dts(stream)=stream->first_dts" ]
- }
- 
- buildflag_header("ffmpeg_features") {