-
Notifications
You must be signed in to change notification settings - Fork 2.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
7 changed files
with
178 additions
and
53 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,20 +1,20 @@ | ||
| --- a/third_party/node/node.py 2021-05-20 04:17:54.000000000 +0200 | ||
| +++ b/third_party/node/node.py 2021-05-20 04:17:54.000000000 +0200 | ||
| @@ -17,11 +17,12 @@ | ||
| if platform.system() == 'Darwin' and platform.machine() == 'arm64': | ||
| return os.path.join(os_path.join(os_path.dirname(__file__), 'mac', | ||
| 'node-darwin-arm64', 'bin', 'node')) | ||
| --- a/third_party/node/node.py | ||
| +++ b/third_party/node/node.py | ||
| @@ -13,11 +13,12 @@ | ||
| def GetBinaryPath(): | ||
| darwin_name = ('node-darwin-arm64' if platform.machine() == 'arm64' else | ||
| 'node-darwin-x64') | ||
| - return os_path.join(os_path.dirname(__file__), *{ | ||
| - 'Darwin': ('mac', 'node-darwin-x64', 'bin', 'node'), | ||
| - 'Darwin': ('mac', darwin_name, 'bin', 'node'), | ||
| - 'Linux': ('linux', 'node-linux-x64', 'bin', 'node'), | ||
| - 'Windows': ('win', 'node.exe'), | ||
| - }[platform.system()]) | ||
| + return "/usr/bin/node" | ||
| + #return os_path.join(os_path.dirname(__file__), *{ | ||
| + # 'Darwin': ('mac', 'node-darwin-x64', 'bin', 'node'), | ||
| + # 'Darwin': ('mac', darwin_name, 'bin', 'node'), | ||
| + # 'Linux': ('linux', 'node-linux-x64', 'bin', 'node'), | ||
| + # 'Windows': ('win', 'node.exe'), | ||
| + #}[platform.system()]) | ||
| + return "/usr/bin/node" | ||
|
|
||
|
|
||
| def RunNode(cmd_parts, stdout=None): |
33 changes: 33 additions & 0 deletions
33
srcpkgs/chromium/patches/downgrade-duplicate-peer-error-to-dvlog.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| From 00604ca8ed6d669fb6cb3ae8bacd6028d5ef10ac Mon Sep 17 00:00:00 2001 | ||
| From: Stephen Roettger <sroettger@google.com> | ||
| Date: Thu, 20 Jan 2022 10:04:04 +0000 | ||
| Subject: [PATCH] Downgrade duplicate peer error to dvlog | ||
| MIME-Version: 1.0 | ||
| Content-Type: text/plain; charset=UTF-8 | ||
| Content-Transfer-Encoding: 8bit | ||
|
|
||
| Downgrading since this case can happen in non-error situations. There can be | ||
| duplicate introductions in flight in which case we simply drop the second one. | ||
|
|
||
| Change-Id: I2c51b177913ccd9634e9bb6343d468101d9735ed | ||
| Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3398794 | ||
| Reviewed-by: Ken Rockot <rockot@google.com> | ||
| Commit-Queue: Stephen Röttger <sroettger@google.com> | ||
| Cr-Commit-Position: refs/heads/main@{#961389} | ||
| --- | ||
| mojo/core/node_controller.cc | 2 +- | ||
| 1 file changed, 1 insertion(+), 1 deletion(-) | ||
|
|
||
| diff --git a/mojo/core/node_controller.cc b/mojo/core/node_controller.cc | ||
| index 7cde7719687..81712676733 100644 | ||
| --- a/mojo/core/node_controller.cc | ||
| +++ b/mojo/core/node_controller.cc | ||
| @@ -594,7 +594,7 @@ void NodeController::AddPeer(const ports::NodeName& name, | ||
| } | ||
|
|
||
| if (dropped_peers_.Contains(name) && !allow_name_reuse) { | ||
| - LOG(ERROR) << "Trying to re-add dropped peer " << name; | ||
| + DVLOG(1) << "Trying to re-add dropped peer " << name; | ||
| return; | ||
| } | ||
|
|
11 changes: 0 additions & 11 deletions
11
srcpkgs/chromium/patches/fix-bits-stdint-intn-include.patch
This file was deleted.
Oops, something went wrong.
62 changes: 62 additions & 0 deletions
62
srcpkgs/chromium/patches/fix-build-break-with-system-libdrm.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,62 @@ | ||
| From 5b287e0be8d8d8475ec6ef81b16eaa61e19db078 Mon Sep 17 00:00:00 2001 | ||
| From: "Steinar H. Gunderson" <sesse@chromium.org> | ||
| Date: Tue, 25 Jan 2022 19:14:53 +0000 | ||
| Subject: [PATCH] Fix build break with system libdrm. | ||
|
|
||
| This patch is submitted on behalf of Andres Salomon | ||
| <dilinger@queued.net> (on Cc). Also adding him to src/AUTHORS | ||
| per policy, as he has signed the CLA. | ||
|
|
||
| Original patch: | ||
| https://salsa.debian.org/dilinger/chromium/-/commit/2333c2fb985ac1ef3d7331776a7833d965c63302 | ||
|
|
||
| Change-Id: I18bd60e2e80f2b9181e74ee7972c3f457ab33b10 | ||
| Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3401704 | ||
| Reviewed-by: Andres Calderon Jaramillo <andrescj@chromium.org> | ||
| Commit-Queue: Steinar H Gunderson <sesse@chromium.org> | ||
| Auto-Submit: Steinar H Gunderson <sesse@chromium.org> | ||
| Cr-Commit-Position: refs/heads/main@{#963119} | ||
| --- | ||
| AUTHORS | 1 + | ||
| media/gpu/chromeos/BUILD.gn | 1 + | ||
| media/gpu/chromeos/video_decoder_pipeline.cc | 2 +- | ||
| 3 files changed, 3 insertions(+), 1 deletion(-) | ||
|
|
||
| diff --git a/AUTHORS b/AUTHORS | ||
| index 0eba3de5065..50edd3f6b38 100644 | ||
| --- a/AUTHORS | ||
| +++ b/AUTHORS | ||
| @@ -93,6 +93,7 @@ Andreas Papacharalampous <andreas@apap04.com> | ||
| Andrei Borza <andrei.borza@gmail.com> | ||
| Andrei Parvu <andrei.prv@gmail.com> | ||
| Andrei Parvu <parvu@adobe.com> | ||
| +Andres Salomon <dilinger@queued.net> | ||
| Andreu Botella <andreu@andreubotella.com> | ||
| Andrew Boyarshin <andrew.boyarshin@gmail.com> | ||
| Andrew Brampton <me@bramp.net> | ||
| diff --git a/media/gpu/chromeos/BUILD.gn b/media/gpu/chromeos/BUILD.gn | ||
| index 7cb4c3ea39a..6fe21c15ecc 100644 | ||
| --- a/media/gpu/chromeos/BUILD.gn | ||
| +++ b/media/gpu/chromeos/BUILD.gn | ||
| @@ -25,6 +25,7 @@ source_set("chromeos") { | ||
|
|
||
| deps = [ | ||
| "//base", | ||
| + "//build/config/linux/libdrm", | ||
| "//media", | ||
| "//media/gpu:buildflags", | ||
| "//media/gpu:command_buffer_helper", | ||
| diff --git a/media/gpu/chromeos/video_decoder_pipeline.cc b/media/gpu/chromeos/video_decoder_pipeline.cc | ||
| index d2f154ea0d8..416b9434a8d 100644 | ||
| --- a/media/gpu/chromeos/video_decoder_pipeline.cc | ||
| +++ b/media/gpu/chromeos/video_decoder_pipeline.cc | ||
| @@ -28,8 +28,8 @@ | ||
| #include "third_party/abseil-cpp/absl/types/optional.h" | ||
|
|
||
| #if BUILDFLAG(USE_VAAPI) | ||
| +#include <drm_fourcc.h> | ||
| #include "media/gpu/vaapi/vaapi_video_decoder.h" | ||
| -#include "third_party/libdrm/src/include/drm/drm_fourcc.h" | ||
| #elif BUILDFLAG(USE_V4L2_CODEC) | ||
| #include "media/gpu/v4l2/v4l2_video_decoder.h" | ||
| #else |
72 changes: 72 additions & 0 deletions
72
srcpkgs/chromium/patches/use-FT_Done_MM_Var-in-CFX_Font-AdjustMMParams.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,72 @@ | ||
| From cb0aad687f34629a42053d600cf2947282cea2c0 Mon Sep 17 00:00:00 2001 | ||
| From: Lei Zhang <thestig@chromium.org> | ||
| Date: Mon, 31 Jan 2022 22:42:35 +0000 | ||
| Subject: [PATCH] Use FT_Done_MM_Var() in CFX_Font::AdjustMMParams() when | ||
| possible. | ||
|
|
||
| When FreeType has FT_Done_MM_Var(), use that to free memory in | ||
| CFX_Font::AdjustMMParams() to avoid mismatched alloc/free functions. | ||
|
|
||
| Bug: pdfium:1400 | ||
| Change-Id: I044540893103921fc64cdd53fcd628cfebf2c9db | ||
| Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/90130 | ||
| Reviewed-by: Nigi <nigi@chromium.org> | ||
| Commit-Queue: Lei Zhang <thestig@chromium.org> | ||
|
|
||
| (cherry picked from commit ffeb67faf715475f6e463d65c368f556780adf19) | ||
| --- | ||
| core/fxge/cfx_font.cpp | 28 ++++++++++++++++++++++++++-- | ||
| 1 file changed, 26 insertions(+), 2 deletions(-) | ||
|
|
||
| diff --git a/core/fxge/cfx_font.cpp b/core/fxge/cfx_font.cpp | ||
| index 7a4e8eb24..0ef421fe7 100644 | ||
| --- a/third_party/pdfium/core/fxge/cfx_font.cpp | ||
| +++ b/third_party/pdfium/core/fxge/cfx_font.cpp | ||
| @@ -43,6 +43,30 @@ struct OUTLINE_PARAMS { | ||
| float m_CoordUnit; | ||
| }; | ||
|
|
||
| +// TODO(crbug.com/pdfium/1400): When FT_Done_MM_Var() is more likely to be | ||
| +// available to all users in the future, remove FreeMMVar() and use | ||
| +// FT_Done_MM_Var() directly. | ||
| +// | ||
| +// Use weak symbols to check if FT_Done_MM_Var() is available at runtime. | ||
| +#if !defined(OS_WIN) | ||
| +extern "C" __attribute__((weak)) decltype(FT_Done_MM_Var) FT_Done_MM_Var; | ||
| +#endif | ||
| + | ||
| +void FreeMMVar(FXFT_FaceRec* rec, FXFT_MM_VarPtr variation_desc) { | ||
| +#if defined(OS_WIN) | ||
| + // Assume `use_system_freetype` GN var is never set on Windows. | ||
| + constexpr bool has_ft_done_mm_var_func = true; | ||
| +#else | ||
| + static const bool has_ft_done_mm_var_func = !!FT_Done_MM_Var; | ||
| +#endif | ||
| + if (has_ft_done_mm_var_func) { | ||
| + FT_Done_MM_Var(CFX_GEModule::Get()->GetFontMgr()->GetFTLibrary(), | ||
| + variation_desc); | ||
| + } else { | ||
| + FXFT_Free(rec, variation_desc); | ||
| + } | ||
| +} | ||
| + | ||
| #ifdef PDF_ENABLE_XFA | ||
| unsigned long FTStreamRead(FXFT_StreamRec* stream, | ||
| unsigned long offset, | ||
| @@ -640,14 +664,14 @@ void CFX_Font::AdjustMMParams(int glyph_index, | ||
| int max_width = FXFT_Get_Glyph_HoriAdvance(m_Face->GetRec()) * 1000 / | ||
| FXFT_Get_Face_UnitsPerEM(m_Face->GetRec()); | ||
| if (max_width == min_width) { | ||
| - FXFT_Free(m_Face->GetRec(), pMasters); | ||
| + FreeMMVar(m_Face->GetRec(), pMasters); | ||
| return; | ||
| } | ||
| int param = min_param + (max_param - min_param) * (dest_width - min_width) / | ||
| (max_width - min_width); | ||
| coords[1] = param; | ||
| } | ||
| - FXFT_Free(m_Face->GetRec(), pMasters); | ||
| + FreeMMVar(m_Face->GetRec(), pMasters); | ||
| FT_Set_MM_Design_Coordinates(m_Face->GetRec(), 2, coords); | ||
| } | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters