diff --git a/extra/firefox/0003-Bug-1820416-Use-correct-FFVPX-headers-from-ffmpeg-6..patch b/extra/firefox/0003-Bug-1820416-Use-correct-FFVPX-headers-from-ffmpeg-6..patch new file mode 100644 index 000000000..b0381041d --- /dev/null +++ b/extra/firefox/0003-Bug-1820416-Use-correct-FFVPX-headers-from-ffmpeg-6..patch @@ -0,0 +1,24 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: stransky +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", + ] + diff --git a/extra/firefox/PKGBUILD b/extra/firefox/PKGBUILD index 86faa15ae..3682dd7f5 100644 --- a/extra/firefox/PKGBUILD +++ b/extra/firefox/PKGBUILD @@ -11,7 +11,7 @@ highmem=1 pkgname=firefox pkgver=110.0.1 -pkgrel=2 +pkgrel=3 pkgdesc="Standalone web browser from mozilla.org" url="https://www.mozilla.org/firefox/" arch=(x86_64) @@ -71,6 +71,7 @@ source=( identity-icons-brand.svg 0001-libwebrtc-screen-cast-sync.patch 0002-Bug-1819374-Squashed-ffmpeg-6.0-update.patch + 0003-Bug-1820416-Use-correct-FFVPX-headers-from-ffmpeg-6..patch build-arm-libopus.patch ) validpgpkeys=( @@ -82,6 +83,7 @@ sha256sums=('f19bb74d684b992625abca68f5776198974cd2785eb5d02d51ba007fc998491f' 'a9b8b4a0a1f4a7b4af77d5fc70c2686d624038909263c795ecc81e0aec7711e9' '43c83101b7ad7dba6f5fffeb89b70a661a547d506a031ea2beada42ccf04eec7' '9347e45cfe3e915b2293f7467fd61c216ec10823e91c70e5aeb9ca08cc5fcfcf' + 'be9ba079a931d5e881ce38430d418cc834e8c6b157af6c79ea267998caece806' '2d4d91f7e35d0860225084e37ec320ca6cae669f6c9c8fe7735cdbd542e3a7c9') b2sums=('ff196016e0271f7828163b8f767f3321b5ee08ef6bd0b03b134e17a1e5b62666f10ae80a14569438f6ac1c995a7a8422265eaabbc505b6a86e95a66b5db07209' 'SKIP' @@ -89,6 +91,7 @@ b2sums=('ff196016e0271f7828163b8f767f3321b5ee08ef6bd0b03b134e17a1e5b62666f10ae80 '63a8dd9d8910f9efb353bed452d8b4b2a2da435857ccee083fc0c557f8c4c1339ca593b463db320f70387a1b63f1a79e709e9d12c69520993e26d85a3d742e34' '2bf65874c8c1f41c9273b68d74f4fe5c81dca5acbad0b9a5f917df1d46e1b2a1fb25d42a419eb885e76f4d193483cdeb6294e14ed4b2e241c34b84565b6ffd72' '086ed7d2c2d4efd441220e2d5244afd8a9a1327fed42b98f1a9e0eb05590abbf893716b3f5e01db1234eafe5386097013578dfc7c20fc8367860ce5cd9611aac' + 'be47c370c1b765921a6ffbb0eeaceaabc26483629b2ebd73c38f36b3ac418d1746fa021b5d444264641ff7c0c13e688a752758bd75c84e0297aceeaec0062ff2' '6e5980e56343a23bce4fcda58f6abc8f2debca0c278c87b09e53abb17ff15849c26e8df3bbff2388985f8fe5a4e9be9982c602ef7159546f0ae335fca1000a41') # Google API keys (see http://www.chromium.org/developers/how-tos/api-keys) @@ -116,6 +119,10 @@ prepare() { # https://bugzilla.mozilla.org/show_bug.cgi?id=1819374 patch -Np1 -i ../0002-Bug-1819374-Squashed-ffmpeg-6.0-update.patch + # https://bugs.archlinux.org/task/77796 + # 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