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

1 files changed, 24 insertions, 0 deletions

diff --git a/devel/electron39/files/patch-media_base_libaom__thread__wrapper.cc b/devel/electron39/files/patch-media_base_libaom__thread__wrapper.cc
new file mode 100644
index 000000000000..d08a8992857e
--- /dev/null
+++ b/devel/electron39/files/patch-media_base_libaom__thread__wrapper.cc
@@ -0,0 +1,24 @@
+--- media/base/libaom_thread_wrapper.cc.orig	2024-04-15 20:34:00 UTC
++++ media/base/libaom_thread_wrapper.cc
+@@ -5,17 +5,21 @@
+ #include "base/logging.h"
+ #include "media/base/codec_worker_impl.h"
+ #include "media/base/libvpx_thread_wrapper.h"
++#if !BUILDFLAG(IS_BSD)
+ #include "third_party/libaom/source/libaom/aom_util/aom_thread.h"
++#endif
+ 
+ namespace media {
+ 
+ void InitLibAomThreadWrapper() {
++#if !BUILDFLAG(IS_BSD)
+   const AVxWorkerInterface interface =
+       CodecWorkerImpl<AVxWorkerInterface, AVxWorkerImpl, AVxWorker,
+                       AVxWorkerStatus, AVX_WORKER_STATUS_NOT_OK,
+                       AVX_WORKER_STATUS_OK,
+                       AVX_WORKER_STATUS_WORKING>::GetCodecWorkerInterface();
+   CHECK(aom_set_worker_interface(&interface));
++#endif
+ }
+ 
+ }  // namespace media