From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 250C5138334 for ; Sat, 29 Dec 2018 18:50:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0D6EBE0ACC; Sat, 29 Dec 2018 18:50:19 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D7F18E0ACC for ; Sat, 29 Dec 2018 18:50:18 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 18132335CB7 for ; Sat, 29 Dec 2018 18:50:05 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5188C4CE for ; Sat, 29 Dec 2018 18:50:03 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1546109385.1939ce0754ff4d47b1dd37ae21dd7dbbb5a52f83.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: www-client/chromium/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: www-client/chromium/files/chromium-widevine-r4.patch X-VCS-Directories: www-client/chromium/files/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: 1939ce0754ff4d47b1dd37ae21dd7dbbb5a52f83 X-VCS-Branch: master Date: Sat, 29 Dec 2018 18:50:03 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 6bde3c68-db37-45cb-bbe2-dbc8e603920c X-Archives-Hash: 9f9319273a95f80bf4faf0b1be7ed0d3 commit: 1939ce0754ff4d47b1dd37ae21dd7dbbb5a52f83 Author: Mike Gilbert gentoo org> AuthorDate: Fri Dec 28 17:20:22 2018 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Sat Dec 29 18:49:45 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1939ce07 www-client/chromium: cleanup widevine patch Bug: https://bugs.gentoo.org/670928 Signed-off-by: Mike Gilbert gentoo.org> www-client/chromium/files/chromium-widevine-r4.patch | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/www-client/chromium/files/chromium-widevine-r4.patch b/www-client/chromium/files/chromium-widevine-r4.patch index 5f912a675a2..d5a3be8345a 100644 --- a/www-client/chromium/files/chromium-widevine-r4.patch +++ b/www-client/chromium/files/chromium-widevine-r4.patch @@ -1,8 +1,11 @@ Define WIDEVINE_CDM_VERSION_STRING && re-re-re-patch for latest ninja --- -diff -urpN a/chrome/common/chrome_content_client.cc b/chrome/common/chrome_content_client.cc ---- a/chrome/common/chrome_content_client.cc 2018-12-19 13:48:52.000000000 -0800 -+++ b/chrome/common/chrome_content_client.cc 2018-12-25 20:24:51.062139147 -0800 + +Stolen from Arch basically. + +gmt + +--- a/chrome/common/chrome_content_client.cc ++++ b/chrome/common/chrome_content_client.cc @@ -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 @@ -12,9 +15,8 @@ diff -urpN a/chrome/common/chrome_content_client.cc b/chrome/common/chrome_conte #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 -urpN a/third_party/widevine/cdm/widevine_cdm_version.h b/third_party/widevine/cdm/widevine_cdm_version.h ---- a/third_party/widevine/cdm/widevine_cdm_version.h 2018-12-19 13:49:55.000000000 -0800 -+++ b/third_party/widevine/cdm/widevine_cdm_version.h 2018-12-25 20:30:09.290141783 -0800 +--- a/third_party/widevine/cdm/widevine_cdm_version.h ++++ b/third_party/widevine/cdm/widevine_cdm_version.h @@ -11,5 +11,6 @@ // If the Widevine CDM is available define the following: // - WIDEVINE_CDM_VERSION_STRING (with the version of the CDM that's available