From 1939ce0754ff4d47b1dd37ae21dd7dbbb5a52f83 Mon Sep 17 00:00:00 2001 From: Mike Gilbert Date: Fri, 28 Dec 2018 12:20:22 -0500 Subject: [PATCH] www-client/chromium: cleanup widevine patch Bug: https://bugs.gentoo.org/670928 Signed-off-by: Mike Gilbert --- .../chromium/files/chromium-widevine-r4.patch | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/www-client/chromium/files/chromium-widevine-r4.patch b/www-client/chromium/files/chromium-widevine-r4.patch index 5f912a675a22..d5a3be8345a2 100644 --- a/www-client/chromium/files/chromium-widevine-r4.patch +++ b/www-client/chromium/files/chromium-widevine-r4.patch @@ -1,8 +1,11 @@ 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 + +Stolen from Arch basically. + +gmt + +--- a/chrome/common/chrome_content_client.cc ++++ b/chrome/common/chrome_content_client.cc @@ -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 @@ -12,9 +15,8 @@ diff -urpN a/chrome/common/chrome_content_client.cc b/chrome/common/chrome_conte #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 +--- a/third_party/widevine/cdm/widevine_cdm_version.h ++++ b/third_party/widevine/cdm/widevine_cdm_version.h @@ -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 -- 2.26.2