[arch-commits] Commit in firefox/trunk (3 files)

[Jan Steffens]

    Date: Monday, April 12, 2021 @ 00:54:27
  Author: heftig
Revision: 412333

87.0-2: fix widevine

Added:
  firefox/trunk/0002-Bug-1701089-Accept-vp09-codec-string-in-Widevine-man.patch
Modified:
  firefox/trunk/0001-Use-remoting-name-for-GDK-application-names.patch
  firefox/trunk/PKGBUILD

-----------------------------------------------------------------+
 0001-Use-remoting-name-for-GDK-application-names.patch          |    4 -
 0002-Bug-1701089-Accept-vp09-codec-string-in-Widevine-man.patch |   34 ++++++++++
 PKGBUILD                                                        |    9 ++
 3 files changed, 43 insertions(+), 4 deletions(-)

Modified: 0001-Use-remoting-name-for-GDK-application-names.patch
===================================================================
--- 0001-Use-remoting-name-for-GDK-application-names.patch	2021-04-12 00:54:08 UTC (rev 412332)
+++ 0001-Use-remoting-name-for-GDK-application-names.patch	2021-04-12 00:54:27 UTC (rev 412333)
@@ -9,10 +9,10 @@
  2 files changed, 6 insertions(+), 12 deletions(-)
 
 diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp
-index 9c7cb46079b5f..dfd4321f52742 100644
+index 27a81620e3ec5..0162744d5c54d 100644
 --- a/toolkit/xre/nsAppRunner.cpp
 +++ b/toolkit/xre/nsAppRunner.cpp
-@@ -4225,11 +4225,7 @@ int XREMain::XRE_mainStartup(bool* aExitFlag) {
+@@ -4285,11 +4285,7 @@ int XREMain::XRE_mainStartup(bool* aExitFlag) {
    // consistently.
  
    // Set program name to the one defined in application.ini.

Added: 0002-Bug-1701089-Accept-vp09-codec-string-in-Widevine-man.patch
===================================================================
--- 0002-Bug-1701089-Accept-vp09-codec-string-in-Widevine-man.patch	                        (rev 0)
+++ 0002-Bug-1701089-Accept-vp09-codec-string-in-Widevine-man.patch	2021-04-12 00:54:27 UTC (rev 412333)
@@ -0,0 +1,34 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Bryce Seager van Dyk <bvandyk at mozilla.com>
+Date: Fri, 26 Mar 2021 19:06:00 +0000
+Subject: [PATCH] Bug 1701089 - Accept "vp09" codec string in Widevine
+ manifest. r=mjf, a=RyanVM
+
+Differential Revision: https://phabricator.services.mozilla.com/D109810
+---
+ dom/media/gmp/GMPParent.cpp | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/dom/media/gmp/GMPParent.cpp b/dom/media/gmp/GMPParent.cpp
+index 2e7f80d368134..1acb0ac18eff6 100644
+--- a/dom/media/gmp/GMPParent.cpp
++++ b/dom/media/gmp/GMPParent.cpp
+@@ -884,15 +884,16 @@ RefPtr<GenericPromise> GMPParent::ParseChromiumManifest(
+   //
+   // Google's code to parse manifests can be used as a reference for strings
+   // the manifest may contain
+-  // https://cs.chromium.org/chromium/src/chrome/common/media/cdm_manifest.cc?l=73&rcl=393e60bfc2299449db7ef374c0ef1c324716e562
++  // https://source.chromium.org/chromium/chromium/src/+/master:components/cdm/common/cdm_manifest.cc;l=74;drc=775880ced8a989191281e93854c7f2201f25068f
+   //
+   // Gecko's internal strings can be found at
+   // https://searchfox.org/mozilla-central/rev/ea63a0888d406fae720cf24f4727d87569a8cab5/dom/media/eme/MediaKeySystemAccess.cpp#149-155
+   for (const nsCString& chromiumCodec : codecs) {
+     nsCString codec;
+     if (chromiumCodec.EqualsASCII("vp8")) {
+       codec = "vp8"_ns;
+-    } else if (chromiumCodec.EqualsASCII("vp9.0")) {
++    } else if (chromiumCodec.EqualsASCII("vp9.0") ||  // Legacy string.
++               chromiumCodec.EqualsASCII("vp09")) {
+       codec = "vp9"_ns;
+     } else if (chromiumCodec.EqualsASCII("avc1")) {
+       codec = "h264"_ns;

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-04-12 00:54:08 UTC (rev 412332)
+++ PKGBUILD	2021-04-12 00:54:27 UTC (rev 412333)
@@ -4,7 +4,7 @@
 
 pkgname=firefox
 pkgver=87.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Standalone web browser from mozilla.org"
 arch=(x86_64)
 license=(MPL GPL LGPL)
@@ -21,10 +21,12 @@
 options=(!emptydirs !makeflags !strip)
 source=(https://archive.mozilla.org/pub/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.xz{,.asc}
         0001-Use-remoting-name-for-GDK-application-names.patch
+        0002-Bug-1701089-Accept-vp09-codec-string-in-Widevine-man.patch
         $pkgname.desktop)
 sha256sums=('ce98be0522f971b6950f22c738c4b2caf19cf7f48ab2ae2e6d46694af7fd58ab'
             'SKIP'
-            'ea8c317a50e84829c3b94ad73b5b9cfb8a08a73e406f8bd9bfb7730854611539'
+            '1375163e9a21f75cfadb8ee77ca3d7f5f2405bfa5ec3940d8153f89d55e94e5f'
+            '2af9ddd8969b7143f112caa24d07a88e5ea0ac17e8adc32f2e92a58830a18a68'
             '298eae9de76ec53182f38d5c549d0379569916eebf62149f9d7f4a7edef36abf')
 validpgpkeys=('14F26682D0916CDD81E37B6D61B7B526D98F0353') # Mozilla Software Releases <release at mozilla.com>
 
@@ -47,6 +49,9 @@
   # https://bugzilla.mozilla.org/show_bug.cgi?id=1530052
   patch -Np1 -i ../0001-Use-remoting-name-for-GDK-application-names.patch
 
+  # https://bugzilla.mozilla.org/show_bug.cgi?id=1704022
+  patch -Np1 -i ../0002-Bug-1701089-Accept-vp09-codec-string-in-Widevine-man.patch
+
   echo -n "$_google_api_key" >google-api-key
   echo -n "$_mozilla_api_key" >mozilla-api-key