[gentoo-commits] repo/gentoo:master commit in: www-client/chromium/files/, www-client/chromium/

[Stephan Hartmann]

commit:     84ce0858cd275482a211e99b3600f648a6990f3f
Author:     Stephan Hartmann <sultan <AT> gentoo <DOT> org>
AuthorDate: Sat Oct  3 07:21:30 2020 +0000
Commit:     Stephan Hartmann <sultan <AT> gentoo <DOT> org>
CommitDate: Sat Oct  3 07:21:44 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84ce0858

www-client/chromium: dev channel bump to 87.0.4278.0

Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Stephan Hartmann <sultan <AT> gentoo.org>

 www-client/chromium/Manifest                       |   4 +-
 ...0.4270.0.ebuild => chromium-87.0.4278.0.ebuild} |  12 +-
 .../files/chromium-87-fix-vaapi-build.patch        | 177 ---------------------
 .../files/chromium-87-webcodecs-deps.patch         |  27 ++++
 4 files changed, 39 insertions(+), 181 deletions(-)

diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 258e12ebaaa..b8d5944ebf6 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -2,6 +2,6 @@ DIST chromium-85-patchset-2.tar.xz 9724 BLAKE2B 929d6abe3a66db395a9cedc63510a6a0
 DIST chromium-85.0.4183.121.tar.xz 833194480 BLAKE2B d91302792fc34730795815a39ba91878f1d6d33c7bb810a10efcea2e117c069a6493b3acb1e3d8a04b19d599335b60d70523f47c65c42080cbe0d3981255c264 SHA512 9d61a0782c012fe36467a10f008962d45f4eaa065f6812276d847f7563056124c9fd21d8376dda8ab64e4c3b793da0593bac9d39988bbd60221828084b534945
 DIST chromium-86-patchset-6.tar.xz 7152 BLAKE2B 494b412caec2b3e3fd6c838ba4b61d499433f5a6043e4763efc424c811e405ed11461d8df2afe0aa22d898329ef82df0c43c47ae30f7c4a1c0c3f6e5b314e283 SHA512 68833c9dea6a7183ff42a2d432cf811b360c1237c36feed6b4f9163b61d7f98854ce73b33c58851cb800cf72311a638adeedb4555caf15f80b4bd6aca5039aef
 DIST chromium-86.0.4240.68.tar.xz 825424240 BLAKE2B 69638d0c0fb434593efd63c8d1700992d52e4ed20f5d36f2152d9c5e9aa6a0fc35a83c80c3428e3bc35ffb70e351185380ea2d4b98bcae6ca2dc7186d73ec45b SHA512 85d55d2ed5fa5fc9c835015871df258a7f465d07ba8b959345d309c52c718b70c2bbce476544eb1b432e88ef5f26ed3d1f1aeba50929b3795391f27371748f53
-DIST chromium-87-patchset-4.tar.xz 8100 BLAKE2B cf052203bb9ced993f051ebac51270da1482e59999d87aff24fa81d25cc0de228a92a00abb56e0caa91c3f045bdd9df7524d77b375b77f1a0c7c198cb05c7649 SHA512 bc7cb6ad99c7d45999d45e5c9df05d43c80c25212dafe3750146d2cb5b38a7239e32ac1e9bf245331ba7055c0a36e551131eab92ecea907e51878259416b59a9
-DIST chromium-87.0.4270.0.tar.xz 831037464 BLAKE2B f9b19b704e252b96c5a6861719828d3b08eee9128d753a8c264b21b0bd26cbc1e7a3d29909d4300e59246ac9c56b88e205f83efd024897915a8b77085fe5f160 SHA512 76cbf88b1390c2e64d6615e29763f00493b94beff5836c240833840b1b50fa782c137ebc66a81a6940f35052895bdc0098fefca5e6cc46f56dbc2b8b2184ca6f
+DIST chromium-87-patchset-5.tar.xz 7932 BLAKE2B d97f2f901e51288504cc6313d517251daf23d4f4b0f7802453076774c019ef4eeebef5e38c64c12efb156cc770f0fa3e0b00d6b832f8e0614988a0961b1ebb05 SHA512 b4d70cca16ec944771238140765c63487b7306a800298d896b6b5b46761af57b6c58f080d308bfd7d9e131e05d8b79503651c94b200a3ff3e18d11dafab3db0c
+DIST chromium-87.0.4278.0.tar.xz 832042784 BLAKE2B 5f02a03ddd076aa543a2c9620295d99f87a337f22afb7ebdee6533a57cfe947aa887522d53e83431b83ee213e56d4415624112d9bf094f39381d9cdf30a590ad SHA512 32ce81904659e07b63ced9ff0bbf9a1a61f6a201701e8154674d7107d0e62173c544fa4724bd1326e47209db44f65a7b29ae5c3832e59863126a7714f2947e0f
 DIST setuptools-44.1.0.zip 858569 BLAKE2B f59f154e121502a731e51294ccd293d60ffccadacf51e23b53bf7ceba38858948b86783238061136c827ac3373ea7ea8e6253d4bb53f3f1dd69284568ec65a68 SHA512 4dfb0f42d334b835758e865a26ecd1e725711fa2b9c38ddc273b8b3849fba04527bc97436d11ba1e98f1a42922aa0f0b9032e32998273c705fac6e10735eacbf

