fixed GMP sandbox patch
This commit is contained in:
parent
375e665e34
commit
fc69159c16
@ -1,7 +1,7 @@
|
|||||||
diff --git a/dom/media/gmp/GMPChild.cpp b/dom/media/gmp/GMPChild.cpp
|
diff -up firefox-92.0/dom/media/gmp/GMPChild.cpp.1725828 firefox-92.0/dom/media/gmp/GMPChild.cpp
|
||||||
--- a/dom/media/gmp/GMPChild.cpp
|
--- firefox-92.0/dom/media/gmp/GMPChild.cpp.1725828 2021-09-01 19:14:40.000000000 +0200
|
||||||
+++ b/dom/media/gmp/GMPChild.cpp
|
+++ firefox-92.0/dom/media/gmp/GMPChild.cpp 2021-09-13 17:32:01.606739188 +0200
|
||||||
@@ -232,8 +232,14 @@
|
@@ -232,8 +232,14 @@ mozilla::ipc::IPCResult GMPChild::RecvPr
|
||||||
}
|
}
|
||||||
#elif defined(XP_LINUX)
|
#elif defined(XP_LINUX)
|
||||||
constexpr static const char* whitelist[] = {
|
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;
|
nsTArray<nsCString> libs;
|
||||||
@@ -256,7 +262,7 @@
|
@@ -256,7 +262,7 @@ mozilla::ipc::IPCResult GMPChild::RecvPr
|
||||||
}
|
}
|
||||||
// End bug 1698718 logging.
|
// 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
|
diff -up firefox-92.0/dom/media/gmp/GMPParent.cpp.1725828 firefox-92.0/dom/media/gmp/GMPParent.cpp
|
||||||
--- a/dom/media/gmp/GMPParent.cpp
|
--- firefox-92.0/dom/media/gmp/GMPParent.cpp.1725828 2021-09-13 17:32:01.606739188 +0200
|
||||||
+++ b/dom/media/gmp/GMPParent.cpp
|
+++ firefox-92.0/dom/media/gmp/GMPParent.cpp 2021-09-13 17:55:54.902965506 +0200
|
||||||
@@ -876,6 +876,20 @@
|
@@ -873,8 +873,21 @@ RefPtr<GenericPromise> GMPParent::ParseC
|
||||||
return GenericPromise::CreateAndReject(NS_ERROR_FAILURE, __func__);
|
return GenericPromise::CreateAndReject(NS_ERROR_FAILURE, __func__);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
- GMPCapability video;
|
||||||
+#ifdef XP_LINUX
|
+#ifdef XP_LINUX
|
||||||
+ // These glibc libraries were merged into libc.so.6 as of glibc
|
+ // These glibc libraries were merged into libc.so.6 as of glibc
|
||||||
+ // 2.34; they now exist only as stub libraries for compatibility and
|
+ // 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");
|
+ mLibs.AppendLiteral("libdl.so.2, libpthread.so.0, librt.so.1");
|
||||||
+ }
|
+ }
|
||||||
+#endif
|
+#endif
|
||||||
+
|
|
||||||
|
+ GMPCapability video;
|
||||||
nsCString codecsString = NS_ConvertUTF16toUTF8(m.mX_cdm_codecs);
|
nsCString codecsString = NS_ConvertUTF16toUTF8(m.mX_cdm_codecs);
|
||||||
nsTArray<nsCString> codecs;
|
nsTArray<nsCString> codecs;
|
||||||
SplitAt(",", codecsString, codecs);
|
SplitAt(",", codecsString, codecs);
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user