Skip to content
Permalink
Browse files

chromium-*-beta=76.0.3809.25

First m76 based beta release. Copied all the patches used in m76
based dev release.

On top of that, a hotfix for building with Ozone Wayland has been
taken from upstream.
  • Loading branch information...
jdapena committed Jun 18, 2019
1 parent f8a0816 commit 0bd8a000ffe14a2e0083f85c4396a1c2709232ef
@@ -1,30 +1,29 @@
require chromium-upstream-tarball.inc

PV = "75.0.3770.80"
PV = "76.0.3809.25"

SRC_URI[md5sum] = "f5b5cae54486b5960c533640b47dceb8"
SRC_URI[sha256sum] = "da828bc8d887821380b461abfbbd0e17538c211d56f240f03711b918c77a66d6"
SRC_URI[md5sum] = "3436cd9b7dde9a25ccf1f761006ab1b0"
SRC_URI[sha256sum] = "0a2dc391b68d2546e677cb14beab98b1849902159493538d13cfd545efc1075f"

LIC_FILES_CHKSUM += "\
file://${S}/buildtools/third_party/libc++/trunk/LICENSE.TXT;md5=55d89dd7eec8d3b4204b680e27da3953 \
file://${S}/buildtools/third_party/libc++abi/trunk/LICENSE.TXT;md5=7b9334635b542c56868400a46b272b1e \
file://${S}/third_party/SPIRV-Tools/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
file://${S}/third_party/angle/LICENSE;md5=7abdb66a6948f39c2f469140db5184e2 \
file://${S}/third_party/blink/LICENSE_FOR_ABOUT_CREDITS;md5=11e90d553b211de885f245900c4ccf89 \
file://${S}/third_party/boringssl/src/LICENSE;md5=9b082148f9953258347788edb83e401b \
file://${S}/third_party/boringssl/src/LICENSE;md5=e91719b7727a2d3464ec006154275572 \
file://${S}/third_party/breakpad/LICENSE;md5=828152b41153892a725f0e7f56faff73 \
file://${S}/third_party/chromevox/LICENSE;md5=45739090b454125d851ac7bb1bbd23a2 \
file://${S}/third_party/d3/src/LICENSE;md5=0679931d76eb2f1dd1915249da84a722 \
file://${S}/third_party/expat/files/COPYING;md5=5b8620d98e49772d95fc1d291c26aa79 \
file://${S}/third_party/ffmpeg/CREDITS.chromium;md5=005e77d67b51bc0b90c80d469d5e7a0e \
file://${S}/third_party/ffmpeg/CREDITS.chromium;md5=eeb4d970460805156a5bc3a414d48740\
file://${S}/third_party/freetype/src/docs/FTL.TXT;md5=9f37b4e6afa3fef9dba8932b16bd3f97 \
file://${S}/third_party/google_toolbox_for_mac/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
file://${S}/third_party/harfbuzz-ng/src/COPYING;md5=e021dd6dda6ff1e6b1044002fc662b9b \
file://${S}/third_party/harfbuzz-ng/src/COPYING;md5=e11f5c3149cdec4bb309babb020b32b9 \
file://${S}/third_party/icu/LICENSE;md5=8bc5d32052a96f214cbdd1e53dfc935d \
file://${S}/third_party/libjpeg_turbo/LICENSE.md;md5=843854939fbe775b4faaf7517f95b091 \
file://${S}/third_party/libjpeg_turbo/LICENSE.md;md5=f568c3bdd0195918f507100b71862ee5 \
file://${S}/third_party/libpng/LICENSE;md5=b0085051bf265bac2bfc38bc89f50000 \
file://${S}/third_party/libsrtp/LICENSE;md5=2909fcf6f09ffff8430463d91c08c4e1\
file://${S}/third_party/openmax_dl/LICENSE;md5=3c999c621badfd6937bcfef14f4528ce \
file://${S}/third_party/ots/LICENSE;md5=e06eff2aa65b917034a81599bea73dc4 \
file://${S}/third_party/protobuf/LICENSE;md5=37b5762e07f0af8c74ce80a8bda4266b \
file://${S}/third_party/shaderc/src/LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \
@@ -37,9 +36,22 @@ SRC_URI += " \
file://0001-Use-v8-qemu-wrapper.sh-on-v8-context-snapshot-creati.patch \
file://0001-Add-missing-limits-header-to-crashpad.patch;patchdir=third_party/crashpad/crashpad \
file://0001-NEON-do-not-use-certain-calls-that-would-break-GCC-b.patch;patchdir=third_party/skia \
file://0001-GCC-do-not-use-COMPILER_GCC.patch;patchdir=third_party/angle \
file://0001-omnibox-AutocompleteMatch-constructor-cannot-be-noex.patch \
file://0001-libstdc-do-not-assume-unique_ptr-has-ostream-operato.patch \
file://0001-zlib-fix-ARMv8-CRC32-compilation-in-GCC.patch \
file://0001-GCC-do-not-use-old-C-notation-to-assign-struct-with-.patch \
file://0001-GCC-CertNetFetcherImpl-declares-Job-as-a-friend-but-.patch \
file://0001-GCC-accessing-TransportParameters-enum-class-members.patch;patchdir=net/third_party/quiche/src \
file://0001-GCC-remove-noexcept-from-move-constructor-and-assign.patch \
file://0001-Fix-AutoCompleteMatch-move-constructor-assign-operat.patch \
file://0001-Make-SharedMemoryMapping-move-constructor-noexcept.patch \
file://0001-IWYU-ThemeService-requires-NativeTheme.patch \
file://0001-Make-blink-LayoutUnit-HasFraction-constexpr.patch \
file://0001-GCC-FeaturePolicyParser-ParseValueForFuzzer-is-not-i.patch \
file://0001-Avoid-pure-virtual-crash-destroying-RenderProcessUse.patch \
file://0001-ThrottlingController-Liveness-needs-to-be-uint32_t.patch \
file://0001-GCC-avoid-ambiguous-NoDestructor-creation-in-GetNeve.patch \
file://0001-DisjoingRangeLockManager-Lock-move-constructor-assig.patch \
file://0001-GCC-XSetWindowAttributes-struct-initialization-shoul.patch \
file://0001-GCC-remove-noexcept-in-history-QueryURLResult-move-c.patch \
file://0001-GCC-move-explicit-specialization-out-of-RunInfo.patch \
file://0001-ozone-wayland-Fix-method-prototype-match.patch \
"
@@ -0,0 +1,33 @@
From 97c7af91b8b1c1c0b01e3a7ae4478c1413bd768c Mon Sep 17 00:00:00 2001
From: Maksim Sisov <msisov@igalia.com>
Date: Fri, 7 Jun 2019 11:16:49 +0000
Subject: ozone/wayland: Fix method prototype match

