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

1 files changed, 0 insertions, 29 deletions

diff --git a/devel/electron35/files/patch-remoting_host_desktop__capturer__wrapper.cc b/devel/electron35/files/patch-remoting_host_desktop__capturer__wrapper.cc
deleted file mode 100644
index 3aef4ac947f7..000000000000
--- a/devel/electron35/files/patch-remoting_host_desktop__capturer__wrapper.cc
+++ /dev/null
@@ -1,29 +0,0 @@
---- remoting/host/desktop_capturer_wrapper.cc.orig	2024-04-15 20:34:03 UTC
-+++ remoting/host/desktop_capturer_wrapper.cc
-@@ -13,7 +13,7 @@
- #include "third_party/webrtc/modules/desktop_capture/desktop_capturer.h"
- #include "third_party/webrtc/modules/desktop_capture/desktop_frame.h"
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "remoting/host/linux/wayland_desktop_capturer.h"
- #include "remoting/host/linux/wayland_utils.h"
- #endif
-@@ -33,7 +33,7 @@ void DesktopCapturerWrapper::CreateCapturer(
-     SourceId id) {
-   DCHECK(!capturer_);
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   if (IsRunningWayland()) {
-     capturer_ = std::make_unique<WaylandDesktopCapturer>(options);
-   } else {
-@@ -112,7 +112,7 @@ bool DesktopCapturerWrapper::SupportsFrameCallbacks() 
- bool DesktopCapturerWrapper::SupportsFrameCallbacks() {
-   DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   return capturer_ && IsRunningWayland();
- #else
-   return false;