upgpkg: ungoogled-chromium 83.0.4103.116-2

7 files changed, 97 insertions, 40 deletions

diff --git a/.SRCINFO b/.SRCINFO
index bfb7365..4c058da 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = ungoogled-chromium
 	pkgdesc = A lightweight approach to removing Google web service dependency
-	pkgver = 83.0.4103.106
-	pkgrel = 1
+	pkgver = 83.0.4103.116
+	pkgrel = 2
 	url = https://github.com/Eloston/ungoogled-chromium
 	install = chromium.install
 	arch = x86_64
@@ -34,7 +34,6 @@ pkgbase = ungoogled-chromium
 	depends = libpulse
 	depends = pciutils
 	depends = json-glib
-	depends = libva
 	depends = desktop-file-utils
 	depends = hicolor-icon-theme
 	depends = icu
@@ -60,12 +59,10 @@ pkgbase = ungoogled-chromium
 	optdepends = kwallet: for storing passwords in KWallet on KDE desktops
 	provides = chromium
 	conflicts = chromium
-	source = https://commondatastorage.googleapis.com/chromium-browser-official/chromium-83.0.4103.106.tar.xz
-	source = https://github.com/Eloston/ungoogled-chromium/archive/83.0.4103.106-1.tar.gz
+	source = https://commondatastorage.googleapis.com/chromium-browser-official/chromium-83.0.4103.116.tar.xz
+	source = https://github.com/Eloston/ungoogled-chromium/archive/83.0.4103.116-1.tar.gz
 	source = chromium-launcher-6.tar.gz::https://github.com/foutrelis/chromium-launcher/archive/v6.tar.gz
 	source = chromium-drirc-disable-10bpc-color-configs.conf
-	source = vdpau-support.patch
-	source = fix-intel-vaapi-wayland.patch
 	source = clean-up-a-call-to-set_utf8.patch
 	source = iwyu-std-numeric_limits-is-defined-in-limits.patch
 	source = add-missing-algorithm-header-in-crx_install_error.cc.patch
@@ -73,15 +70,17 @@ pkgbase = ungoogled-chromium
 	source = include-memory-header-to-get-the-definition-of-std-u.patch
 	source = make-some-of-blink-custom-iterators-STL-compatible.patch
 	source = avoid-double-destruction-of-ServiceWorkerObjectHost.patch
+	source = force-mp3-files-to-have-a-start-time-of-zero.patch
 	source = v8-remove-soon-to-be-removed-getAllFieldPositions.patch
+	source = intel-vp9-quirk.patch
+	source = wayland-egl.patch
+	source = nvidia-vdpau.patch
 	source = chromium-83-gcc-10.patch
 	source = chromium-skia-harmony.patch
-	sha256sums = cfd153a2e10b0bb0fb3b7e6be543aef0915181f5fbdbea893d08465afd097e2f
-	sha256sums = 0f4a0466e098184f850c167b29d2a25b99136a414104d47e58133f88271edb17
+	sha256sums = bb0c7e8dfee9f3a5e30eca7f34fc9f21caefa82a86c058c552f52b1ae2da2ac3
+	sha256sums = a8cff01fae3bc0823841c242c85746346619f684aff7968ebeb4886345395f24
 	sha256sums = 04917e3cd4307d8e31bfb0027a5dce6d086edb10ff8a716024fbb8bb0c7dccf1
 	sha256sums = babda4f5c1179825797496898d77334ac067149cac03d797ab27ac69671a7feb
-	sha256sums = 0ec6ee49113cc8cc5036fa008519b94137df6987bf1f9fbffb2d42d298af868a
-	sha256sums = f6335d1e14e4ed865f37695d67df18008c8664778620e698bb46c35b88a8b4c2
 	sha256sums = 58c41713eb6fb33b6eef120f4324fa1fb8123b1fbc4ecbe5662f1f9779b9b6af
 	sha256sums = 675fb3d6276cce569a641436465f58d5709d1d4a5f62b7052989479fd4aaea24
 	sha256sums = 0e2a78e4aa7272ab0ff4a4c467750e01bad692a026ad9828aaf06d2a9418b9d8
