Gentoo Archives: gentoo-commits

From: Mike Gilbert <floppym@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: www-client/chromium/files/
Date: Sat, 29 Dec 2018 18:50:20
Message-Id: 1546109385.1939ce0754ff4d47b1dd37ae21dd7dbbb5a52f83.floppym@gentoo
1 commit: 1939ce0754ff4d47b1dd37ae21dd7dbbb5a52f83
2 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
3 AuthorDate: Fri Dec 28 17:20:22 2018 +0000
4 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
5 CommitDate: Sat Dec 29 18:49:45 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1939ce07
7
8 www-client/chromium: cleanup widevine patch
9
10 Bug: https://bugs.gentoo.org/670928
11 Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
12
13 www-client/chromium/files/chromium-widevine-r4.patch | 16 +++++++++-------
14 1 file changed, 9 insertions(+), 7 deletions(-)
15
16 diff --git a/www-client/chromium/files/chromium-widevine-r4.patch b/www-client/chromium/files/chromium-widevine-r4.patch
17 index 5f912a675a2..d5a3be8345a 100644
18 --- a/www-client/chromium/files/chromium-widevine-r4.patch
19 +++ b/www-client/chromium/files/chromium-widevine-r4.patch
20 @@ -1,8 +1,11 @@
21 Define WIDEVINE_CDM_VERSION_STRING && re-re-re-patch for latest ninja
22 ---
23 -diff -urpN a/chrome/common/chrome_content_client.cc b/chrome/common/chrome_content_client.cc
24 ---- a/chrome/common/chrome_content_client.cc 2018-12-19 13:48:52.000000000 -0800
25 -+++ b/chrome/common/chrome_content_client.cc 2018-12-25 20:24:51.062139147 -0800
26 +
27 +Stolen from Arch basically.
28 +
29 +gmt
30 +
31 +--- a/chrome/common/chrome_content_client.cc
32 ++++ b/chrome/common/chrome_content_client.cc
33 @@ -99,7 +99,7 @@
34 // Registers Widevine CDM if Widevine is enabled, the Widevine CDM is
35 // bundled and not a component. When the Widevine CDM is a component, it is
36 @@ -12,9 +15,8 @@ diff -urpN a/chrome/common/chrome_content_client.cc b/chrome/common/chrome_conte
37 #define REGISTER_BUNDLED_WIDEVINE_CDM
38 #include "third_party/widevine/cdm/widevine_cdm_common.h" // nogncheck
39 // TODO(crbug.com/663554): Needed for WIDEVINE_CDM_VERSION_STRING. Support
40 -diff -urpN a/third_party/widevine/cdm/widevine_cdm_version.h b/third_party/widevine/cdm/widevine_cdm_version.h
41 ---- a/third_party/widevine/cdm/widevine_cdm_version.h 2018-12-19 13:49:55.000000000 -0800
42 -+++ b/third_party/widevine/cdm/widevine_cdm_version.h 2018-12-25 20:30:09.290141783 -0800
43 +--- a/third_party/widevine/cdm/widevine_cdm_version.h
44 ++++ b/third_party/widevine/cdm/widevine_cdm_version.h
45 @@ -11,5 +11,6 @@
46 // If the Widevine CDM is available define the following:
47 // - WIDEVINE_CDM_VERSION_STRING (with the version of the CDM that's available