Date: Friday, July 22, 2016 @ 13:46:38 Author: bpiotrowski Revision: 272117
upgpkg: chromium 52.0.2743.82-1 new upstream release Modified: chromium/trunk/PKGBUILD chromium/trunk/chromium-widevine.patch -------------------------+ PKGBUILD | 6 +++--- chromium-widevine.patch | 43 ------------------------------------------- 2 files changed, 3 insertions(+), 46 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2016-07-22 12:46:11 UTC (rev 272116) +++ PKGBUILD 2016-07-22 13:46:38 UTC (rev 272117) @@ -5,7 +5,7 @@ # Contributor: Daniel J Griffiths <[email protected]> pkgname=chromium -pkgver=51.0.2704.106 +pkgver=52.0.2743.82 pkgrel=1 _launcher_ver=3 pkgdesc="The open-source project behind Google Chrome, an attempt at creating a safer, faster, and more stable browser" @@ -29,10 +29,10 @@ chromium.desktop chromium-widevine.patch PNGImageDecoder.patch) -sha256sums=('fb97a6a3119ec2c8cc4ad9a0bd6c4d306516769039a2633633f7d0c770012cfd' +sha256sums=('a7de6015df9cf685d68efd1e070ae9c706c723cd9395d079a7d43672a2c37eb4' '8b01fb4efe58146279858a754d90b49e5a38c9a0b36a1f84cbb7d12f92b84c28' '028a748a5c275de9b8f776f97909f999a8583a4b77fd1cd600b4fc5c0c3e91e9' - '4660344789c45c9b9e52cb6d86f7cb6edb297b39320d04f6947e5216d6e5f64c' + 'd6fdcb922e5a7fbe15759d39ccc8ea4225821c44d98054ce0f23f9d1f00c9808' 'd9fd982ba6d50edb7743db6122b975ad1d3da5a9ad907c8ab7cf574395b186cd') # Google API keys (see http://www.chromium.org/developers/how-tos/api-keys) Modified: chromium-widevine.patch =================================================================== --- chromium-widevine.patch 2016-07-22 12:46:11 UTC (rev 272116) +++ chromium-widevine.patch 2016-07-22 13:46:38 UTC (rev 272117) @@ -1,46 +1,3 @@ -diff -upr chromium-48.0.2564.82.orig/chrome/common/chrome_content_client.cc chromium-48.0.2564.82/chrome/common/chrome_content_client.cc ---- chromium-48.0.2564.82.orig/chrome/common/chrome_content_client.cc 2016-01-20 22:01:20.000000000 +0200 -+++ chromium-48.0.2564.82/chrome/common/chrome_content_client.cc 2016-01-21 20:02:02.788936626 +0200 -@@ -158,7 +158,12 @@ void ComputeBuiltInPlugins(std::vector<c - #if defined(WIDEVINE_CDM_AVAILABLE) && defined(ENABLE_PEPPER_CDMS) && \ - !defined(WIDEVINE_CDM_IS_COMPONENT) - static bool skip_widevine_cdm_file_check = false; -- if (PathService::Get(chrome::FILE_WIDEVINE_CDM_ADAPTER, &path)) { -+ bool widevine_cdm_present = -+ skip_widevine_cdm_file_check || -+ (PathService::Get(chrome::FILE_WIDEVINE_CDM, &path) && -+ base::PathExists(path)); -+ if (widevine_cdm_present && -+ PathService::Get(chrome::FILE_WIDEVINE_CDM_ADAPTER, &path)) { - if (skip_widevine_cdm_file_check || base::PathExists(path)) { - content::PepperPluginInfo widevine_cdm; - widevine_cdm.is_out_of_process = true; -diff -upr chromium-48.0.2564.82.orig/chrome/common/chrome_paths.cc chromium-48.0.2564.82/chrome/common/chrome_paths.cc ---- chromium-48.0.2564.82.orig/chrome/common/chrome_paths.cc 2016-01-20 22:01:20.000000000 +0200 -+++ chromium-48.0.2564.82/chrome/common/chrome_paths.cc 2016-01-21 19:18:51.287978456 +0200 -@@ -375,6 +375,11 @@ bool PathProvider(int key, base::FilePat - return false; - cur = cur.AppendASCII(kWidevineCdmAdapterFileName); - break; -+ case chrome::FILE_WIDEVINE_CDM: -+ if (!GetInternalPluginsDirectory(&cur)) -+ return false; -+ cur = cur.AppendASCII(kWidevineCdmFileName); -+ break; - #endif // defined(WIDEVINE_CDM_AVAILABLE) && defined(ENABLE_PEPPER_CDMS) - case chrome::FILE_RESOURCES_PACK: - #if defined(OS_MACOSX) && !defined(OS_IOS) -diff -upr chromium-48.0.2564.82.orig/chrome/common/chrome_paths.h chromium-48.0.2564.82/chrome/common/chrome_paths.h ---- chromium-48.0.2564.82.orig/chrome/common/chrome_paths.h 2016-01-14 03:49:22.000000000 +0200 -+++ chromium-48.0.2564.82/chrome/common/chrome_paths.h 2016-01-21 19:18:51.287978456 +0200 -@@ -99,6 +99,7 @@ enum { - DIR_COMPONENT_WIDEVINE_CDM, // Directory that contains component-updated - // Widevine CDM files. - FILE_WIDEVINE_CDM_ADAPTER, // Full path to the Widevine CDM adapter file. -+ FILE_WIDEVINE_CDM, // Full path to the Widevine CDM file. - FILE_RESOURCES_PACK, // Full path to the .pak file containing - // binary data (e.g., html files and images - // used by internal pages). diff -upr chromium-48.0.2564.82.orig/third_party/widevine/cdm/stub/widevine_cdm_version.h chromium-48.0.2564.82/third_party/widevine/cdm/stub/widevine_cdm_version.h --- chromium-48.0.2564.82.orig/third_party/widevine/cdm/stub/widevine_cdm_version.h 2016-01-14 01:05:17.000000000 +0200 +++ chromium-48.0.2564.82/third_party/widevine/cdm/stub/widevine_cdm_version.h 2016-01-21 19:18:51.287978456 +0200
