diff options
| author |   Eric Hameleers <alien@slackware.com> | 2014-12-30 20:16:37 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2014-12-30 20:16:37 +0000 |
| commit | 79970f6181ff92113da835c839839c1b73010048 (patch) | |
| tree | e07650b3ed7765b984fbf599af7d80d74988c5a5 /chromium-dev | |
| parent | 88d7df224b9ee74d8280bcf757e97066b1ac8daa (diff) | |
| download | asb-79970f6181ff92113da835c839839c1b73010048.tar.gz asb-79970f6181ff92113da835c839839c1b73010048.tar.xz | |
With this patch (and the widevine libraries present) I am able to compile 100%
Diffstat (limited to 'chromium-dev')
| -rw-r--r-- | chromium-dev/build/patches/chromium_widevine.patch | 28 |
1 files changed, 24 insertions, 4 deletions
diff --git a/chromium-dev/build/patches/chromium_widevine.patch b/chromium-dev/build/patches/chromium_widevine.patch index ad78a8bf..feaa984c 100644 --- a/chromium-dev/build/patches/chromium_widevine.patch +++ b/chromium-dev/build/patches/chromium_widevine.patch @@ -1,11 +1,22 @@ ---- a/third_party/widevine/cdm/widevine_cdm.gyp 2014-09-05 22:56:05.564694269 +0200 -+++ b/third_party/widevine/cdm/widevine_cdm.gyp 2014-09-07 12:58:18.112607071 +0200 +--- chromium-39.0.2171.95/third_party/widevine/cdm/widevine_cdm_version.h.orig 2014-12-10 05:36:13.000000000 +0100 ++++ chromium-39.0.2171.95/third_party/widevine/cdm/widevine_cdm_version.h 2014-12-28 20:47:39.080795240 +0100 +@@ -14,4 +14,8 @@ + // - WIDEVINE_CDM_VERSION_STRING (with the version of the CDM that's available + // as a string, e.g., "1.0.123.456"). + ++#include "third_party/widevine/cdm/widevine_cdm_common.h" ++#define WIDEVINE_CDM_AVAILABLE ++#define WIDEVINE_CDM_VERSION_STRING "1.4.5.671" ++ + #endif // WIDEVINE_CDM_VERSION_H_ +--- chromium-39.0.2171.95/third_party/widevine/cdm/widevine_cdm.gyp.orig 2014-12-10 05:54:35.000000000 +0100 ++++ chromium-39.0.2171.95/third_party/widevine/cdm/widevine_cdm.gyp 2014-12-28 20:50:48.163269989 +0100 @@ -7,7 +7,7 @@ 'widevine_cdm_version_h_file%': 'widevine_cdm_version.h', 'widevine_cdm_binary_files%': [], 'conditions': [ - [ 'branding == "Chrome"', { -+ [ 'branding == "Chrome" or branding == "Chromium"', { ++ [ 'branding == "Chromium"', { 'conditions': [ [ 'chromeos == 1', { 'widevine_cdm_version_h_file%': @@ -14,7 +25,16 @@ 'type': 'none', 'conditions': [ - [ 'branding == "Chrome" and enable_pepper_cdms==1', { -+ [ '( branding == "Chrome" or branding == "Chromium" ) and enable_pepper_cdms==1', { ++ [ 'branding == "Chromium" and enable_pepper_cdms==1', { 'dependencies': [ '<(DEPTH)/ppapi/ppapi.gyp:ppapi_cpp', '<(DEPTH)/media/media_cdm_adapter.gyp:cdmadapter', +@@ -115,7 +115,7 @@ + 'target_name': 'widevine_test_license_server', + 'type': 'none', + 'conditions': [ +- [ 'branding == "Chrome" and OS == "linux"', { ++ [ 'branding == "Chromium" and OS == "linux"', { + 'dependencies': [ + '<(DEPTH)/third_party/widevine/test/license_server/license_server.gyp:test_license_server', + ], |