From 56079661fa8bebe4ec1d01747da184511022cf24 Mon Sep 17 00:00:00 2001 From: Rasmus Thomsen Date: Tue, 25 Dec 2018 19:01:42 +0100 Subject: [PATCH] chromium: fix widevine integration [ci skip] --- .../patches/chromium-widevine-revision.patch | 23 +++++++++++-------- srcpkgs/chromium/template | 2 +- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/srcpkgs/chromium/patches/chromium-widevine-revision.patch b/srcpkgs/chromium/patches/chromium-widevine-revision.patch index 7525fa1ddbc..c702a9dae5d 100644 --- a/srcpkgs/chromium/patches/chromium-widevine-revision.patch +++ b/srcpkgs/chromium/patches/chromium-widevine-revision.patch @@ -1,14 +1,17 @@ -From 5818fdbef3d399fe1bfbb56f81e59184e1a8e467 Mon Sep 17 00:00:00 2001 -From: Mike Gilbert -Date: Sun, 14 Oct 2018 20:04:03 -0400 -Subject: [PATCH] Define WIDEVINE_CDM_VERSION_STRING +diff -upr chrome/common/chrome_content_client.cc chrome/common/chrome_content_client.cc +--- chrome/common/chrome_content_client.cc 2018-12-21 20:16:43.000000000 +0000 ++++ 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 ---- - third_party/widevine/cdm/widevine_cdm_version.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/third_party/widevine/cdm/widevine_cdm_version.h b/third_party/widevine/cdm/widevine_cdm_version.h -index dd6efed02646..eaa017197e61 100644 +diff -upr a/third_party/widevine/cdm/widevine_cdm_version.h b/third_party/widevine/cdm/widevine_cdm_version.h --- third_party/widevine/cdm/widevine_cdm_version.h +++ third_party/widevine/cdm/widevine_cdm_version.h @@ -11,5 +11,6 @@ diff --git a/srcpkgs/chromium/template b/srcpkgs/chromium/template index 1cd6c613a7d..7194b64dd72 100644 --- a/srcpkgs/chromium/template +++ b/srcpkgs/chromium/template @@ -2,7 +2,7 @@ pkgname=chromium # See http://www.chromium.org/developers/calendar for the latest version version=71.0.3578.98 -revision=1 +revision=2 short_desc="Google's attempt at creating a safer, faster, and more stable browser" maintainer="Rasmus Thomsen " license="BSD-3-Clause"