summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Playfair Cal2020-09-29 22:24:22 +1000
committerDaniel Playfair Cal2020-09-29 22:24:22 +1000
commit272608dddb1bcd015ee649427795bc5d268bdbdb (patch)
tree0d8f4dc277e61d050304d65e9ce5c091eb690fe2
parentd96e7df26b6d44aa497c569073b533ad9b5986f0 (diff)
downloadaur-272608dddb1bcd015ee649427795bc5d268bdbdb.tar.gz
87.0.4270.0-1
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD27
-rw-r--r--d23f751.diff39
3 files changed, 53 insertions, 21 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 8af253b6c76..ee52321644f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = chromium-dev-ozone
pkgdesc = Chromium built with patches for wayland support via Ozone (dev channel)
- pkgver = 87.0.4252.0
+ pkgver = 87.0.4270.0
pkgrel = 1
url = https://www.chromium.org/Home
install = chromium.install
@@ -55,12 +55,14 @@ pkgbase = chromium-dev-ozone
optdepends = kwallet: for storing passwords in KWallet on KDE desktops
provides = chromium
conflicts = chromium
- source = https://commondatastorage.googleapis.com/chromium-browser-official/chromium-87.0.4252.0.tar.xz
+ source = https://commondatastorage.googleapis.com/chromium-browser-official/chromium-87.0.4270.0.tar.xz
source = chromium-launcher-6.tar.gz::https://github.com/foutrelis/chromium-launcher/archive/v6.tar.gz
source = chromium-skia-harmony.patch
- sha256sums = 5ea43fa7c79061f8fa5ce9f9f1e1776f1e639dad8fdfdd613af00f136dd3b4d3
+ source = d23f751.diff
+ sha256sums = dfcc78c1b8bd5c447004dbd50f95b9c83666e308d7e77a9a50a4c4663edf3aa9
sha256sums = 04917e3cd4307d8e31bfb0027a5dce6d086edb10ff8a716024fbb8bb0c7dccf1
sha256sums = 771292942c0901092a402cc60ee883877a99fb804cb54d568c8c6c94565a48e1
+ sha256sums = 458419d7dc4acded51f1684fbc1163f9db778c48a1987c0b3aec37757b6935d1
pkgname = chromium-dev-ozone
diff --git a/PKGBUILD b/PKGBUILD
index e7005662ae9..ad9fcb31633 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
pkgname=chromium-dev-ozone
-pkgver=87.0.4252.0
+pkgver=87.0.4270.0
pkgrel=1
_launcher_ver=6
pkgdesc="Chromium built with patches for wayland support via Ozone (dev channel)"
@@ -28,10 +28,12 @@ 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
- chromium-skia-harmony.patch)
-sha256sums=('5ea43fa7c79061f8fa5ce9f9f1e1776f1e639dad8fdfdd613af00f136dd3b4d3'
+ chromium-skia-harmony.patch
+ d23f751.diff)
+sha256sums=('dfcc78c1b8bd5c447004dbd50f95b9c83666e308d7e77a9a50a4c4663edf3aa9'
'04917e3cd4307d8e31bfb0027a5dce6d086edb10ff8a716024fbb8bb0c7dccf1'
- '771292942c0901092a402cc60ee883877a99fb804cb54d568c8c6c94565a48e1')
+ '771292942c0901092a402cc60ee883877a99fb804cb54d568c8c6c94565a48e1'
+ '458419d7dc4acded51f1684fbc1163f9db778c48a1987c0b3aec37757b6935d1')
# Possible replacements are listed in build/linux/unbundle/replace_gn_files.py
# Keys are the names in the above script; values are the dependencies in Arch
@@ -66,14 +68,6 @@ _google_api_key=AIzaSyDwr302FpOSkGRpLlUpPThNTDPbXcIn_FM
_google_default_client_id=413772536636.apps.googleusercontent.com
_google_default_client_secret=0ZChLK6AxeA3Isu96MkwqDR4
-# Branch point: 772468
-# Extra commits related specifically to wayland support:
-
-# These consist of the above commits and their dependencies
-# generated with `git-deps -r -e <release tag> <commit>^! ...` (in reverse order)
-_bugfix_patches=(
-)
-
prepare() {
cd "$srcdir/chromium-$pkgver"
@@ -90,11 +84,8 @@ prepare() {
# https://crbug.com/skia/6663#c10
patch -Np0 -i ../chromium-skia-harmony.patch
- for PATCH in ${_bugfix_patches[@]}
- do
- echo "Applying $PATCH"
- patch -Np1 -i $srcdir/${PATCH}
- done
+ # https://bugs.chromium.org/p/chromium/issues/detail?id=1128997#c33
+ patch -Np1 -i ../d23f751.diff
# Force script incompatible with Python 3 to use /usr/bin/python2
sed -i '1s|python$|&2|' third_party/dom_distiller_js/protoc_plugins/*.py
@@ -144,7 +135,7 @@ build() {
'ozone_platform_gbm=false'
'ozone_platform_headless=true'
'use_system_libwayland=true'
- 'use_vaapi=true'
+ 'use_vaapi=false'
'enable_nacl=false'
"google_api_key=\"${_google_api_key}\""
"google_default_client_id=\"${_google_default_client_id}\""
diff --git a/d23f751.diff b/d23f751.diff
new file mode 100644
index 00000000000..42c5b4a22c2
--- /dev/null
+++ b/d23f751.diff
@@ -0,0 +1,39 @@
+From d23f751309e430050ab9ee3ac9423397a7fea7d0 Mon Sep 17 00:00:00 2001
+From: Maksim Sisov <msisov@igalia.com>
+Date: Mon, 28 Sep 2020 14:07:36 +0000
+Subject: [PATCH] ozone/wayland: temporarily disable usage of RGBX_8888.
+
+RGBX_8888 shall be used as buffer format with images without alpha. However,
+Chromium doesn't allow it to use for scanout in some parts of the code,
+and allows to use in other.
+
+Thus, temporarily disable usage of RGBX_8888 and always use either RGBA or
+BGRA_8888 for images with alpha and no alpha.
+
+Bug: 1128997
+Change-Id: I4a3a8ad102d46d6dc12ccaba4cbade41432d6b49
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2434928
+Auto-Submit: Maksim Sisov (GMT+3) <msisov@igalia.com>
+Commit-Queue: Peng Huang <penghuang@chromium.org>
+Reviewed-by: Peng Huang <penghuang@chromium.org>
+Cr-Commit-Position: refs/heads/master@{#811220}
+---
+
+diff --git a/ui/ozone/platform/wayland/host/wayland_screen.cc b/ui/ozone/platform/wayland/host/wayland_screen.cc
+index fcebc07..9beaf27 100644
+--- a/ui/ozone/platform/wayland/host/wayland_screen.cc
++++ b/ui/ozone/platform/wayland/host/wayland_screen.cc
+@@ -46,8 +46,11 @@
+ // crbug.com/1127558.
+ if (format == gfx::BufferFormat::RGBA_8888)
+ image_format_alpha_ = gfx::BufferFormat::RGBA_8888;
+- if (format == gfx::BufferFormat::RGBX_8888)
+- image_format_no_alpha_ = format;
++
++ // TODO(1128997): |image_format_no_alpha_| should use RGBX_8888 when it's
++ // available, but for some reason Chromium gets broken when it's used.
++ // Though, we can import RGBX_8888 dma buffer to EGLImage successfully.
++ // Enable that back when the issue is resolved.
+ #endif // !BUILDFLAG(IS_LACROS)
+
+ if (!image_format_alpha_ && format == gfx::BufferFormat::BGRA_8888)