Date: Friday, March 10, 2023 @ 05:38:49
Author: heftig
Revision: 470507
110.0.1-3: FS#77796 restore vaapi
Added:
firefox/trunk/0003-Bug-1820416-Use-correct-FFVPX-headers-from-ffmpeg-6..patch
Modified:
firefox/trunk/PKGBUILD
-----------------------------------------------------------------+
0003-Bug-1820416-Use-correct-FFVPX-headers-from-ffmpeg-6..patch | 24
++++++++++
PKGBUILD | 13 ++++-
2 files changed, 34 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 05:38:49 UTC (rev 470507)
@@ -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-09 22:56:05 UTC (rev 470506)
+++ PKGBUILD 2023-03-10 05:38:49 UTC (rev 470507)
@@ -4,7 +4,7 @@
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)
@@ -68,6 +68,7 @@
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
)
validpgpkeys=(
'14F26682D0916CDD81E37B6D61B7B526D98F0353' # Mozilla Software Releases
<[email protected]>
@@ -77,13 +78,15 @@
'298eae9de76ec53182f38d5c549d0379569916eebf62149f9d7f4a7edef36abf'
'a9b8b4a0a1f4a7b4af77d5fc70c2686d624038909263c795ecc81e0aec7711e9'
'43c83101b7ad7dba6f5fffeb89b70a661a547d506a031ea2beada42ccf04eec7'
- '9347e45cfe3e915b2293f7467fd61c216ec10823e91c70e5aeb9ca08cc5fcfcf')
+ '9347e45cfe3e915b2293f7467fd61c216ec10823e91c70e5aeb9ca08cc5fcfcf'
+ 'be9ba079a931d5e881ce38430d418cc834e8c6b157af6c79ea267998caece806')
b2sums=('ff196016e0271f7828163b8f767f3321b5ee08ef6bd0b03b134e17a1e5b62666f10ae80a14569438f6ac1c995a7a8422265eaabbc505b6a86e95a66b5db07209'
'SKIP'
'e18f2c22e394ca3b6758bc130245b254947e4d15921be3da443d6d7c3c4b0d22ead1b39fbc10a4f896edd19e2a1dffbd1cbb34dc4beb0621a6ddb70ccc53b3a7'
'63a8dd9d8910f9efb353bed452d8b4b2a2da435857ccee083fc0c557f8c4c1339ca593b463db320f70387a1b63f1a79e709e9d12c69520993e26d85a3d742e34'
'2bf65874c8c1f41c9273b68d74f4fe5c81dca5acbad0b9a5f917df1d46e1b2a1fb25d42a419eb885e76f4d193483cdeb6294e14ed4b2e241c34b84565b6ffd72'
-
'086ed7d2c2d4efd441220e2d5244afd8a9a1327fed42b98f1a9e0eb05590abbf893716b3f5e01db1234eafe5386097013578dfc7c20fc8367860ce5cd9611aac')
+
'086ed7d2c2d4efd441220e2d5244afd8a9a1327fed42b98f1a9e0eb05590abbf893716b3f5e01db1234eafe5386097013578dfc7c20fc8367860ce5cd9611aac'
+
'be47c370c1b765921a6ffbb0eeaceaabc26483629b2ebd73c38f36b3ac418d1746fa021b5d444264641ff7c0c13e688a752758bd75c84e0297aceeaec0062ff2')
# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
# Note: These are for Arch Linux use ONLY. For your own distribution, please
@@ -109,6 +112,10 @@
# 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
