[arch-commits] Commit in electron15/trunk (3 files)
Nicola Squartini
tensor5 at gemini.archlinux.org
Sun Mar 13 14:10:38 UTC 2022
Date: Sunday, March 13, 2022 @ 14:10:38
Author: tensor5
Revision: 1150971
upgpkg: electron15 15.4.1-1
Modified:
electron15/trunk/PKGBUILD
Deleted:
electron15/trunk/chromium-93-ffmpeg-4.4.patch
electron15/trunk/chromium-94-ffmpeg-roll.patch
-------------------------------+
PKGBUILD | 19 ++++-----------
chromium-93-ffmpeg-4.4.patch | 36 -----------------------------
chromium-94-ffmpeg-roll.patch | 49 ----------------------------------------
3 files changed, 5 insertions(+), 99 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2022-03-13 13:41:40 UTC (rev 1150970)
+++ PKGBUILD 2022-03-13 14:10:38 UTC (rev 1150971)
@@ -1,12 +1,12 @@
# Maintainer: Nicola Squartini <tensor5 at gmail.com>
_use_suffix=1
-pkgver=15.3.7
-_commit=58e9dedd76a4768c113e2fb1906ad0a0105bd8f0
+pkgver=15.4.1
+_commit=8e517202ea5d62e3827d14275904bd48ccbfc3e5
_chromiumver=94.0.4606.81
_gcc_patchset=3
# shellcheck disable=SC2034
-pkgrel=2
+pkgrel=1
_major_ver=${pkgver%%.*}
if [[ ${_use_suffix} != 0 ]]; then
@@ -28,7 +28,8 @@
# shellcheck disable=SC2034
makedepends=('clang' 'git' 'gn' 'gperf' 'harfbuzz-icu' 'http-parser'
'java-runtime-headless' 'jsoncpp' 'libnotify' 'lld' 'llvm' 'ninja'
- 'npm' 'pciutils' 'pipewire' 'python' 'wget' 'yarn')
+ 'npm' 'pciutils' 'pipewire' 'python' 'python-httplib2'
+ 'python-pyparsing' 'python-six' 'wget' 'yarn')
# shellcheck disable=SC2034
optdepends=('kde-cli-tools: file deletion support (kioclient5)'
'libappindicator-gtk3: StatusNotifierItem support'
@@ -59,8 +60,6 @@
'gn-visibility-mojo.patch'
'gn-visibility-webrtc.patch'
'add-a-TODO-about-a-missing-pnacl-flag.patch'
- 'chromium-93-ffmpeg-4.4.patch'
- 'chromium-94-ffmpeg-roll.patch'
'unexpire-accelerated-video-decode-flag.patch'
'use-ffile-compilation-dir.patch'
'sandbox-build-if-glibc-2.34-dynamic-stack-size-is-en.patch'
@@ -82,8 +81,6 @@
'cca2d224cf2e9d7cfb4f5729ca76b5b8a7100b1ca39892b41fb296adaced1bf7'
'574785a21168c3e9b7aa82630713ceb6ced12f699133db66b10fc84b7bb2c631'
'd53da216538f2e741a6e048ed103964a91a98e9a3c10c27fdfa34d4692fdc455'
- '1a9e074f417f8ffd78bcd6874d8e2e74a239905bf662f76a7755fa40dc476b57'
- '56acb6e743d2ab1ed9f3eb01700ade02521769978d03ac43226dec94659b3ace'
'2a97b26c3d6821b15ef4ef1369905c6fa3e9c8da4877eb9af4361452a425290b'
'921010cd8fab5f30be76c68b68c9b39fac9e21f4c4133bb709879592bbdf606e'
'f910be9370c880de6e1d61cc30383c069e421d7acf406166e4fbfad324fc7d61'
@@ -179,12 +176,6 @@
patch -Np1 -i ../patches/chromium-90-ruy-include.patch
patch -Np1 -i ../patches/chromium-94-CustomSpaces-include.patch
- # Patches to build with ffmpeg 4.4; remove when ffmpeg 5.0 moves to stable
- if ! pkg-config --atleast-version 59 libavformat; then
- patch -Np1 -i ../chromium-93-ffmpeg-4.4.patch
- patch -Rp1 -i ../chromium-94-ffmpeg-roll.patch
- fi
-
patch -Np1 -i ../unbundle-fix-visibility-of-build-config-freetype.patch
patch -Np1 -i ../gn-visibility-gmock.patch
patch -Np1 -i ../gn-visibility-mojo.patch
Deleted: chromium-93-ffmpeg-4.4.patch
===================================================================
--- chromium-93-ffmpeg-4.4.patch 2022-03-13 13:41:40 UTC (rev 1150970)
+++ chromium-93-ffmpeg-4.4.patch 2022-03-13 14:10:38 UTC (rev 1150971)
@@ -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: chromium-94-ffmpeg-roll.patch
===================================================================
--- chromium-94-ffmpeg-roll.patch 2022-03-13 13:41:40 UTC (rev 1150970)
+++ chromium-94-ffmpeg-roll.patch 2022-03-13 14:10:38 UTC (rev 1150971)
@@ -1,49 +0,0 @@
-From b94755e4633045be96ab5e0bdde0db7e16a804bd Mon Sep 17 00:00:00 2001
-From: "liberato at chromium.org" <liberato at chromium.org>
-Date: Fri, 6 Aug 2021 04:25:31 +0000
-Subject: [PATCH] FFmpeg M94 roll.
-
-Contains DEPS update + chromium-side fixes.
-
-Bug: 1227259
-Change-Id: I61c5eaa789ea12c17d0cbcbf837435b9cf32479b
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3011889
-Reviewed-by: Thomas Guilbert <tguilbert at chromium.org>
-Commit-Queue: Frank Liberato <liberato at chromium.org>
-Cr-Commit-Position: refs/heads/master@{#909174}
----
- media/ffmpeg/ffmpeg_common.h | 1 +
- media/filters/ffmpeg_demuxer.cc | 4 ++--
- 2 files changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/media/ffmpeg/ffmpeg_common.h b/media/ffmpeg/ffmpeg_common.h
-index cede8ac5a7..97d6307e28 100644
---- a/media/ffmpeg/ffmpeg_common.h
-+++ b/media/ffmpeg/ffmpeg_common.h
-@@ -29,6 +29,7 @@ extern "C" {
- #include <libavformat/avformat.h>
- #include <libavformat/avio.h>
- #include <libavutil/avutil.h>
-+#include <libavutil/channel_layout.h>
- #include <libavutil/imgutils.h>
- #include <libavutil/log.h>
- #include <libavutil/mastering_display_metadata.h>
-diff --git a/media/filters/ffmpeg_demuxer.cc b/media/filters/ffmpeg_demuxer.cc
-index ac4713b072..605001d935 100644
---- a/media/filters/ffmpeg_demuxer.cc
-+++ b/media/filters/ffmpeg_demuxer.cc
-@@ -106,12 +106,12 @@ static base::TimeDelta ExtractStartTime(AVStream* stream) {
-
- // Next try to use the first DTS value, for codecs where we know PTS == DTS
- // (excludes all H26x codecs). The start time must be returned in PTS.
-- if (stream->first_dts != kNoFFmpegTimestamp &&
-+ if (av_stream_get_first_dts(stream) != kNoFFmpegTimestamp &&
- stream->codecpar->codec_id != AV_CODEC_ID_HEVC &&
- stream->codecpar->codec_id != AV_CODEC_ID_H264 &&
- stream->codecpar->codec_id != AV_CODEC_ID_MPEG4) {
- const base::TimeDelta first_pts =
-- ConvertFromTimeBase(stream->time_base, stream->first_dts);
-+ ConvertFromTimeBase(stream->time_base, av_stream_get_first_dts(stream));
- if (first_pts < start_time)
- start_time = first_pts;
- }
More information about the arch-commits
mailing list