[chromium-freeworld/f29] Fix widevine on chromium
commit dc7fd0a67b0e74143876fefd823d3ed187b22998
Author: Akarshan Biswas <akarshan.biswas(a)gmail.com>
Date: Wed Jan 9 17:32:59 2019 +0000
Fix widevine on chromium
Fixes #RHBZ 1464705
Signed-off-by: Akarshan Biswas <akarshan.biswas(a)gmail.com>
chromium-71.0.3578.98-widevine-r3.patch | 25 ++++++++++++++++++-------
1 file changed, 18 insertions(+), 7 deletions(-)
---
diff --git a/chromium-71.0.3578.98-widevine-r3.patch
b/chromium-71.0.3578.98-widevine-r3.patch
index a8deaf0..8d875c6 100644
--- a/chromium-71.0.3578.98-widevine-r3.patch
+++ b/chromium-71.0.3578.98-widevine-r3.patch
@@ -1,11 +1,22 @@
-diff -up chromium-71.0.3578.98/third_party/widevine/cdm/BUILD.gn.wvhack
chromium-71.0.3578.98/third_party/widevine/cdm/BUILD.gn
-diff -up chromium-71.0.3578.98/third_party/widevine/cdm/widevine_cdm_version.h.wvhack
chromium-71.0.3578.98/third_party/widevine/cdm/widevine_cdm_version.h
----
chromium-71.0.3578.98/third_party/widevine/cdm/widevine_cdm_version.h.wvhack 2018-12-14
11:58:37.918972853 -0500
-+++ chromium-71.0.3578.98/third_party/widevine/cdm/widevine_cdm_version.h 2018-12-14
11:58:57.327554078 -0500
-@@ -11,5 +11,6 @@
- // If the Widevine CDM is available define the following:
+diff -upr chromium-71.0.3578.80.orig/chrome/common/chrome_content_client.cc
chromium-71.0.3578.80/chrome/common/chrome_content_client.cc
+--- chromium-71.0.3578.80.orig/chrome/common/chrome_content_client.cc 2018-12-21
20:16:43.000000000 +0000
++++ chromium-71.0.3578.80/chrome/common/chrome_content_client.cc 2018-12-21
21:34:28.658206942 +0000
+@@ -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 -upr chromium-71.0.3578.80.orig/third_party/widevine/cdm/widevine_cdm_version.h
chromium-71.0.3578.80/third_party/widevine/cdm/widevine_cdm_version.h
+--- chromium-71.0.3578.80.orig/third_party/widevine/cdm/widevine_cdm_version.h 2018-12-21
20:18:01.000000000 +0000
++++ chromium-71.0.3578.80/third_party/widevine/cdm/widevine_cdm_version.h 2018-12-21
21:37:45.635374949 +0000
+@@ -12,4 +12,6 @@
// - 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"
++#define WIDEVINE_CDM_VERSION_STRING "unknown"
++
#endif // WIDEVINE_CDM_VERSION_H_