diff --git a/www-client/chromium/chromium-87.0.4270.0.ebuild b/www-client/chromium/chromium-87.0.4278.0.ebuild
similarity index 98%
rename from www-client/chromium/chromium-87.0.4270.0.ebuild
rename to www-client/chromium/chromium-87.0.4278.0.ebuild
index 008abd293ee..2b6529a24d7 100644
--- a/www-client/chromium/chromium-87.0.4270.0.ebuild
+++ b/www-client/chromium/chromium-87.0.4278.0.ebuild
@@ -12,7 +12,7 @@ inherit check-reqs chromium-2 desktop flag-o-matic multilib ninja-utils pax-util
 
 DESCRIPTION="Open-source version of Google Chrome web browser"
 HOMEPAGE="https://chromium.org/"
-PATCHSET="4"
+PATCHSET="5"
 PATCHSET_NAME="chromium-$(ver_cut 1)-patchset-${PATCHSET}"
 SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz
 	https://files.pythonhosted.org/packages/ed/7b/bbf89ca71e722b7f9464ebffe4b5ee20a9e5c9a555a56e2d3914bb9119a6/setuptools-44.1.0.zip
@@ -177,6 +177,7 @@ in /etc/chromium/default.
 
 PATCHES=(
 	"${FILESDIR}/chromium-87-ozone-deps.patch"
+	"${FILESDIR}/chromium-87-webcodecs-deps.patch"
 )
 
 pre_build_checks() {
@@ -233,7 +234,6 @@ src_prepare() {
 	eapply "${WORKDIR}/patches"
 	if use vaapi; then
 		eapply "${FILESDIR}/chromium-86-fix-vaapi-on-intel.patch"
-		eapply "${FILESDIR}/chromium-87-fix-vaapi-build.patch"
 	fi
 
 	default
@@ -404,6 +404,7 @@ src_prepare() {
 		third_party/s2cellid
 		third_party/schema_org
 		third_party/securemessage
+		third_party/shaka-player
 		third_party/shell-encryption
 		third_party/simplejson
 		third_party/skia
@@ -881,4 +882,11 @@ pkg_postinst() {
 	xdg_icon_cache_update
 	xdg_desktop_database_update
 	readme.gentoo_print_elog
+
+	if use vaapi; then
+		elog "VA-API is disabled by default at runtime. Either enable it"
+		elog "by navigating to chrome://flags/#enable-accelerated-video-decode"
+		elog "inside Chromium or add --enable-accelerated-video-decode"
+		elog "to CHROMIUM_FLAGS in /etc/chromium/default."
+	fi
 }

diff --git a/www-client/chromium/files/chromium-87-fix-vaapi-build.patch b/www-client/chromium/files/chromium-87-fix-vaapi-build.patch
deleted file mode 100644
index e230510fde7..00000000000
--- a/www-client/chromium/files/chromium-87-fix-vaapi-build.patch
+++ /dev/null
@@ -1,177 +0,0 @@
-From 90c4cfb5355a36de6660df4ed0a1c405a830ca0e Mon Sep 17 00:00:00 2001
-From: Tom Anderson <thomasanderson@××××××××.org>
-Date: Tue, 15 Sep 2020 12:02:17 -0700
-Subject: [PATCH] [XProto] Fix VAAPI build
-
-Fixes the build after [1] broke it.
-
-[1] https://chromium-review.googlesource.com/c/chromium/src/+/2392140
-
-Bug: 1066670, 1127532
-Change-Id: I340f91a1d4ba7214ea47fa4b1bb4a368fe5597f5
-R=mcasas
-CC=tmathmeyer
----
-
-diff --git a/media/gpu/vaapi/vaapi_picture_native_pixmap_angle.cc b/media/gpu/vaapi/vaapi_picture_native_pixmap_angle.cc
-index 843cf22..91eb184 100644
---- a/media/gpu/vaapi/vaapi_picture_native_pixmap_angle.cc
-+++ b/media/gpu/vaapi/vaapi_picture_native_pixmap_angle.cc
-@@ -7,6 +7,8 @@
- #include "media/gpu/vaapi/va_surface.h"
- #include "media/gpu/vaapi/vaapi_wrapper.h"
- #include "ui/base/ui_base_features.h"
-+#include "ui/gfx/x/connection.h"
-+#include "ui/gfx/x/xproto.h"
- #include "ui/gl/gl_bindings.h"
- #include "ui/gl/gl_image_egl_pixmap.h"
- #include "ui/gl/scoped_binders.h"
-@@ -16,24 +18,27 @@
- namespace {
- 
- inline Pixmap CreatePixmap(const gfx::Size& size) {
--  auto* display = gfx::GetXDisplay();
-+  auto* connection = x11::Connection::Get();
-+  auto* display = connection->display();
-   if (!display)
-     return 0;
- 
--  int screen = DefaultScreen(display);
--  auto root = XRootWindow(display, screen);
--  if (root == BadValue)
--    return 0;
-+  auto root = connection->default_root();
- 
--  XWindowAttributes win_attr = {};
--  // returns 0 on failure, see:
--  // https://tronche.com/gui/x/xlib/introduction/errors.html#Status
--  if (!XGetWindowAttributes(display, root, &win_attr))
-+  uint8_t depth = 0;
-+  if (auto reply = connection->GetGeometry({root}).Sync())
-+    depth = reply->depth;
-+  else
-     return 0;
- 
-   // TODO(tmathmeyer) should we use the depth from libva instead of root window?
--  return XCreatePixmap(display, root, size.width(), size.height(),
--                       win_attr.depth);
-+  auto pixmap = connection->GenerateId<x11::Pixmap>();
-+  auto req = connection->CreatePixmap(
-+      {depth, pixmap, root, base::checked_cast<uint16_t>(size.width()),
-+       base::checked_cast<uint16_t>(size.height())});
-+  if (req.Sync().error)
-+    pixmap = x11::Pixmap::None;
-+  return base::strict_cast<::Pixmap>(pixmap);
- }
- 
- }  // namespace
-@@ -71,11 +76,8 @@
-     DCHECK_EQ(glGetError(), static_cast<GLenum>(GL_NO_ERROR));
-   }
- 
--  if (x_pixmap_) {
--    if (auto* display = gfx::GetXDisplay()) {
--      XFreePixmap(display, x_pixmap_);
--    }
--  }
-+  if (x_pixmap_)
-+    x11::Connection::Get()->FreePixmap({static_cast<x11::Pixmap>(x_pixmap_)});
- }
- 
- Status VaapiPictureNativePixmapAngle::Allocate(gfx::BufferFormat format) {
-diff --git a/media/gpu/vaapi/vaapi_picture_tfp.cc b/media/gpu/vaapi/vaapi_picture_tfp.cc
-index 9ff0372..1c917a1 100644
---- a/media/gpu/vaapi/vaapi_picture_tfp.cc
-+++ b/media/gpu/vaapi/vaapi_picture_tfp.cc
-@@ -7,6 +7,7 @@
- #include "media/gpu/vaapi/va_surface.h"
- #include "media/gpu/vaapi/vaapi_wrapper.h"
- #include "ui/base/ui_base_features.h"
-+#include "ui/gfx/x/connection.h"
- #include "ui/gfx/x/x11_types.h"
- #include "ui/gl/gl_bindings.h"
- #include "ui/gl/gl_image_glx.h"
-@@ -33,7 +34,8 @@
-                    texture_id,
-                    client_texture_id,
-                    texture_target),
--      x_display_(gfx::GetXDisplay()),
-+      connection_(x11::Connection::Get()),
-+      x_display_(connection_->display()),
-       x_pixmap_(0) {
-   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
-   DCHECK(!features::IsUsingOzonePlatform());
-@@ -49,7 +51,7 @@
-   }
- 
-   if (x_pixmap_)
--    XFreePixmap(x_display_, x_pixmap_);
-+    connection_->FreePixmap({static_cast<x11::Pixmap>(x_pixmap_)});
- }
- 
- Status VaapiTFPPicture::Initialize() {
-@@ -85,15 +87,20 @@
-   }
- 
-   XWindowAttributes win_attr;
--  int screen = DefaultScreen(x_display_);
--  XGetWindowAttributes(x_display_, XRootWindow(x_display_, screen), &win_attr);
-+  auto root = connection_->default_root();
-+  XGetWindowAttributes(x_display_, static_cast<::Window>(root), &win_attr);
-   // TODO(posciak): pass the depth required by libva, not the RootWindow's
-   // depth
--  x_pixmap_ = XCreatePixmap(x_display_, XRootWindow(x_display_, screen),
--                            size_.width(), size_.height(), win_attr.depth);
--  if (!x_pixmap_) {
-+  auto pixmap = connection_->GenerateId<x11::Pixmap>();
-+  if (connection_
-+          ->CreatePixmap(
-+              {win_attr.depth, pixmap, root, size_.width(), size_.height()})
-+          .Sync()
-+          .error) {
-     DLOG(ERROR) << "Failed creating an X Pixmap for TFP";
-     return StatusCode::kVaapiNoPixmap;
-+  } else {
-+    x_pixmap_ = static_cast<::Pixmap>(pixmap);
-   }
- 
-   return Initialize();
-diff --git a/media/gpu/vaapi/vaapi_picture_tfp.h b/media/gpu/vaapi/vaapi_picture_tfp.h
-index c4eb2c1..a32955e 100644
---- a/media/gpu/vaapi/vaapi_picture_tfp.h
-+++ b/media/gpu/vaapi/vaapi_picture_tfp.h
-@@ -11,6 +11,7 @@
- #include "base/memory/ref_counted.h"
- #include "media/gpu/vaapi/vaapi_picture.h"
- #include "ui/gfx/geometry/size.h"
-+#include "ui/gfx/x/connection.h"
- #include "ui/gl/gl_bindings.h"
- 
- namespace gl {
-@@ -47,6 +48,7 @@
-  private:
-   Status Initialize();
- 
-+  x11::Connection* const connection_;
-   Display* x_display_;
- 
-   Pixmap x_pixmap_;
-diff --git a/media/gpu/vaapi/vaapi_wrapper.cc b/media/gpu/vaapi/vaapi_wrapper.cc
-index 2ad0b997..a988233 100644
---- a/media/gpu/vaapi/vaapi_wrapper.cc
-+++ b/media/gpu/vaapi/vaapi_wrapper.cc
-@@ -57,8 +57,13 @@
- #include "ui/gl/gl_implementation.h"
- 
- #if defined(USE_X11)
--#include <va/va_x11.h>
- #include "ui/gfx/x/x11_types.h"  // nogncheck
-+
-+typedef XID Drawable;
-+
-+extern "C" {
-+#include "media/gpu/vaapi/va_x11.sigs"
-+}
- #endif
- 
- #if defined(USE_OZONE)

diff --git a/www-client/chromium/files/chromium-87-webcodecs-deps.patch b/www-client/chromium/files/chromium-87-webcodecs-deps.patch
new file mode 100644
index 00000000000..e9d411305ee
--- /dev/null
+++ b/www-client/chromium/files/chromium-87-webcodecs-deps.patch
@@ -0,0 +1,27 @@
+From 47f6a3bcf7e72c467ca6a2cd633a5c3585a218d5 Mon Sep 17 00:00:00 2001
+From: Stephan Hartmann <stha09@××××××××××.com>
+Date: Fri, 2 Oct 2020 06:44:53 +0000
+Subject: [PATCH] add dependency on openh264:encoder
+
+webcodecs uses openh264 encoder, but dependency is missing. With
+unbundled openh264 library build fails, because include path is
+incomplete.
+---
+ third_party/blink/renderer/modules/webcodecs/BUILD.gn | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/third_party/blink/renderer/modules/webcodecs/BUILD.gn b/third_party/blink/renderer/modules/webcodecs/BUILD.gn
+index 99d0e47..7c4d188 100644
+--- a/third_party/blink/renderer/modules/webcodecs/BUILD.gn
++++ b/third_party/blink/renderer/modules/webcodecs/BUILD.gn
+@@ -54,6 +54,7 @@ blink_modules_sources("webcodecs") {
+     "//media/mojo/clients",
+     "//media/mojo/mojom",
+     "//third_party/libyuv:libyuv",
++    "//third_party/openh264:encoder",
+   ]
+   public_deps = [
+     "//third_party/blink/renderer/modules/mediastream:mediastream",
+-- 
+2.26.2
+