@@ -89,7 +88,11 @@ pkgbase = ungoogled-chromium
 	sha256sums = 071326135bc25226aa165639dff80a03670a17548f2d2ff5cc4f40982b39c52a
 	sha256sums = 3d7f20e1d2ee7d73ed25e708c0d59a0cb215fcce10a379e3d48a856533c4b0b7
 	sha256sums = d793842e9584bf75e3779918297ba0ffa6dd05394ef5b2bf5fb73aa9c86a7e2f
+	sha256sums = abc3fad113408332c3b187b083bf33eba59eb5c87fa3ce859023984b5804623c
 	sha256sums = e042024423027ad3ef729a7e4709bdf9714aea49d64cfbbf46a645a05703abc2
+	sha256sums = 326b8ad8f1100ad11213ee916effab43dfd7b0229ee8bed2c1c8c3132866bcae
+	sha256sums = 34d08ea93cb4762cb33c7cffe931358008af32265fc720f2762f0179c3973574
+	sha256sums = 8095bf73afbca7c2b07306c5b4dd8f79b66e1053fa4e58b07f71ef938be603f1
 	sha256sums = 3e5ba8c0a70a4bc673deec0c61eb2b58f05a4c784cbdb7c8118be1eb6580db6d
 	sha256sums = 771292942c0901092a402cc60ee883877a99fb804cb54d568c8c6c94565a48e1
 
diff --git a/.gitignore b/.gitignore
index 5fafde5..63371c1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 ungoogled-chromium
 src
 pkg
+*.tar.*
diff --git a/PKGBUILD b/PKGBUILD
index affca76..4f6422b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,18 +3,18 @@
 # Derived from official Chromium and Inox PKGBUILDS and ungoogled-chromium buildkit
 
 pkgname=ungoogled-chromium
-pkgver=83.0.4103.106
-pkgrel=1
+pkgver=83.0.4103.116
+pkgrel=2
 # sometimes an ungoogled patches can be combined with a new chromium release
 # only if the release only includes security fixes
