diff options
author | Jason A. Donenfeld <zx2c4@gentoo.org> | 2018-12-27 22:18:03 +0100 |
---|---|---|
committer | Jason A. Donenfeld <zx2c4@gentoo.org> | 2018-12-28 03:39:54 +0100 |
commit | 666ce8363b1335c0b8472d7e650e12240c52f4ea (patch) | |
tree | 4b134b282319a3240559d14b8afe4741a695b4c8 /www-client/chromium/files | |
parent | media-gfx/displaycal: 3.7.1.3 bump (diff) | |
download | gentoo-666ce8363b1335c0b8472d7e650e12240c52f4ea.tar.gz gentoo-666ce8363b1335c0b8472d7e650e12240c52f4ea.tar.bz2 gentoo-666ce8363b1335c0b8472d7e650e12240c52f4ea.zip |
www-client/chromium: fix widevine and cleanup unused patch
Fixes: 670928
Package-Manager: Portage-2.3.51, Repoman-2.3.12
Signed-off-by: Jason A. Donenfeld <zx2c4@gentoo.org>
Diffstat (limited to 'www-client/chromium/files')
-rw-r--r-- | www-client/chromium/files/chromium-widevine-r2.patch | 39 | ||||
-rw-r--r-- | www-client/chromium/files/chromium-widevine-r4.patch | 24 |
2 files changed, 24 insertions, 39 deletions
diff --git a/www-client/chromium/files/chromium-widevine-r2.patch b/www-client/chromium/files/chromium-widevine-r2.patch deleted file mode 100644 index 5527f7f293c6..000000000000 --- a/www-client/chromium/files/chromium-widevine-r2.patch +++ /dev/null @@ -1,39 +0,0 @@ -Minimal patch to get chromium to compile with widevine support. - -Exactly the same as -r1, but we now need to patch -ninja to pretty please not terminate our build. - -caveat emptor: it's in no way clear that building chromium this -way is safer, from a security perspective, than whatever Google -Chrome does. - -Upstream appears to be cooking up a code-signing trust-chain -which may protect users against malicious cdm blobs; I doubt -we benefit from these using this kludge. Ideally, someone -would look into this more carefully than I have ... tbh as -soon as I got my "stories" back, I pretty much lost interest :) - --gmt - --- ---- a/third_party/widevine/cdm/stub/widevine_cdm_version.h -+++ b/third_party/widevine/cdm/stub/widevine_cdm_version.h -@@ -10,6 +10,7 @@ - - #include "third_party/widevine/cdm/widevine_cdm_common.h" - -+#define WIDEVINE_CDM_VERSION_STRING "unknown" - #define WIDEVINE_CDM_AVAILABLE - - #endif // WIDEVINE_CDM_VERSION_H_ ---- a/third_party/widevine/cdm/BUILD.gn -+++ b/third_party/widevine/cdm/BUILD.gn -@@ -11,7 +11,7 @@ import("//third_party/widevine/cdm/widev - # Internal Cast builds set enable_widevine=true to bring in Widevine support. - # TODO(xhwang): Support component updated CDM on other platforms and remove this - # assert. --assert(!enable_widevine || is_win || is_mac || is_chromecast, -+assert(!enable_widevine || is_win || is_mac || is_chromecast || is_linux, - "Component updated CDM only supported on Windows and Mac for now.") - - widevine_arch = current_cpu diff --git a/www-client/chromium/files/chromium-widevine-r4.patch b/www-client/chromium/files/chromium-widevine-r4.patch new file mode 100644 index 000000000000..5f912a675a22 --- /dev/null +++ b/www-client/chromium/files/chromium-widevine-r4.patch @@ -0,0 +1,24 @@ +Define WIDEVINE_CDM_VERSION_STRING && re-re-re-patch for latest ninja +-- +diff -urpN a/chrome/common/chrome_content_client.cc b/chrome/common/chrome_content_client.cc +--- a/chrome/common/chrome_content_client.cc 2018-12-19 13:48:52.000000000 -0800 ++++ b/chrome/common/chrome_content_client.cc 2018-12-25 20:24:51.062139147 -0800 +@@ -99,7 +99,7 @@ + // Registers Widevine CDM if Widevine is enabled, the Widevine CDM is + // bundled and not a component. When the Widevine CDM is a component, it is + // registered in widevine_cdm_component_installer.cc. +-#if BUILDFLAG(BUNDLE_WIDEVINE_CDM) && !BUILDFLAG(ENABLE_WIDEVINE_CDM_COMPONENT) ++#if BUILDFLAG(ENABLE_WIDEVINE) && !BUILDFLAG(ENABLE_WIDEVINE_CDM_COMPONENT) + #define REGISTER_BUNDLED_WIDEVINE_CDM + #include "third_party/widevine/cdm/widevine_cdm_common.h" // nogncheck + // TODO(crbug.com/663554): Needed for WIDEVINE_CDM_VERSION_STRING. Support +diff -urpN a/third_party/widevine/cdm/widevine_cdm_version.h b/third_party/widevine/cdm/widevine_cdm_version.h +--- a/third_party/widevine/cdm/widevine_cdm_version.h 2018-12-19 13:49:55.000000000 -0800 ++++ b/third_party/widevine/cdm/widevine_cdm_version.h 2018-12-25 20:30:09.290141783 -0800 +@@ -11,5 +11,6 @@ + // If the Widevine CDM is available define the following: + // - WIDEVINE_CDM_VERSION_STRING (with the version of the CDM that's available + // as a string, e.g., "1.0.123.456"). ++#define WIDEVINE_CDM_VERSION_STRING "unknown" + + #endif // WIDEVINE_CDM_VERSION_H_ |