diff options
author | Daniel Playfair Cal | 2020-07-21 09:30:58 +1000 |
---|---|---|
committer | Daniel Playfair Cal | 2020-07-27 14:20:46 +1000 |
commit | 5f8c814623faa9fdb6c4891ec7181735564d523d (patch) | |
tree | 3b8f305e071981172a85581d73faaa47d7ce4a76 | |
parent | 76ba84c23a90195cd3326553baf5c1ec16ba29cc (diff) | |
download | aur-5f8c814623faa9fdb6c4891ec7181735564d523d.tar.gz |
85.0.4183.26-1
-rw-r--r-- | .SRCINFO | 8 | ||||
-rw-r--r-- | PKGBUILD | 9 | ||||
-rw-r--r-- | force-mp3-files-to-have-a-start-time-of-zero.patch | 38 |
3 files changed, 5 insertions, 50 deletions
@@ -1,6 +1,6 @@ pkgbase = chromium-beta-ozone pkgdesc = Chromium built with patches for wayland support via Ozone (beta channel) - pkgver = 85.0.4181.8 + pkgver = 85.0.4183.26 pkgrel = 1 url = https://www.chromium.org/Home install = chromium.install @@ -55,13 +55,11 @@ pkgbase = chromium-beta-ozone optdepends = kwallet: for storing passwords in KWallet on KDE desktops provides = chromium conflicts = chromium - source = https://commondatastorage.googleapis.com/chromium-browser-official/chromium-85.0.4181.8.tar.xz + source = https://commondatastorage.googleapis.com/chromium-browser-official/chromium-85.0.4183.26.tar.xz source = chromium-launcher-6.tar.gz::https://github.com/foutrelis/chromium-launcher/archive/v6.tar.gz - source = force-mp3-files-to-have-a-start-time-of-zero.patch source = chromium-skia-harmony.patch - sha256sums = f269edce0e3938aff6480ed1f37d2ef50768937d99c600c71a76a8bc7dbb1c30 + sha256sums = ac8121bbcc76400d846a3a46fc20f684fd3134f8f387d6213c5b077ba848ec6e sha256sums = 04917e3cd4307d8e31bfb0027a5dce6d086edb10ff8a716024fbb8bb0c7dccf1 - sha256sums = abc3fad113408332c3b187b083bf33eba59eb5c87fa3ce859023984b5804623c sha256sums = 771292942c0901092a402cc60ee883877a99fb804cb54d568c8c6c94565a48e1 pkgname = chromium-beta-ozone @@ -5,7 +5,7 @@ # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=chromium-beta-ozone -pkgver=85.0.4181.8 +pkgver=85.0.4183.26 pkgrel=1 _launcher_ver=6 pkgdesc="Chromium built with patches for wayland support via Ozone (beta channel)" @@ -28,11 +28,9 @@ optdepends=('pepper-flash: support for Flash content' install=chromium.install source=(https://commondatastorage.googleapis.com/chromium-browser-official/chromium-$pkgver.tar.xz chromium-launcher-$_launcher_ver.tar.gz::https://github.com/foutrelis/chromium-launcher/archive/v$_launcher_ver.tar.gz - force-mp3-files-to-have-a-start-time-of-zero.patch chromium-skia-harmony.patch) -sha256sums=('f269edce0e3938aff6480ed1f37d2ef50768937d99c600c71a76a8bc7dbb1c30' +sha256sums=('ac8121bbcc76400d846a3a46fc20f684fd3134f8f387d6213c5b077ba848ec6e' '04917e3cd4307d8e31bfb0027a5dce6d086edb10ff8a716024fbb8bb0c7dccf1' - 'abc3fad113408332c3b187b083bf33eba59eb5c87fa3ce859023984b5804623c' '771292942c0901092a402cc60ee883877a99fb804cb54d568c8c6c94565a48e1') # Possible replacements are listed in build/linux/unbundle/replace_gn_files.py @@ -89,9 +87,6 @@ prepare() { third_party/blink/renderer/core/xml/parser/xml_document_parser.cc \ third_party/libxml/chromium/*.cc - # https://chromium-review.googlesource.com/c/chromium/src/+/2268221 - patch -Np1 -i ../force-mp3-files-to-have-a-start-time-of-zero.patch - # https://crbug.com/skia/6663#c10 patch -Np0 -i ../chromium-skia-harmony.patch diff --git a/force-mp3-files-to-have-a-start-time-of-zero.patch b/force-mp3-files-to-have-a-start-time-of-zero.patch deleted file mode 100644 index d018a87094dc..000000000000 --- a/force-mp3-files-to-have-a-start-time-of-zero.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 192fc3899f76e9487d77895f31df8d2d13bf9619 Mon Sep 17 00:00:00 2001 -From: Dale Curtis <dalecurtis@chromium.org> -Date: Fri, 26 Jun 2020 01:10:55 +0000 -Subject: [PATCH] Force mp3 files to have a start time of zero. - -This will allow us to remove our custom patch which breaks upstream -ffmpeg functionality for unknown reasons. - -R=sandersd - -Fixed: 1062037 -Change-Id: I253011843dee4dd6a8c958b14990ad836a9f1dca -Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2268221 -Auto-Submit: Dale Curtis <dalecurtis@chromium.org> -Reviewed-by: Dan Sanders <sandersd@chromium.org> -Commit-Queue: Dale Curtis <dalecurtis@chromium.org> -Cr-Commit-Position: refs/heads/master@{#782792} ---- - media/filters/ffmpeg_demuxer.cc | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/media/filters/ffmpeg_demuxer.cc b/media/filters/ffmpeg_demuxer.cc -index 01266e1a072..a7ed542b5fc 100644 ---- a/media/filters/ffmpeg_demuxer.cc -+++ b/media/filters/ffmpeg_demuxer.cc -@@ -1522,6 +1522,12 @@ void FFmpegDemuxer::OnFindStreamInfoDone(int result) { - if (glue_->container() == container_names::CONTAINER_AVI) - format_context->flags |= AVFMT_FLAG_GENPTS; - -+ // FFmpeg will incorrectly adjust the start time of MP3 files into the future -+ // based on discard samples. We were unable to fix this upstream without -+ // breaking ffmpeg functionality. https://crbug.com/1062037 -+ if (glue_->container() == container_names::CONTAINER_MP3) -+ start_time_ = base::TimeDelta(); -+ - // For testing purposes, don't overwrite the timeline offset if set already. - if (timeline_offset_.is_null()) { - timeline_offset_ = |