mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

chore: deprecate apply-patches in favour of git-{import,export}-patches (#15300)

Browse source
This commit is contained in:
Jeremy Apthorp 2018-10-24 11:24:11 -07:00 • committed by GitHub
parent 4185efa08f
commit 335e9f68b7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
123 changed files with 4368 additions and 4780 deletions
Download patch file Download diff file Expand all files Collapse all files

2
patches/common/ffmpeg/.patches Normal file
View file

@ -0,0 +1,2 @@
build_gn.patch
fix_build_on_linux_x86.patch

15
patches/common/ffmpeg/.patches.yaml
View file

@ -1,15 +0,0 @@
repo: src/third_party/ffmpeg
patches:
-
author: Ales Pergl <alpergl@microsoft.com>
file: build_gn.patch
description: |
Chromium's Mac toolchain sets the "install_name" linker parameter only
when "is_component_build" is true, but we want to set even if it's false,
because we are making a dylib which will be distributed inside a bundle.
-
author: Aleksei Kuzmin <alkuzmin@microsoft.com>
file: fix_build_on_linux_x86.patch
description: |
Builds on Linux x86 fail with a clang error. See https://crbug.com/796379.
Once it's fixed the patch can be removed.

16
patches/common/ffmpeg/build_gn.patch
View file

@ -1,8 +1,17 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Ales Pergl <alpergl@microsoft.com>
Date: Mon, 22 Oct 2018 10:45:25 -0700
Subject: build_gn.patch
Chromium's Mac toolchain sets the "install_name" linker parameter only
when "is_component_build" is true, but we want to set even if it's false,
because we are making a dylib which will be distributed inside a bundle.
diff --git a/BUILD.gn b/BUILD.gn
index 5439b39693..6783292c3b 100755
index 494d33fc041c05acc6698e1bfe26cc3f8820bb6b..947deba96107c931582007ce89917f8896923a6f 100755
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -393,6 +393,10 @@ if (is_component_ffmpeg) {
@@ -390,6 +390,10 @@ if (is_component_ffmpeg) {
# So we can append below and assume they're defined.
ldflags = []
@ -13,3 +22,6 @@ index 5439b39693..6783292c3b 100755
if (is_fuchsia || (is_posix && !is_mac)) {
# Fixes warnings PIC relocation when building as component.
ldflags += [
--
2.17.0

12
patches/common/ffmpeg/fix_build_on_linux_x86.patch
View file

@ -1,5 +1,13 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Aleksei Kuzmin <alkuzmin@microsoft.com>
Date: Mon, 22 Oct 2018 10:45:25 -0700
Subject: fix_build_on_linux_x86.patch
Builds on Linux x86 fail with a clang error. See https://crbug.com/796379.
Once it's fixed the patch can be removed.
diff --git a/BUILD.gn b/BUILD.gn
index 494d33fc04..249f3700f3 100755
index 947deba96107c931582007ce89917f8896923a6f..7afd535cb5e43762a14c51dd7b3b163571958d9c 100755
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -239,7 +239,7 @@ target(link_target_type, "ffmpeg_internal") {
@ -11,3 +19,5 @@ index 494d33fc04..249f3700f3 100755
defines += [ "HAVE_EBP_AVAILABLE=0" ]
} else {
defines += [ "HAVE_EBP_AVAILABLE=1" ]
--
2.17.0