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,52 +1,52 @@ ---- 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 @@ #if BUILDFLAG(ENABLE_WIDEVINE) #include "third_party/widevine/cdm/widevine_cdm_common.h" // nogncheck -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FREEBSD) #include "base/native_library.h" #include "chrome/common/chrome_paths.h" #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) -#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)) && \ - (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) + (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FREEBSD)) // Create a CdmInfo for a Widevine CDM, using |version|, |cdm_library_path|, and // |capability|. std::unique_ptr CreateWidevineCdmInfo( @@ -101,7 +101,7 @@ std::unique_ptr CreateCdmInfoFromWid // BUILDFLAG(IS_CHROMEOS)) #if BUILDFLAG(BUNDLE_WIDEVINE_CDM) && \ - (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) + (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FREEBSD)) // On Linux/ChromeOS we have to preload the CDM since it uses the zygote // 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)) + (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FREEBSD)) // This code checks to see if a component updated Widevine CDM can be found. If // there is one and it looks valid, return the CdmInfo for that CDM. Otherwise // return nullptr. @@ -160,7 +160,7 @@ void AddSoftwareSecureWidevine(std::vector