summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Playfair Cal2020-06-27 16:21:23 +1000
committerDaniel Playfair Cal2020-06-27 16:21:23 +1000
commit8318af1e7d45bd11b52ae5e9284bd11baa6f140e (patch)
treec096de3fe631b7a409c534cee503389e894e39be
parentbe962656a4441568794ba721c34aba245aa51e91 (diff)
parentd29ae37939808029d59660b98216b3de2524c823 (diff)
downloadaur-8318af1e7d45bd11b52ae5e9284bd11baa6f140e.tar.gz
Merge branch 'stable' into beta
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD39
-rw-r--r--force-mp3-files-to-have-a-start-time-of-zero.patch38
3 files changed, 69 insertions, 11 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 533ed93fe1e..a7d8675db02 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -9,7 +9,6 @@ pkgbase = chromium-beta-ozone
makedepends = python
makedepends = python2
makedepends = gperf
- makedepends = yasm
makedepends = mesa
makedepends = ninja
makedepends = nodejs
@@ -57,9 +56,11 @@ pkgbase = chromium-beta-ozone
conflicts = chromium
source = https://commondatastorage.googleapis.com/chromium-browser-official/chromium-84.0.4147.30.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 = 14d2b6240eb307f8907c8d9900dddfab530a84324bda0b6f5a10d7a6c809c5ff
sha256sums = 04917e3cd4307d8e31bfb0027a5dce6d086edb10ff8a716024fbb8bb0c7dccf1
+ sha256sums = abc3fad113408332c3b187b083bf33eba59eb5c87fa3ce859023984b5804623c
sha256sums = 771292942c0901092a402cc60ee883877a99fb804cb54d568c8c6c94565a48e1
pkgname = chromium-beta-ozone
diff --git a/PKGBUILD b/PKGBUILD
index c086743c494..fb99ef5c7c8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -28,9 +28,11 @@ 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=('14d2b6240eb307f8907c8d9900dddfab530a84324bda0b6f5a10d7a6c809c5ff'
'04917e3cd4307d8e31bfb0027a5dce6d086edb10ff8a716024fbb8bb0c7dccf1'
+ 'abc3fad113408332c3b187b083bf33eba59eb5c87fa3ce859023984b5804623c'
'771292942c0901092a402cc60ee883877a99fb804cb54d568c8c6c94565a48e1')
# Possible replacements are listed in build/linux/unbundle/replace_gn_files.py
@@ -87,6 +89,9 @@ 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
@@ -146,7 +151,6 @@ build() {
'use_system_libwayland=true'
'use_vaapi=false'
'enable_nacl=false'
- 'enable_swiftshader=false'
"google_api_key=\"${_google_api_key}\""
"google_default_client_id=\"${_google_default_client_id}\""
"google_default_client_secret=\"${_google_default_client_secret}\""
@@ -189,22 +193,37 @@ package() {
install -Dm644 chrome/app/resources/manpage.1.in \
"$pkgdir/usr/share/man/man1/chromium.1"
sed -i \
- -e "s/@@MENUNAME@@/Chromium/g" \
- -e "s/@@PACKAGE@@/chromium/g" \
- -e "s/@@USR_BIN_SYMLINK_NAME@@/chromium/g" \
+ -e 's/@@MENUNAME@@/Chromium/g' \
+ -e 's/@@PACKAGE@@/chromium/g' \
+ -e 's/@@USR_BIN_SYMLINK_NAME@@/chromium/g' \
"$pkgdir/usr/share/applications/chromium.desktop" \
"$pkgdir/usr/share/man/man1/chromium.1"
- cp \
- out/Release/{chrome_{100,200}_percent,resources}.pak \
- out/Release/{*.bin,chromedriver} \
- "$pkgdir/usr/lib/chromium/"
- install -Dm644 -t "$pkgdir/usr/lib/chromium/locales" out/Release/locales/*.pak
+ install -Dm644 chrome/installer/linux/common/chromium-browser/chromium-browser.appdata.xml \
+ "$pkgdir/usr/share/metainfo/chromium.appdata.xml"
+ sed -ni \
+ -e 's/chromium-browser\.desktop/chromium.desktop/' \
+ -e '/<update_contact>/d' \
+ -e '/<p>/N;/<p>\n.*\(We invite\|Chromium supports Vorbis\)/,/<\/p>/d' \
+ -e '/^<?xml/,$p' \
+ "$pkgdir/usr/share/metainfo/chromium.appdata.xml"
+
+ local toplevel_files=(
+ chrome_100_percent.pak
+ chrome_200_percent.pak
+ resources.pak
+ v8_context_snapshot.bin
+ chromedriver
+ )
if [[ -z ${_system_libs[icu]+set} ]]; then
- cp out/Release/icudtl.dat "$pkgdir/usr/lib/chromium/"
+ toplevel_files+=(icudtl.dat)
fi
+ cp "${toplevel_files[@]/#/out/Release/}" "$pkgdir/usr/lib/chromium/"
+ install -Dm644 -t "$pkgdir/usr/lib/chromium/locales" out/Release/locales/*.pak
+ install -Dm755 -t "$pkgdir/usr/lib/chromium/swiftshader" out/Release/swiftshader/*.so
+
for size in 24 48 64 128 256; do
install -Dm644 "chrome/app/theme/chromium/product_logo_$size.png" \
"$pkgdir/usr/share/icons/hicolor/${size}x${size}/apps/chromium.png"
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
new file mode 100644
index 00000000000..d018a87094d
--- /dev/null
+++ b/force-mp3-files-to-have-a-start-time-of-zero.patch
@@ -0,0 +1,38 @@
+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_ =