From nobody Sun Oct 01 19:06:43 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RzD8g3dG4z4vhMq; Sun, 1 Oct 2023 19:06:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RzD8g3CJLz4H3L; Sun, 1 Oct 2023 19:06:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696187203; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=l9rZy5mpUJJHrlbxIsPhFm5/qNWAUpKm5zt3MEBNEgw=; b=wlcIGsII+MAwj9tiX5WTWv0cYVK/YTeui9LumYCbY+NrjwyH3KMxS+kRCpZCG8d4IkFgcR r2AUfMvLZR+KywQSI5r83XKKE5nhZClVGePHfgemtSAfnbRuLnkkudNKowiZxOj9QYLqBU I8GwitaDFjUxVimQydgtDo1XAy7PN/1OU91RS4x0kY0jlGR/TmyjdittDIMWQ/8R8DkeYD wrEUKjTswqaWbobxYOxAMc0JPlVaCySwFT3dR3NP/uCMTm0F4ynBDsbXTqgYmQgArmRI4a 5rmMQ+9RLFj9NhWyQnDvCR4kn0r80ZAu6SPf7glNn5VMdrcZXOEtQqjN9mCaLw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696187203; a=rsa-sha256; cv=none; b=KYZdlbIiX5UM/WH5Sgvbw+w1yyH8UAGH+yWn2sKDPftEds18hGSKCx5nCr1XXXZBfrA5pu x67X6/OVmL/cZaKRH4TloFSF+X1eyd/Um+P/yN+KF0VK8pkWB0n3DwTvSSDFebWZkA/p/7 6FUp0wUvf+qxerIQV+dxfYT1v2c21RHMEr5DA6VVQGbmWErVAx9D/lxn3v4KJX5y2K035e hfdYp4NAx+uA+bQLk+RnHu820ta+8I1qimLgGpe1YNNoJSOalk5VXlJaEImnxZ0DIi11QI yrMXR/fdaljYELwZK+MGy7egBOSOZzNoecGs2XOPdOCILnFdrJr3ug+WnPpvgA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696187203; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=l9rZy5mpUJJHrlbxIsPhFm5/qNWAUpKm5zt3MEBNEgw=; b=nvQkttUNhooJeUf5249dS3PYI8XwnHAWix6alOm3woIFc2aEvwDs80AI7c29/2E6kSRZCn e2hdZIlgT8Cd37H0UxN26ueoKrM1AJv2sqD2g/w/0coMREgqJjaBewwlbyVMCLsQVdYwVI Rz8emIOzyr3vbFi3ZNowSiPlCguqdqFJxg0i88IgNHZaOmGoSBLAaIuYr/cRxTJyx1/flT rfWxNO3v72xtqAQro04P4JfupcQL/EcRJR4g31Len3PS5QbdNIs1kNoyjCfuZVuO+NbKtL 1T7OgXX5w88nXKMb31rJTaVA5Zlcv8WQcVilBGY3e2cClJ33CbMK64cGslEF/g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RzD8g29Ftzh5x; Sun, 1 Oct 2023 19:06:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 391J6hsm056448; Sun, 1 Oct 2023 19:06:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 391J6hba056445; Sun, 1 Oct 2023 19:06:43 GMT (envelope-from git) Date: Sun, 1 Oct 2023 19:06:43 GMT Message-Id: <202310011906.391J6hba056445@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Gleb Popov Subject: git: cd01a25f035e - main - www/chromium: Fix patches which became outdated and broke the build. List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: arrowd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cd01a25f035e0242b6edd98eae4033d7c961ffd9 Auto-Submitted: auto-generated The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=cd01a25f035e0242b6edd98eae4033d7c961ffd9 commit cd01a25f035e0242b6edd98eae4033d7c961ffd9 Author: Gleb Popov AuthorDate: 2023-10-01 19:05:34 +0000 Commit: Gleb Popov CommitDate: 2023-10-01 19:06:38 +0000 www/chromium: Fix patches which became outdated and broke the build. Reported by: rnagy Fixes: 04ee4737c5f74da5b7d2e6d0f7f40a06343e1222 --- ..._updater_widevine__cdm__component__installer.cc | 27 ++++++++++++++-------- .../patch-chrome_common_media_cdm__registration.cc | 8 +++---- ...a_component__widevine__cdm__hint__file__linux.h | 8 +++---- 3 files changed, 26 insertions(+), 17 deletions(-) diff --git a/www/chromium/files/patch-chrome_browser_component__updater_widevine__cdm__component__installer.cc b/www/chromium/files/patch-chrome_browser_component__updater_widevine__cdm__component__installer.cc index ff0187e1cc42..e07d40cc63c3 100644 --- a/www/chromium/files/patch-chrome_browser_component__updater_widevine__cdm__component__installer.cc +++ b/www/chromium/files/patch-chrome_browser_component__updater_widevine__cdm__component__installer.cc @@ -1,11 +1,20 @@ ---- chrome/browser/component_updater/widevine_cdm_component_installer.cc.orig 2023-09-04 16:07:23 UTC +--- chrome/browser/component_updater/widevine_cdm_component_installer.cc.orig 2023-09-27 23:09:54 UTC +++ chrome/browser/component_updater/widevine_cdm_component_installer.cc -@@ -72,6 +72,8 @@ const char kWidevineCdmPlatform[] = - "cros"; - #elif BUILDFLAG(IS_LINUX) - "linux"; -+#elif BUILDFLAG(IS_FREEBSD) -+ "linux"; - #else - #error This file should only be included for supported platforms. +@@ -77,7 +77,7 @@ const char ImageLoaderComponentName[] = "WidevineCdm"; + const char ImageLoaderComponentName[] = "WidevineCdm"; #endif + +-#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) ++#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_FREEBSD) + // On Linux and ChromeOS the Widevine CDM is loaded at startup before the + // zygote is locked down. As a result there is no need to register the CDM + // with Chrome as it can't be used until Chrome is restarted. +@@ -363,7 +363,7 @@ void WidevineCdmComponentInstallerPolicy::UpdateCdmPat + return; + } + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_FREEBSD) + VLOG(1) << "Updating hint file with Widevine CDM " << cdm_version; + + // This is running on a thread that allows IO, so simply update the hint file. diff --git a/www/chromium/files/patch-chrome_common_media_cdm__registration.cc b/www/chromium/files/patch-chrome_common_media_cdm__registration.cc index cc4ebfdb5a15..6cd0a0a656a2 100644 --- a/www/chromium/files/patch-chrome_common_media_cdm__registration.cc +++ b/www/chromium/files/patch-chrome_common_media_cdm__registration.cc @@ -1,4 +1,4 @@ ---- chrome/common/media/cdm_registration.cc.orig 2023-09-04 16:08:25 UTC +--- chrome/common/media/cdm_registration.cc.orig 2023-09-27 23:09:59 UTC +++ chrome/common/media/cdm_registration.cc @@ -25,11 +25,11 @@ @@ -12,9 +12,9 @@ -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FREEBSD) #include "base/no_destructor.h" + #include "chrome/common/media/component_widevine_cdm_hint_file_linux.h" #include "components/cdm/common/cdm_manifest.h" - #include "media/cdm/supported_audio_codecs.h" -@@ -58,7 +58,7 @@ using Robustness = content::CdmInfo::Robustness; +@@ -56,7 +56,7 @@ using Robustness = content::CdmInfo::Robustness; #if BUILDFLAG(ENABLE_WIDEVINE) #if (BUILDFLAG(BUNDLE_WIDEVINE_CDM) || \ BUILDFLAG(ENABLE_WIDEVINE_CDM_COMPONENT)) && \ @@ -33,7 +33,7 @@ // sandbox. On Windows and Mac, the bundled CDM is handled by the component // updater. @@ -125,7 +125,7 @@ content::CdmInfo* GetBundledWidevine() { - // BUILDFLAG(IS_CHROMEOS)) + // (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) #if BUILDFLAG(ENABLE_WIDEVINE_CDM_COMPONENT) && \ - (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) diff --git a/www/chromium/files/patch-chrome_common_media_component__widevine__cdm__hint__file__linux.h b/www/chromium/files/patch-chrome_common_media_component__widevine__cdm__hint__file__linux.h index b8d1b2ff2528..5d3c4fb47e75 100644 --- a/www/chromium/files/patch-chrome_common_media_component__widevine__cdm__hint__file__linux.h +++ b/www/chromium/files/patch-chrome_common_media_component__widevine__cdm__hint__file__linux.h @@ -1,11 +1,11 @@ ---- chrome/common/media/component_widevine_cdm_hint_file_linux.h.orig 2023-09-04 16:25:40 UTC +--- chrome/common/media/component_widevine_cdm_hint_file_linux.h.orig 2023-09-27 23:09:59 UTC +++ chrome/common/media/component_widevine_cdm_hint_file_linux.h @@ -15,7 +15,7 @@ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. --#if !(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) -+#if !(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_FREEBSD)) - #error "This file only applies to desktop Linux." +-#if !(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) ++#if !(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FREEBSD)) + #error "This file only applies to desktop Linux and ChromeOS." #endif