Added ffmpeg4 patch

3 files changed, 12 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9cbb93d004f7..bd0e379341ff 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = firefox-esr52
 	pkgdesc = Standalone web browser from mozilla.org, Extended Support Release 52.x
 	pkgver = 52.8.0
-	pkgrel = 1
+	pkgrel = 2
 	url = https://www.mozilla.org/en-US/firefox/organizations/
 	arch = x86_64
 	license = MPL
@@ -52,6 +52,7 @@ pkgbase = firefox-esr52
 	source = rust-i686.patch
 	source = make_SystemResourceMonitor.stop_more_resilient_to_errors.patch
 	source = use_noexcept_in_mozalloc.patch
+	source = ffmpeg4.patch.gz
 	validpgpkeys = 2B90598A745E992F315E22C58AB132963A06537A
 	sha256sums = babed4fe0ae95783e39358aedf7111b20fd9442f73b3b41b025fa4951fe76287
 	sha256sums = c202e5e18da1eeddd2e1d81cb3436813f11e44585ca7357c4c5f1bddd4bec826
@@ -62,6 +63,7 @@ pkgbase = firefox-esr52
 	sha256sums = f61ea706ce6905f568b9bdafd1b044b58f20737426f0aa5019ddb9b64031a269
 	sha256sums = 7760ebe71f4057cbd2f52b715abaf0d944c14c39e2bb2a5322114ad8451e12d9
 	sha256sums = 32eae55bf9151df5f77ee98585e6cef4cc7ee2e5f2ca44c1a42f87d132eb22d8
+	sha256sums = 2a285e0c31968e3fe9b65a585838b46f9342ff0a369e786a729b4c3886617034
 
 pkgname = firefox-esr52
 
diff --git a/PKGBUILD b/PKGBUILD
index e477647b2b01..969156913673 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=firefox-esr52
 pkgver=52.8.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Standalone web browser from mozilla.org, Extended Support Release 52.x"
 arch=(x86_64)
 license=(MPL GPL LGPL)
@@ -26,7 +26,8 @@ source=(https://ftp.mozilla.org/pub/firefox/releases/${pkgver}esr/source/firefox
         firefox-install-dir.patch fix-wifi-scanner.diff
         rust-i686.patch
         make_SystemResourceMonitor.stop_more_resilient_to_errors.patch
-        use_noexcept_in_mozalloc.patch)
+        use_noexcept_in_mozalloc.patch
+        ffmpeg4.patch.gz)
 sha256sums=('babed4fe0ae95783e39358aedf7111b20fd9442f73b3b41b025fa4951fe76287'
             'c202e5e18da1eeddd2e1d81cb3436813f11e44585ca7357c4c5f1bddd4bec826'
             'a2474b32b9b2d7e0fb53a4c89715507ad1c194bef77713d798fa39d507def9e9'
@@ -35,7 +36,8 @@ sha256sums=('babed4fe0ae95783e39358aedf7111b20fd9442f73b3b41b025fa4951fe76287'
             '9765bca5d63fb5525bbd0520b7ab1d27cabaed697e2fc7791400abc3fa4f13b8'
             'f61ea706ce6905f568b9bdafd1b044b58f20737426f0aa5019ddb9b64031a269'
             '7760ebe71f4057cbd2f52b715abaf0d944c14c39e2bb2a5322114ad8451e12d9'
-            '32eae55bf9151df5f77ee98585e6cef4cc7ee2e5f2ca44c1a42f87d132eb22d8')
+            '32eae55bf9151df5f77ee98585e6cef4cc7ee2e5f2ca44c1a42f87d132eb22d8'
+            '2a285e0c31968e3fe9b65a585838b46f9342ff0a369e786a729b4c3886617034')
 validpgpkeys=('2B90598A745E992F315E22C58AB132963A06537A')
 
 # Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
@@ -73,6 +75,10 @@ prepare() {
   # https://hg.mozilla.org/mozilla-central/rev/ae7e3082d862
   patch -Np1 -i ../use_noexcept_in_mozalloc.patch
 
+  # https://hg.mozilla.org/releases/mozilla-esr60/rev/2f39b32593bd
+  # https://svnweb.freebsd.org/ports/head/www/firefox/files/patch-bug1435212?view=markup&pathrev=468159
+  patch -Np0 -i ../ffmpeg4.patch
+
   echo -n "$_google_api_key" >google-api-key
   echo -n "$_mozilla_api_key" >mozilla-api-key
 
diff --git a/ffmpeg4.patch.gz b/ffmpeg4.patch.gz
new file mode 100644
index 000000000000..d95cf87ec981
--- /dev/null
+++ b/ffmpeg4.patch.gz