From 0a23c0b032782a5fcd5635efa4ae447f84dc5f8d Mon Sep 17 00:00:00 2001 From: Jeremy Apthorp Date: Tue, 4 Dec 2018 03:11:24 -0800 Subject: [PATCH] chore: remove old patch for fixing ffmpeg on 32-bit linux (#15226) It's no longer necessary, per the comment --- patches/common/ffmpeg/.patches | 1 - .../ffmpeg/fix_build_on_linux_x86.patch | 21 ------------------- 2 files changed, 22 deletions(-) delete mode 100644 patches/common/ffmpeg/fix_build_on_linux_x86.patch diff --git a/patches/common/ffmpeg/.patches b/patches/common/ffmpeg/.patches index 6a5badd7d0..12f89d1f5d 100644 --- a/patches/common/ffmpeg/.patches +++ b/patches/common/ffmpeg/.patches @@ -1,2 +1 @@ build_gn.patch -fix_build_on_linux_x86.patch diff --git a/patches/common/ffmpeg/fix_build_on_linux_x86.patch b/patches/common/ffmpeg/fix_build_on_linux_x86.patch deleted file mode 100644 index 159fbac217..0000000000 --- a/patches/common/ffmpeg/fix_build_on_linux_x86.patch +++ /dev/null @@ -1,21 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Aleksei Kuzmin -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 947deba96107c931582007ce89917f8896923a6f..7afd535cb5e43762a14c51dd7b3b163571958d9c 100755 ---- a/BUILD.gn -+++ b/BUILD.gn -@@ -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" ]