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

update v8, ffmpeg, chromium, crashpad, boringssl, and webrtc patches

Browse source
This commit is contained in:
Jeremy Apthorp 2018-09-14 11:03:43 -07:00 • committed by Aleksei Kuzmin
parent d5e9b662f8
commit 6f2f761df3
90 changed files with 7411 additions and 7874 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,13 +1,13 @@
diff --git a/BUILD.gn b/BUILD.gn
index ff09111634..fa7712a3a3 100755
index 494d33fc04..249f3700f3 100755
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -247,7 +247,7 @@ target(link_target_type, "ffmpeg_internal") {
# On POSIX x86, sanitizers will fail to compiler the H264 CABAC code due to
# insufficient registers unless we disable EBP usage. crbug.com/786760
if (target_cpu == "x86") {
- if (using_sanitizer) {
+ if (using_sanitizer || is_electron_build) {
defines += [ "HAVE_EBP_AVAILABLE=0" ]
} else {
defines += [ "HAVE_EBP_AVAILABLE=1" ]
@@ -239,7 +239,7 @@ target(link_target_type, "ffmpeg_internal") {
# Windows builds can't compile without EBP because we can't omit frame
# pointers like we do on posix.
if (target_cpu == "x86") {
- if (using_sanitizer || is_win) {
+ if (using_sanitizer || is_win || is_electron_build) {
defines += [ "HAVE_EBP_AVAILABLE=0" ]
} else {
defines += [ "HAVE_EBP_AVAILABLE=1" ]