← Back to branch summary

~chromium-team/chromium-browser/trusty-dev

« back to all changes in this revision

Viewing changes to debian/patches/fix_building_widevinecdm_with_chromium.patch

  • Committer: Olivier Tilloy
  • Date: 2017-10-31 06:34:18 UTC
  • Revision ID: olivier.tilloy@canonical.com-20171031063418-ucd9vac98o29gvfo
* Upstream dev channel update: 64.0.3251.0
* debian/patches/add-missing-cstddef-include.patch: added
* debian/patches/add-missing-gpu_lists_versions_h.patch: added
* debian/patches/build-with-gcc-mozilla.patch: refreshed
* debian/patches/disable-sse2: refreshed
* debian/patches/fix_building_widevinecdm_with_chromium.patch: updated
* debian/patches/no-new-ninja-flag.patch: refreshed
* debian/patches/revert-Xclang-instcombine-lower-dbg-declare.patch: updated
* debian/patches/set-rpath-on-chromium-executables.patch: refreshed
* debian/patches/suppress-newer-clang-warning-flags.patch: refreshed

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/fix_building_widevinecdm_with_chromium.patch
1
1
--- a/chrome/common/chrome_content_client.cc
2
2
+++ b/chrome/common/chrome_content_client.cc
3
 
@@ -226,9 +226,8 @@ void ComputeBuiltInPlugins(std::vector<c
4
 
     widevine_cdm.path = adapter_path;
5
 
     widevine_cdm.name = kWidevineCdmDisplayName;
6
 
     widevine_cdm.description =
 
3
@@ -238,9 +238,8 @@ void ComputeBuiltInPlugins(std::vector<c
 
4
     info.path = adapter_path;
 
5
     info.name = kWidevineCdmDisplayName;
 
6
     info.description =
7
7
-        base::StringPrintf("%s (version: " WIDEVINE_CDM_VERSION_STRING ")",
8
 
+           (
 
8
+        (
9
9
                            kWidevineCdmDescription);
10
 
-    widevine_cdm.version = WIDEVINE_CDM_VERSION_STRING;
11
 
     content::WebPluginMimeType widevine_cdm_mime_type(
12
 
         kWidevineCdmPluginMimeType, kWidevineCdmPluginExtension,
13
 
         kWidevineCdmPluginMimeTypeDescription);
 
10
-    info.version = WIDEVINE_CDM_VERSION_STRING;
 
11
     info.permissions = kWidevineCdmPluginPermissions;
 
12
 
 
13
     content::WebPluginMimeType mime_type(kWidevineCdmPluginMimeType,
14
14
--- a/third_party/widevine/cdm/widevine_cdm_common.h
15
15
+++ b/third_party/widevine/cdm/widevine_cdm_common.h
16
 
@@ -64,7 +64,7 @@ const char kCdmSupportedCodecVp9[] = "vp
17
 
 const char kCdmSupportedCodecAvc1[] = "avc1";
18
 
 #endif  // BUILDFLAG(USE_PROPRIETARY_CODECS)
 
16
@@ -69,7 +69,7 @@ const char kCdmPersistentLicenseSupporte
 
17
 const char kCdmFeatureSupported[] = "true";
 
18
 const char kCdmFeatureNotSupported[] = "false";
19
19
 
20
20
-#if defined(OS_MACOSX) || defined(OS_WIN)
21
21
+#if defined(OS_MACOSX) || defined(OS_WIN) || 1