-_ungoogled_ver=83.0.4103.106-1
+_ungoogled_ver=83.0.4103.116-1
 _launcher_ver=6
 pkgdesc="A lightweight approach to removing Google web service dependency"
 arch=('x86_64')
 url="https://github.com/Eloston/ungoogled-chromium"
 license=('BSD')
 depends=('gtk3' 'nss' 'alsa-lib' 'xdg-utils' 'libxss' 'libcups' 'libgcrypt'
-         'ttf-liberation' 'systemd' 'dbus' 'libpulse' 'pciutils' 'json-glib' 'libva'
+         'ttf-liberation' 'systemd' 'dbus' 'libpulse' 'pciutils' 'json-glib'
          'desktop-file-utils' 'hicolor-icon-theme')
 makedepends=('python' 'python2' 'gperf' 'yasm' 'mesa' 'ninja' 'nodejs' 'git'
              'libpipewire02' 'libva' 'clang' 'lld' 'gn' 'java-runtime-headless'
@@ -32,8 +32,6 @@ source=(https://commondatastorage.googleapis.com/chromium-browser-official/chrom
         https://github.com/Eloston/ungoogled-chromium/archive/$_ungoogled_ver.tar.gz
         chromium-launcher-$_launcher_ver.tar.gz::https://github.com/foutrelis/chromium-launcher/archive/v$_launcher_ver.tar.gz
         chromium-drirc-disable-10bpc-color-configs.conf
-        vdpau-support.patch
-        fix-intel-vaapi-wayland.patch
         clean-up-a-call-to-set_utf8.patch
         iwyu-std-numeric_limits-is-defined-in-limits.patch
         add-missing-algorithm-header-in-crx_install_error.cc.patch
@@ -41,15 +39,17 @@ source=(https://commondatastorage.googleapis.com/chromium-browser-official/chrom
         include-memory-header-to-get-the-definition-of-std-u.patch
         make-some-of-blink-custom-iterators-STL-compatible.patch
         avoid-double-destruction-of-ServiceWorkerObjectHost.patch
+        force-mp3-files-to-have-a-start-time-of-zero.patch
         v8-remove-soon-to-be-removed-getAllFieldPositions.patch
+        intel-vp9-quirk.patch
+        wayland-egl.patch
+        nvidia-vdpau.patch
         chromium-83-gcc-10.patch
         chromium-skia-harmony.patch)
-sha256sums=('cfd153a2e10b0bb0fb3b7e6be543aef0915181f5fbdbea893d08465afd097e2f'
-            '0f4a0466e098184f850c167b29d2a25b99136a414104d47e58133f88271edb17'
+sha256sums=('bb0c7e8dfee9f3a5e30eca7f34fc9f21caefa82a86c058c552f52b1ae2da2ac3'
+            'a8cff01fae3bc0823841c242c85746346619f684aff7968ebeb4886345395f24'
             '04917e3cd4307d8e31bfb0027a5dce6d086edb10ff8a716024fbb8bb0c7dccf1'
             'babda4f5c1179825797496898d77334ac067149cac03d797ab27ac69671a7feb'
-            '0ec6ee49113cc8cc5036fa008519b94137df6987bf1f9fbffb2d42d298af868a'
-            'f6335d1e14e4ed865f37695d67df18008c8664778620e698bb46c35b88a8b4c2'
             '58c41713eb6fb33b6eef120f4324fa1fb8123b1fbc4ecbe5662f1f9779b9b6af'
             '675fb3d6276cce569a641436465f58d5709d1d4a5f62b7052989479fd4aaea24'
             '0e2a78e4aa7272ab0ff4a4c467750e01bad692a026ad9828aaf06d2a9418b9d8'
@@ -57,7 +57,11 @@ sha256sums=('cfd153a2e10b0bb0fb3b7e6be543aef0915181f5fbdbea893d08465afd097e2f'
             '071326135bc25226aa165639dff80a03670a17548f2d2ff5cc4f40982b39c52a'
             '3d7f20e1d2ee7d73ed25e708c0d59a0cb215fcce10a379e3d48a856533c4b0b7'
             'd793842e9584bf75e3779918297ba0ffa6dd05394ef5b2bf5fb73aa9c86a7e2f'
+            'abc3fad113408332c3b187b083bf33eba59eb5c87fa3ce859023984b5804623c'
             'e042024423027ad3ef729a7e4709bdf9714aea49d64cfbbf46a645a05703abc2'
+            '326b8ad8f1100ad11213ee916effab43dfd7b0229ee8bed2c1c8c3132866bcae'
+            '34d08ea93cb4762cb33c7cffe931358008af32265fc720f2762f0179c3973574'
+            '8095bf73afbca7c2b07306c5b4dd8f79b66e1053fa4e58b07f71ef938be603f1'
             '3e5ba8c0a70a4bc673deec0c61eb2b58f05a4c784cbdb7c8118be1eb6580db6d'
             '771292942c0901092a402cc60ee883877a99fb804cb54d568c8c6c94565a48e1')
 
@@ -122,6 +126,9 @@ prepare() {
   # https://chromium-review.googlesource.com/c/chromium/src/+/2094496
   patch -Np1 -i ../avoid-double-destruction-of-ServiceWorkerObjectHost.patch
 
+  # 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/v8/10393
   patch -Np1 -d v8 <../v8-remove-soon-to-be-removed-getAllFieldPositions.patch
 
@@ -131,11 +138,14 @@ prepare() {
   # Fixes from Gentoo
   patch -Np1 -i ../chromium-83-gcc-10.patch
 
-  # Fix VA-API on Nvidia
-  patch -Np1 -i ../vdpau-support.patch
+  # Intel KabyLake/GeminiLake VP9 quirk
+  patch -Np1 -i ../intel-vp9-quirk.patch
+
+  # Wayland/EGL regression (crbug #1071528 #1071550)
+  patch -Np1 -i ../wayland-egl.patch
 
-  # Fix VA-API on Intel on Wayland
-  patch -Np1 -i ../fix-intel-vaapi-wayland.patch
+  # NVIDIA vdpau-wrapper
+  patch -Np1 -i ../nvidia-vdpau.patch
 
   # Ungoogled Chromium changes
   _ungoogled_repo="$srcdir/$pkgname-$_ungoogled_ver"
@@ -145,7 +155,8 @@ prepare() {
   msg2 'Applying patches'
   python "$_utils/patches.py" apply ./ "$_ungoogled_repo/patches"
   msg2 'Applying domain substitution'
-  python "$_utils/domain_substitution.py" apply -r "$_ungoogled_repo/domain_regex.list" -f "$_ungoogled_repo/domain_substitution.list" -c domainsubcache.tar.gz ./
+  python "$_utils/domain_substitution.py" apply -r "$_ungoogled_repo/domain_regex.list" \
+    -f "$_ungoogled_repo/domain_substitution.list" -c domainsubcache.tar.gz ./
 
   # Force script incompatible with Python 3 to use /usr/bin/python2
   sed -i '1s|python$|&2|' third_party/dom_distiller_js/protoc_plugins/*.py
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 0000000..d018a87
--- /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_ =
diff --git a/intel-vp9-quirk.patch b/intel-vp9-quirk.patch
new file mode 100644
index 0000000..27820a5
--- /dev/null
+++ b/intel-vp9-quirk.patch
@@ -0,0 +1,12 @@
+--- a/media/gpu/vaapi/vaapi_video_decode_accelerator.cc	2020-06-15 11:58:38.000000000 -0700
++++ b/media/gpu/vaapi/vaapi_video_decode_accelerator.cc	2020-06-23 17:18:20.219862776 -0700
+@@ -1163,6 +1163,9 @@
+   // of frames needed by the client pipeline (see b/133733739).
+   // TODO(crbug.com/911754): Enable for VP9 Profile 2.
+   if (IsGeminiLakeOrLater() &&
++#if defined(OS_LINUX)
++      false &&
++#endif
+       (profile_ == VP9PROFILE_PROFILE0 || profile_ == VP8PROFILE_ANY)) {
+     // Add one to the reference frames for the one being currently egressed, and
+     // an extra allocation for both |client_| and |decoder_|, see
diff --git a/vdpau-support.patch b/nvidia-vdpau.patch
index b5372d1..8d879de 100644
--- a/vdpau-support.patch
+++ b/nvidia-vdpau.patch
@@ -31,15 +31,6 @@
    // TODO(crbug.com/912295): Enable a better BufferAllocationMode for IMPORT
    // |output_mode_| as well.
    if (output_mode_ == VideoDecodeAccelerator::Config::OutputMode::IMPORT)
-@@ -1105,7 +1113,7 @@ VaapiVideoDecodeAccelerator::DecideBufferAllocationMode() {
-   // depends on the bitstream and sometimes it's not enough to cover the amount
-   // of frames needed by the client pipeline (see b/133733739).
-   // TODO(crbug.com/911754): Enable for VP9 Profile 2.
--  if (IsGeminiLakeOrLater() &&
-+  if (false && IsGeminiLakeOrLater() &&
-       (profile_ == VP9PROFILE_PROFILE0 || profile_ == VP8PROFILE_ANY)) {
-     // Add one to the reference frames for the one being currently egressed, and
-     // an extra allocation for both |client_| and |decoder_|, see
 --- a/media/gpu/vaapi/vaapi_video_decode_accelerator.h
 +++ b/media/gpu/vaapi/vaapi_video_decode_accelerator.h
 @@ -204,6 +204,7 @@ class MEDIA_GPU_EXPORT VaapiVideoDecodeAccelerator
diff --git a/fix-intel-vaapi-wayland.patch b/wayland-egl.patch
index 8e87b10..58a0798 100644
--- a/fix-intel-vaapi-wayland.patch
+++ b/wayland-egl.patch
@@ -1,16 +1,16 @@
---- a/ui/gl/gl_image_native_pixmap.cc
-+++ b/ui/gl/gl_image_native_pixmap.cc
+--- a/ui/gl/gl_image_native_pixmap.cc	2020-05-18 11:40:06.000000000 -0700
++++ b/ui/gl/gl_image_native_pixmap.cc	2020-05-22 02:07:16.007770442 -0700
 @@ -288,6 +288,8 @@
                                 std::move(scoped_fd));
    }
-
+ 
 +  handle.planes[0].size = size_.GetArea();
 +
    return handle;
  #endif  // !defined(OS_FUCHSIA)
  }
---- a/gpu/command_buffer/service/error_state.cc
-+++ b/gpu/command_buffer/service/error_state.cc
+--- a/gpu/command_buffer/service/error_state.cc	2020-05-18 11:39:22.000000000 -0700
++++ b/gpu/command_buffer/service/error_state.cc	2020-05-22 13:43:09.181180388 -0700
 @@ -115,6 +115,8 @@
      // buffer.
      error = GL_NO_ERROR;
@@ -19,3 +19,4 @@
 +    error = GL_NO_ERROR;
    return error;
  }
+