Date: Friday, March 10, 2023 @ 19:48:06
Author: andrewsc
Revision: 1417718
upgpkg: firefox-developer-edition 111.0b8-3
Added:
firefox-developer-edition/trunk/0003-Bug-1820416-Use-correct-FFVPX-headers-from-ffmpeg-6.patch
Modified:
firefox-developer-edition/trunk/PKGBUILD
----------------------------------------------------------------+
0003-Bug-1820416-Use-correct-FFVPX-headers-from-ffmpeg-6.patch | 24
++++++++++
PKGBUILD | 11 +++-
2 files changed, 32 insertions(+), 3 deletions(-)
Added: 0003-Bug-1820416-Use-correct-FFVPX-headers-from-ffmpeg-6.patch
===================================================================
--- 0003-Bug-1820416-Use-correct-FFVPX-headers-from-ffmpeg-6.patch
(rev 0)
+++ 0003-Bug-1820416-Use-correct-FFVPX-headers-from-ffmpeg-6.patch
2023-03-10 19:48:06 UTC (rev 1417718)
@@ -0,0 +1,24 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: stransky <[email protected]>
+Date: Thu, 9 Mar 2023 13:16:19 +0000
+Subject: [PATCH] Bug 1820416 Use correct FFVPX headers from ffmpeg 6.0
+ r=padenot
+
+Differential Revision: https://phabricator.services.mozilla.com/D172116
+---
+ dom/media/platforms/ffmpeg/ffvpx/moz.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/dom/media/platforms/ffmpeg/ffvpx/moz.build
b/dom/media/platforms/ffmpeg/ffvpx/moz.build
+index 188b866fc9de..cda0960787a5 100644
+--- a/dom/media/platforms/ffmpeg/ffvpx/moz.build
++++ b/dom/media/platforms/ffmpeg/ffvpx/moz.build
+@@ -20,7 +20,7 @@ SOURCES += [
+ ]
+ LOCAL_INCLUDES += [
+ "..",
+- "../ffmpeg59/include",
++ "../ffmpeg60/include",
+ "/media/mozva",
+ ]
+
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2023-03-10 19:45:51 UTC (rev 1417717)
+++ PKGBUILD 2023-03-10 19:48:06 UTC (rev 1417718)
@@ -3,7 +3,7 @@
pkgname=firefox-developer-edition
pkgver=111.0b8
-pkgrel=2
+pkgrel=3
pkgdesc="Developer Edition of the popular Firefox web browser"
arch=('x86_64')
license=('MPL' 'GPL' 'LGPL')
@@ -50,13 +50,15 @@
firefox-install-dir.patch
"$pkgname".desktop
identity-icons-brand.svg
- 0002-Bug-1819374-Squashed-ffmpeg-6.0-update.patch)
+ 0002-Bug-1819374-Squashed-ffmpeg-6.0-update.patch
+ 0003-Bug-1820416-Use-correct-FFVPX-headers-from-ffmpeg-6.patch)
b2sums=('cf6d7d6907f7754163831ddaf8ca45c5358470fe9052fb158ec004ad83b8c6bc4dfe59ea80974515843ee88726da160bec37a4e86d17a83092143c019ba89014'
'SKIP'
'eb61793257458b20bc7ab5598240bc1901666d7fb7e971941af99ac706d387859642d8fba3130fa31789546b9123c7500edbe6373701ce9fc7d65aef3974c90c'
'dfb74f902b5b7e4533c6dd91bcade3de809751d2c6d991b5c57c831be3d42759e0d416fc90a71977f17036db5f8b49775b483f5f4032d3022533b8b81f8c9e65'
'63a8dd9d8910f9efb353bed452d8b4b2a2da435857ccee083fc0c557f8c4c1339ca593b463db320f70387a1b63f1a79e709e9d12c69520993e26d85a3d742e34'
-
'086ed7d2c2d4efd441220e2d5244afd8a9a1327fed42b98f1a9e0eb05590abbf893716b3f5e01db1234eafe5386097013578dfc7c20fc8367860ce5cd9611aac')
+
'086ed7d2c2d4efd441220e2d5244afd8a9a1327fed42b98f1a9e0eb05590abbf893716b3f5e01db1234eafe5386097013578dfc7c20fc8367860ce5cd9611aac'
+
'be47c370c1b765921a6ffbb0eeaceaabc26483629b2ebd73c38f36b3ac418d1746fa021b5d444264641ff7c0c13e688a752758bd75c84e0297aceeaec0062ff2')
validpgpkeys=('14F26682D0916CDD81E37B6D61B7B526D98F0353') # Mozilla Software
Releases <[email protected]>
# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
@@ -79,6 +81,9 @@
# https://bugzilla.mozilla.org/show_bug.cgi?id=1819374
patch -Np1 -i ../0002-Bug-1819374-Squashed-ffmpeg-6.0-update.patch
+ # https://bugzilla.mozilla.org/show_bug.cgi?id=1820416
+ patch -Np1 -i
../0003-Bug-1820416-Use-correct-FFVPX-headers-from-ffmpeg-6.patch
+
echo -n "$_google_api_key" > google-api-key
echo -n "$_mozilla_api_key" > mozilla-api-key
