Date: Sun, 1 Oct 2023 19:06:43 GMT From: Gleb Popov <arrowd@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: cd01a25f035e - main - www/chromium: Fix patches which became outdated and broke the build. Message-ID: <202310011906.391J6hba056445@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=cd01a25f035e0242b6edd98eae4033d7c961ffd9 commit cd01a25f035e0242b6edd98eae4033d7c961ffd9 Author: Gleb Popov <arrowd@FreeBSD.org> AuthorDate: 2023-10-01 19:05:34 +0000 Commit: Gleb Popov <arrowd@FreeBSD.org> 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202310011906.391J6hba056445>