CreateShmBasedBuffer uses uint64_t type for the length parameter,
but the definition uses size_t instead.

This CL fixes this inconsistency.

Bug: 578890
Change-Id: I3deac38340422d7c2098d226966312ad16eb831b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1649156
Reviewed-by: Antonio Gomes <tonikitoo@igalia.com>
Commit-Queue: Maksim Sisov <msisov@igalia.com>
Cr-Commit-Position: refs/heads/master@{#667080}

diff --git a/ui/ozone/platform/wayland/host/wayland_buffer_manager_host.cc b/ui/ozone/platform/wayland/host/wayland_buffer_manager_host.cc
index b6c85ef70fb4..3f163a012c31 100644
--- a/ui/ozone/platform/wayland/host/wayland_buffer_manager_host.cc
+++ b/ui/ozone/platform/wayland/host/wayland_buffer_manager_host.cc
@@ -558,7 +558,7 @@ void WaylandBufferManagerHost::CreateDmabufBasedBuffer(
void WaylandBufferManagerHost::CreateShmBasedBuffer(
gfx::AcceleratedWidget widget,
mojo::ScopedHandle shm_fd,
- size_t length,
+ uint64_t length,
const gfx::Size& size,
uint32_t buffer_id) {
DCHECK(base::MessageLoopCurrentForUI::IsSet());
--
2.20.1

0 comments on commit 0bd8a00

Please sign in to comment.
You can’t perform that action at this time.