summaryrefslogtreecommitdiff
path: root/mozilla-1725828.patch
diff options
context:
space:
mode:
authorMartin Stransky <stransky@redhat.com>2021-09-13 18:00:51 +0200
committerMartin Stransky <stransky@redhat.com>2021-09-13 18:00:51 +0200
commitfc69159c16b8035abdc07e69134357970f6b516f (patch)
tree5ae7a9d1f1f827f26f217e1aa6fa6c818dfb43bb /mozilla-1725828.patch
parentAdded fix for mozbz#1725828 (diff)
downloadlibrewolf-fedora-ff-fc69159c16b8035abdc07e69134357970f6b516f.tar.gz
librewolf-fedora-ff-fc69159c16b8035abdc07e69134357970f6b516f.tar.bz2
librewolf-fedora-ff-fc69159c16b8035abdc07e69134357970f6b516f.zip
fixed GMP sandbox patch
Diffstat (limited to 'mozilla-1725828.patch')
-rw-r--r--mozilla-1725828.patch23
1 files changed, 12 insertions, 11 deletions
diff --git a/mozilla-1725828.patch b/mozilla-1725828.patch
index eed100a..c891ab6 100644
--- a/mozilla-1725828.patch
+++ b/mozilla-1725828.patch
@@ -1,7 +1,7 @@
-diff --git a/dom/media/gmp/GMPChild.cpp b/dom/media/gmp/GMPChild.cpp
---- a/dom/media/gmp/GMPChild.cpp
-+++ b/dom/media/gmp/GMPChild.cpp
-@@ -232,8 +232,14 @@
+diff -up firefox-92.0/dom/media/gmp/GMPChild.cpp.1725828 firefox-92.0/dom/media/gmp/GMPChild.cpp
+--- firefox-92.0/dom/media/gmp/GMPChild.cpp.1725828 2021-09-01 19:14:40.000000000 +0200
++++ firefox-92.0/dom/media/gmp/GMPChild.cpp 2021-09-13 17:32:01.606739188 +0200
+@@ -232,8 +232,14 @@ mozilla::ipc::IPCResult GMPChild::RecvPr
}
#elif defined(XP_LINUX)
constexpr static const char* whitelist[] = {
@@ -16,7 +16,7 @@ diff --git a/dom/media/gmp/GMPChild.cpp b/dom/media/gmp/GMPChild.cpp
};
nsTArray<nsCString> libs;
-@@ -256,7 +262,7 @@
+@@ -256,7 +262,7 @@ mozilla::ipc::IPCResult GMPChild::RecvPr
}
// End bug 1698718 logging.
@@ -25,13 +25,14 @@ diff --git a/dom/media/gmp/GMPChild.cpp b/dom/media/gmp/GMPChild.cpp
}
}
}
-diff --git a/dom/media/gmp/GMPParent.cpp b/dom/media/gmp/GMPParent.cpp
---- a/dom/media/gmp/GMPParent.cpp
-+++ b/dom/media/gmp/GMPParent.cpp
-@@ -876,6 +876,20 @@
+diff -up firefox-92.0/dom/media/gmp/GMPParent.cpp.1725828 firefox-92.0/dom/media/gmp/GMPParent.cpp
+--- firefox-92.0/dom/media/gmp/GMPParent.cpp.1725828 2021-09-13 17:32:01.606739188 +0200
++++ firefox-92.0/dom/media/gmp/GMPParent.cpp 2021-09-13 17:55:54.902965506 +0200
+@@ -873,8 +873,21 @@ RefPtr<GenericPromise> GMPParent::ParseC
return GenericPromise::CreateAndReject(NS_ERROR_FAILURE, __func__);
}
+- GMPCapability video;
+#ifdef XP_LINUX
+ // These glibc libraries were merged into libc.so.6 as of glibc
+ // 2.34; they now exist only as stub libraries for compatibility and
@@ -45,8 +46,8 @@ diff --git a/dom/media/gmp/GMPParent.cpp b/dom/media/gmp/GMPParent.cpp
+ mLibs.AppendLiteral("libdl.so.2, libpthread.so.0, librt.so.1");
+ }
+#endif
-+
+
++ GMPCapability video;
nsCString codecsString = NS_ConvertUTF16toUTF8(m.mX_cdm_codecs);
nsTArray<nsCString> codecs;
SplitAt(",", codecsString, codecs);
-
bgstack15