Merge remote-tracking branch 'freebsd/main' into lf/mainlf/main

1 files changed, 20 insertions, 0 deletions

diff --git a/devel/electron39/files/patch-content_browser_audio_audio__service.cc b/devel/electron39/files/patch-content_browser_audio_audio__service.cc
new file mode 100644
index 000000000000..6dd0bd481e42
--- /dev/null
+++ b/devel/electron39/files/patch-content_browser_audio_audio__service.cc
@@ -0,0 +1,20 @@
+--- content/browser/audio/audio_service.cc.orig	2025-03-24 20:50:14 UTC
++++ content/browser/audio/audio_service.cc
+@@ -33,7 +33,7 @@
+ #if BUILDFLAG(ENABLE_PASSTHROUGH_AUDIO_CODECS)
+ #include "ui/display/util/edid_parser.h"
+ 
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ #include "ui/display/display_util.h"
+ #endif  // BUILDFLAG(IS_LINUX)
+ 
+@@ -201,7 +201,7 @@ audio::mojom::AudioService& GetAudioService() {
+         ->PostTaskAndReplyWithResult(
+             FROM_HERE, base::BindOnce(&ScanEdidBitstreams),
+             base::BindOnce(&LaunchAudioService, std::move(receiver)));
+-#elif BUILDFLAG(ENABLE_PASSTHROUGH_AUDIO_CODECS) && BUILDFLAG(IS_LINUX)
++#elif BUILDFLAG(ENABLE_PASSTHROUGH_AUDIO_CODECS) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD))
+     LaunchAudioService(
+         std::move(receiver),
+         ConvertEdidBitstreams(display::DisplayUtil::GetAudioFormats()));