mirror of
https://github.com/void-linux/void-packages.git
synced 2025-06-14 11:03:49 +02:00
New package: electron13-13.2.2
This commit is contained in:
John
John Zimmermann
parent
af087fbce2
commit
0ccfce32ec
43 changed files with 7107 additions and 0 deletions
|
|
@ -0,0 +1,29 @@
|
||||||
|
--- base/threading/platform_thread_linux.cc.orig
|
||||||
|
+++ base/threading/platform_thread_linux.cc
|
||||||
|
@@ -99 +99,2 @@ size_t GetDefaultThreadStackSize(const p
|
||||||
|
- return 0;
|
||||||
|
+ // use 8mb like glibc to avoid running out of space
|
||||||
|
+ return (1 << 23);
|
||||||
|
--- chrome/app/shutdown_signal_handlers_posix.cc.orig
|
||||||
|
+++ chrome/app/shutdown_signal_handlers_posix.cc
|
||||||
|
@@ -184,11 +184,19 @@
|
||||||
|
g_shutdown_pipe_read_fd = pipefd[0];
|
||||||
|
g_shutdown_pipe_write_fd = pipefd[1];
|
||||||
|
#if !defined(ADDRESS_SANITIZER)
|
||||||
|
+# if defined(__GLIBC__)
|
||||||
|
const size_t kShutdownDetectorThreadStackSize = PTHREAD_STACK_MIN * 2;
|
||||||
|
+# else
|
||||||
|
+ const size_t kShutdownDetectorThreadStackSize = PTHREAD_STACK_MIN * 2 * 8; // match up musls 2k PTHREAD_STACK_MIN with glibcs 16k
|
||||||
|
+# endif
|
||||||
|
#else
|
||||||
|
// ASan instrumentation bloats the stack frames, so we need to increase the
|
||||||
|
// stack size to avoid hitting the guard page.
|
||||||
|
+# if defined(__GLIBC__)
|
||||||
|
const size_t kShutdownDetectorThreadStackSize = PTHREAD_STACK_MIN * 4;
|
||||||
|
+# else
|
||||||
|
+ const size_t kShutdownDetectorThreadStackSize = PTHREAD_STACK_MIN * 4 * 8; // match up musls 2k PTHREAD_STACK_MIN with glibcs 16k
|
||||||
|
+# endif
|
||||||
|
#endif
|
||||||
|
ShutdownDetector* detector = new ShutdownDetector(
|
||||||
|
g_shutdown_pipe_read_fd, shutdown_callback, task_runner);
|
||||||
|
|
||||||
|
|
@ -0,0 +1,23 @@
|
||||||
|
--- third_party/crashpad/crashpad/util/linux/ptracer.cc
|
||||||
|
+++ third_party/crashpad/crashpad/util/linux/ptracer.cc
|
||||||
|
@@ -26,6 +26,7 @@
|
||||||
|
|
||||||
|
#if defined(ARCH_CPU_X86_FAMILY)
|
||||||
|
#include <asm/ldt.h>
|
||||||
|
+#include <asm/ptrace-abi.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
namespace crashpad {
|
||||||
|
|
||||||
|
--- third_party/crashpad/crashpad/compat/linux/sys/ptrace.h
|
||||||
|
+++ third_party/crashpad/crashpad/compat/linux/sys/ptrace.h
|
||||||
|
@@ -17,7 +17,9 @@
|
||||||
|
|
||||||
|
#include_next <sys/ptrace.h>
|
||||||
|
|
||||||
|
+#if defined(__GLIBC__)
|
||||||
|
#include <sys/cdefs.h>
|
||||||
|
+#endif
|
||||||
|
|
||||||
|
// https://sourceware.org/bugzilla/show_bug.cgi?id=22433
|
||||||
|
#if !defined(PTRACE_GET_THREAD_AREA) && !defined(PT_GET_THREAD_AREA) && \
|
||||||
|
|
@ -0,0 +1,32 @@
|
||||||
|
--- net/features.gni 2021-05-20 04:17:11.000000000 +0200
|
||||||
|
+++ - 2021-05-26 16:03:25.826113608 +0200
|
||||||
|
@@ -28,6 +28,9 @@
|
||||||
|
# Reporting not used on iOS.
|
||||||
|
enable_reporting = !is_ios
|
||||||
|
|
||||||
|
+ # Force Posix dns config
|
||||||
|
+ force_posix_dns = true
|
||||||
|
+
|
||||||
|
# Includes the transport security state preload list. This list includes
|
||||||
|
# mechanisms (e.g. HSTS, HPKP) to enforce trusted connections to a significant
|
||||||
|
# set of hardcoded domains. While this list has a several hundred KB of binary
|
||||||
|
--- net/dns/BUILD.gn 2021-05-20 04:17:11.000000000 +0200
|
||||||
|
+++ - 2021-05-26 16:05:01.510622102 +0200
|
||||||
|
@@ -114,7 +114,7 @@
|
||||||
|
"dns_config_service_android.cc",
|
||||||
|
"dns_config_service_android.h",
|
||||||
|
]
|
||||||
|
- } else if (is_linux) {
|
||||||
|
+ } else if (is_linux && !force_posix_dns) {
|
||||||
|
sources += [
|
||||||
|
"dns_config_service_linux.cc",
|
||||||
|
"dns_config_service_linux.h",
|
||||||
|
@@ -433,7 +433,7 @@
|
||||||
|
|
||||||
|
if (is_android) {
|
||||||
|
sources += [ "dns_config_service_android_unittest.cc" ]
|
||||||
|
- } else if (is_linux) {
|
||||||
|
+ } else if (is_linux && !force_posix_dns) {
|
||||||
|
sources += [ "dns_config_service_linux_unittest.cc" ]
|
||||||
|
} else if (is_posix) {
|
||||||
|
sources += [ "dns_config_service_posix_unittest.cc" ]
|
||||||
212
srcpkgs/electron13/files/musl-patches/chromium-musl-fixes.patch
Normal file
212
srcpkgs/electron13/files/musl-patches/chromium-musl-fixes.patch
Normal file
|
|
@ -0,0 +1,212 @@
|
||||||
|
--- ./third_party/lss/linux_syscall_support.h.orig
|
||||||
|
+++ ./third_party/lss/linux_syscall_support.h
|
||||||
|
@@ -1127,6 +1127,12 @@
|
||||||
|
#ifndef __NR_fallocate
|
||||||
|
#define __NR_fallocate 285
|
||||||
|
#endif
|
||||||
|
+
|
||||||
|
+#undef __NR_pread
|
||||||
|
+#define __NR_pread __NR_pread64
|
||||||
|
+#undef __NR_pwrite
|
||||||
|
+#define __NR_pwrite __NR_pwrite64
|
||||||
|
+
|
||||||
|
/* End of x86-64 definitions */
|
||||||
|
#elif defined(__mips__)
|
||||||
|
#if _MIPS_SIM == _MIPS_SIM_ABI32
|
||||||
|
--- ./third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h.orig
|
||||||
|
+++ ./third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
|
||||||
|
@@ -37,6 +37,10 @@
|
||||||
|
#include "common/memory.h"
|
||||||
|
#include "google_breakpad/common/minidump_format.h"
|
||||||
|
|
||||||
|
+#if !defined(__GLIBC__)
|
||||||
|
+ #define _libc_fpstate _fpstate
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
namespace google_breakpad {
|
||||||
|
|
||||||
|
// Wraps platform-dependent implementations of accessors to ucontext_t structs.
|
||||||
|
--- ./third_party/breakpad/breakpad/src/common/linux/elf_core_dump.h.orig
|
||||||
|
+++ ./third_party/breakpad/breakpad/src/common/linux/elf_core_dump.h
|
||||||
|
@@ -36,6 +36,7 @@
|
||||||
|
#include <elf.h>
|
||||||
|
#include <link.h>
|
||||||
|
#include <stddef.h>
|
||||||
|
+#include <limits.h>
|
||||||
|
|
||||||
|
#include "common/memory_range.h"
|
||||||
|
|
||||||
|
--- ./sandbox/linux/suid/process_util.h.orig
|
||||||
|
+++ ./sandbox/linux/suid/process_util.h
|
||||||
|
@@ -11,6 +11,14 @@
|
||||||
|
#include <stdbool.h>
|
||||||
|
#include <sys/types.h>
|
||||||
|
|
||||||
|
+// Some additional functions
|
||||||
|
+# define TEMP_FAILURE_RETRY(expression) \
|
||||||
|
+ (__extension__ \
|
||||||
|
+ ({ long int __result; \
|
||||||
|
+ do __result = (long int) (expression); \
|
||||||
|
+ while (__result == -1L && errno == EINTR); \
|
||||||
|
+ __result; }))
|
||||||
|
+
|
||||||
|
// This adjusts /proc/process/oom_score_adj so the Linux OOM killer
|
||||||
|
// will prefer certain process types over others. The range for the
|
||||||
|
// adjustment is [-1000, 1000], with [0, 1000] being user accessible.
|
||||||
|
--- ./sandbox/linux/seccomp-bpf/trap.cc.orig 2020-04-12 08:26:40.184159217 -0400
|
||||||
|
+++ ./sandbox/linux/seccomp-bpf/trap.cc 2020-04-12 08:46:16.737191222 -0400
|
||||||
|
@@ -174,7 +174,7 @@
|
||||||
|
// If the version of glibc doesn't include this information in
|
||||||
|
// siginfo_t (older than 2.17), we need to explicitly copy it
|
||||||
|
// into an arch_sigsys structure.
|
||||||
|
- memcpy(&sigsys, &info->_sifields, sizeof(sigsys));
|
||||||
|
+ memcpy(&sigsys, &info->__sifields, sizeof(sigsys));
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if defined(__mips__)
|
||||||
|
--- ./third_party/ffmpeg/libavutil/cpu.c.orig
|
||||||
|
+++ ./third_party/ffmpeg/libavutil/cpu.c
|
||||||
|
@@ -38,7 +38,6 @@
|
||||||
|
#include <sys/param.h>
|
||||||
|
#endif
|
||||||
|
#include <sys/types.h>
|
||||||
|
-#include <sys/sysctl.h>
|
||||||
|
#endif
|
||||||
|
#if HAVE_UNISTD_H
|
||||||
|
#include <unistd.h>
|
||||||
|
diff --git a/chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc b/chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc
|
||||||
|
--- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig 2021-03-10 07:23:00.145810088 -0500
|
||||||
|
+++ chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc 2021-03-10 10:57:19.405962671 -0500
|
||||||
|
@@ -55,7 +55,9 @@
|
||||||
|
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
|
||||||
|
// of lacros-chrome is complete.
|
||||||
|
#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
|
||||||
|
+#if defined(__GLIBC__)
|
||||||
|
#include <gnu/libc-version.h>
|
||||||
|
+#endif
|
||||||
|
|
||||||
|
#include "base/linux_util.h"
|
||||||
|
#include "base/strings/string_split.h"
|
||||||
|
@@ -316,7 +318,7 @@
|
||||||
|
void RecordLinuxGlibcVersion() {
|
||||||
|
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
|
||||||
|
// of lacros-chrome is complete.
|
||||||
|
-#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
|
||||||
|
+#if defined(__GLIBC__) || BUILDFLAG(IS_CHROMEOS_LACROS)
|
||||||
|
base::Version version(gnu_get_libc_version());
|
||||||
|
|
||||||
|
UMALinuxGlibcVersion glibc_version_result = UMA_LINUX_GLIBC_NOT_PARSEABLE;
|
||||||
|
--- services/device/serial/serial_io_handler_posix.cc.orig 2019-07-03 10:57:32.568171835 -0400
|
||||||
|
+++ services/device/serial/serial_io_handler_posix.cc 2019-07-03 10:57:16.867983031 -0400
|
||||||
|
@@ -6,6 +6,7 @@
|
||||||
|
|
||||||
|
#include <sys/ioctl.h>
|
||||||
|
#include <termios.h>
|
||||||
|
+#include <asm-generic/ioctls.h>
|
||||||
|
|
||||||
|
#include <algorithm>
|
||||||
|
#include <utility>
|
||||||
|
diff --git a/third_party/ots/include/opentype-sanitiser.h b/third_party/ots/include/opentype-sanitiser.h
|
||||||
|
--- third_party/ots/src/include/opentype-sanitiser.h
|
||||||
|
+++ third_party/ots/src/include/opentype-sanitiser.h
|
||||||
|
@@ -20,6 +20,7 @@ typedef unsigned __int64 uint64_t;
|
||||||
|
#define htonl(x) _byteswap_ulong (x)
|
||||||
|
#define htons(x) _byteswap_ushort (x)
|
||||||
|
#else
|
||||||
|
+#include <sys/types.h>
|
||||||
|
#include <arpa/inet.h>
|
||||||
|
#include <stdint.h>
|
||||||
|
#endif
|
||||||
|
--- ./base/logging.cc.orig 2021-01-20 12:09:54.227038757 -0500
|
||||||
|
+++ ./base/logging.cc 2021-01-20 12:24:32.600301351 -0500
|
||||||
|
@@ -557,8 +557,7 @@
|
||||||
|
|
||||||
|
LogMessage::~LogMessage() {
|
||||||
|
size_t stack_start = stream_.tellp();
|
||||||
|
-#if !defined(OFFICIAL_BUILD) && !defined(OS_NACL) && !defined(__UCLIBC__) && \
|
||||||
|
- !defined(OS_AIX)
|
||||||
|
+#if !defined(OFFICIAL_BUILD) && !defined(OS_NACL) && defined(__GLIBC__)
|
||||||
|
if (severity_ == LOGGING_FATAL && !base::debug::BeingDebugged()) {
|
||||||
|
// Include a stack trace on a fatal, unless a debugger is attached.
|
||||||
|
base::debug::StackTrace stack_trace;
|
||||||
|
--- ./third_party/blink/renderer/platform/wtf/stack_util.cc.orig
|
||||||
|
+++ ./third_party/blink/renderer/platform/wtf/stack_util.cc
|
||||||
|
@@ -28,7 +28,7 @@
|
||||||
|
// FIXME: On Mac OSX and Linux, this method cannot estimate stack size
|
||||||
|
// correctly for the main thread.
|
||||||
|
|
||||||
|
-#elif defined(__GLIBC__) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \
|
||||||
|
+#elif defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \
|
||||||
|
defined(OS_FUCHSIA)
|
||||||
|
// pthread_getattr_np() can fail if the thread is not invoked by
|
||||||
|
// pthread_create() (e.g., the main thread of blink_unittests).
|
||||||
|
@@ -96,7 +96,7 @@
|
||||||
|
}
|
||||||
|
|
||||||
|
void* GetStackStart() {
|
||||||
|
-#if defined(__GLIBC__) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \
|
||||||
|
+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \
|
||||||
|
defined(OS_FUCHSIA)
|
||||||
|
pthread_attr_t attr;
|
||||||
|
int error;
|
||||||
|
--- ./net/dns/dns_config_service_posix.cc.orig
|
||||||
|
+++ ./net/dns/dns_config_service_posix.cc
|
||||||
|
@@ -122,7 +122,7 @@
|
||||||
|
ConfigParsePosixResult result;
|
||||||
|
config->unhandled_options = false;
|
||||||
|
// TODO(fuchsia): Use res_ninit() when it's implemented on Fuchsia.
|
||||||
|
-#if defined(OS_OPENBSD) || defined(OS_FUCHSIA)
|
||||||
|
+#if defined(OS_OPENBSD) || defined(OS_FUCHSIA) || defined(_GNU_SOURCE)
|
||||||
|
// Note: res_ninit in glibc always returns 0 and sets RES_INIT.
|
||||||
|
// res_init behaves the same way.
|
||||||
|
memset(&_res, 0, sizeof(_res));
|
||||||
|
--- third_party/swiftshader/third_party/llvm-subzero/lib/Support/Unix/Signals.inc.orig 2019-06-18 11:51:17.000000000 -0400
|
||||||
|
+++ third_party/swiftshader/third_party/llvm-subzero/lib/Support/Unix/Signals.inc 2019-07-03 12:32:50.938758186 -0400
|
||||||
|
@@ -25,7 +25,7 @@
|
||||||
|
#include "llvm/Support/raw_ostream.h"
|
||||||
|
#include <algorithm>
|
||||||
|
#include <string>
|
||||||
|
-#if HAVE_EXECINFO_H
|
||||||
|
+#if HAVE_EXECINFO_H && defined(__GLIBC__)
|
||||||
|
# include <execinfo.h> // For backtrace().
|
||||||
|
#endif
|
||||||
|
#if HAVE_SIGNAL_H
|
||||||
|
@@ -52,6 +52,7 @@
|
||||||
|
#include <unwind.h>
|
||||||
|
#else
|
||||||
|
#undef HAVE__UNWIND_BACKTRACE
|
||||||
|
+#undef HAVE_BACKTRACE
|
||||||
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
|
--- third_party/nasm/nasmlib/realpath.c.orig 2019-07-03 12:23:05.021949895 -0400
|
||||||
|
+++ third_party/nasm/nasmlib/realpath.c 2019-07-03 12:24:24.246862665 -0400
|
||||||
|
@@ -49,7 +49,7 @@
|
||||||
|
|
||||||
|
#include "nasmlib.h"
|
||||||
|
|
||||||
|
-#ifdef HAVE_CANONICALIZE_FILE_NAME
|
||||||
|
+#if defined(__GLIBC__)
|
||||||
|
|
||||||
|
/*
|
||||||
|
* GNU-specific, but avoids the realpath(..., NULL)
|
||||||
|
--- third_party/perfetto/include/perfetto/ext/base/thread_utils.h
|
||||||
|
+++ third_party/perfetto/include/perfetto/ext/base/thread_utils.h
|
||||||
|
@@ -29,7 +29,7 @@
|
||||||
|
#include <algorithm>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
-#if PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID)
|
||||||
|
+#if 1
|
||||||
|
#include <sys/prctl.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
@@ -58,7 +58,7 @@ inline bool MaybeSetThreadName(const std::string& name) {
|
||||||
|
|
||||||
|
inline bool GetThreadName(std::string& out_result) {
|
||||||
|
char buf[16] = {};
|
||||||
|
-#if PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID)
|
||||||
|
+#if 1
|
||||||
|
if (prctl(PR_GET_NAME, buf) != 0)
|
||||||
|
return false;
|
||||||
|
#else
|
||||||
|
|
@ -0,0 +1,34 @@
|
||||||
|
--- base/debug/stack_trace.cc.orig 2018-12-08 14:11:25.303475116 +0100
|
||||||
|
+++ base/debug/stack_trace.cc 2018-12-08 18:00:43.874946999 +0100
|
||||||
|
@@ -229,7 +229,7 @@
|
||||||
|
}
|
||||||
|
std::string StackTrace::ToStringWithPrefix(const char* prefix_string) const {
|
||||||
|
std::stringstream stream;
|
||||||
|
-#if !defined(__UCLIBC__) && !defined(_AIX)
|
||||||
|
+#if defined(__GLIBC__) && !defined(_AIX)
|
||||||
|
OutputToStreamWithPrefix(&stream, prefix_string);
|
||||||
|
#endif
|
||||||
|
return stream.str();
|
||||||
|
--- net/socket/udp_socket_posix.cc.orig 2019-07-03 13:13:46.034342649 -0400
|
||||||
|
+++ net/socket/udp_socket_posix.cc 2019-07-03 13:23:53.117081909 -0400
|
||||||
|
@@ -1194,7 +1194,7 @@
|
||||||
|
msg_iov->push_back({const_cast<char*>(buffer->data()), buffer->length()});
|
||||||
|
msgvec->reserve(buffers.size());
|
||||||
|
for (size_t j = 0; j < buffers.size(); j++)
|
||||||
|
- msgvec->push_back({{nullptr, 0, &msg_iov[j], 1, nullptr, 0, 0}, 0});
|
||||||
|
+ msgvec->push_back({{nullptr, 0, &msg_iov[j], 1, 0, 0, 0}, 0});
|
||||||
|
int result = HANDLE_EINTR(Sendmmsg(fd, &msgvec[0], buffers.size(), 0));
|
||||||
|
SendResult send_result(0, 0, std::move(buffers));
|
||||||
|
if (result < 0) {
|
||||||
|
--- base/debug/stack_trace.cc 2021-05-25 00:05:31.000000000 +0200
|
||||||
|
+++ - 2021-05-27 13:46:43.740380140 +0200
|
||||||
|
@@ -217,7 +217,9 @@
|
||||||
|
}
|
||||||
|
|
||||||
|
void StackTrace::OutputToStream(std::ostream* os) const {
|
||||||
|
+#if defined(__GLIBC__)
|
||||||
|
OutputToStreamWithPrefix(os, nullptr);
|
||||||
|
+#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
std::string StackTrace::ToString() const {
|
||||||
|
|
@ -0,0 +1,55 @@
|
||||||
|
diff --git a/buildtools/third_party/libc++/trunk/include/locale b/buildtools/third_party/libc++/trunk/include/locale
|
||||||
|
index d29a2dc..53998bc 100644
|
||||||
|
--- buildtools/third_party/libc++/trunk/include/locale
|
||||||
|
+++ buildtools/third_party/libc++/trunk/include/locale
|
||||||
|
@@ -11,6 +11,15 @@
|
||||||
|
#ifndef _LIBCPP_LOCALE
|
||||||
|
#define _LIBCPP_LOCALE
|
||||||
|
|
||||||
|
+// musl doesn't define _l (with locale) variants of functions, as it only supports UTF-8.
|
||||||
|
+// we can simply make macros that will call the non-localated ones if we're using musl, or rather not-using something that has the _l ones.
|
||||||
|
+// couldn't find anything glibc #defines when it creates strtoull_l (that it doesn't undefine a few lines later), so let's test against glibc and glibc-likes.
|
||||||
|
+// almost all glibc-likes define __GNU_LIBRARY__ for compatibility
|
||||||
|
+#ifndef __GNU_LIBRARY__
|
||||||
|
+#define strtoull_l(A, B, C, LOC) strtoull(A,B,C)
|
||||||
|
+#define strtoll_l(A, B, C, LOC) strtoll(A,B,C)
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
/*
|
||||||
|
locale synopsis
|
||||||
|
|
||||||
|
diff --git a/buildtools/third_party/libc++/trunk/src/locale.cpp b/buildtools/third_party/libc++/trunk/src/locale.cpp
|
||||||
|
index 4163c2c..3d1902a 100644
|
||||||
|
--- a/buildtools/third_party/libc++/trunk/src/locale.cpp
|
||||||
|
+++ buildtools/third_party/libc++/trunk/src/locale.cpp
|
||||||
|
@@ -1028,11 +1028,11 @@ ctype<char>::do_narrow(const char_type* low, const char_type* high, char dfault,
|
||||||
|
return low;
|
||||||
|
}
|
||||||
|
|
||||||
|
-#if defined(__EMSCRIPTEN__)
|
||||||
|
+//#if defined(__EMSCRIPTEN__)
|
||||||
|
extern "C" const unsigned short ** __ctype_b_loc();
|
||||||
|
extern "C" const int ** __ctype_tolower_loc();
|
||||||
|
extern "C" const int ** __ctype_toupper_loc();
|
||||||
|
-#endif
|
||||||
|
+//#endif
|
||||||
|
|
||||||
|
#ifdef _LIBCPP_PROVIDES_DEFAULT_RUNE_TABLE
|
||||||
|
const ctype<char>::mask*
|
||||||
|
@@ -1136,12 +1136,10 @@ ctype<char>::classic_table() _NOEXCEPT
|
||||||
|
#elif defined(_AIX)
|
||||||
|
return (const unsigned int *)__lc_ctype_ptr->obj->mask;
|
||||||
|
#else
|
||||||
|
- // Platform not supported: abort so the person doing the port knows what to
|
||||||
|
- // fix
|
||||||
|
-# warning ctype<char>::classic_table() is not implemented
|
||||||
|
- printf("ctype<char>::classic_table() is not implemented\n");
|
||||||
|
- abort();
|
||||||
|
- return NULL;
|
||||||
|
+// not sure any other libc like this exists, but there is no way to differentiate musl as of right now
|
||||||
|
+// to be fair, with the change above, this should always work
|
||||||
|
+// also, #warning is a gcc extension
|
||||||
|
+ return (const unsigned long *)*__ctype_b_loc();
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
@ -0,0 +1,92 @@
|
||||||
|
--- ./sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc.orig 2019-07-03 11:53:21.213479736 -0400
|
||||||
|
+++ ./sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc 2019-07-03 11:57:01.304998253 -0400
|
||||||
|
@@ -140,31 +140,14 @@
|
||||||
|
ResultExpr RestrictCloneToThreadsAndEPERMFork() {
|
||||||
|
const Arg<unsigned long> flags(0);
|
||||||
|
|
||||||
|
- // TODO(mdempsky): Extend DSL to support (flags & ~mask1) == mask2.
|
||||||
|
- const uint64_t kAndroidCloneMask = CLONE_VM | CLONE_FS | CLONE_FILES |
|
||||||
|
- CLONE_SIGHAND | CLONE_THREAD |
|
||||||
|
- CLONE_SYSVSEM;
|
||||||
|
- const uint64_t kObsoleteAndroidCloneMask = kAndroidCloneMask | CLONE_DETACHED;
|
||||||
|
+ const int required = CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND |
|
||||||
|
+ CLONE_THREAD | CLONE_SYSVSEM;
|
||||||
|
+ const int safe = CLONE_SETTLS | CLONE_PARENT_SETTID | CLONE_CHILD_CLEARTID |
|
||||||
|
+ CLONE_DETACHED;
|
||||||
|
+ const BoolExpr thread_clone_ok = (flags&~safe)==required;
|
||||||
|
|
||||||
|
- const uint64_t kGlibcPthreadFlags =
|
||||||
|
- CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND | CLONE_THREAD |
|
||||||
|
- CLONE_SYSVSEM | CLONE_SETTLS | CLONE_PARENT_SETTID | CLONE_CHILD_CLEARTID;
|
||||||
|
- const BoolExpr glibc_test = flags == kGlibcPthreadFlags;
|
||||||
|
-
|
||||||
|
- const BoolExpr android_test =
|
||||||
|
- AnyOf(flags == kAndroidCloneMask, flags == kObsoleteAndroidCloneMask,
|
||||||
|
- flags == kGlibcPthreadFlags);
|
||||||
|
-
|
||||||
|
- // The following two flags are the two important flags in any vfork-emulating
|
||||||
|
- // clone call. EPERM any clone call that contains both of them.
|
||||||
|
- const uint64_t kImportantCloneVforkFlags = CLONE_VFORK | CLONE_VM;
|
||||||
|
-
|
||||||
|
- const BoolExpr is_fork_or_clone_vfork =
|
||||||
|
- AnyOf((flags & (CLONE_VM | CLONE_THREAD)) == 0,
|
||||||
|
- (flags & kImportantCloneVforkFlags) == kImportantCloneVforkFlags);
|
||||||
|
-
|
||||||
|
- return If(IsAndroid() ? android_test : glibc_test, Allow())
|
||||||
|
- .ElseIf(is_fork_or_clone_vfork, Error(EPERM))
|
||||||
|
+ return If(thread_clone_ok, Allow())
|
||||||
|
+ .ElseIf((flags & (CLONE_VM | CLONE_THREAD)) == 0, Error(EPERM))
|
||||||
|
.Else(CrashSIGSYSClone());
|
||||||
|
}
|
||||||
|
|
||||||
|
--- ./sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc.orig
|
||||||
|
+++ ./sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
|
||||||
|
@@ -494,6 +494,7 @@
|
||||||
|
case __NR_mlock:
|
||||||
|
case __NR_munlock:
|
||||||
|
case __NR_munmap:
|
||||||
|
+ case __NR_mremap:
|
||||||
|
return true;
|
||||||
|
case __NR_madvise:
|
||||||
|
case __NR_mincore:
|
||||||
|
@@ -509,7 +510,6 @@
|
||||||
|
case __NR_modify_ldt:
|
||||||
|
#endif
|
||||||
|
case __NR_mprotect:
|
||||||
|
- case __NR_mremap:
|
||||||
|
case __NR_msync:
|
||||||
|
case __NR_munlockall:
|
||||||
|
case __NR_readahead:
|
||||||
|
diff --git a/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc b/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
|
||||||
|
index 80f02c0..21fbe21 100644
|
||||||
|
--- sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
|
||||||
|
+++ sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
|
||||||
|
@@ -373,6 +373,7 @@ bool SyscallSets::IsAllowedProcessStartOrDeath(int sysno) {
|
||||||
|
#if defined(__i386__)
|
||||||
|
case __NR_waitpid:
|
||||||
|
#endif
|
||||||
|
+ case __NR_set_tid_address:
|
||||||
|
return true;
|
||||||
|
case __NR_clone: // Should be parameter-restricted.
|
||||||
|
case __NR_setns: // Privileged.
|
||||||
|
@@ -385,7 +386,6 @@ bool SyscallSets::IsAllowedProcessStartOrDeath(int sysno) {
|
||||||
|
#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
|
||||||
|
case __NR_set_thread_area:
|
||||||
|
#endif
|
||||||
|
- case __NR_set_tid_address:
|
||||||
|
case __NR_unshare:
|
||||||
|
#if !defined(__mips__) && !defined(__aarch64__)
|
||||||
|
case __NR_vfork:
|
||||||
|
--- sandbox/policy/linux/bpf_renderer_policy_linux.cc
|
||||||
|
+++ sandbox/policy/linux/bpf_renderer_policy_linux.cc
|
||||||
|
@@ -100,9 +100,9 @@
|
||||||
|
case __NR_uname:
|
||||||
|
case __NR_sched_getparam:
|
||||||
|
case __NR_sched_getscheduler:
|
||||||
|
+ case __NR_sched_setscheduler:
|
||||||
|
return Allow();
|
||||||
|
case __NR_sched_getaffinity:
|
||||||
|
- case __NR_sched_setscheduler:
|
||||||
|
return RestrictSchedTarget(GetPolicyPid(), sysno);
|
||||||
|
case __NR_prlimit64:
|
||||||
|
// See crbug.com/662450 and setrlimit comment above.
|
||||||
|
|
@ -0,0 +1,30 @@
|
||||||
|
--- third_party/libsync/src/include/sync/sync.h.orig 2020-02-21 07:43:33.748325175 -0500
|
||||||
|
+++ third_party/libsync/src/include/sync/sync.h 2020-02-21 07:44:07.288328784 -0500
|
||||||
|
@@ -19,12 +19,16 @@
|
||||||
|
#ifndef __SYS_CORE_SYNC_H
|
||||||
|
#define __SYS_CORE_SYNC_H
|
||||||
|
|
||||||
|
+#if defined(__GLIBC__)
|
||||||
|
#include <sys/cdefs.h>
|
||||||
|
+#endif
|
||||||
|
#include <stdint.h>
|
||||||
|
|
||||||
|
#include <linux/types.h>
|
||||||
|
|
||||||
|
-__BEGIN_DECLS
|
||||||
|
+#ifdef __cplusplus
|
||||||
|
+extern "C" {
|
||||||
|
+#endif
|
||||||
|
|
||||||
|
struct sync_legacy_merge_data {
|
||||||
|
int32_t fd2;
|
||||||
|
@@ -158,6 +162,8 @@
|
||||||
|
struct sync_pt_info *itr);
|
||||||
|
void sync_fence_info_free(struct sync_fence_info_data *info);
|
||||||
|
|
||||||
|
-__END_DECLS
|
||||||
|
+#ifdef __cplusplus
|
||||||
|
+}
|
||||||
|
+#endif
|
||||||
|
|
||||||
|
#endif /* __SYS_CORE_SYNC_H */
|
||||||
|
|
@ -0,0 +1,190 @@
|
||||||
|
diff --git sandbox/linux/bpf_dsl/seccomp_macros.h sandbox/linux/bpf_dsl/seccomp_macros.h
|
||||||
|
index a6aec544e..2a4a7f1bc 100644
|
||||||
|
--- sandbox/linux/bpf_dsl/seccomp_macros.h
|
||||||
|
+++ sandbox/linux/bpf_dsl/seccomp_macros.h
|
||||||
|
@@ -16,7 +16,7 @@
|
||||||
|
#if defined(__mips__)
|
||||||
|
// sys/user.h in eglibc misses size_t definition
|
||||||
|
#include <stddef.h>
|
||||||
|
-#elif defined(__powerpc64__)
|
||||||
|
+#elif defined(__powerpc64__) && defined(__GLIBC__)
|
||||||
|
// Manually define greg_t on ppc64
|
||||||
|
typedef unsigned long long greg_t;
|
||||||
|
#endif
|
||||||
|
@@ -361,11 +361,11 @@ typedef struct pt_regs regs_struct;
|
||||||
|
#define SECCOMP_ARCH AUDIT_ARCH_PPC64
|
||||||
|
#endif
|
||||||
|
|
||||||
|
-#define SECCOMP_REG(_ctx, _reg) ((_ctx)->uc_mcontext.regs->gpr[_reg])
|
||||||
|
+#define SECCOMP_REG(_ctx, _reg) (((struct pt_regs *)(_ctx)->uc_mcontext.regs)->gpr[_reg])
|
||||||
|
|
||||||
|
#define SECCOMP_RESULT(_ctx) SECCOMP_REG(_ctx, 3)
|
||||||
|
#define SECCOMP_SYSCALL(_ctx) SECCOMP_REG(_ctx, 0)
|
||||||
|
-#define SECCOMP_IP(_ctx) (_ctx)->uc_mcontext.regs->nip
|
||||||
|
+#define SECCOMP_IP(_ctx) ((struct pt_regs *)(_ctx)->uc_mcontext.regs)->nip
|
||||||
|
#define SECCOMP_PARM1(_ctx) SECCOMP_REG(_ctx, 3)
|
||||||
|
#define SECCOMP_PARM2(_ctx) SECCOMP_REG(_ctx, 4)
|
||||||
|
#define SECCOMP_PARM3(_ctx) SECCOMP_REG(_ctx, 5)
|
||||||
|
diff --git sandbox/linux/seccomp-bpf/syscall.cc sandbox/linux/seccomp-bpf/syscall.cc
|
||||||
|
index d53a7ff56..c290f0e92 100644
|
||||||
|
--- sandbox/linux/seccomp-bpf/syscall.cc
|
||||||
|
+++ sandbox/linux/seccomp-bpf/syscall.cc
|
||||||
|
@@ -499,9 +499,9 @@ void Syscall::PutValueInUcontext(intptr_t ret_val, ucontext_t* ctx) {
|
||||||
|
// Same as MIPS, need to invert ret and set error register (cr0.SO)
|
||||||
|
if (ret_val <= -1 && ret_val >= -4095) {
|
||||||
|
ret_val = -ret_val;
|
||||||
|
- ctx->uc_mcontext.regs->ccr |= (1 << 28);
|
||||||
|
+ ((struct pt_regs *)ctx->uc_mcontext.regs)->ccr |= (1 << 28);
|
||||||
|
} else {
|
||||||
|
- ctx->uc_mcontext.regs->ccr &= ~(1 << 28);
|
||||||
|
+ ((struct pt_regs *)ctx->uc_mcontext.regs)->ccr &= ~(1 << 28);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
SECCOMP_RESULT(ctx) = static_cast<greg_t>(ret_val);
|
||||||
|
diff --git third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.h third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.h
|
||||||
|
index cdce9bf8..73d77dda 100644
|
||||||
|
--- third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.h
|
||||||
|
+++ third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.h
|
||||||
|
@@ -46,7 +46,7 @@
|
||||||
|
|
||||||
|
// The following platforms have an implementation of a hardware counter.
|
||||||
|
#if defined(__i386__) || defined(__x86_64__) || defined(__aarch64__) || \
|
||||||
|
- defined(__powerpc__) || defined(__ppc__) || \
|
||||||
|
+ ((defined(__powerpc__) || defined(__ppc__)) && defined(__GLIBC__)) || \
|
||||||
|
defined(_M_IX86) || defined(_M_X64)
|
||||||
|
#define ABSL_HAVE_UNSCALED_CYCLECLOCK_IMPLEMENTATION 1
|
||||||
|
#else
|
||||||
|
--- third_party/abseil-cpp/absl/debugging/internal/stacktrace_config.h
|
||||||
|
+++ third_party/abseil-cpp/absl/debugging/internal/stacktrace_config.h
|
||||||
|
@@ -64,7 +64,7 @@
|
||||||
|
#elif defined(__i386__) || defined(__x86_64__)
|
||||||
|
#define ABSL_STACKTRACE_INL_HEADER \
|
||||||
|
"absl/debugging/internal/stacktrace_x86-inl.inc"
|
||||||
|
-#elif defined(__ppc__) || defined(__PPC__)
|
||||||
|
+#elif (defined(__ppc__) || defined(__PPC__)) && defined(__GLIBC__)
|
||||||
|
#define ABSL_STACKTRACE_INL_HEADER \
|
||||||
|
"absl/debugging/internal/stacktrace_powerpc-inl.inc"
|
||||||
|
#elif defined(__aarch64__)
|
||||||
|
diff --git third_party/breakpad/BUILD.gn third_party/breakpad/BUILD.gn
|
||||||
|
index f9a60e37..25f3a0b7 100644
|
||||||
|
--- third_party/breakpad/BUILD.gn
|
||||||
|
+++ third_party/breakpad/BUILD.gn
|
||||||
|
@@ -637,6 +637,7 @@ if (is_linux || is_android) {
|
||||||
|
|
||||||
|
if (current_cpu == "ppc64") {
|
||||||
|
defines = [ "HAVE_GETCONTEXT" ]
|
||||||
|
+ libs += [ "ucontext" ]
|
||||||
|
} else {
|
||||||
|
sources += [
|
||||||
|
"breakpad/src/common/linux/breakpad_getcontext.S"
|
||||||
|
diff --git third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.cc third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.cc
|
||||||
|
index 03afec7a..0264ecf1 100644
|
||||||
|
--- third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.cc
|
||||||
|
+++ third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.cc
|
||||||
|
@@ -273,6 +273,9 @@ void ThreadInfo::FillCPUContext(RawContextCPU* out) const {
|
||||||
|
|
||||||
|
#elif defined(__powerpc64__)
|
||||||
|
|
||||||
|
+#include <asm/elf.h>
|
||||||
|
+#include <asm/ptrace.h>
|
||||||
|
+
|
||||||
|
uintptr_t ThreadInfo::GetInstructionPointer() const {
|
||||||
|
return mcontext.gp_regs[PT_NIP];
|
||||||
|
}
|
||||||
|
@@ -290,9 +293,9 @@ void ThreadInfo::FillCPUContext(RawContextCPU* out) const {
|
||||||
|
out->ctr = mcontext.gp_regs[PT_CTR];
|
||||||
|
|
||||||
|
for (int i = 0; i < MD_FLOATINGSAVEAREA_PPC_FPR_COUNT; i++)
|
||||||
|
- out->float_save.fpregs[i] = mcontext.fp_regs[i];
|
||||||
|
+ out->float_save.fpregs[i] = ((uint64_t *)&mcontext.fp_regs)[i];
|
||||||
|
|
||||||
|
- out->float_save.fpscr = mcontext.fp_regs[NFPREG-1];
|
||||||
|
+ out->float_save.fpscr = ((uint64_t *)&mcontext.fp_regs)[ELF_NFPREG-1];
|
||||||
|
|
||||||
|
for (int i = 0; i < MD_VECTORSAVEAREA_PPC_VR_COUNT; i++)
|
||||||
|
out->vector_save.save_vr[i] = \
|
||||||
|
diff --git third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc
|
||||||
|
index 1090470f..e580233d 100644
|
||||||
|
--- third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc
|
||||||
|
+++ third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc
|
||||||
|
@@ -257,6 +257,9 @@ void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc) {
|
||||||
|
|
||||||
|
#elif defined(__powerpc64__)
|
||||||
|
|
||||||
|
+#include <asm/elf.h>
|
||||||
|
+#include <asm/ptrace.h>
|
||||||
|
+
|
||||||
|
uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) {
|
||||||
|
return uc->uc_mcontext.gp_regs[MD_CONTEXT_PPC64_REG_SP];
|
||||||
|
}
|
||||||
|
@@ -280,9 +283,9 @@ void UContextReader::FillCPUContext(RawContextCPU* out, const ucontext_t* uc,
|
||||||
|
out->ctr = uc->uc_mcontext.gp_regs[PT_CTR];
|
||||||
|
|
||||||
|
for (int i = 0; i < MD_FLOATINGSAVEAREA_PPC_FPR_COUNT; i++)
|
||||||
|
- out->float_save.fpregs[i] = uc->uc_mcontext.fp_regs[i];
|
||||||
|
+ out->float_save.fpregs[i] = ((uint64_t *)&uc->uc_mcontext.fp_regs)[i];
|
||||||
|
|
||||||
|
- out->float_save.fpscr = uc->uc_mcontext.fp_regs[NFPREG-1];
|
||||||
|
+ out->float_save.fpscr = ((uint64_t *)&uc->uc_mcontext.fp_regs)[ELF_NFPREG-1];
|
||||||
|
|
||||||
|
for (int i = 0; i < MD_VECTORSAVEAREA_PPC_VR_COUNT; i++)
|
||||||
|
out->vector_save.save_vr[i] =
|
||||||
|
diff --git third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
|
||||||
|
index 5a7ab50c..ee8b858c 100644
|
||||||
|
--- third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
|
||||||
|
+++ third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
|
||||||
|
@@ -105,6 +105,11 @@
|
||||||
|
#define PR_SET_PTRACER 0x59616d61
|
||||||
|
#endif
|
||||||
|
|
||||||
|
+/* musl hack, can't include asm/ptrace.h as that causes conflicts */
|
||||||
|
+#if defined(__powerpc64__) && !defined(PT_NIP)
|
||||||
|
+#define PT_NIP 32
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
namespace google_breakpad {
|
||||||
|
|
||||||
|
namespace {
|
||||||
|
diff --git third_party/crashpad/crashpad/snapshot/linux/signal_context.h third_party/crashpad/crashpad/snapshot/linux/signal_context.h
|
||||||
|
index 8e335a09..b2a0f155 100644
|
||||||
|
--- third_party/crashpad/crashpad/snapshot/linux/signal_context.h
|
||||||
|
+++ third_party/crashpad/crashpad/snapshot/linux/signal_context.h
|
||||||
|
@@ -469,7 +469,7 @@ struct MContext64 {
|
||||||
|
SignalThreadContext64 gp_regs;
|
||||||
|
SignalFloatContext64 fp_regs;
|
||||||
|
SignalVectorContext64 *v_regs;
|
||||||
|
- int64_t vmx_reserve[69];
|
||||||
|
+ int64_t vmx_reserve[101];
|
||||||
|
};
|
||||||
|
|
||||||
|
struct ContextTraits64 : public Traits64 {
|
||||||
|
diff --git third_party/crashpad/crashpad/util/linux/thread_info.h third_party/crashpad/crashpad/util/linux/thread_info.h
|
||||||
|
index dea0d1f3..b203e5b2 100644
|
||||||
|
--- third_party/crashpad/crashpad/util/linux/thread_info.h
|
||||||
|
+++ third_party/crashpad/crashpad/util/linux/thread_info.h
|
||||||
|
@@ -30,6 +30,7 @@
|
||||||
|
|
||||||
|
#if defined(ARCH_CPU_PPC64_FAMILY)
|
||||||
|
#include <sys/ucontext.h>
|
||||||
|
+#include <asm/ptrace.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
namespace crashpad {
|
||||||
|
diff --git third_party/lss/linux_syscall_support.h third_party/lss/linux_syscall_support.h
|
||||||
|
index 9955ce44..4c1cc488 100644
|
||||||
|
--- third_party/lss/linux_syscall_support.h
|
||||||
|
+++ third_party/lss/linux_syscall_support.h
|
||||||
|
@@ -4216,9 +4216,13 @@ struct kernel_statfs {
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
#if defined(__NR_fstatat64)
|
||||||
|
+ // musl does #define fstatat64 fstatat
|
||||||
|
+ #undef fstatat64
|
||||||
|
LSS_INLINE _syscall4(int, fstatat64, int, d,
|
||||||
|
const char *, p,
|
||||||
|
struct kernel_stat64 *, b, int, f)
|
||||||
|
+ // set it back like it was
|
||||||
|
+ #define fstatat64 fstatat
|
||||||
|
#endif
|
||||||
|
#if defined(__NR_waitpid)
|
||||||
|
// waitpid is polyfilled below when not available.
|
||||||
|
|
@ -0,0 +1,54 @@
|
||||||
|
--- base/trace_event/malloc_dump_provider.cc.orig
|
||||||
|
+++ base/trace_event/malloc_dump_provider.cc
|
||||||
|
@@ -243,7 +243,7 @@
|
||||||
|
allocated_objects_count = main_heap_info.block_count;
|
||||||
|
#elif defined(OS_FUCHSIA)
|
||||||
|
// TODO(fuchsia): Port, see https://crbug.com/706592.
|
||||||
|
-#else
|
||||||
|
+#elif defined(__GLIBC__)
|
||||||
|
struct mallinfo info = mallinfo();
|
||||||
|
DCHECK_GE(info.arena + info.hblkhd, info.uordblks);
|
||||||
|
|
||||||
|
--- base/process/process_metrics_posix.cc.orig 2020-11-18 23:50:33.958223497 -0500
|
||||||
|
+++ base/process/process_metrics_posix.cc 2020-11-18 23:53:52.024589316 -0500
|
||||||
|
@@ -119,14 +119,14 @@
|
||||||
|
malloc_statistics_t stats = {0};
|
||||||
|
malloc_zone_statistics(nullptr, &stats);
|
||||||
|
return stats.size_in_use;
|
||||||
|
-#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
|
||||||
|
+#elif defined(__GLIBC__) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
|
||||||
|
struct mallinfo minfo = mallinfo();
|
||||||
|
#if BUILDFLAG(USE_TCMALLOC)
|
||||||
|
return minfo.uordblks;
|
||||||
|
#else
|
||||||
|
return minfo.hblkhd + minfo.arena;
|
||||||
|
#endif
|
||||||
|
-#elif defined(OS_FUCHSIA)
|
||||||
|
+#else
|
||||||
|
// TODO(fuchsia): Not currently exposed. https://crbug.com/735087.
|
||||||
|
return 0;
|
||||||
|
#endif
|
||||||
|
--- third_party/swiftshader/third_party/llvm-subzero/lib/Support/Unix/Process.inc
|
||||||
|
+++ third_party/swiftshader/third_party/llvm-subzero/lib/Support/Unix/Process.inc.orig
|
||||||
|
@@ -84,7 +84,7 @@
|
||||||
|
}
|
||||||
|
|
||||||
|
size_t Process::GetMallocUsage() {
|
||||||
|
-#if defined(HAVE_MALLINFO)
|
||||||
|
+#if defined(HAVE_MALLINFO) && defined(__GLIBC__)
|
||||||
|
struct mallinfo mi;
|
||||||
|
mi = ::mallinfo();
|
||||||
|
return mi.uordblks;
|
||||||
|
|
||||||
|
--- third_party/swiftshader/third_party/llvm-10.0/configs/linux/include/llvm/Config/config.h.orig 2019-09-30 13:03:42.556880537 -0400
|
||||||
|
+++ third_party/swiftshader/third_party/llvm-10.0/configs/linux/include/llvm/Config/config.h 2019-09-30 13:07:27.989821227 -0400
|
||||||
|
@@ -122,7 +122,9 @@
|
||||||
|
/* #undef HAVE_MALLCTL */
|
||||||
|
|
||||||
|
/* Define to 1 if you have the `mallinfo' function. */
|
||||||
|
+#if defined(__GLIBC__)
|
||||||
|
#define HAVE_MALLINFO 1
|
||||||
|
+#endif
|
||||||
|
|
||||||
|
/* Define to 1 if you have the <malloc.h> header file. */
|
||||||
|
#define HAVE_MALLOC_H 1
|
||||||
|
|
@ -0,0 +1,38 @@
|
||||||
|
--- net/dns/host_resolver_manager.cc.orig 2020-10-09 16:39:12.064069835 -0400
|
||||||
|
+++ net/dns/host_resolver_manager.cc 2020-10-09 16:42:49.738302772 -0400
|
||||||
|
@@ -2779,8 +2779,7 @@
|
||||||
|
NetworkChangeNotifier::AddConnectionTypeObserver(this);
|
||||||
|
if (system_dns_config_notifier_)
|
||||||
|
system_dns_config_notifier_->AddObserver(this);
|
||||||
|
-#if defined(OS_POSIX) && !defined(OS_APPLE) && !defined(OS_OPENBSD) && \
|
||||||
|
- !defined(OS_ANDROID)
|
||||||
|
+#if defined(__GLIBC__)
|
||||||
|
EnsureDnsReloaderInit();
|
||||||
|
#endif
|
||||||
|
|
||||||
|
--- net/dns/dns_reloader.cc.orig 2020-10-09 16:39:12.064069835 -0400
|
||||||
|
+++ net/dns/dns_reloader.cc 2020-10-09 16:44:30.442419823 -0400
|
||||||
|
@@ -4,9 +4,8 @@
|
||||||
|
|
||||||
|
#include "net/dns/dns_reloader.h"
|
||||||
|
|
||||||
|
-#if defined(OS_POSIX) && !defined(OS_APPLE) && !defined(OS_OPENBSD) && \
|
||||||
|
- !defined(OS_ANDROID) && !defined(OS_FUCHSIA)
|
||||||
|
-
|
||||||
|
+#if defined(__GLIBC__)
|
||||||
|
+
|
||||||
|
#include <resolv.h>
|
||||||
|
|
||||||
|
#include "base/lazy_instance.h"
|
||||||
|
--- net/dns/host_resolver_proc.cc.orig 2020-10-09 16:39:12.065069836 -0400
|
||||||
|
+++ net/dns/host_resolver_proc.cc 2020-10-09 16:45:09.641466644 -0400
|
||||||
|
@@ -159,8 +159,7 @@
|
||||||
|
base::ScopedBlockingCall scoped_blocking_call(FROM_HERE,
|
||||||
|
base::BlockingType::WILL_BLOCK);
|
||||||
|
|
||||||
|
-#if defined(OS_POSIX) && !defined(OS_APPLE) && !defined(OS_OPENBSD) && \
|
||||||
|
- !defined(OS_ANDROID) && !defined(OS_FUCHSIA)
|
||||||
|
+#if defined(__GLIBC__)
|
||||||
|
DnsReloaderMaybeReload();
|
||||||
|
#endif
|
||||||
|
base::Optional<AddressInfo> ai;
|
||||||
|
|
@ -0,0 +1,10 @@
|
||||||
|
--- a/chrome/browser/search/background/ntp_backgrounds.h 2020-08-10 20:39:20.000000000 +0200
|
||||||
|
+++ b/chrome/browser/search/background/ntp_backgrounds.h 2020-09-04 13:48:22.640023256 +0200
|
||||||
|
@@ -6,6 +6,7 @@
|
||||||
|
#define CHROME_BROWSER_SEARCH_BACKGROUND_NTP_BACKGROUNDS_H_
|
||||||
|
|
||||||
|
#include <array>
|
||||||
|
+#include <cstddef>
|
||||||
|
|
||||||
|
class GURL;
|
||||||
|
|
||||||
26
srcpkgs/electron13/files/patches/chromium-libc_malloc.patch
Normal file
26
srcpkgs/electron13/files/patches/chromium-libc_malloc.patch
Normal file
|
|
@ -0,0 +1,26 @@
|
||||||
|
--- a/base/process/memory_linux.cc.orig 2017-09-15 08:41:43.000000000 +0000
|
||||||
|
+++ a/base/process/memory_linux.cc 2017-09-15 08:44:39.804995469 +0000
|
||||||
|
@@ -21,6 +21,12 @@
|
||||||
|
#include "third_party/tcmalloc/chromium/src/gperftools/tcmalloc.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
|
+#if defined(LIBC_GLIBC)
|
||||||
|
+extern "C" {
|
||||||
|
+extern void *__libc_malloc(size_t size);
|
||||||
|
+}
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
namespace base {
|
||||||
|
|
||||||
|
size_t g_oom_size = 0U;
|
||||||
|
--- a/base/process/memory_linux.cc.orig 2020-08-30 14:18:35.401132593 -0400
|
||||||
|
+++ a/base/process/memory_linux.cc 2020-08-30 14:19:08.030199189 -0400
|
||||||
|
@@ -141,7 +141,7 @@
|
||||||
|
(!defined(LIBC_GLIBC) && !BUILDFLAG(USE_TCMALLOC))
|
||||||
|
*result = malloc(size);
|
||||||
|
#elif defined(LIBC_GLIBC) && !BUILDFLAG(USE_TCMALLOC)
|
||||||
|
- *result = __libc_malloc(size);
|
||||||
|
+ *result = ::__libc_malloc(size);
|
||||||
|
#elif BUILDFLAG(USE_TCMALLOC)
|
||||||
|
*result = tc_malloc_skip_new_handler(size);
|
||||||
|
#endif
|
||||||
|
|
@ -0,0 +1,24 @@
|
||||||
|
Use monotonic clock for pthread_cond_timedwait with musl too.
|
||||||
|
|
||||||
|
diff --git a/v8/src/base/platform/condition-variable.cc b/v8/src/base/platform/condition-variable.cc
|
||||||
|
index 5ea7083..c13027e 100644
|
||||||
|
--- a/v8/src/base/platform/condition-variable.cc
|
||||||
|
+++ a/v8/src/base/platform/condition-variable.cc
|
||||||
|
@@ -16,7 +16,7 @@ namespace base {
|
||||||
|
|
||||||
|
ConditionVariable::ConditionVariable() {
|
||||||
|
#if (V8_OS_FREEBSD || V8_OS_NETBSD || V8_OS_OPENBSD || \
|
||||||
|
- (V8_OS_LINUX && V8_LIBC_GLIBC))
|
||||||
|
+ V8_OS_LINUX)
|
||||||
|
// On Free/Net/OpenBSD and Linux with glibc we can change the time
|
||||||
|
// source for pthread_cond_timedwait() to use the monotonic clock.
|
||||||
|
pthread_condattr_t attr;
|
||||||
|
@@ -92,7 +92,7 @@ bool ConditionVariable::WaitFor(Mutex* mutex, const TimeDelta& rel_time) {
|
||||||
|
&native_handle_, &mutex->native_handle(), &ts);
|
||||||
|
#else
|
||||||
|
#if (V8_OS_FREEBSD || V8_OS_NETBSD || V8_OS_OPENBSD || \
|
||||||
|
- (V8_OS_LINUX && V8_LIBC_GLIBC))
|
||||||
|
+ V8_OS_LINUX)
|
||||||
|
// On Free/Net/OpenBSD and Linux with glibc we can change the time
|
||||||
|
// source for pthread_cond_timedwait() to use the monotonic clock.
|
||||||
|
result = clock_gettime(CLOCK_MONOTONIC, &ts);
|
||||||
72
srcpkgs/electron13/files/patches/chromium-no-execinfo.patch
Normal file
72
srcpkgs/electron13/files/patches/chromium-no-execinfo.patch
Normal file
|
|
@ -0,0 +1,72 @@
|
||||||
|
--- a/base/debug/stack_trace_posix.cc.orig 2019-05-14 14:49:44.000000000 -0400
|
||||||
|
+++ a/base/debug/stack_trace_posix.cc 2019-07-02 10:43:43.490045013 -0400
|
||||||
|
@@ -27,7 +27,7 @@
|
||||||
|
#if !defined(USE_SYMBOLIZE)
|
||||||
|
#include <cxxabi.h>
|
||||||
|
#endif
|
||||||
|
-#if !defined(__UCLIBC__) && !defined(_AIX)
|
||||||
|
+#if defined(__GLIBC__) && !defined(_AIX)
|
||||||
|
#include <execinfo.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
@@ -86,7 +86,7 @@
|
||||||
|
// Note: code in this function is NOT async-signal safe (std::string uses
|
||||||
|
// malloc internally).
|
||||||
|
|
||||||
|
-#if !defined(__UCLIBC__) && !defined(_AIX)
|
||||||
|
+#if defined(__GLIBC__) && !defined(_AIX)
|
||||||
|
std::string::size_type search_from = 0;
|
||||||
|
while (search_from < text->size()) {
|
||||||
|
// Look for the start of a mangled symbol, from search_from.
|
||||||
|
@@ -121,7 +121,7 @@
|
||||||
|
search_from = mangled_start + 2;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
-#endif // !defined(__UCLIBC__) && !defined(_AIX)
|
||||||
|
+#endif // defined(__GLIBC__) && !defined(_AIX)
|
||||||
|
}
|
||||||
|
#endif // !defined(USE_SYMBOLIZE)
|
||||||
|
|
||||||
|
@@ -133,7 +133,7 @@
|
||||||
|
virtual ~BacktraceOutputHandler() = default;
|
||||||
|
};
|
||||||
|
|
||||||
|
-#if !defined(__UCLIBC__) && !defined(_AIX)
|
||||||
|
+#if defined(__GLIBC__) && !defined(_AIX)
|
||||||
|
void OutputPointer(void* pointer, BacktraceOutputHandler* handler) {
|
||||||
|
// This should be more than enough to store a 64-bit number in hex:
|
||||||
|
// 16 hex digits + 1 for null-terminator.
|
||||||
|
@@ -216,7 +216,7 @@
|
||||||
|
}
|
||||||
|
#endif // defined(USE_SYMBOLIZE)
|
||||||
|
}
|
||||||
|
-#endif // !defined(__UCLIBC__) && !defined(_AIX)
|
||||||
|
+#endif // defined(__GLIBC__) && !defined(_AIX)
|
||||||
|
|
||||||
|
void PrintToStderr(const char* output) {
|
||||||
|
// NOTE: This code MUST be async-signal safe (it's used by in-process
|
||||||
|
@@ -812,7 +812,7 @@
|
||||||
|
// NOTE: This code MUST be async-signal safe (it's used by in-process
|
||||||
|
// stack dumping signal handler). NO malloc or stdio is allowed here.
|
||||||
|
|
||||||
|
-#if !defined(__UCLIBC__) && !defined(_AIX)
|
||||||
|
+#if defined(__GLIBC__) && !defined(_AIX)
|
||||||
|
// Though the backtrace API man page does not list any possible negative
|
||||||
|
// return values, we take no chance.
|
||||||
|
return base::saturated_cast<size_t>(backtrace(trace, count));
|
||||||
|
@@ -825,13 +825,13 @@
|
||||||
|
// NOTE: This code MUST be async-signal safe (it's used by in-process
|
||||||
|
// stack dumping signal handler). NO malloc or stdio is allowed here.
|
||||||
|
|
||||||
|
-#if !defined(__UCLIBC__) && !defined(_AIX)
|
||||||
|
+#if defined(__GLIBC__) && !defined(_AIX)
|
||||||
|
PrintBacktraceOutputHandler handler;
|
||||||
|
ProcessBacktrace(trace_, count_, prefix_string, &handler);
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
-#if !defined(__UCLIBC__) && !defined(_AIX)
|
||||||
|
+#if defined(__GLIBC__) && !defined(_AIX)
|
||||||
|
void StackTrace::OutputToStreamWithPrefix(std::ostream* os,
|
||||||
|
const char* prefix_string) const {
|
||||||
|
StreamBacktraceOutputHandler handler(os);
|
||||||
|
|
@ -0,0 +1,27 @@
|
||||||
|
--- a/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc.orig 2015-12-06 09:59:55.554536646 +0100
|
||||||
|
+++ a/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc 2015-12-06 10:01:16.818238035 +0100
|
||||||
|
@@ -477,7 +477,9 @@ bool ExceptionHandler::SimulateSignalDel
|
||||||
|
siginfo.si_code = SI_USER;
|
||||||
|
siginfo.si_pid = getpid();
|
||||||
|
ucontext_t context;
|
||||||
|
+#if defined(__GLIBC__)
|
||||||
|
getcontext(&context);
|
||||||
|
+#endif
|
||||||
|
return HandleSignal(sig, &siginfo, &context);
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -647,9 +649,14 @@ bool ExceptionHandler::WriteMinidump() {
|
||||||
|
sys_prctl(PR_SET_DUMPABLE, 1, 0, 0, 0);
|
||||||
|
|
||||||
|
CrashContext context;
|
||||||
|
+
|
||||||
|
+#if defined(__GLIBC__)
|
||||||
|
int getcontext_result = getcontext(&context.context);
|
||||||
|
if (getcontext_result)
|
||||||
|
return false;
|
||||||
|
+#else
|
||||||
|
+ return false;
|
||||||
|
+#endif
|
||||||
|
|
||||||
|
#if defined(__i386__)
|
||||||
|
// In CPUFillFromUContext in minidumpwriter.cc the stack pointer is retrieved
|
||||||
|
|
@ -0,0 +1,15 @@
|
||||||
|
This was dropped for some reason in 6951c37cecd05979b232a39e5c10e6346a0f74ef
|
||||||
|
--- a/third_party/closure_compiler/compiler.py 2021-05-20 04:17:53.000000000 +0200
|
||||||
|
+++ - 2021-05-25 20:31:10.102971765 +0200
|
||||||
|
@@ -13,8 +13,9 @@
|
||||||
|
|
||||||
|
|
||||||
|
_CURRENT_DIR = os.path.join(os.path.dirname(__file__))
|
||||||
|
-_JAVA_PATH = os.path.join(_CURRENT_DIR, "..", "jdk", "current", "bin", "java")
|
||||||
|
-assert os.path.isfile(_JAVA_PATH), "java only allowed in android builds"
|
||||||
|
+_JAVA_BIN = "java"
|
||||||
|
+_JDK_PATH = os.path.join(_CURRENT_DIR, "..", "jdk", "current", "bin", "java")
|
||||||
|
+_JAVA_PATH = _JDK_PATH if os.path.isfile(_JDK_PATH) else _JAVA_BIN
|
||||||
|
|
||||||
|
class Compiler(object):
|
||||||
|
"""Runs the Closure compiler on given source files to typecheck them
|
||||||
|
|
@ -0,0 +1,10 @@
|
||||||
|
--- a/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
|
||||||
|
+++ a/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
|
||||||
|
@@ -370,6 +370,7 @@
|
||||||
|
switch (sysno) {
|
||||||
|
case __NR_exit:
|
||||||
|
case __NR_exit_group:
|
||||||
|
+ case __NR_membarrier:
|
||||||
|
case __NR_wait4:
|
||||||
|
case __NR_waitid:
|
||||||
|
#if defined(__i386__)
|
||||||
|
|
@ -0,0 +1,20 @@
|
||||||
|
Allow SYS_sched_getparam and SYS_sched_getscheduler
|
||||||
|
musl uses them for pthread_getschedparam()
|
||||||
|
|
||||||
|
source: https://git.alpinelinux.org/aports/commit/community/chromium?id=54af9f8ac24f52d382c5758e2445bf0206eff40e
|
||||||
|
|
||||||
|
--- a/sandbox/policy/linux/bpf_renderer_policy_linux.cc.orig 2019-10-08 21:03:18.253080425 +0200
|
||||||
|
+++ a/sandbox/policy/linux/bpf_renderer_policy_linux.cc 2019-10-08 21:04:19.648549718 +0200
|
||||||
|
@@ -88,10 +88,10 @@
|
||||||
|
case __NR_sysinfo:
|
||||||
|
case __NR_times:
|
||||||
|
case __NR_uname:
|
||||||
|
- return Allow();
|
||||||
|
- case __NR_sched_getaffinity:
|
||||||
|
case __NR_sched_getparam:
|
||||||
|
case __NR_sched_getscheduler:
|
||||||
|
+ return Allow();
|
||||||
|
+ case __NR_sched_getaffinity:
|
||||||
|
case __NR_sched_setscheduler:
|
||||||
|
return sandbox::RestrictSchedTarget(GetPolicyPid(), sysno);
|
||||||
|
case __NR_prlimit64:
|
||||||
886
srcpkgs/electron13/files/patches/chromium-sndio.patch
Normal file
886
srcpkgs/electron13/files/patches/chromium-sndio.patch
Normal file
|
|
@ -0,0 +1,886 @@
|
||||||
|
diff -Naur chromium-83.0.4103.97.orig/media/BUILD.gn chromium-83.0.4103.97/media/BUILD.gn
|
||||||
|
--- a/media/BUILD.gn.orig 2020-06-03 20:40:26.000000000 +0200
|
||||||
|
+++ a/media/BUILD.gn 2020-06-13 17:32:28.510395975 +0200
|
||||||
|
@@ -65,6 +65,9 @@
|
||||||
|
defines += [ "DLOPEN_PULSEAUDIO" ]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
+ if (use_sndio) {
|
||||||
|
+ defines += [ "USE_SNDIO" ]
|
||||||
|
+ }
|
||||||
|
if (use_cras) {
|
||||||
|
defines += [ "USE_CRAS" ]
|
||||||
|
}
|
||||||
|
diff -Naur chromium-83.0.4103.97.orig/media/audio/BUILD.gn chromium-83.0.4103.97/media/audio/BUILD.gn
|
||||||
|
--- a/media/audio/BUILD.gn.orig 2020-06-03 20:39:37.000000000 +0200
|
||||||
|
+++ a/media/audio/BUILD.gn 2020-06-13 17:32:28.511395969 +0200
|
||||||
|
@@ -236,6 +236,17 @@
|
||||||
|
sources += [ "linux/audio_manager_linux.cc" ]
|
||||||
|
}
|
||||||
|
|
||||||
|
+ if (use_sndio) {
|
||||||
|
+ libs += [ "sndio" ]
|
||||||
|
+ sources += [
|
||||||
|
+ "sndio/audio_manager_sndio.cc",
|
||||||
|
+ "sndio/sndio_input.cc",
|
||||||
|
+ "sndio/sndio_input.h",
|
||||||
|
+ "sndio/sndio_output.cc",
|
||||||
|
+ "sndio/sndio_output.h"
|
||||||
|
+ ]
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
if (use_alsa) {
|
||||||
|
libs += [ "asound" ]
|
||||||
|
sources += [
|
||||||
|
diff -Naur chromium-83.0.4103.97.orig/media/audio/linux/audio_manager_linux.cc chromium-83.0.4103.97/media/audio/linux/audio_manager_linux.cc
|
||||||
|
--- a/media/audio/linux/audio_manager_linux.cc.orig 2020-06-03 20:39:37.000000000 +0200
|
||||||
|
+++ a/media/audio/linux/audio_manager_linux.cc 2020-06-13 18:09:43.623333167 +0200
|
||||||
|
@@ -19,6 +19,11 @@
|
||||||
|
#include "media/audio/pulse/audio_manager_pulse.h"
|
||||||
|
#include "media/audio/pulse/pulse_util.h"
|
||||||
|
#endif
|
||||||
|
+#if defined(USE_SNDIO)
|
||||||
|
+#include "media/audio/sndio/audio_manager_sndio.h"
|
||||||
|
+#include "media/audio/sndio/sndio_input.h"
|
||||||
|
+#include "media/audio/sndio/sndio_output.h"
|
||||||
|
+#endif
|
||||||
|
|
||||||
|
namespace media {
|
||||||
|
|
||||||
|
@@ -26,7 +31,8 @@
|
||||||
|
kPulse,
|
||||||
|
kAlsa,
|
||||||
|
kCras,
|
||||||
|
- kAudioIOMax = kCras // Must always be equal to largest logged entry.
|
||||||
|
+ kSndio,
|
||||||
|
+ kAudioIOMax = kSndio // Must always be equal to largest logged entry.
|
||||||
|
};
|
||||||
|
|
||||||
|
std::unique_ptr<media::AudioManager> CreateAudioManager(
|
||||||
|
@@ -39,6 +45,16 @@
|
||||||
|
audio_log_factory);
|
||||||
|
}
|
||||||
|
|
||||||
|
+#if defined(USE_SNDIO)
|
||||||
|
+ struct sio_hdl *hdl = sio_open(SIO_DEVANY, SIO_PLAY, 0);
|
||||||
|
+ if (hdl != NULL) {
|
||||||
|
+ sio_close(hdl);
|
||||||
|
+ UMA_HISTOGRAM_ENUMERATION("Media.LinuxAudioIO", kSndio, kAudioIOMax + 1);
|
||||||
|
+ return std::make_unique<AudioManagerSndio>(std::move(audio_thread),
|
||||||
|
+ audio_log_factory);
|
||||||
|
+ }
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
#if defined(USE_CRAS)
|
||||||
|
if (base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kUseCras)) {
|
||||||
|
UMA_HISTOGRAM_ENUMERATION("Media.LinuxAudioIO", kCras, kAudioIOMax + 1);
|
||||||
|
diff -Naur chromium-83.0.4103.97.orig/media/audio/sndio/audio_manager_sndio.cc chromium-83.0.4103.97/media/audio/sndio/audio_manager_sndio.cc
|
||||||
|
--- a/media/audio/sndio/audio_manager_sndio.cc.orig 1970-01-01 01:00:00.000000000 +0100
|
||||||
|
+++ a/media/audio/sndio/audio_manager_sndio.cc 2020-06-13 17:32:28.511395969 +0200
|
||||||
|
@@ -0,0 +1,148 @@
|
||||||
|
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
|
||||||
|
+// Use of this source code is governed by a BSD-style license that can be
|
||||||
|
+// found in the LICENSE file.
|
||||||
|
+
|
||||||
|
+#include "media/audio/sndio/audio_manager_sndio.h"
|
||||||
|
+
|
||||||
|
+#include "base/metrics/histogram_macros.h"
|
||||||
|
+#include "base/memory/ptr_util.h"
|
||||||
|
+#include "media/audio/audio_device_description.h"
|
||||||
|
+#include "media/audio/audio_output_dispatcher.h"
|
||||||
|
+#include "media/audio/sndio/sndio_input.h"
|
||||||
|
+#include "media/audio/sndio/sndio_output.h"
|
||||||
|
+#include "media/base/limits.h"
|
||||||
|
+#include "media/base/media_switches.h"
|
||||||
|
+
|
||||||
|
+namespace media {
|
||||||
|
+
|
||||||
|
+
|
||||||
|
+// Maximum number of output streams that can be open simultaneously.
|
||||||
|
+static const int kMaxOutputStreams = 4;
|
||||||
|
+
|
||||||
|
+// Default sample rate for input and output streams.
|
||||||
|
+static const int kDefaultSampleRate = 48000;
|
||||||
|
+
|
||||||
|
+void AddDefaultDevice(AudioDeviceNames* device_names) {
|
||||||
|
+ DCHECK(device_names->empty());
|
||||||
|
+ device_names->push_front(AudioDeviceName::CreateDefault());
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+bool AudioManagerSndio::HasAudioOutputDevices() {
|
||||||
|
+ return true;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+bool AudioManagerSndio::HasAudioInputDevices() {
|
||||||
|
+ return true;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+void AudioManagerSndio::GetAudioInputDeviceNames(
|
||||||
|
+ AudioDeviceNames* device_names) {
|
||||||
|
+ DCHECK(device_names->empty());
|
||||||
|
+ AddDefaultDevice(device_names);
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+void AudioManagerSndio::GetAudioOutputDeviceNames(
|
||||||
|
+ AudioDeviceNames* device_names) {
|
||||||
|
+ AddDefaultDevice(device_names);
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+const char* AudioManagerSndio::GetName() {
|
||||||
|
+ return "SNDIO";
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+AudioParameters AudioManagerSndio::GetInputStreamParameters(
|
||||||
|
+ const std::string& device_id) {
|
||||||
|
+ static const int kDefaultInputBufferSize = 1024;
|
||||||
|
+
|
||||||
|
+ int user_buffer_size = GetUserBufferSize();
|
||||||
|
+ int buffer_size = user_buffer_size ?
|
||||||
|
+ user_buffer_size : kDefaultInputBufferSize;
|
||||||
|
+
|
||||||
|
+ return AudioParameters(
|
||||||
|
+ AudioParameters::AUDIO_PCM_LOW_LATENCY, CHANNEL_LAYOUT_STEREO,
|
||||||
|
+ kDefaultSampleRate, buffer_size);
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+AudioManagerSndio::AudioManagerSndio(std::unique_ptr<AudioThread> audio_thread,
|
||||||
|
+ AudioLogFactory* audio_log_factory)
|
||||||
|
+ : AudioManagerBase(std::move(audio_thread),
|
||||||
|
+ audio_log_factory) {
|
||||||
|
+ DLOG(WARNING) << "AudioManagerSndio";
|
||||||
|
+ SetMaxOutputStreamsAllowed(kMaxOutputStreams);
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+AudioManagerSndio::~AudioManagerSndio() {
|
||||||
|
+ Shutdown();
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+AudioOutputStream* AudioManagerSndio::MakeLinearOutputStream(
|
||||||
|
+ const AudioParameters& params,
|
||||||
|
+ const LogCallback& log_callback) {
|
||||||
|
+ DCHECK_EQ(AudioParameters::AUDIO_PCM_LINEAR, params.format());
|
||||||
|
+ return MakeOutputStream(params);
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+AudioOutputStream* AudioManagerSndio::MakeLowLatencyOutputStream(
|
||||||
|
+ const AudioParameters& params,
|
||||||
|
+ const std::string& device_id,
|
||||||
|
+ const LogCallback& log_callback) {
|
||||||
|
+ DLOG_IF(ERROR, !device_id.empty()) << "Not implemented!";
|
||||||
|
+ DCHECK_EQ(AudioParameters::AUDIO_PCM_LOW_LATENCY, params.format());
|
||||||
|
+ return MakeOutputStream(params);
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+AudioInputStream* AudioManagerSndio::MakeLinearInputStream(
|
||||||
|
+ const AudioParameters& params,
|
||||||
|
+ const std::string& device_id,
|
||||||
|
+ const LogCallback& log_callback) {
|
||||||
|
+ DCHECK_EQ(AudioParameters::AUDIO_PCM_LINEAR, params.format());
|
||||||
|
+ return MakeInputStream(params);
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+AudioInputStream* AudioManagerSndio::MakeLowLatencyInputStream(
|
||||||
|
+ const AudioParameters& params,
|
||||||
|
+ const std::string& device_id,
|
||||||
|
+ const LogCallback& log_callback) {
|
||||||
|
+ DCHECK_EQ(AudioParameters::AUDIO_PCM_LOW_LATENCY, params.format());
|
||||||
|
+ return MakeInputStream(params);
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+AudioParameters AudioManagerSndio::GetPreferredOutputStreamParameters(
|
||||||
|
+ const std::string& output_device_id,
|
||||||
|
+ const AudioParameters& input_params) {
|
||||||
|
+ // TODO(tommi): Support |output_device_id|.
|
||||||
|
+ DLOG_IF(ERROR, !output_device_id.empty()) << "Not implemented!";
|
||||||
|
+ static const int kDefaultOutputBufferSize = 2048;
|
||||||
|
+
|
||||||
|
+ ChannelLayout channel_layout = CHANNEL_LAYOUT_STEREO;
|
||||||
|
+ int sample_rate = kDefaultSampleRate;
|
||||||
|
+ int buffer_size = kDefaultOutputBufferSize;
|
||||||
|
+ if (input_params.IsValid()) {
|
||||||
|
+ sample_rate = input_params.sample_rate();
|
||||||
|
+ channel_layout = input_params.channel_layout();
|
||||||
|
+ buffer_size = std::min(buffer_size, input_params.frames_per_buffer());
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ int user_buffer_size = GetUserBufferSize();
|
||||||
|
+ if (user_buffer_size)
|
||||||
|
+ buffer_size = user_buffer_size;
|
||||||
|
+
|
||||||
|
+ return AudioParameters(
|
||||||
|
+ AudioParameters::AUDIO_PCM_LOW_LATENCY, channel_layout,
|
||||||
|
+ sample_rate, buffer_size);
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+AudioInputStream* AudioManagerSndio::MakeInputStream(
|
||||||
|
+ const AudioParameters& params) {
|
||||||
|
+ DLOG(WARNING) << "MakeInputStream";
|
||||||
|
+ return new SndioAudioInputStream(this,
|
||||||
|
+ AudioDeviceDescription::kDefaultDeviceId, params);
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+AudioOutputStream* AudioManagerSndio::MakeOutputStream(
|
||||||
|
+ const AudioParameters& params) {
|
||||||
|
+ DLOG(WARNING) << "MakeOutputStream";
|
||||||
|
+ return new SndioAudioOutputStream(params, this);
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+} // namespace media
|
||||||
|
diff -Naur chromium-83.0.4103.97.orig/media/audio/sndio/audio_manager_sndio.h chromium-83.0.4103.97/media/audio/sndio/audio_manager_sndio.h
|
||||||
|
--- a/media/audio/sndio/audio_manager_sndio.h.orig 1970-01-01 01:00:00.000000000 +0100
|
||||||
|
+++ a/media/audio/sndio/audio_manager_sndio.h 2020-06-13 17:32:28.511395969 +0200
|
||||||
|
@@ -0,0 +1,65 @@
|
||||||
|
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
|
||||||
|
+// Use of this source code is governed by a BSD-style license that can be
|
||||||
|
+// found in the LICENSE file.
|
||||||
|
+
|
||||||
|
+#ifndef MEDIA_AUDIO_SNDIO_AUDIO_MANAGER_SNDIO_H_
|
||||||
|
+#define MEDIA_AUDIO_SNDIO_AUDIO_MANAGER_SNDIO_H_
|
||||||
|
+
|
||||||
|
+#include <set>
|
||||||
|
+
|
||||||
|
+#include "base/compiler_specific.h"
|
||||||
|
+#include "base/macros.h"
|
||||||
|
+#include "base/memory/ref_counted.h"
|
||||||
|
+#include "base/threading/thread.h"
|
||||||
|
+#include "media/audio/audio_manager_base.h"
|
||||||
|
+
|
||||||
|
+namespace media {
|
||||||
|
+
|
||||||
|
+class MEDIA_EXPORT AudioManagerSndio : public AudioManagerBase {
|
||||||
|
+ public:
|
||||||
|
+ AudioManagerSndio(std::unique_ptr<AudioThread> audio_thread,
|
||||||
|
+ AudioLogFactory* audio_log_factory);
|
||||||
|
+ ~AudioManagerSndio() override;
|
||||||
|
+
|
||||||
|
+ // Implementation of AudioManager.
|
||||||
|
+ bool HasAudioOutputDevices() override;
|
||||||
|
+ bool HasAudioInputDevices() override;
|
||||||
|
+ void GetAudioInputDeviceNames(AudioDeviceNames* device_names) override;
|
||||||
|
+ void GetAudioOutputDeviceNames(AudioDeviceNames* device_names) override;
|
||||||
|
+ AudioParameters GetInputStreamParameters(
|
||||||
|
+ const std::string& device_id) override;
|
||||||
|
+ const char* GetName() override;
|
||||||
|
+
|
||||||
|
+ // Implementation of AudioManagerBase.
|
||||||
|
+ AudioOutputStream* MakeLinearOutputStream(
|
||||||
|
+ const AudioParameters& params,
|
||||||
|
+ const LogCallback& log_callback) override;
|
||||||
|
+ AudioOutputStream* MakeLowLatencyOutputStream(
|
||||||
|
+ const AudioParameters& params,
|
||||||
|
+ const std::string& device_id,
|
||||||
|
+ const LogCallback& log_callback) override;
|
||||||
|
+ AudioInputStream* MakeLinearInputStream(
|
||||||
|
+ const AudioParameters& params,
|
||||||
|
+ const std::string& device_id,
|
||||||
|
+ const LogCallback& log_callback) override;
|
||||||
|
+ AudioInputStream* MakeLowLatencyInputStream(
|
||||||
|
+ const AudioParameters& params,
|
||||||
|
+ const std::string& device_id,
|
||||||
|
+ const LogCallback& log_callback) override;
|
||||||
|
+
|
||||||
|
+ protected:
|
||||||
|
+ AudioParameters GetPreferredOutputStreamParameters(
|
||||||
|
+ const std::string& output_device_id,
|
||||||
|
+ const AudioParameters& input_params) override;
|
||||||
|
+
|
||||||
|
+ private:
|
||||||
|
+ // Called by MakeLinearOutputStream and MakeLowLatencyOutputStream.
|
||||||
|
+ AudioOutputStream* MakeOutputStream(const AudioParameters& params);
|
||||||
|
+ AudioInputStream* MakeInputStream(const AudioParameters& params);
|
||||||
|
+
|
||||||
|
+ DISALLOW_COPY_AND_ASSIGN(AudioManagerSndio);
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
+} // namespace media
|
||||||
|
+
|
||||||
|
+#endif // MEDIA_AUDIO_SNDIO_AUDIO_MANAGER_SNDIO_H_
|
||||||
|
diff -Naur chromium-83.0.4103.97.orig/media/audio/sndio/sndio_input.cc chromium-83.0.4103.97/media/audio/sndio/sndio_input.cc
|
||||||
|
--- a/media/audio/sndio/sndio_input.cc.orig 1970-01-01 01:00:00.000000000 +0100
|
||||||
|
+++ a/media/audio/sndio/sndio_input.cc 2020-06-13 17:32:28.511395969 +0200
|
||||||
|
@@ -0,0 +1,200 @@
|
||||||
|
+// Copyright 2013 The Chromium Authors. All rights reserved.
|
||||||
|
+// Use of this source code is governed by a BSD-style license that can be
|
||||||
|
+// found in the LICENSE file.
|
||||||
|
+
|
||||||
|
+#include "base/bind.h"
|
||||||
|
+#include "base/logging.h"
|
||||||
|
+#include "base/macros.h"
|
||||||
|
+#include "media/base/audio_timestamp_helper.h"
|
||||||
|
+#include "media/audio/sndio/audio_manager_sndio.h"
|
||||||
|
+#include "media/audio/audio_manager.h"
|
||||||
|
+#include "media/audio/sndio/sndio_input.h"
|
||||||
|
+
|
||||||
|
+namespace media {
|
||||||
|
+
|
||||||
|
+static const SampleFormat kSampleFormat = kSampleFormatS16;
|
||||||
|
+
|
||||||
|
+void SndioAudioInputStream::OnMoveCallback(void *arg, int delta)
|
||||||
|
+{
|
||||||
|
+ SndioAudioInputStream* self = static_cast<SndioAudioInputStream*>(arg);
|
||||||
|
+
|
||||||
|
+ self->hw_delay += delta;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+void *SndioAudioInputStream::ThreadEntry(void *arg) {
|
||||||
|
+ SndioAudioInputStream* self = static_cast<SndioAudioInputStream*>(arg);
|
||||||
|
+
|
||||||
|
+ self->ThreadLoop();
|
||||||
|
+ return NULL;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+SndioAudioInputStream::SndioAudioInputStream(AudioManagerBase* manager,
|
||||||
|
+ const std::string& device_name,
|
||||||
|
+ const AudioParameters& params)
|
||||||
|
+ : manager(manager),
|
||||||
|
+ params(params),
|
||||||
|
+ audio_bus(AudioBus::Create(params)),
|
||||||
|
+ state(kClosed) {
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+SndioAudioInputStream::~SndioAudioInputStream() {
|
||||||
|
+ if (state != kClosed)
|
||||||
|
+ Close();
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+bool SndioAudioInputStream::Open() {
|
||||||
|
+ struct sio_par par;
|
||||||
|
+ int sig;
|
||||||
|
+
|
||||||
|
+ if (state != kClosed)
|
||||||
|
+ return false;
|
||||||
|
+
|
||||||
|
+ if (params.format() != AudioParameters::AUDIO_PCM_LINEAR &&
|
||||||
|
+ params.format() != AudioParameters::AUDIO_PCM_LOW_LATENCY) {
|
||||||
|
+ LOG(WARNING) << "Unsupported audio format.";
|
||||||
|
+ return false;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ sio_initpar(&par);
|
||||||
|
+ par.rate = params.sample_rate();
|
||||||
|
+ par.rchan = params.channels();
|
||||||
|
+ par.bits = SampleFormatToBitsPerChannel(kSampleFormat);
|
||||||
|
+ par.bps = par.bits / 8;
|
||||||
|
+ par.sig = sig = par.bits != 8 ? 1 : 0;
|
||||||
|
+ par.le = SIO_LE_NATIVE;
|
||||||
|
+ par.appbufsz = params.frames_per_buffer();
|
||||||
|
+
|
||||||
|
+ hdl = sio_open(SIO_DEVANY, SIO_REC, 0);
|
||||||
|
+
|
||||||
|
+ if (hdl == NULL) {
|
||||||
|
+ LOG(ERROR) << "Couldn't open audio device.";
|
||||||
|
+ return false;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ if (!sio_setpar(hdl, &par) || !sio_getpar(hdl, &par)) {
|
||||||
|
+ LOG(ERROR) << "Couldn't set audio parameters.";
|
||||||
|
+ goto bad_close;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ if (par.rate != (unsigned int)params.sample_rate() ||
|
||||||
|
+ par.rchan != (unsigned int)params.channels() ||
|
||||||
|
+ par.bits != (unsigned int)SampleFormatToBitsPerChannel(kSampleFormat) ||
|
||||||
|
+ par.sig != (unsigned int)sig ||
|
||||||
|
+ (par.bps > 1 && par.le != SIO_LE_NATIVE) ||
|
||||||
|
+ (par.bits != par.bps * 8)) {
|
||||||
|
+ LOG(ERROR) << "Unsupported audio parameters.";
|
||||||
|
+ goto bad_close;
|
||||||
|
+ }
|
||||||
|
+ state = kStopped;
|
||||||
|
+ buffer = new char[audio_bus->frames() * params.GetBytesPerFrame(kSampleFormat)];
|
||||||
|
+ sio_onmove(hdl, &OnMoveCallback, this);
|
||||||
|
+ return true;
|
||||||
|
+bad_close:
|
||||||
|
+ sio_close(hdl);
|
||||||
|
+ return false;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+void SndioAudioInputStream::Start(AudioInputCallback* cb) {
|
||||||
|
+
|
||||||
|
+ StartAgc();
|
||||||
|
+
|
||||||
|
+ state = kRunning;
|
||||||
|
+ hw_delay = 0;
|
||||||
|
+ callback = cb;
|
||||||
|
+ sio_start(hdl);
|
||||||
|
+ if (pthread_create(&thread, NULL, &ThreadEntry, this) != 0) {
|
||||||
|
+ LOG(ERROR) << "Failed to create real-time thread for recording.";
|
||||||
|
+ sio_stop(hdl);
|
||||||
|
+ state = kStopped;
|
||||||
|
+ }
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+void SndioAudioInputStream::Stop() {
|
||||||
|
+
|
||||||
|
+ if (state == kStopped)
|
||||||
|
+ return;
|
||||||
|
+
|
||||||
|
+ state = kStopWait;
|
||||||
|
+ pthread_join(thread, NULL);
|
||||||
|
+ sio_stop(hdl);
|
||||||
|
+ state = kStopped;
|
||||||
|
+
|
||||||
|
+ StopAgc();
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+void SndioAudioInputStream::Close() {
|
||||||
|
+
|
||||||
|
+ if (state == kClosed)
|
||||||
|
+ return;
|
||||||
|
+
|
||||||
|
+ if (state == kRunning)
|
||||||
|
+ Stop();
|
||||||
|
+
|
||||||
|
+ state = kClosed;
|
||||||
|
+ delete [] buffer;
|
||||||
|
+ sio_close(hdl);
|
||||||
|
+
|
||||||
|
+ manager->ReleaseInputStream(this);
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+double SndioAudioInputStream::GetMaxVolume() {
|
||||||
|
+ // Not supported
|
||||||
|
+ return 0.0;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+void SndioAudioInputStream::SetVolume(double volume) {
|
||||||
|
+ // Not supported. Do nothing.
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+double SndioAudioInputStream::GetVolume() {
|
||||||
|
+ // Not supported.
|
||||||
|
+ return 0.0;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+bool SndioAudioInputStream::IsMuted() {
|
||||||
|
+ // Not supported.
|
||||||
|
+ return false;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+void SndioAudioInputStream::SetOutputDeviceForAec(
|
||||||
|
+ const std::string& output_device_id) {
|
||||||
|
+ // Not supported.
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+void SndioAudioInputStream::ThreadLoop(void) {
|
||||||
|
+ size_t todo, n;
|
||||||
|
+ char *data;
|
||||||
|
+ unsigned int nframes;
|
||||||
|
+ double normalized_volume = 0.0;
|
||||||
|
+
|
||||||
|
+ nframes = audio_bus->frames();
|
||||||
|
+
|
||||||
|
+ while (state == kRunning && !sio_eof(hdl)) {
|
||||||
|
+
|
||||||
|
+ GetAgcVolume(&normalized_volume);
|
||||||
|
+
|
||||||
|
+ // read one block
|
||||||
|
+ todo = nframes * params.GetBytesPerFrame(kSampleFormat);
|
||||||
|
+ data = buffer;
|
||||||
|
+ while (todo > 0) {
|
||||||
|
+ n = sio_read(hdl, data, todo);
|
||||||
|
+ if (n == 0)
|
||||||
|
+ return; // unrecoverable I/O error
|
||||||
|
+ todo -= n;
|
||||||
|
+ data += n;
|
||||||
|
+ }
|
||||||
|
+ hw_delay -= nframes;
|
||||||
|
+
|
||||||
|
+ // convert frames count to TimeDelta
|
||||||
|
+ const base::TimeDelta delay = AudioTimestampHelper::FramesToTime(hw_delay,
|
||||||
|
+ params.sample_rate());
|
||||||
|
+
|
||||||
|
+ // push into bus
|
||||||
|
+ audio_bus->FromInterleaved(buffer, nframes, SampleFormatToBytesPerChannel(kSampleFormat));
|
||||||
|
+
|
||||||
|
+ // invoke callback
|
||||||
|
+ callback->OnData(audio_bus.get(), base::TimeTicks::Now() - delay, 1.);
|
||||||
|
+ }
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+} // namespace media
|
||||||
|
diff -Naur chromium-83.0.4103.97.orig/media/audio/sndio/sndio_input.h chromium-83.0.4103.97/media/audio/sndio/sndio_input.h
|
||||||
|
--- a/media/audio/sndio/sndio_input.h.orig 1970-01-01 01:00:00.000000000 +0100
|
||||||
|
+++ a/media/audio/sndio/sndio_input.h 2020-06-13 17:32:28.511395969 +0200
|
||||||
|
@@ -0,0 +1,91 @@
|
||||||
|
+// Copyright 2013 The Chromium Authors. All rights reserved.
|
||||||
|
+// Use of this source code is governed by a BSD-style license that can be
|
||||||
|
+// found in the LICENSE file.
|
||||||
|
+
|
||||||
|
+#ifndef MEDIA_AUDIO_SNDIO_SNDIO_INPUT_H_
|
||||||
|
+#define MEDIA_AUDIO_SNDIO_SNDIO_INPUT_H_
|
||||||
|
+
|
||||||
|
+#include <stdint.h>
|
||||||
|
+#include <string>
|
||||||
|
+#include <sndio.h>
|
||||||
|
+
|
||||||
|
+#include "base/compiler_specific.h"
|
||||||
|
+#include "base/macros.h"
|
||||||
|
+#include "base/memory/weak_ptr.h"
|
||||||
|
+#include "base/time/time.h"
|
||||||
|
+#include "media/audio/agc_audio_stream.h"
|
||||||
|
+#include "media/audio/audio_io.h"
|
||||||
|
+#include "media/audio/audio_device_description.h"
|
||||||
|
+#include "media/base/audio_parameters.h"
|
||||||
|
+
|
||||||
|
+namespace media {
|
||||||
|
+
|
||||||
|
+class AudioManagerBase;
|
||||||
|
+
|
||||||
|
+// Implementation of AudioOutputStream using sndio(7)
|
||||||
|
+class SndioAudioInputStream : public AgcAudioStream<AudioInputStream> {
|
||||||
|
+ public:
|
||||||
|
+ // Pass this to the constructor if you want to attempt auto-selection
|
||||||
|
+ // of the audio recording device.
|
||||||
|
+ static const char kAutoSelectDevice[];
|
||||||
|
+
|
||||||
|
+ // Create a PCM Output stream for the SNDIO device identified by
|
||||||
|
+ // |device_name|. If unsure of what to use for |device_name|, use
|
||||||
|
+ // |kAutoSelectDevice|.
|
||||||
|
+ SndioAudioInputStream(AudioManagerBase* audio_manager,
|
||||||
|
+ const std::string& device_name,
|
||||||
|
+ const AudioParameters& params);
|
||||||
|
+
|
||||||
|
+ ~SndioAudioInputStream() override;
|
||||||
|
+
|
||||||
|
+ // Implementation of AudioInputStream.
|
||||||
|
+ bool Open() override;
|
||||||
|
+ void Start(AudioInputCallback* callback) override;
|
||||||
|
+ void Stop() override;
|
||||||
|
+ void Close() override;
|
||||||
|
+ double GetMaxVolume() override;
|
||||||
|
+ void SetVolume(double volume) override;
|
||||||
|
+ double GetVolume() override;
|
||||||
|
+ bool IsMuted() override;
|
||||||
|
+ void SetOutputDeviceForAec(const std::string& output_device_id) override;
|
||||||
|
+
|
||||||
|
+ private:
|
||||||
|
+
|
||||||
|
+ enum StreamState {
|
||||||
|
+ kClosed, // Not opened yet
|
||||||
|
+ kStopped, // Device opened, but not started yet
|
||||||
|
+ kRunning, // Started, device playing
|
||||||
|
+ kStopWait // Stopping, waiting for the real-time thread to exit
|
||||||
|
+ };
|
||||||
|
+
|
||||||
|
+ // C-style call-backs
|
||||||
|
+ static void OnMoveCallback(void *arg, int delta);
|
||||||
|
+ static void* ThreadEntry(void *arg);
|
||||||
|
+
|
||||||
|
+ // Continuously moves data from the device to the consumer
|
||||||
|
+ void ThreadLoop();
|
||||||
|
+ // Our creator, the audio manager needs to be notified when we close.
|
||||||
|
+ AudioManagerBase* manager;
|
||||||
|
+ // Parameters of the source
|
||||||
|
+ AudioParameters params;
|
||||||
|
+ // We store data here for consumer
|
||||||
|
+ std::unique_ptr<AudioBus> audio_bus;
|
||||||
|
+ // Call-back that consumes recorded data
|
||||||
|
+ AudioInputCallback* callback; // Valid during a recording session.
|
||||||
|
+ // Handle of the audio device
|
||||||
|
+ struct sio_hdl* hdl;
|
||||||
|
+ // Current state of the stream
|
||||||
|
+ enum StreamState state;
|
||||||
|
+ // High priority thread running ThreadLoop()
|
||||||
|
+ pthread_t thread;
|
||||||
|
+ // Number of frames buffered in the hardware
|
||||||
|
+ int hw_delay;
|
||||||
|
+ // Temporary buffer where data is stored sndio-compatible format
|
||||||
|
+ char* buffer;
|
||||||
|
+
|
||||||
|
+ DISALLOW_COPY_AND_ASSIGN(SndioAudioInputStream);
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
+} // namespace media
|
||||||
|
+
|
||||||
|
+#endif // MEDIA_AUDIO_SNDIO_SNDIO_INPUT_H_
|
||||||
|
diff -Naur chromium-83.0.4103.97.orig/media/audio/sndio/sndio_output.cc chromium-83.0.4103.97/media/audio/sndio/sndio_output.cc
|
||||||
|
--- a/media/audio/sndio/sndio_output.cc.orig 1970-01-01 01:00:00.000000000 +0100
|
||||||
|
+++ a/media/audio/sndio/sndio_output.cc 2020-06-13 17:32:28.511395969 +0200
|
||||||
|
@@ -0,0 +1,183 @@
|
||||||
|
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
|
||||||
|
+// Use of this source code is governed by a BSD-style license that can be
|
||||||
|
+// found in the LICENSE file.
|
||||||
|
+
|
||||||
|
+#include "base/logging.h"
|
||||||
|
+#include "base/time/time.h"
|
||||||
|
+#include "base/time/default_tick_clock.h"
|
||||||
|
+#include "media/audio/audio_manager_base.h"
|
||||||
|
+#include "media/base/audio_timestamp_helper.h"
|
||||||
|
+#include "media/audio/sndio/sndio_output.h"
|
||||||
|
+
|
||||||
|
+namespace media {
|
||||||
|
+
|
||||||
|
+static const SampleFormat kSampleFormat = kSampleFormatS16;
|
||||||
|
+
|
||||||
|
+void SndioAudioOutputStream::OnMoveCallback(void *arg, int delta) {
|
||||||
|
+ SndioAudioOutputStream* self = static_cast<SndioAudioOutputStream*>(arg);
|
||||||
|
+
|
||||||
|
+ self->hw_delay -= delta;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+void SndioAudioOutputStream::OnVolCallback(void *arg, unsigned int vol) {
|
||||||
|
+ SndioAudioOutputStream* self = static_cast<SndioAudioOutputStream*>(arg);
|
||||||
|
+
|
||||||
|
+ self->vol = vol;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+void *SndioAudioOutputStream::ThreadEntry(void *arg) {
|
||||||
|
+ SndioAudioOutputStream* self = static_cast<SndioAudioOutputStream*>(arg);
|
||||||
|
+
|
||||||
|
+ self->ThreadLoop();
|
||||||
|
+ return NULL;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+SndioAudioOutputStream::SndioAudioOutputStream(const AudioParameters& params,
|
||||||
|
+ AudioManagerBase* manager)
|
||||||
|
+ : manager(manager),
|
||||||
|
+ params(params),
|
||||||
|
+ audio_bus(AudioBus::Create(params)),
|
||||||
|
+ state(kClosed),
|
||||||
|
+ mutex(PTHREAD_MUTEX_INITIALIZER) {
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+SndioAudioOutputStream::~SndioAudioOutputStream() {
|
||||||
|
+ if (state != kClosed)
|
||||||
|
+ Close();
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+bool SndioAudioOutputStream::Open() {
|
||||||
|
+ struct sio_par par;
|
||||||
|
+ int sig;
|
||||||
|
+
|
||||||
|
+ if (params.format() != AudioParameters::AUDIO_PCM_LINEAR &&
|
||||||
|
+ params.format() != AudioParameters::AUDIO_PCM_LOW_LATENCY) {
|
||||||
|
+ LOG(WARNING) << "Unsupported audio format.";
|
||||||
|
+ return false;
|
||||||
|
+ }
|
||||||
|
+ sio_initpar(&par);
|
||||||
|
+ par.rate = params.sample_rate();
|
||||||
|
+ par.pchan = params.channels();
|
||||||
|
+ par.bits = SampleFormatToBitsPerChannel(kSampleFormat);
|
||||||
|
+ par.bps = par.bits / 8;
|
||||||
|
+ par.sig = sig = par.bits != 8 ? 1 : 0;
|
||||||
|
+ par.le = SIO_LE_NATIVE;
|
||||||
|
+ par.appbufsz = params.frames_per_buffer();
|
||||||
|
+
|
||||||
|
+ hdl = sio_open(SIO_DEVANY, SIO_PLAY, 0);
|
||||||
|
+ if (hdl == NULL) {
|
||||||
|
+ LOG(ERROR) << "Couldn't open audio device.";
|
||||||
|
+ return false;
|
||||||
|
+ }
|
||||||
|
+ if (!sio_setpar(hdl, &par) || !sio_getpar(hdl, &par)) {
|
||||||
|
+ LOG(ERROR) << "Couldn't set audio parameters.";
|
||||||
|
+ goto bad_close;
|
||||||
|
+ }
|
||||||
|
+ if (par.rate != (unsigned int)params.sample_rate() ||
|
||||||
|
+ par.pchan != (unsigned int)params.channels() ||
|
||||||
|
+ par.bits != (unsigned int)SampleFormatToBitsPerChannel(kSampleFormat) ||
|
||||||
|
+ par.sig != (unsigned int)sig ||
|
||||||
|
+ (par.bps > 1 && par.le != SIO_LE_NATIVE) ||
|
||||||
|
+ (par.bits != par.bps * 8)) {
|
||||||
|
+ LOG(ERROR) << "Unsupported audio parameters.";
|
||||||
|
+ goto bad_close;
|
||||||
|
+ }
|
||||||
|
+ state = kStopped;
|
||||||
|
+ volpending = 0;
|
||||||
|
+ vol = 0;
|
||||||
|
+ buffer = new char[audio_bus->frames() * params.GetBytesPerFrame(kSampleFormat)];
|
||||||
|
+ sio_onmove(hdl, &OnMoveCallback, this);
|
||||||
|
+ sio_onvol(hdl, &OnVolCallback, this);
|
||||||
|
+ return true;
|
||||||
|
+ bad_close:
|
||||||
|
+ sio_close(hdl);
|
||||||
|
+ return false;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+void SndioAudioOutputStream::Close() {
|
||||||
|
+ if (state == kClosed)
|
||||||
|
+ return;
|
||||||
|
+ if (state == kRunning)
|
||||||
|
+ Stop();
|
||||||
|
+ state = kClosed;
|
||||||
|
+ delete [] buffer;
|
||||||
|
+ sio_close(hdl);
|
||||||
|
+ manager->ReleaseOutputStream(this); // Calls the destructor
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+void SndioAudioOutputStream::Start(AudioSourceCallback* callback) {
|
||||||
|
+ state = kRunning;
|
||||||
|
+ hw_delay = 0;
|
||||||
|
+ source = callback;
|
||||||
|
+ sio_start(hdl);
|
||||||
|
+ if (pthread_create(&thread, NULL, &ThreadEntry, this) != 0) {
|
||||||
|
+ LOG(ERROR) << "Failed to create real-time thread.";
|
||||||
|
+ sio_stop(hdl);
|
||||||
|
+ state = kStopped;
|
||||||
|
+ }
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+void SndioAudioOutputStream::Stop() {
|
||||||
|
+ if (state == kStopped)
|
||||||
|
+ return;
|
||||||
|
+ state = kStopWait;
|
||||||
|
+ pthread_join(thread, NULL);
|
||||||
|
+ sio_stop(hdl);
|
||||||
|
+ state = kStopped;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+void SndioAudioOutputStream::SetVolume(double v) {
|
||||||
|
+ pthread_mutex_lock(&mutex);
|
||||||
|
+ vol = v * SIO_MAXVOL;
|
||||||
|
+ volpending = 1;
|
||||||
|
+ pthread_mutex_unlock(&mutex);
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+void SndioAudioOutputStream::GetVolume(double* v) {
|
||||||
|
+ pthread_mutex_lock(&mutex);
|
||||||
|
+ *v = vol * (1. / SIO_MAXVOL);
|
||||||
|
+ pthread_mutex_unlock(&mutex);
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+// This stream is always used with sub second buffer sizes, where it's
|
||||||
|
+// sufficient to simply always flush upon Start().
|
||||||
|
+void SndioAudioOutputStream::Flush() {}
|
||||||
|
+
|
||||||
|
+void SndioAudioOutputStream::ThreadLoop(void) {
|
||||||
|
+ int avail, count, result;
|
||||||
|
+
|
||||||
|
+ while (state == kRunning) {
|
||||||
|
+ // Update volume if needed
|
||||||
|
+ pthread_mutex_lock(&mutex);
|
||||||
|
+ if (volpending) {
|
||||||
|
+ volpending = 0;
|
||||||
|
+ sio_setvol(hdl, vol);
|
||||||
|
+ }
|
||||||
|
+ pthread_mutex_unlock(&mutex);
|
||||||
|
+
|
||||||
|
+ // Get data to play
|
||||||
|
+ const base::TimeDelta delay = AudioTimestampHelper::FramesToTime(hw_delay,
|
||||||
|
+ params.sample_rate());
|
||||||
|
+ count = source->OnMoreData(delay, base::TimeTicks::Now(), 0, audio_bus.get());
|
||||||
|
+ audio_bus->ToInterleaved(count, SampleFormatToBytesPerChannel(kSampleFormat), buffer);
|
||||||
|
+ if (count == 0) {
|
||||||
|
+ // We have to submit something to the device
|
||||||
|
+ count = audio_bus->frames();
|
||||||
|
+ memset(buffer, 0, count * params.GetBytesPerFrame(kSampleFormat));
|
||||||
|
+ LOG(WARNING) << "No data to play, running empty cycle.";
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ // Submit data to the device
|
||||||
|
+ avail = count * params.GetBytesPerFrame(kSampleFormat);
|
||||||
|
+ result = sio_write(hdl, buffer, avail);
|
||||||
|
+ if (result == 0) {
|
||||||
|
+ LOG(WARNING) << "Audio device disconnected.";
|
||||||
|
+ break;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ // Update hardware pointer
|
||||||
|
+ hw_delay += count;
|
||||||
|
+ }
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+} // namespace media
|
||||||
|
diff -Naur chromium-83.0.4103.97.orig/media/audio/sndio/sndio_output.h chromium-83.0.4103.97/media/audio/sndio/sndio_output.h
|
||||||
|
--- a/media/audio/sndio/sndio_output.h.orig 1970-01-01 01:00:00.000000000 +0100
|
||||||
|
+++ a/media/audio/sndio/sndio_output.h 2020-06-13 17:32:28.511395969 +0200
|
||||||
|
@@ -0,0 +1,86 @@
|
||||||
|
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
|
||||||
|
+// Use of this source code is governed by a BSD-style license that can be
|
||||||
|
+// found in the LICENSE file.
|
||||||
|
+
|
||||||
|
+#ifndef MEDIA_AUDIO_SNDIO_SNDIO_OUTPUT_H_
|
||||||
|
+#define MEDIA_AUDIO_SNDIO_SNDIO_OUTPUT_H_
|
||||||
|
+
|
||||||
|
+#include <pthread.h>
|
||||||
|
+#include <sndio.h>
|
||||||
|
+
|
||||||
|
+#include "base/time/tick_clock.h"
|
||||||
|
+#include "base/time/time.h"
|
||||||
|
+#include "media/audio/audio_io.h"
|
||||||
|
+
|
||||||
|
+namespace media {
|
||||||
|
+
|
||||||
|
+class AudioManagerBase;
|
||||||
|
+
|
||||||
|
+// Implementation of AudioOutputStream using sndio(7)
|
||||||
|
+class SndioAudioOutputStream : public AudioOutputStream {
|
||||||
|
+ public:
|
||||||
|
+ // The manager is creating this object
|
||||||
|
+ SndioAudioOutputStream(const AudioParameters& params,
|
||||||
|
+ AudioManagerBase* manager);
|
||||||
|
+ virtual ~SndioAudioOutputStream();
|
||||||
|
+
|
||||||
|
+ // Implementation of AudioOutputStream.
|
||||||
|
+ bool Open() override;
|
||||||
|
+ void Close() override;
|
||||||
|
+ void Start(AudioSourceCallback* callback) override;
|
||||||
|
+ void Stop() override;
|
||||||
|
+ void SetVolume(double volume) override;
|
||||||
|
+ void GetVolume(double* volume) override;
|
||||||
|
+ void Flush() override;
|
||||||
|
+
|
||||||
|
+ friend void sndio_onmove(void *arg, int delta);
|
||||||
|
+ friend void sndio_onvol(void *arg, unsigned int vol);
|
||||||
|
+ friend void *sndio_threadstart(void *arg);
|
||||||
|
+
|
||||||
|
+ private:
|
||||||
|
+ enum StreamState {
|
||||||
|
+ kClosed, // Not opened yet
|
||||||
|
+ kStopped, // Device opened, but not started yet
|
||||||
|
+ kRunning, // Started, device playing
|
||||||
|
+ kStopWait // Stopping, waiting for the real-time thread to exit
|
||||||
|
+ };
|
||||||
|
+
|
||||||
|
+ // C-style call-backs
|
||||||
|
+ static void OnMoveCallback(void *arg, int delta);
|
||||||
|
+ static void OnVolCallback(void *arg, unsigned int vol);
|
||||||
|
+ static void* ThreadEntry(void *arg);
|
||||||
|
+
|
||||||
|
+ // Continuously moves data from the producer to the device
|
||||||
|
+ void ThreadLoop(void);
|
||||||
|
+
|
||||||
|
+ // Our creator, the audio manager needs to be notified when we close.
|
||||||
|
+ AudioManagerBase* manager;
|
||||||
|
+ // Parameters of the source
|
||||||
|
+ AudioParameters params;
|
||||||
|
+ // Source stores data here
|
||||||
|
+ std::unique_ptr<AudioBus> audio_bus;
|
||||||
|
+ // Call-back that produces data to play
|
||||||
|
+ AudioSourceCallback* source;
|
||||||
|
+ // Handle of the audio device
|
||||||
|
+ struct sio_hdl* hdl;
|
||||||
|
+ // Current state of the stream
|
||||||
|
+ enum StreamState state;
|
||||||
|
+ // High priority thread running ThreadLoop()
|
||||||
|
+ pthread_t thread;
|
||||||
|
+ // Protects vol, volpending and hw_delay
|
||||||
|
+ pthread_mutex_t mutex;
|
||||||
|
+ // Current volume in the 0..SIO_MAXVOL range
|
||||||
|
+ int vol;
|
||||||
|
+ // Set to 1 if volumes must be refreshed in the realtime thread
|
||||||
|
+ int volpending;
|
||||||
|
+ // Number of frames buffered in the hardware
|
||||||
|
+ int hw_delay;
|
||||||
|
+ // Temporary buffer where data is stored sndio-compatible format
|
||||||
|
+ char* buffer;
|
||||||
|
+
|
||||||
|
+ DISALLOW_COPY_AND_ASSIGN(SndioAudioOutputStream);
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
+} // namespace media
|
||||||
|
+
|
||||||
|
+#endif // MEDIA_AUDIO_SNDIO_SNDIO_OUTPUT_H_
|
||||||
|
diff -Naur chromium-83.0.4103.97.orig/media/media_options.gni chromium-83.0.4103.97/media/media_options.gni
|
||||||
|
--- a/media/media_options.gni.orig 2020-06-03 20:40:26.000000000 +0200
|
||||||
|
+++ a/media/media_options.gni 2020-06-13 17:32:28.512395963 +0200
|
||||||
|
@@ -119,6 +119,9 @@
|
||||||
|
# Enables runtime selection of ALSA library for audio.
|
||||||
|
use_alsa = false
|
||||||
|
|
||||||
|
+ # Enable runtime selection of sndio(7)
|
||||||
|
+ use_sndio = false
|
||||||
|
+
|
||||||
|
# Alsa should be used on non-Android, non-Mac POSIX systems.
|
||||||
|
# Alsa should be used on desktop Chromecast and audio-only Chromecast builds.
|
||||||
|
if (is_posix && !is_android && !is_mac &&
|
||||||
|
|
@ -0,0 +1,20 @@
|
||||||
|
--- a/third_party/node/node.py 2021-05-20 04:17:54.000000000 +0200
|
||||||
|
+++ - 2021-05-25 11:57:32.895222559 +0200
|
||||||
|
@@ -17,11 +17,12 @@
|
||||||
|
if platform.system() == 'Darwin' and platform.machine() == 'arm64':
|
||||||
|
return os.path.join(os_path.join(os_path.dirname(__file__), 'mac',
|
||||||
|
'node-darwin-arm64', 'bin', 'node'))
|
||||||
|
- return os_path.join(os_path.dirname(__file__), *{
|
||||||
|
- 'Darwin': ('mac', 'node-darwin-x64', 'bin', 'node'),
|
||||||
|
- 'Linux': ('linux', 'node-linux-x64', 'bin', 'node'),
|
||||||
|
- 'Windows': ('win', 'node.exe'),
|
||||||
|
- }[platform.system()])
|
||||||
|
+ return "/usr/bin/node"
|
||||||
|
+ #return os_path.join(os_path.dirname(__file__), *{
|
||||||
|
+ # 'Darwin': ('mac', 'node-darwin-x64', 'bin', 'node'),
|
||||||
|
+ # 'Linux': ('linux', 'node-linux-x64', 'bin', 'node'),
|
||||||
|
+ # 'Windows': ('win', 'node.exe'),
|
||||||
|
+ #}[platform.system()])
|
||||||
|
|
||||||
|
|
||||||
|
def RunNode(cmd_parts, stdout=None):
|
||||||
|
|
@ -0,0 +1,10 @@
|
||||||
|
--- a/third_party/webrtc/modules/desktop_capture/linux/window_capturer_x11.cc.orig 2019-02-21 21:21:24.488058990 +0100
|
||||||
|
+++ a/third_party/webrtc/modules/desktop_capture/linux/window_capturer_x11.cc 2019-02-21 21:21:36.151961064 +0100
|
||||||
|
@@ -16,6 +16,7 @@
|
||||||
|
|
||||||
|
#include <memory>
|
||||||
|
#include <string>
|
||||||
|
+#include <string.h>
|
||||||
|
#include <utility>
|
||||||
|
|
||||||
|
#include "modules/desktop_capture/desktop_frame.h"
|
||||||
33
srcpkgs/electron13/files/patches/chromium-webrtc-r0.patch
Normal file
33
srcpkgs/electron13/files/patches/chromium-webrtc-r0.patch
Normal file
|
|
@ -0,0 +1,33 @@
|
||||||
|
Upstream: Yes, https://webrtc-review.googlesource.com/9384
|
||||||
|
Reason: Fixes musl builds of webrtc
|
||||||
|
|
||||||
|
From 7f90e2cceda0458cf56026eb6ccffb961a47804b Mon Sep 17 00:00:00 2001
|
||||||
|
From: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com>
|
||||||
|
Date: Fri, 13 Oct 2017 15:49:32 +0200
|
||||||
|
Subject: [PATCH] IWYU: Include math.h for round(3).
|
||||||
|
|
||||||
|
math.h was being implicitly included, which can break the build with
|
||||||
|
alternative libc implementations.
|
||||||
|
|
||||||
|
Bug: None
|
||||||
|
Change-Id: I969b320b65d0f44abb33d3e1036cfbcb859a4952
|
||||||
|
Reviewed-on: https://webrtc-review.googlesource.com/9384
|
||||||
|
Reviewed-by: Tommi <tommi@webrtc.org>
|
||||||
|
Commit-Queue: Raphael Kubo da Costa (rakuco) <raphael.kubo.da.costa@intel.com>
|
||||||
|
Cr-Commit-Position: refs/heads/master@{#20292}
|
||||||
|
---
|
||||||
|
|
||||||
|
--- a/third_party/webrtc/p2p/base/port.cc
|
||||||
|
+++ a/third_party/webrtc/p2p/base/port.cc
|
||||||
|
@@ -10,6 +10,8 @@
|
||||||
|
|
||||||
|
#include "p2p/base/port.h"
|
||||||
|
|
||||||
|
+#include <math.h>
|
||||||
|
+
|
||||||
|
#include <algorithm>
|
||||||
|
#include <vector>
|
||||||
|
|
||||||
|
--
|
||||||
|
2.15.0.rc2
|
||||||
|
|
||||||
|
|
@ -0,0 +1,10 @@
|
||||||
|
--- a/third_party/webrtc/modules/audio_processing/aec3/clockdrift_detector.h 2020-08-10 20:42:29.000000000 +0200
|
||||||
|
+++ a/third_party/webrtc/modules/audio_processing/aec3/clockdrift_detector.h 2020-09-04 12:47:07.014833633 +0200
|
||||||
|
@@ -12,6 +12,7 @@
|
||||||
|
#define MODULES_AUDIO_PROCESSING_AEC3_CLOCKDRIFT_DETECTOR_H_
|
||||||
|
|
||||||
|
#include <array>
|
||||||
|
+#include <cstddef>
|
||||||
|
|
||||||
|
namespace webrtc {
|
||||||
|
|
||||||
|
|
@ -0,0 +1,72 @@
|
||||||
|
Uses generic target for now. To use ppc64le, change --target to ppc64le-gnu
|
||||||
|
and add --enable-vsx, and change generic to ppc for the rtcd header.
|
||||||
|
|
||||||
|
From 18e6c5c55cfae0cfb458d8210d7bc709360a0e90 Mon Sep 17 00:00:00 2001
|
||||||
|
From: q66 <daniel@octaforge.org>
|
||||||
|
Date: Wed, 9 Sep 2020 19:08:25 +0200
|
||||||
|
Subject: [PATCH] enable generation of ppc64 libvpx bits
|
||||||
|
|
||||||
|
this doesn't update the gni file, that's done from
|
||||||
|
the template by running the appropriate scripts
|
||||||
|
---
|
||||||
|
third_party/libvpx/BUILD.gn | 4 ++++
|
||||||
|
third_party/libvpx/generate_gni.sh | 9 +++++++++
|
||||||
|
2 files changed, 13 insertions(+)
|
||||||
|
|
||||||
|
diff --git third_party/libvpx/BUILD.gn third_party/libvpx/BUILD.gn
|
||||||
|
index 7198e59..3300485 100644
|
||||||
|
--- a/third_party/libvpx/BUILD.gn
|
||||||
|
+++ b/third_party/libvpx/BUILD.gn
|
||||||
|
@@ -336,6 +336,8 @@ static_library("libvpx") {
|
||||||
|
} else {
|
||||||
|
sources = libvpx_srcs_arm64
|
||||||
|
}
|
||||||
|
+ } else if (current_cpu == "ppc64") {
|
||||||
|
+ sources = libvpx_srcs_ppc64
|
||||||
|
}
|
||||||
|
|
||||||
|
configs -= [ "//build/config/compiler:chromium_code" ]
|
||||||
|
diff --git third_party/libvpx/generate_gni.sh third_party/libvpx/generate_gni.sh
|
||||||
|
index bcf84b0..8a3f4f1 100755
|
||||||
|
--- a/third_party/libvpx/generate_gni.sh
|
||||||
|
+++ b/third_party/libvpx/generate_gni.sh
|
||||||
|
@@ -361,6 +361,7 @@ gen_config_files linux/arm-neon-highbd "--target=armv7-linux-gcc ${all_platforms
|
||||||
|
gen_config_files linux/arm64-highbd "--target=armv8-linux-gcc ${all_platforms} ${HIGHBD}"
|
||||||
|
gen_config_files linux/mipsel "--target=mips32-linux-gcc ${all_platforms}"
|
||||||
|
gen_config_files linux/mips64el "--target=mips64-linux-gcc ${all_platforms}"
|
||||||
|
+gen_config_files linux/ppc64 "--target=generic-gnu $HIGHBD ${all_platforms}"
|
||||||
|
gen_config_files linux/generic "--target=generic-gnu $HIGHBD ${all_platforms}"
|
||||||
|
gen_config_files win/arm64 "--target=arm64-win64-vs15 ${all_platforms} ${HIGHBD}"
|
||||||
|
gen_config_files win/ia32 "--target=x86-win32-vs14 ${all_platforms} ${x86_platforms}"
|
||||||
|
@@ -386,6 +387,7 @@ lint_config linux/arm-neon-highbd
|
||||||
|
lint_config linux/arm64-highbd
|
||||||
|
lint_config linux/mipsel
|
||||||
|
lint_config linux/mips64el
|
||||||
|
+lint_config linux/ppc64
|
||||||
|
lint_config linux/generic
|
||||||
|
lint_config win/arm64
|
||||||
|
lint_config win/ia32
|
||||||
|
@@ -415,6 +417,7 @@ gen_rtcd_header linux/arm-neon-highbd armv7
|
||||||
|
gen_rtcd_header linux/arm64-highbd armv8
|
||||||
|
gen_rtcd_header linux/mipsel mipsel
|
||||||
|
gen_rtcd_header linux/mips64el mips64el
|
||||||
|
+gen_rtcd_header linux/ppc64 generic
|
||||||
|
gen_rtcd_header linux/generic generic
|
||||||
|
gen_rtcd_header win/arm64 armv8
|
||||||
|
gen_rtcd_header win/ia32 x86 "${require_sse2}"
|
||||||
|
@@ -500,6 +503,12 @@ if [ -z $ONLY_CONFIGS ]; then
|
||||||
|
|
||||||
|
echo "MIPS64 source list is identical to MIPS source list. No need to generate it."
|
||||||
|
|
||||||
|
+ echo "Generate ppc64 source list."
|
||||||
|
+ config=$(print_config_basic linux/ppc64)
|
||||||
|
+ make_clean
|
||||||
|
+ make libvpx_srcs.txt target=libs $config > /dev/null
|
||||||
|
+ convert_srcs_to_project_files libvpx_srcs.txt libvpx_srcs_ppc64
|
||||||
|
+
|
||||||
|
echo "Generate NaCl source list."
|
||||||
|
config=$(print_config_basic nacl)
|
||||||
|
make_clean
|
||||||
|
--
|
||||||
|
2.28.0
|
||||||
|
|
||||||
3707
srcpkgs/electron13/files/patches/chromium-xxx-ppc64le-support.patch
Normal file
3707
srcpkgs/electron13/files/patches/chromium-xxx-ppc64le-support.patch
Normal file
File diff suppressed because it is too large
Load diff
|
|
@ -0,0 +1,18 @@
|
||||||
|
--- a/third_party/swiftshader/third_party/llvm-10.0/BUILD.gn
|
||||||
|
+++ b/third_party/swiftshader/third_party/llvm-10.0/BUILD.gn
|
||||||
|
@@ -574,6 +574,7 @@ swiftshader_llvm_source_set("swiftshader
|
||||||
|
"llvm/lib/MC/MCAsmInfoCOFF.cpp",
|
||||||
|
"llvm/lib/MC/MCAsmInfoDarwin.cpp",
|
||||||
|
"llvm/lib/MC/MCAsmInfoELF.cpp",
|
||||||
|
+ "llvm/lib/MC/MCAsmInfoXCOFF.cpp",
|
||||||
|
"llvm/lib/MC/MCAsmMacro.cpp",
|
||||||
|
"llvm/lib/MC/MCAsmStreamer.cpp",
|
||||||
|
"llvm/lib/MC/MCAssembler.cpp",
|
||||||
|
@@ -629,6 +630,7 @@ swiftshader_llvm_source_set("swiftshader
|
||||||
|
"llvm/lib/MC/MCWinCOFFStreamer.cpp",
|
||||||
|
"llvm/lib/MC/MCWinEH.cpp",
|
||||||
|
"llvm/lib/MC/MCXCOFFStreamer.cpp",
|
||||||
|
+ "llvm/lib/MC/MCXCOFFObjectTargetWriter.cpp",
|
||||||
|
"llvm/lib/MC/MachObjectWriter.cpp",
|
||||||
|
"llvm/lib/MC/StringTableBuilder.cpp",
|
||||||
|
"llvm/lib/MC/SubtargetFeature.cpp",
|
||||||
|
|
@ -0,0 +1,42 @@
|
||||||
|
From ff4122f236b70c272c746d0c336cdbd588d78cd1 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Elvis Pranskevichus <elvis@magic.io>
|
||||||
|
Date: Thu, 12 Dec 2019 16:12:18 -0500
|
||||||
|
Subject: [PATCH] Add a script to list patch targets
|
||||||
|
|
||||||
|
---
|
||||||
|
script/list_patch_targets.py | 23 +++++++++++++++++++++++
|
||||||
|
1 file changed, 23 insertions(+)
|
||||||
|
create mode 100755 script/list_patch_targets.py
|
||||||
|
|
||||||
|
diff --git a/script/list_patch_targets.py b/script/list_patch_targets.py
|
||||||
|
new file mode 100755
|
||||||
|
index 000000000..55173bac9
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/script/list_patch_targets.py
|
||||||
|
@@ -0,0 +1,23 @@
|
||||||
|
+#!/usr/bin/env python
|
||||||
|
+
|
||||||
|
+import argparse
|
||||||
|
+import json
|
||||||
|
+
|
||||||
|
+
|
||||||
|
+def parse_args():
|
||||||
|
+ parser = argparse.ArgumentParser(description='Apply Electron patches')
|
||||||
|
+ parser.add_argument('config', nargs='+',
|
||||||
|
+ type=argparse.FileType('r'),
|
||||||
|
+ help='patches\' config(s) in the JSON format')
|
||||||
|
+ return parser.parse_args()
|
||||||
|
+
|
||||||
|
+
|
||||||
|
+def main():
|
||||||
|
+ configs = parse_args().config
|
||||||
|
+ for config_json in configs:
|
||||||
|
+ for patch_dir, repo in json.load(config_json).iteritems():
|
||||||
|
+ print(repo)
|
||||||
|
+
|
||||||
|
+
|
||||||
|
+if __name__ == '__main__':
|
||||||
|
+ main()
|
||||||
|
--
|
||||||
|
2.23.0
|
||||||
|
|
||||||
|
|
@ -0,0 +1,47 @@
|
||||||
|
diff --git a/build/args/release.gn b/build/args/release.gn
|
||||||
|
index e5017f6e1..59207b389 100644
|
||||||
|
--- a/build/args/release.gn
|
||||||
|
+++ b/build/args/release.gn
|
||||||
|
@@ -1,6 +1,4 @@
|
||||||
|
import("all.gn")
|
||||||
|
-is_component_build = false
|
||||||
|
-is_official_build = true
|
||||||
|
|
||||||
|
# This may be guarded behind is_chrome_branded alongside
|
||||||
|
# proprietary_codecs https://webrtc-review.googlesource.com/c/src/+/36321,
|
||||||
|
@@ -8,9 +6,3 @@ is_official_build = true
|
||||||
|
# The initialization of the decoder depends on whether ffmpeg has
|
||||||
|
# been built with H.264 support.
|
||||||
|
rtc_use_h264 = proprietary_codecs
|
||||||
|
-
|
||||||
|
-# By default, Electron builds ffmpeg with proprietary codecs enabled. In order
|
||||||
|
-# to facilitate users who don't want to ship proprietary codecs in ffmpeg, or
|
||||||
|
-# who have an LGPL requirement to ship ffmpeg as a dynamically linked library,
|
||||||
|
-# we build ffmpeg as a shared library.
|
||||||
|
-is_component_ffmpeg = true
|
||||||
|
diff --git a/build/npm.gni b/build/npm.gni
|
||||||
|
index a1987d095..fb33a14c3 100644
|
||||||
|
--- a/build/npm.gni
|
||||||
|
+++ b/build/npm.gni
|
||||||
|
@@ -35,7 +35,6 @@ template("npm_action") {
|
||||||
|
if (!defined(deps)) {
|
||||||
|
deps = []
|
||||||
|
}
|
||||||
|
- deps += [ ":npm_pre_flight_" + target_name ]
|
||||||
|
|
||||||
|
script = "//electron/build/npm-run.py"
|
||||||
|
args = [
|
||||||
|
diff --git a/patches/node/fix_add_default_values_for_enable_lto_and_build_v8_with_gn_in.patch b/patches/node/fix_add_default_values_for_enable_lto_and_build_v8_with_gn_in.patch
|
||||||
|
index 0dc9916be..7eaa46bf5 100644
|
||||||
|
--- a/patches/node/fix_add_default_values_for_enable_lto_and_build_v8_with_gn_in.patch
|
||||||
|
+++ b/patches/node/fix_add_default_values_for_enable_lto_and_build_v8_with_gn_in.patch
|
||||||
|
@@ -30,7 +30,7 @@
|
||||||
|
+ # these values being accurate.
|
||||||
|
+ 'build_v8_with_gn': 'false',
|
||||||
|
+ 'enable_lto%': 'false',
|
||||||
|
-+
|
||||||
|
++ 'openssl_fips': '',
|
||||||
|
'conditions': [
|
||||||
|
['target_arch=="arm64"', {
|
||||||
|
# Disabled pending https://github.com/nodejs/node/issues/23913.
|
||||||
|
|
||||||
|
|
@ -0,0 +1,17 @@
|
||||||
|
--- a/build/zip.py.orig 2020-04-27 17:59:53.499281667 +0200
|
||||||
|
+++ b/build/zip.py 2020-04-27 17:59:57.655839143 +0200
|
||||||
|
@@ -1,4 +1,4 @@
|
||||||
|
-#!/usr/bin/env python
|
||||||
|
+#!/usr/bin/env python2
|
||||||
|
from __future__ import print_function
|
||||||
|
import os
|
||||||
|
import subprocess
|
||||||
|
|
||||||
|
--- a/build/npm-run.py.orig 2020-04-27 17:59:50.829351807 +0200
|
||||||
|
+++ b/build/npm-run.py 2020-04-27 18:00:02.702373256 +0200
|
||||||
|
@@ -1,4 +1,4 @@
|
||||||
|
-#!/usr/bin/env python
|
||||||
|
+#!/usr/bin/env python2
|
||||||
|
from __future__ import print_function
|
||||||
|
import os
|
||||||
|
import subprocess
|
||||||
|
|
@ -0,0 +1,10 @@
|
||||||
|
--- a/script/apply_all_patches.py 2020-08-22 17:46:41.796707506 +0200
|
||||||
|
+++ - 2020-08-22 17:47:05.887813512 +0200
|
||||||
|
@@ -14,6 +14,7 @@
|
||||||
|
for patch_dir, repo in dirs.items():
|
||||||
|
git.import_patches(repo=repo, patch_data=patch_from_dir(patch_dir),
|
||||||
|
threeway=threeway is not None,
|
||||||
|
+ exclude=['test/mjsunit/**', 'content/test/**', 'test/cctest/**', 'test/unittests/**', 'third_party/blink/web_tests/**'],
|
||||||
|
committer_name="Electron Scripts", committer_email="scripts@electron")
|
||||||
|
|
||||||
|
|
||||||
148
srcpkgs/electron13/files/sndio-files/audio_manager_openbsd.cc
Normal file
148
srcpkgs/electron13/files/sndio-files/audio_manager_openbsd.cc
Normal file
|
|
@ -0,0 +1,148 @@
|
||||||
|
// Copyright (c) 2012 The Chromium Authors. All rights reserved.
|
||||||
|
// Use of this source code is governed by a BSD-style license that can be
|
||||||
|
// found in the LICENSE file.
|
||||||
|
|
||||||
|
#include "base/metrics/histogram_macros.h"
|
||||||
|
#include "base/memory/ptr_util.h"
|
||||||
|
|
||||||
|
#include "media/audio/openbsd/audio_manager_openbsd.h"
|
||||||
|
|
||||||
|
#include "media/audio/audio_device_description.h"
|
||||||
|
#include "media/audio/audio_output_dispatcher.h"
|
||||||
|
#include "media/audio/sndio/sndio_input.h"
|
||||||
|
#include "media/audio/sndio/sndio_output.h"
|
||||||
|
#include "media/base/limits.h"
|
||||||
|
#include "media/base/media_switches.h"
|
||||||
|
|
||||||
|
namespace media {
|
||||||
|
|
||||||
|
// Maximum number of output streams that can be open simultaneously.
|
||||||
|
static const int kMaxOutputStreams = 4;
|
||||||
|
|
||||||
|
// Default sample rate for input and output streams.
|
||||||
|
static const int kDefaultSampleRate = 48000;
|
||||||
|
|
||||||
|
void AddDefaultDevice(AudioDeviceNames* device_names) {
|
||||||
|
DCHECK(device_names->empty());
|
||||||
|
device_names->push_front(AudioDeviceName::CreateDefault());
|
||||||
|
}
|
||||||
|
|
||||||
|
bool AudioManagerOpenBSD::HasAudioOutputDevices() {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool AudioManagerOpenBSD::HasAudioInputDevices() {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
void AudioManagerOpenBSD::GetAudioInputDeviceNames(
|
||||||
|
AudioDeviceNames* device_names) {
|
||||||
|
DCHECK(device_names->empty());
|
||||||
|
AddDefaultDevice(device_names);
|
||||||
|
}
|
||||||
|
|
||||||
|
void AudioManagerOpenBSD::GetAudioOutputDeviceNames(
|
||||||
|
AudioDeviceNames* device_names) {
|
||||||
|
AddDefaultDevice(device_names);
|
||||||
|
}
|
||||||
|
|
||||||
|
const char* AudioManagerOpenBSD::GetName() {
|
||||||
|
return "SNDIO";
|
||||||
|
}
|
||||||
|
|
||||||
|
AudioParameters AudioManagerOpenBSD::GetInputStreamParameters(
|
||||||
|
const std::string& device_id) {
|
||||||
|
static const int kDefaultInputBufferSize = 1024;
|
||||||
|
|
||||||
|
int user_buffer_size = GetUserBufferSize();
|
||||||
|
int buffer_size = user_buffer_size ?
|
||||||
|
user_buffer_size : kDefaultInputBufferSize;
|
||||||
|
|
||||||
|
return AudioParameters(
|
||||||
|
AudioParameters::AUDIO_PCM_LOW_LATENCY, CHANNEL_LAYOUT_STEREO,
|
||||||
|
kDefaultSampleRate, buffer_size);
|
||||||
|
}
|
||||||
|
|
||||||
|
AudioManagerOpenBSD::AudioManagerOpenBSD(std::unique_ptr<AudioThread> audio_thread,
|
||||||
|
AudioLogFactory* audio_log_factory)
|
||||||
|
: AudioManagerBase(std::move(audio_thread),
|
||||||
|
audio_log_factory) {
|
||||||
|
DLOG(WARNING) << "AudioManagerOpenBSD";
|
||||||
|
SetMaxOutputStreamsAllowed(kMaxOutputStreams);
|
||||||
|
}
|
||||||
|
|
||||||
|
AudioManagerOpenBSD::~AudioManagerOpenBSD() {
|
||||||
|
Shutdown();
|
||||||
|
}
|
||||||
|
|
||||||
|
AudioOutputStream* AudioManagerOpenBSD::MakeLinearOutputStream(
|
||||||
|
const AudioParameters& params,
|
||||||
|
const LogCallback& log_callback) {
|
||||||
|
DCHECK_EQ(AudioParameters::AUDIO_PCM_LINEAR, params.format());
|
||||||
|
return MakeOutputStream(params);
|
||||||
|
}
|
||||||
|
|
||||||
|
AudioOutputStream* AudioManagerOpenBSD::MakeLowLatencyOutputStream(
|
||||||
|
const AudioParameters& params,
|
||||||
|
const std::string& device_id,
|
||||||
|
const LogCallback& log_callback) {
|
||||||
|
DLOG_IF(ERROR, !device_id.empty()) << "Not implemented!";
|
||||||
|
DCHECK_EQ(AudioParameters::AUDIO_PCM_LOW_LATENCY, params.format());
|
||||||
|
return MakeOutputStream(params);
|
||||||
|
}
|
||||||
|
|
||||||
|
AudioInputStream* AudioManagerOpenBSD::MakeLinearInputStream(
|
||||||
|
const AudioParameters& params,
|
||||||
|
const std::string& device_id,
|
||||||
|
const LogCallback& log_callback) {
|
||||||
|
DCHECK_EQ(AudioParameters::AUDIO_PCM_LINEAR, params.format());
|
||||||
|
return MakeInputStream(params);
|
||||||
|
}
|
||||||
|
|
||||||
|
AudioInputStream* AudioManagerOpenBSD::MakeLowLatencyInputStream(
|
||||||
|
const AudioParameters& params,
|
||||||
|
const std::string& device_id,
|
||||||
|
const LogCallback& log_callback) {
|
||||||
|
DCHECK_EQ(AudioParameters::AUDIO_PCM_LOW_LATENCY, params.format());
|
||||||
|
return MakeInputStream(params);
|
||||||
|
}
|
||||||
|
|
||||||
|
AudioParameters AudioManagerOpenBSD::GetPreferredOutputStreamParameters(
|
||||||
|
const std::string& output_device_id,
|
||||||
|
const AudioParameters& input_params) {
|
||||||
|
// TODO(tommi): Support |output_device_id|.
|
||||||
|
DLOG_IF(ERROR, !output_device_id.empty()) << "Not implemented!";
|
||||||
|
static const int kDefaultOutputBufferSize = 2048;
|
||||||
|
|
||||||
|
ChannelLayout channel_layout = CHANNEL_LAYOUT_STEREO;
|
||||||
|
int sample_rate = kDefaultSampleRate;
|
||||||
|
int buffer_size = kDefaultOutputBufferSize;
|
||||||
|
if (input_params.IsValid()) {
|
||||||
|
sample_rate = input_params.sample_rate();
|
||||||
|
channel_layout = input_params.channel_layout();
|
||||||
|
buffer_size = std::min(buffer_size, input_params.frames_per_buffer());
|
||||||
|
}
|
||||||
|
|
||||||
|
int user_buffer_size = GetUserBufferSize();
|
||||||
|
if (user_buffer_size)
|
||||||
|
buffer_size = user_buffer_size;
|
||||||
|
|
||||||
|
return AudioParameters(
|
||||||
|
AudioParameters::AUDIO_PCM_LOW_LATENCY, channel_layout,
|
||||||
|
sample_rate, buffer_size);
|
||||||
|
}
|
||||||
|
|
||||||
|
AudioInputStream* AudioManagerOpenBSD::MakeInputStream(
|
||||||
|
const AudioParameters& params) {
|
||||||
|
DLOG(WARNING) << "MakeInputStream";
|
||||||
|
return new SndioAudioInputStream(this,
|
||||||
|
AudioDeviceDescription::kDefaultDeviceId, params);
|
||||||
|
}
|
||||||
|
|
||||||
|
AudioOutputStream* AudioManagerOpenBSD::MakeOutputStream(
|
||||||
|
const AudioParameters& params) {
|
||||||
|
DLOG(WARNING) << "MakeOutputStream";
|
||||||
|
return new SndioAudioOutputStream(params, this);
|
||||||
|
}
|
||||||
|
|
||||||
|
} // namespace media
|
||||||
65
srcpkgs/electron13/files/sndio-files/audio_manager_openbsd.h
Normal file
65
srcpkgs/electron13/files/sndio-files/audio_manager_openbsd.h
Normal file
|
|
@ -0,0 +1,65 @@
|
||||||
|
// Copyright (c) 2012 The Chromium Authors. All rights reserved.
|
||||||
|
// Use of this source code is governed by a BSD-style license that can be
|
||||||
|
// found in the LICENSE file.
|
||||||
|
|
||||||
|
#ifndef MEDIA_AUDIO_OPENBSD_AUDIO_MANAGER_OPENBSD_H_
|
||||||
|
#define MEDIA_AUDIO_OPENBSD_AUDIO_MANAGER_OPENBSD_H_
|
||||||
|
|
||||||
|
#include <set>
|
||||||
|
|
||||||
|
#include "base/compiler_specific.h"
|
||||||
|
#include "base/macros.h"
|
||||||
|
#include "base/memory/ref_counted.h"
|
||||||
|
#include "base/threading/thread.h"
|
||||||
|
#include "media/audio/audio_manager_base.h"
|
||||||
|
|
||||||
|
namespace media {
|
||||||
|
|
||||||
|
class MEDIA_EXPORT AudioManagerOpenBSD : public AudioManagerBase {
|
||||||
|
public:
|
||||||
|
AudioManagerOpenBSD(std::unique_ptr<AudioThread> audio_thread,
|
||||||
|
AudioLogFactory* audio_log_factory);
|
||||||
|
~AudioManagerOpenBSD() override;
|
||||||
|
|
||||||
|
// Implementation of AudioManager.
|
||||||
|
bool HasAudioOutputDevices() override;
|
||||||
|
bool HasAudioInputDevices() override;
|
||||||
|
void GetAudioInputDeviceNames(AudioDeviceNames* device_names) override;
|
||||||
|
void GetAudioOutputDeviceNames(AudioDeviceNames* device_names) override;
|
||||||
|
AudioParameters GetInputStreamParameters(
|
||||||
|
const std::string& device_id) override;
|
||||||
|
const char* GetName() override;
|
||||||
|
|
||||||
|
// Implementation of AudioManagerBase.
|
||||||
|
AudioOutputStream* MakeLinearOutputStream(
|
||||||
|
const AudioParameters& params,
|
||||||
|
const LogCallback& log_callback) override;
|
||||||
|
AudioOutputStream* MakeLowLatencyOutputStream(
|
||||||
|
const AudioParameters& params,
|
||||||
|
const std::string& device_id,
|
||||||
|
const LogCallback& log_callback) override;
|
||||||
|
AudioInputStream* MakeLinearInputStream(
|
||||||
|
const AudioParameters& params,
|
||||||
|
const std::string& device_id,
|
||||||
|
const LogCallback& log_callback) override;
|
||||||
|
AudioInputStream* MakeLowLatencyInputStream(
|
||||||
|
const AudioParameters& params,
|
||||||
|
const std::string& device_id,
|
||||||
|
const LogCallback& log_callback) override;
|
||||||
|
|
||||||
|
protected:
|
||||||
|
AudioParameters GetPreferredOutputStreamParameters(
|
||||||
|
const std::string& output_device_id,
|
||||||
|
const AudioParameters& input_params) override;
|
||||||
|
|
||||||
|
private:
|
||||||
|
// Called by MakeLinearOutputStream and MakeLowLatencyOutputStream.
|
||||||
|
AudioOutputStream* MakeOutputStream(const AudioParameters& params);
|
||||||
|
AudioInputStream* MakeInputStream(const AudioParameters& params);
|
||||||
|
|
||||||
|
DISALLOW_COPY_AND_ASSIGN(AudioManagerOpenBSD);
|
||||||
|
};
|
||||||
|
|
||||||
|
} // namespace media
|
||||||
|
|
||||||
|
#endif // MEDIA_AUDIO_OPENBSD_AUDIO_MANAGER_OPENBSD_H_
|
||||||
200
srcpkgs/electron13/files/sndio-files/sndio_input.cc
Normal file
200
srcpkgs/electron13/files/sndio-files/sndio_input.cc
Normal file
|
|
@ -0,0 +1,200 @@
|
||||||
|
// Copyright 2013 The Chromium Authors. All rights reserved.
|
||||||
|
// Use of this source code is governed by a BSD-style license that can be
|
||||||
|
// found in the LICENSE file.
|
||||||
|
|
||||||
|
#include "base/bind.h"
|
||||||
|
#include "base/logging.h"
|
||||||
|
#include "base/macros.h"
|
||||||
|
#include "media/base/audio_timestamp_helper.h"
|
||||||
|
#include "media/audio/openbsd/audio_manager_openbsd.h"
|
||||||
|
#include "media/audio/audio_manager.h"
|
||||||
|
#include "media/audio/sndio/sndio_input.h"
|
||||||
|
|
||||||
|
namespace media {
|
||||||
|
|
||||||
|
static const SampleFormat kSampleFormat = kSampleFormatS16;
|
||||||
|
|
||||||
|
void SndioAudioInputStream::OnMoveCallback(void *arg, int delta)
|
||||||
|
{
|
||||||
|
SndioAudioInputStream* self = static_cast<SndioAudioInputStream*>(arg);
|
||||||
|
|
||||||
|
self->hw_delay += delta;
|
||||||
|
}
|
||||||
|
|
||||||
|
void *SndioAudioInputStream::ThreadEntry(void *arg) {
|
||||||
|
SndioAudioInputStream* self = static_cast<SndioAudioInputStream*>(arg);
|
||||||
|
|
||||||
|
self->ThreadLoop();
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
SndioAudioInputStream::SndioAudioInputStream(AudioManagerBase* manager,
|
||||||
|
const std::string& device_name,
|
||||||
|
const AudioParameters& params)
|
||||||
|
: manager(manager),
|
||||||
|
params(params),
|
||||||
|
audio_bus(AudioBus::Create(params)),
|
||||||
|
state(kClosed) {
|
||||||
|
}
|
||||||
|
|
||||||
|
SndioAudioInputStream::~SndioAudioInputStream() {
|
||||||
|
if (state != kClosed)
|
||||||
|
Close();
|
||||||
|
}
|
||||||
|
|
||||||
|
bool SndioAudioInputStream::Open() {
|
||||||
|
struct sio_par par;
|
||||||
|
int sig;
|
||||||
|
|
||||||
|
if (state != kClosed)
|
||||||
|
return false;
|
||||||
|
|
||||||
|
if (params.format() != AudioParameters::AUDIO_PCM_LINEAR &&
|
||||||
|
params.format() != AudioParameters::AUDIO_PCM_LOW_LATENCY) {
|
||||||
|
LOG(WARNING) << "Unsupported audio format.";
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
sio_initpar(&par);
|
||||||
|
par.rate = params.sample_rate();
|
||||||
|
par.rchan = params.channels();
|
||||||
|
par.bits = SampleFormatToBitsPerChannel(kSampleFormat);
|
||||||
|
par.bps = par.bits / 8;
|
||||||
|
par.sig = sig = par.bits != 8 ? 1 : 0;
|
||||||
|
par.le = SIO_LE_NATIVE;
|
||||||
|
par.appbufsz = params.frames_per_buffer();
|
||||||
|
|
||||||
|
hdl = sio_open(SIO_DEVANY, SIO_REC, 0);
|
||||||
|
|
||||||
|
if (hdl == NULL) {
|
||||||
|
LOG(ERROR) << "Couldn't open audio device.";
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!sio_setpar(hdl, &par) || !sio_getpar(hdl, &par)) {
|
||||||
|
LOG(ERROR) << "Couldn't set audio parameters.";
|
||||||
|
goto bad_close;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (par.rate != (unsigned int)params.sample_rate() ||
|
||||||
|
par.rchan != (unsigned int)params.channels() ||
|
||||||
|
par.bits != (unsigned int)SampleFormatToBitsPerChannel(kSampleFormat) ||
|
||||||
|
par.sig != (unsigned int)sig ||
|
||||||
|
(par.bps > 1 && par.le != SIO_LE_NATIVE) ||
|
||||||
|
(par.bits != par.bps * 8)) {
|
||||||
|
LOG(ERROR) << "Unsupported audio parameters.";
|
||||||
|
goto bad_close;
|
||||||
|
}
|
||||||
|
state = kStopped;
|
||||||
|
buffer = new char[audio_bus->frames() * params.GetBytesPerFrame(kSampleFormat)];
|
||||||
|
sio_onmove(hdl, &OnMoveCallback, this);
|
||||||
|
return true;
|
||||||
|
bad_close:
|
||||||
|
sio_close(hdl);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
void SndioAudioInputStream::Start(AudioInputCallback* cb) {
|
||||||
|
|
||||||
|
StartAgc();
|
||||||
|
|
||||||
|
state = kRunning;
|
||||||
|
hw_delay = 0;
|
||||||
|
callback = cb;
|
||||||
|
sio_start(hdl);
|
||||||
|
if (pthread_create(&thread, NULL, &ThreadEntry, this) != 0) {
|
||||||
|
LOG(ERROR) << "Failed to create real-time thread for recording.";
|
||||||
|
sio_stop(hdl);
|
||||||
|
state = kStopped;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void SndioAudioInputStream::Stop() {
|
||||||
|
|
||||||
|
if (state == kStopped)
|
||||||
|
return;
|
||||||
|
|
||||||
|
state = kStopWait;
|
||||||
|
pthread_join(thread, NULL);
|
||||||
|
sio_stop(hdl);
|
||||||
|
state = kStopped;
|
||||||
|
|
||||||
|
StopAgc();
|
||||||
|
}
|
||||||
|
|
||||||
|
void SndioAudioInputStream::Close() {
|
||||||
|
|
||||||
|
if (state == kClosed)
|
||||||
|
return;
|
||||||
|
|
||||||
|
if (state == kRunning)
|
||||||
|
Stop();
|
||||||
|
|
||||||
|
state = kClosed;
|
||||||
|
delete [] buffer;
|
||||||
|
sio_close(hdl);
|
||||||
|
|
||||||
|
manager->ReleaseInputStream(this);
|
||||||
|
}
|
||||||
|
|
||||||
|
double SndioAudioInputStream::GetMaxVolume() {
|
||||||
|
// Not supported
|
||||||
|
return 0.0;
|
||||||
|
}
|
||||||
|
|
||||||
|
void SndioAudioInputStream::SetVolume(double volume) {
|
||||||
|
// Not supported. Do nothing.
|
||||||
|
}
|
||||||
|
|
||||||
|
double SndioAudioInputStream::GetVolume() {
|
||||||
|
// Not supported.
|
||||||
|
return 0.0;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool SndioAudioInputStream::IsMuted() {
|
||||||
|
// Not supported.
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
void SndioAudioInputStream::SetOutputDeviceForAec(
|
||||||
|
const std::string& output_device_id) {
|
||||||
|
// Not supported.
|
||||||
|
}
|
||||||
|
|
||||||
|
void SndioAudioInputStream::ThreadLoop(void) {
|
||||||
|
size_t todo, n;
|
||||||
|
char *data;
|
||||||
|
unsigned int nframes;
|
||||||
|
double normalized_volume = 0.0;
|
||||||
|
|
||||||
|
nframes = audio_bus->frames();
|
||||||
|
|
||||||
|
while (state == kRunning && !sio_eof(hdl)) {
|
||||||
|
|
||||||
|
GetAgcVolume(&normalized_volume);
|
||||||
|
|
||||||
|
// read one block
|
||||||
|
todo = nframes * params.GetBytesPerFrame(kSampleFormat);
|
||||||
|
data = buffer;
|
||||||
|
while (todo > 0) {
|
||||||
|
n = sio_read(hdl, data, todo);
|
||||||
|
if (n == 0)
|
||||||
|
return; // unrecoverable I/O error
|
||||||
|
todo -= n;
|
||||||
|
data += n;
|
||||||
|
}
|
||||||
|
hw_delay -= nframes;
|
||||||
|
|
||||||
|
// convert frames count to TimeDelta
|
||||||
|
const base::TimeDelta delay = AudioTimestampHelper::FramesToTime(hw_delay,
|
||||||
|
params.sample_rate());
|
||||||
|
|
||||||
|
// push into bus
|
||||||
|
audio_bus->FromInterleaved(buffer, nframes, SampleFormatToBytesPerChannel(kSampleFormat));
|
||||||
|
|
||||||
|
// invoke callback
|
||||||
|
callback->OnData(audio_bus.get(), base::TimeTicks::Now() - delay, 1.);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
} // namespace media
|
||||||
91
srcpkgs/electron13/files/sndio-files/sndio_input.h
Normal file
91
srcpkgs/electron13/files/sndio-files/sndio_input.h
Normal file
|
|
@ -0,0 +1,91 @@
|
||||||
|
// Copyright 2013 The Chromium Authors. All rights reserved.
|
||||||
|
// Use of this source code is governed by a BSD-style license that can be
|
||||||
|
// found in the LICENSE file.
|
||||||
|
|
||||||
|
#ifndef MEDIA_AUDIO_SNDIO_SNDIO_INPUT_H_
|
||||||
|
#define MEDIA_AUDIO_SNDIO_SNDIO_INPUT_H_
|
||||||
|
|
||||||
|
#include <stdint.h>
|
||||||
|
#include <string>
|
||||||
|
#include <sndio.h>
|
||||||
|
|
||||||
|
#include "base/compiler_specific.h"
|
||||||
|
#include "base/macros.h"
|
||||||
|
#include "base/memory/weak_ptr.h"
|
||||||
|
#include "base/time/time.h"
|
||||||
|
#include "media/audio/agc_audio_stream.h"
|
||||||
|
#include "media/audio/audio_io.h"
|
||||||
|
#include "media/audio/audio_device_description.h"
|
||||||
|
#include "media/base/audio_parameters.h"
|
||||||
|
|
||||||
|
namespace media {
|
||||||
|
|
||||||
|
class AudioManagerBase;
|
||||||
|
|
||||||
|
// Implementation of AudioOutputStream using sndio(7)
|
||||||
|
class SndioAudioInputStream : public AgcAudioStream<AudioInputStream> {
|
||||||
|
public:
|
||||||
|
// Pass this to the constructor if you want to attempt auto-selection
|
||||||
|
// of the audio recording device.
|
||||||
|
static const char kAutoSelectDevice[];
|
||||||
|
|
||||||
|
// Create a PCM Output stream for the SNDIO device identified by
|
||||||
|
// |device_name|. If unsure of what to use for |device_name|, use
|
||||||
|
// |kAutoSelectDevice|.
|
||||||
|
SndioAudioInputStream(AudioManagerBase* audio_manager,
|
||||||
|
const std::string& device_name,
|
||||||
|
const AudioParameters& params);
|
||||||
|
|
||||||
|
~SndioAudioInputStream() override;
|
||||||
|
|
||||||
|
// Implementation of AudioInputStream.
|
||||||
|
bool Open() override;
|
||||||
|
void Start(AudioInputCallback* callback) override;
|
||||||
|
void Stop() override;
|
||||||
|
void Close() override;
|
||||||
|
double GetMaxVolume() override;
|
||||||
|
void SetVolume(double volume) override;
|
||||||
|
double GetVolume() override;
|
||||||
|
bool IsMuted() override;
|
||||||
|
void SetOutputDeviceForAec(const std::string& output_device_id) override;
|
||||||
|
|
||||||
|
private:
|
||||||
|
|
||||||
|
enum StreamState {
|
||||||
|
kClosed, // Not opened yet
|
||||||
|
kStopped, // Device opened, but not started yet
|
||||||
|
kRunning, // Started, device playing
|
||||||
|
kStopWait // Stopping, waiting for the real-time thread to exit
|
||||||
|
};
|
||||||
|
|
||||||
|
// C-style call-backs
|
||||||
|
static void OnMoveCallback(void *arg, int delta);
|
||||||
|
static void* ThreadEntry(void *arg);
|
||||||
|
|
||||||
|
// Continuously moves data from the device to the consumer
|
||||||
|
void ThreadLoop();
|
||||||
|
// Our creator, the audio manager needs to be notified when we close.
|
||||||
|
AudioManagerBase* manager;
|
||||||
|
// Parameters of the source
|
||||||
|
AudioParameters params;
|
||||||
|
// We store data here for consumer
|
||||||
|
std::unique_ptr<AudioBus> audio_bus;
|
||||||
|
// Call-back that consumes recorded data
|
||||||
|
AudioInputCallback* callback; // Valid during a recording session.
|
||||||
|
// Handle of the audio device
|
||||||
|
struct sio_hdl* hdl;
|
||||||
|
// Current state of the stream
|
||||||
|
enum StreamState state;
|
||||||
|
// High priority thread running ThreadLoop()
|
||||||
|
pthread_t thread;
|
||||||
|
// Number of frames buffered in the hardware
|
||||||
|
int hw_delay;
|
||||||
|
// Temporary buffer where data is stored sndio-compatible format
|
||||||
|
char* buffer;
|
||||||
|
|
||||||
|
DISALLOW_COPY_AND_ASSIGN(SndioAudioInputStream);
|
||||||
|
};
|
||||||
|
|
||||||
|
} // namespace media
|
||||||
|
|
||||||
|
#endif // MEDIA_AUDIO_SNDIO_SNDIO_INPUT_H_
|
||||||
183
srcpkgs/electron13/files/sndio-files/sndio_output.cc
Normal file
183
srcpkgs/electron13/files/sndio-files/sndio_output.cc
Normal file
|
|
@ -0,0 +1,183 @@
|
||||||
|
// Copyright (c) 2012 The Chromium Authors. All rights reserved.
|
||||||
|
// Use of this source code is governed by a BSD-style license that can be
|
||||||
|
// found in the LICENSE file.
|
||||||
|
|
||||||
|
#include "base/logging.h"
|
||||||
|
#include "base/time/time.h"
|
||||||
|
#include "base/time/default_tick_clock.h"
|
||||||
|
#include "media/audio/audio_manager_base.h"
|
||||||
|
#include "media/base/audio_timestamp_helper.h"
|
||||||
|
#include "media/audio/sndio/sndio_output.h"
|
||||||
|
|
||||||
|
namespace media {
|
||||||
|
|
||||||
|
static const SampleFormat kSampleFormat = kSampleFormatS16;
|
||||||
|
|
||||||
|
void SndioAudioOutputStream::OnMoveCallback(void *arg, int delta) {
|
||||||
|
SndioAudioOutputStream* self = static_cast<SndioAudioOutputStream*>(arg);
|
||||||
|
|
||||||
|
self->hw_delay -= delta;
|
||||||
|
}
|
||||||
|
|
||||||
|
void SndioAudioOutputStream::OnVolCallback(void *arg, unsigned int vol) {
|
||||||
|
SndioAudioOutputStream* self = static_cast<SndioAudioOutputStream*>(arg);
|
||||||
|
|
||||||
|
self->vol = vol;
|
||||||
|
}
|
||||||
|
|
||||||
|
void *SndioAudioOutputStream::ThreadEntry(void *arg) {
|
||||||
|
SndioAudioOutputStream* self = static_cast<SndioAudioOutputStream*>(arg);
|
||||||
|
|
||||||
|
self->ThreadLoop();
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
SndioAudioOutputStream::SndioAudioOutputStream(const AudioParameters& params,
|
||||||
|
AudioManagerBase* manager)
|
||||||
|
: manager(manager),
|
||||||
|
params(params),
|
||||||
|
audio_bus(AudioBus::Create(params)),
|
||||||
|
state(kClosed),
|
||||||
|
mutex(PTHREAD_MUTEX_INITIALIZER) {
|
||||||
|
}
|
||||||
|
|
||||||
|
SndioAudioOutputStream::~SndioAudioOutputStream() {
|
||||||
|
if (state != kClosed)
|
||||||
|
Close();
|
||||||
|
}
|
||||||
|
|
||||||
|
bool SndioAudioOutputStream::Open() {
|
||||||
|
struct sio_par par;
|
||||||
|
int sig;
|
||||||
|
|
||||||
|
if (params.format() != AudioParameters::AUDIO_PCM_LINEAR &&
|
||||||
|
params.format() != AudioParameters::AUDIO_PCM_LOW_LATENCY) {
|
||||||
|
LOG(WARNING) << "Unsupported audio format.";
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
sio_initpar(&par);
|
||||||
|
par.rate = params.sample_rate();
|
||||||
|
par.pchan = params.channels();
|
||||||
|
par.bits = SampleFormatToBitsPerChannel(kSampleFormat);
|
||||||
|
par.bps = par.bits / 8;
|
||||||
|
par.sig = sig = par.bits != 8 ? 1 : 0;
|
||||||
|
par.le = SIO_LE_NATIVE;
|
||||||
|
par.appbufsz = params.frames_per_buffer();
|
||||||
|
|
||||||
|
hdl = sio_open(SIO_DEVANY, SIO_PLAY, 0);
|
||||||
|
if (hdl == NULL) {
|
||||||
|
LOG(ERROR) << "Couldn't open audio device.";
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
if (!sio_setpar(hdl, &par) || !sio_getpar(hdl, &par)) {
|
||||||
|
LOG(ERROR) << "Couldn't set audio parameters.";
|
||||||
|
goto bad_close;
|
||||||
|
}
|
||||||
|
if (par.rate != (unsigned int)params.sample_rate() ||
|
||||||
|
par.pchan != (unsigned int)params.channels() ||
|
||||||
|
par.bits != (unsigned int)SampleFormatToBitsPerChannel(kSampleFormat) ||
|
||||||
|
par.sig != (unsigned int)sig ||
|
||||||
|
(par.bps > 1 && par.le != SIO_LE_NATIVE) ||
|
||||||
|
(par.bits != par.bps * 8)) {
|
||||||
|
LOG(ERROR) << "Unsupported audio parameters.";
|
||||||
|
goto bad_close;
|
||||||
|
}
|
||||||
|
state = kStopped;
|
||||||
|
volpending = 0;
|
||||||
|
vol = 0;
|
||||||
|
buffer = new char[audio_bus->frames() * params.GetBytesPerFrame(kSampleFormat)];
|
||||||
|
sio_onmove(hdl, &OnMoveCallback, this);
|
||||||
|
sio_onvol(hdl, &OnVolCallback, this);
|
||||||
|
return true;
|
||||||
|
bad_close:
|
||||||
|
sio_close(hdl);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
void SndioAudioOutputStream::Close() {
|
||||||
|
if (state == kClosed)
|
||||||
|
return;
|
||||||
|
if (state == kRunning)
|
||||||
|
Stop();
|
||||||
|
state = kClosed;
|
||||||
|
delete [] buffer;
|
||||||
|
sio_close(hdl);
|
||||||
|
manager->ReleaseOutputStream(this); // Calls the destructor
|
||||||
|
}
|
||||||
|
|
||||||
|
void SndioAudioOutputStream::Start(AudioSourceCallback* callback) {
|
||||||
|
state = kRunning;
|
||||||
|
hw_delay = 0;
|
||||||
|
source = callback;
|
||||||
|
sio_start(hdl);
|
||||||
|
if (pthread_create(&thread, NULL, &ThreadEntry, this) != 0) {
|
||||||
|
LOG(ERROR) << "Failed to create real-time thread.";
|
||||||
|
sio_stop(hdl);
|
||||||
|
state = kStopped;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void SndioAudioOutputStream::Stop() {
|
||||||
|
if (state == kStopped)
|
||||||
|
return;
|
||||||
|
state = kStopWait;
|
||||||
|
pthread_join(thread, NULL);
|
||||||
|
sio_stop(hdl);
|
||||||
|
state = kStopped;
|
||||||
|
}
|
||||||
|
|
||||||
|
void SndioAudioOutputStream::SetVolume(double v) {
|
||||||
|
pthread_mutex_lock(&mutex);
|
||||||
|
vol = v * SIO_MAXVOL;
|
||||||
|
volpending = 1;
|
||||||
|
pthread_mutex_unlock(&mutex);
|
||||||
|
}
|
||||||
|
|
||||||
|
void SndioAudioOutputStream::GetVolume(double* v) {
|
||||||
|
pthread_mutex_lock(&mutex);
|
||||||
|
*v = vol * (1. / SIO_MAXVOL);
|
||||||
|
pthread_mutex_unlock(&mutex);
|
||||||
|
}
|
||||||
|
|
||||||
|
// This stream is always used with sub second buffer sizes, where it's
|
||||||
|
// sufficient to simply always flush upon Start().
|
||||||
|
void SndioAudioOutputStream::Flush() {}
|
||||||
|
|
||||||
|
void SndioAudioOutputStream::ThreadLoop(void) {
|
||||||
|
int avail, count, result;
|
||||||
|
|
||||||
|
while (state == kRunning) {
|
||||||
|
// Update volume if needed
|
||||||
|
pthread_mutex_lock(&mutex);
|
||||||
|
if (volpending) {
|
||||||
|
volpending = 0;
|
||||||
|
sio_setvol(hdl, vol);
|
||||||
|
}
|
||||||
|
pthread_mutex_unlock(&mutex);
|
||||||
|
|
||||||
|
// Get data to play
|
||||||
|
const base::TimeDelta delay = AudioTimestampHelper::FramesToTime(hw_delay,
|
||||||
|
params.sample_rate());
|
||||||
|
count = source->OnMoreData(delay, base::TimeTicks::Now(), 0, audio_bus.get());
|
||||||
|
audio_bus->ToInterleaved(count, SampleFormatToBytesPerChannel(kSampleFormat), buffer);
|
||||||
|
if (count == 0) {
|
||||||
|
// We have to submit something to the device
|
||||||
|
count = audio_bus->frames();
|
||||||
|
memset(buffer, 0, count * params.GetBytesPerFrame(kSampleFormat));
|
||||||
|
LOG(WARNING) << "No data to play, running empty cycle.";
|
||||||
|
}
|
||||||
|
|
||||||
|
// Submit data to the device
|
||||||
|
avail = count * params.GetBytesPerFrame(kSampleFormat);
|
||||||
|
result = sio_write(hdl, buffer, avail);
|
||||||
|
if (result == 0) {
|
||||||
|
LOG(WARNING) << "Audio device disconnected.";
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Update hardware pointer
|
||||||
|
hw_delay += count;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
} // namespace media
|
||||||
86
srcpkgs/electron13/files/sndio-files/sndio_output.h
Normal file
86
srcpkgs/electron13/files/sndio-files/sndio_output.h
Normal file
|
|
@ -0,0 +1,86 @@
|
||||||
|
// Copyright (c) 2012 The Chromium Authors. All rights reserved.
|
||||||
|
// Use of this source code is governed by a BSD-style license that can be
|
||||||
|
// found in the LICENSE file.
|
||||||
|
|
||||||
|
#ifndef MEDIA_AUDIO_SNDIO_SNDIO_OUTPUT_H_
|
||||||
|
#define MEDIA_AUDIO_SNDIO_SNDIO_OUTPUT_H_
|
||||||
|
|
||||||
|
#include <pthread.h>
|
||||||
|
#include <sndio.h>
|
||||||
|
|
||||||
|
#include "base/time/tick_clock.h"
|
||||||
|
#include "base/time/time.h"
|
||||||
|
#include "media/audio/audio_io.h"
|
||||||
|
|
||||||
|
namespace media {
|
||||||
|
|
||||||
|
class AudioManagerBase;
|
||||||
|
|
||||||
|
// Implementation of AudioOutputStream using sndio(7)
|
||||||
|
class SndioAudioOutputStream : public AudioOutputStream {
|
||||||
|
public:
|
||||||
|
// The manager is creating this object
|
||||||
|
SndioAudioOutputStream(const AudioParameters& params,
|
||||||
|
AudioManagerBase* manager);
|
||||||
|
virtual ~SndioAudioOutputStream();
|
||||||
|
|
||||||
|
// Implementation of AudioOutputStream.
|
||||||
|
bool Open() override;
|
||||||
|
void Close() override;
|
||||||
|
void Start(AudioSourceCallback* callback) override;
|
||||||
|
void Stop() override;
|
||||||
|
void SetVolume(double volume) override;
|
||||||
|
void GetVolume(double* volume) override;
|
||||||
|
void Flush() override;
|
||||||
|
|
||||||
|
friend void sndio_onmove(void *arg, int delta);
|
||||||
|
friend void sndio_onvol(void *arg, unsigned int vol);
|
||||||
|
friend void *sndio_threadstart(void *arg);
|
||||||
|
|
||||||
|
private:
|
||||||
|
enum StreamState {
|
||||||
|
kClosed, // Not opened yet
|
||||||
|
kStopped, // Device opened, but not started yet
|
||||||
|
kRunning, // Started, device playing
|
||||||
|
kStopWait // Stopping, waiting for the real-time thread to exit
|
||||||
|
};
|
||||||
|
|
||||||
|
// C-style call-backs
|
||||||
|
static void OnMoveCallback(void *arg, int delta);
|
||||||
|
static void OnVolCallback(void *arg, unsigned int vol);
|
||||||
|
static void* ThreadEntry(void *arg);
|
||||||
|
|
||||||
|
// Continuously moves data from the producer to the device
|
||||||
|
void ThreadLoop(void);
|
||||||
|
|
||||||
|
// Our creator, the audio manager needs to be notified when we close.
|
||||||
|
AudioManagerBase* manager;
|
||||||
|
// Parameters of the source
|
||||||
|
AudioParameters params;
|
||||||
|
// Source stores data here
|
||||||
|
std::unique_ptr<AudioBus> audio_bus;
|
||||||
|
// Call-back that produces data to play
|
||||||
|
AudioSourceCallback* source;
|
||||||
|
// Handle of the audio device
|
||||||
|
struct sio_hdl* hdl;
|
||||||
|
// Current state of the stream
|
||||||
|
enum StreamState state;
|
||||||
|
// High priority thread running ThreadLoop()
|
||||||
|
pthread_t thread;
|
||||||
|
// Protects vol, volpending and hw_delay
|
||||||
|
pthread_mutex_t mutex;
|
||||||
|
// Current volume in the 0..SIO_MAXVOL range
|
||||||
|
int vol;
|
||||||
|
// Set to 1 if volumes must be refreshed in the realtime thread
|
||||||
|
int volpending;
|
||||||
|
// Number of frames buffered in the hardware
|
||||||
|
int hw_delay;
|
||||||
|
// Temporary buffer where data is stored sndio-compatible format
|
||||||
|
char* buffer;
|
||||||
|
|
||||||
|
DISALLOW_COPY_AND_ASSIGN(SndioAudioOutputStream);
|
||||||
|
};
|
||||||
|
|
||||||
|
} // namespace media
|
||||||
|
|
||||||
|
#endif // MEDIA_AUDIO_SNDIO_SNDIO_OUTPUT_H_
|
||||||
|
|
@ -0,0 +1,43 @@
|
||||||
|
diff --git a/chromium/media/audio/linux/audio_manager_linux.cc b/chromium/media/audio/linux/audio_manager_linux.cc
|
||||||
|
index 5d703549372..9e60b40c749 100644
|
||||||
|
--- media/audio/linux/audio_manager_linux.cc
|
||||||
|
+++ media/audio/linux/audio_manager_linux.cc
|
||||||
|
@@ -20,6 +20,10 @@
|
||||||
|
#include "media/audio/pulse/audio_manager_pulse.h"
|
||||||
|
#include "media/audio/pulse/pulse_util.h"
|
||||||
|
#endif
|
||||||
|
+#if defined(USE_SNDIO)
|
||||||
|
+#include <sndio.h>
|
||||||
|
+#include "media/audio/openbsd/audio_manager_openbsd.h"
|
||||||
|
+#endif
|
||||||
|
|
||||||
|
namespace media {
|
||||||
|
|
||||||
|
@@ -27,7 +31,8 @@ enum LinuxAudioIO {
|
||||||
|
kPulse,
|
||||||
|
kAlsa,
|
||||||
|
kCras,
|
||||||
|
- kAudioIOMax = kCras // Must always be equal to largest logged entry.
|
||||||
|
+ kSndio,
|
||||||
|
+ kAudioIOMax = kSndio // Must always be equal to largest logged entry.
|
||||||
|
};
|
||||||
|
|
||||||
|
std::unique_ptr<media::AudioManager> CreateAudioManager(
|
||||||
|
@@ -41,6 +46,17 @@ std::unique_ptr<media::AudioManager> CreateAudioManager(
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
+#if defined(USE_SNDIO)
|
||||||
|
+ struct sio_hdl * hdl = NULL;
|
||||||
|
+ if ((hdl=sio_open(SIO_DEVANY, SIO_PLAY, 1)) != NULL) {
|
||||||
|
+ sio_close(hdl);
|
||||||
|
+ UMA_HISTOGRAM_ENUMERATION("Media.LinuxAudioIO", kSndio, kAudioIOMax +1);
|
||||||
|
+ return std::make_unique<AudioManagerOpenBSD>(std::move(audio_thread),
|
||||||
|
+ audio_log_factory);
|
||||||
|
+ }
|
||||||
|
+ DVLOG(1) << "Sndio is not available on the OS";
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
#if defined(USE_PULSEAUDIO)
|
||||||
|
pa_threaded_mainloop* pa_mainloop = nullptr;
|
||||||
|
pa_context* pa_context = nullptr;
|
||||||
|
|
@ -0,0 +1,12 @@
|
||||||
|
--- media/BUILD.gn 2020-03-24 10:16:30.000000000 +0100
|
||||||
|
+++ - 2020-04-06 14:32:27.960817513 +0200
|
||||||
|
@@ -65,6 +65,9 @@
|
||||||
|
if (use_cras) {
|
||||||
|
defines += [ "USE_CRAS" ]
|
||||||
|
}
|
||||||
|
+ if (use_sndio) {
|
||||||
|
+ defines += [ "USE_SNDIO" ]
|
||||||
|
+ }
|
||||||
|
}
|
||||||
|
|
||||||
|
# Internal grouping of the configs necessary to support sub-folders having their
|
||||||
|
|
@ -0,0 +1,23 @@
|
||||||
|
--- media/audio/BUILD.gn 2020-03-24 10:16:30.000000000 +0100
|
||||||
|
+++ - 2020-04-06 14:31:28.871450217 +0200
|
||||||
|
@@ -232,9 +232,19 @@
|
||||||
|
deps += [ "//media/base/android:media_jni_headers" ]
|
||||||
|
}
|
||||||
|
|
||||||
|
- if (is_linux) {
|
||||||
|
+ if (is_linux) {
|
||||||
|
sources += [ "linux/audio_manager_linux.cc" ]
|
||||||
|
}
|
||||||
|
+ if (use_sndio) {
|
||||||
|
+ libs += [ "sndio" ]
|
||||||
|
+ sources += [
|
||||||
|
+ "openbsd/audio_manager_openbsd.cc",
|
||||||
|
+ "sndio/sndio_input.cc",
|
||||||
|
+ "sndio/sndio_input.h",
|
||||||
|
+ "sndio/sndio_output.cc",
|
||||||
|
+ "sndio/sndio_output.h"
|
||||||
|
+ ]
|
||||||
|
+ }
|
||||||
|
|
||||||
|
if (use_alsa) {
|
||||||
|
libs += [ "asound" ]
|
||||||
|
|
@ -0,0 +1,12 @@
|
||||||
|
--- media/media_options.gni 2020-03-24 10:16:30.000000000 +0100
|
||||||
|
+++ - 2020-04-06 14:29:22.958630783 +0200
|
||||||
|
@@ -114,6 +114,9 @@
|
||||||
|
# Enables runtime selection of ALSA library for audio.
|
||||||
|
use_alsa = false
|
||||||
|
|
||||||
|
+ # Enables runtime selection of sndio library for audio.
|
||||||
|
+ use_sndio = false
|
||||||
|
+
|
||||||
|
# Alsa should be used on non-Android, non-Mac POSIX systems.
|
||||||
|
# Alsa should be used on desktop Chromecast and audio-only Chromecast builds.
|
||||||
|
if (is_posix && !is_android && !is_mac &&
|
||||||
377
srcpkgs/electron13/template
Normal file
377
srcpkgs/electron13/template
Normal file
|
|
@ -0,0 +1,377 @@
|
||||||
|
# Template file for 'electron13'
|
||||||
|
pkgname=electron13
|
||||||
|
version=13.2.2
|
||||||
|
revision=1
|
||||||
|
_nodever=14.16.0
|
||||||
|
_chromiumver=91.0.4472.69
|
||||||
|
archs="x86_64* i686* aarch64* ppc64le*"
|
||||||
|
create_wrksrc=yes
|
||||||
|
build_wrksrc="src"
|
||||||
|
hostmakedepends="$(vopt_if clang clang) python pkgconf perl gperf bison ninja nodejs hwids
|
||||||
|
libwebp-devel freetype-devel harfbuzz-devel libpng-devel nss-devel which git libevent-devel
|
||||||
|
pciutils-devel libatomic-devel ffmpeg-devel libxml2-devel libglib-devel yarn openjdk libxslt-devel
|
||||||
|
opus-devel libXcursor-devel libXcomposite-devel libXtst-devel libXrandr-devel libXScrnSaver-devel
|
||||||
|
alsa-lib-devel re2-devel snappy-devel mit-krb5-devel $(vopt_if pulseaudio pulseaudio-devel)
|
||||||
|
$(vopt_if sndio sndio-devel) jq"
|
||||||
|
makedepends="libpng-devel gtk+-devel gtk+3-devel nss-devel pciutils-devel
|
||||||
|
libXi-devel libgcrypt-devel libgnome-keyring-devel cups-devel elfutils-devel
|
||||||
|
libXcomposite-devel speech-dispatcher-devel libXrandr-devel mit-krb5-devel
|
||||||
|
libXScrnSaver-devel alsa-lib-devel snappy-devel libdrm-devel
|
||||||
|
libxml2-devel libxslt-devel $(vopt_if pulseaudio pulseaudio-devel) libexif-devel
|
||||||
|
libXcursor-devel libflac-devel speex-devel libmtp-devel libwebp-devel
|
||||||
|
libjpeg-turbo-devel libevent-devel json-c-devel harfbuzz-devel
|
||||||
|
minizip-devel jsoncpp-devel zlib-devel libcap-devel libXdamage-devel
|
||||||
|
re2-devel fontconfig-devel freetype-devel opus-devel libatomic-devel
|
||||||
|
$(vopt_if sndio sndio-devel) ffmpeg-devel libva-devel libuv-devel c-ares-devel libnotify-devel
|
||||||
|
$(vopt_if pipewire pipewire-devel) wayland-devel libcurl-devel"
|
||||||
|
short_desc="Cross platform application framework based on web technologies"
|
||||||
|
maintainer="John <me@johnnynator.dev>"
|
||||||
|
license="BSD-3-Clause"
|
||||||
|
homepage="https://electronjs.org"
|
||||||
|
distfiles="https://github.com/electron/electron/archive/v$version.tar.gz>electron-${version}.tar.gz
|
||||||
|
https://commondatastorage.googleapis.com/chromium-browser-official/chromium-$_chromiumver.tar.xz
|
||||||
|
https://github.com/nodejs/node/archive/v$_nodever.tar.gz>node-$_nodever.tar.gz"
|
||||||
|
checksum="d5e35b412fc055e6fc5636717392193004b37fdd669302f528eee7232b34d9c5
|
||||||
|
1f6843c636f4adee6b06c301193810cce103ee3e4582d4cbc31c915efc3d0c7b
|
||||||
|
bcdf869b0743405515ee897b1047b5e851a717e426b4974d26537c9b10dfd53a"
|
||||||
|
|
||||||
|
case "$XBPS_TARGET_MACHINE" in
|
||||||
|
ppc64*-musl) makedepends+=" libucontext-devel" ;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
no_generic_pkgconfig_link=yes
|
||||||
|
lib32disabled=yes
|
||||||
|
nopie=yes # contains tools that are not PIE, enables PIE itself
|
||||||
|
|
||||||
|
build_options="pulseaudio sndio clang pipewire"
|
||||||
|
build_options_default="pulseaudio clang pipewire"
|
||||||
|
|
||||||
|
if [ "$build_option_clang" ]; then
|
||||||
|
nocross="No proper setup for using clang as cross compiler in void yet"
|
||||||
|
elif [ "${XBPS_TARGET_MACHINE%%-musl}" = "aarch64" ]; then
|
||||||
|
broken="Falls apart at runtime when compiled with gcc"
|
||||||
|
fi
|
||||||
|
|
||||||
|
_buildtype=Release
|
||||||
|
_is_debug=false
|
||||||
|
|
||||||
|
CFLAGS="-Wno-unknown-warning-option -fPIC"
|
||||||
|
CXXFLAGS="-Wno-unknown-warning-option -fPIC"
|
||||||
|
|
||||||
|
_apply_patch() {
|
||||||
|
local args="$1" pname="$(basename $2)"
|
||||||
|
|
||||||
|
if [ ! -f ".${pname}_done" ]; then
|
||||||
|
msg_normal "$pkgver: patching: ${pname}.\n"
|
||||||
|
patch -N $args -i $2
|
||||||
|
touch .${pname}_done
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
_get_chromium_arch() {
|
||||||
|
case "$1" in
|
||||||
|
x86_64*) echo x64 ;;
|
||||||
|
i686*) echo x86 ;;
|
||||||
|
arm*) echo arm ;;
|
||||||
|
aarch64*) echo arm64 ;;
|
||||||
|
ppc64*) echo ppc64 ;;
|
||||||
|
ppc*) echo ppc ;;
|
||||||
|
mipsel*) echo mipsel ;;
|
||||||
|
mips*) echo mips ;;
|
||||||
|
*) msg_error "$pkgver: cannot be compiled for ${XBPS_TARGET_MACHINE}.\n" ;;
|
||||||
|
esac
|
||||||
|
}
|
||||||
|
|
||||||
|
post_extract() {
|
||||||
|
ln -s chromium-$_chromiumver src
|
||||||
|
mkdir -p src/third_party/
|
||||||
|
ln -s ../../node-$_nodever src/third_party/electron_node
|
||||||
|
ln -s ../electron-${version} src/electron
|
||||||
|
|
||||||
|
}
|
||||||
|
post_patch() {
|
||||||
|
cd $wrksrc
|
||||||
|
for x in $FILESDIR/patches/*; do
|
||||||
|
case "${x##*/}" in
|
||||||
|
electron*.patch)
|
||||||
|
cd src/electron
|
||||||
|
_apply_patch -p1 "$x"
|
||||||
|
cd "$wrksrc";;
|
||||||
|
esac
|
||||||
|
done
|
||||||
|
|
||||||
|
# Sigh, electron uses git am...
|
||||||
|
if [ ! -f ".electron_patches_done" ]; then
|
||||||
|
mv src/electron/patches/config.json config.json.old
|
||||||
|
jq 'del(."src/electron/patches/Mantle", ."src/electron/patches/ReactiveObjC",
|
||||||
|
."src/electron/patches/squirrel.mac", ."src/electron/patches/nan")' \
|
||||||
|
config.json.old > src/electron/patches/config.json
|
||||||
|
|
||||||
|
python2 src/electron/script/list_patch_targets.py src/electron/patches/config.json | while read -r repopath; do
|
||||||
|
cd "$wrksrc"/"$repopath"
|
||||||
|
git init -q
|
||||||
|
git config "gc.auto" 0
|
||||||
|
if [ "$repopath" != "src" ]; then
|
||||||
|
echo "/${repopath#src/}" >> "$wrksrc/$build_wrksrc/.gitignore"
|
||||||
|
fi
|
||||||
|
git add .
|
||||||
|
git -c 'user.name=Electron build' -c 'user.email=electron@ebuild' \
|
||||||
|
commit -q -m "." || true
|
||||||
|
done
|
||||||
|
cd $wrksrc
|
||||||
|
python2 src/electron/script/apply_all_patches.py src/electron/patches/config.json
|
||||||
|
touch .electron_patches_done
|
||||||
|
fi
|
||||||
|
|
||||||
|
for x in $FILESDIR/patches/*; do
|
||||||
|
case "${x##*/}" in
|
||||||
|
chromium*.patch)
|
||||||
|
cd src
|
||||||
|
_apply_patch -p1 "$x"
|
||||||
|
cd "$wrksrc";;
|
||||||
|
esac
|
||||||
|
done
|
||||||
|
|
||||||
|
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
|
||||||
|
for x in $FILESDIR/musl-patches/*; do
|
||||||
|
case "${x##*/}" in
|
||||||
|
chromium*.patch)
|
||||||
|
cd src
|
||||||
|
_apply_patch -p0 "$x"
|
||||||
|
cd "$wrksrc";;
|
||||||
|
electron*.patch)
|
||||||
|
cd src/electron
|
||||||
|
_apply_patch -p1 "$x"
|
||||||
|
cd "$wrksrc";;
|
||||||
|
esac
|
||||||
|
done
|
||||||
|
fi
|
||||||
|
if [ "$build_option_sndio" ]; then
|
||||||
|
mkdir -p ${wrksrc}/${build_wrksrc}/media/audio/{sndio,openbsd}
|
||||||
|
cp ${FILESDIR}/sndio-files/sndio_*put.* \
|
||||||
|
${wrksrc}/${build_wrksrc}/media/audio/sndio
|
||||||
|
cp ${FILESDIR}/sndio-files/audio_manager_openbsd.* \
|
||||||
|
${wrksrc}/${build_wrksrc}/media/audio/openbsd
|
||||||
|
for f in "${FILESDIR}"/sndio-patches/*.patch; do
|
||||||
|
cd src
|
||||||
|
_apply_patch -p0 "$f"
|
||||||
|
cd "$wrksrc"
|
||||||
|
done
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
pre_configure() {
|
||||||
|
cd "$wrksrc/$build_wrksrc"
|
||||||
|
|
||||||
|
# https://groups.google.com/a/chromium.org/d/topic/chromium-packagers/9JX1N2nf4PU/discussion
|
||||||
|
touch chrome/test/data/webui/i18n_process_css_test.html
|
||||||
|
# Use the file at run time instead of effectively compiling it in
|
||||||
|
sed 's|//third_party/usb_ids/usb.ids|/usr/share/hwdata/usb.ids|g' \
|
||||||
|
-i services/device/public/cpp/usb/BUILD.gn
|
||||||
|
|
||||||
|
mkdir -p third_party/node/linux/node-linux-x64/bin
|
||||||
|
ln -s /usr/bin/node third_party/node/linux/node-linux-x64/bin/
|
||||||
|
|
||||||
|
# compile gn early, so it can be used to generate gni stuff
|
||||||
|
msg_normal "Bootstrapping GN\n"
|
||||||
|
CC="${CC_FOR_BUILD:-$CC}" CXX="${CXX_FOR_BUILD:-$CXX}" LD="${LD_FOR_BUILD:-$LD}" \
|
||||||
|
CFLAGS="${CFLAGS_FOR_BUILD:-$CFLAGS}" CXXFLAGS="${CXXFLAGS_FOR_BUILD:-$CXXFLAGS}" \
|
||||||
|
LDFLAGS="${XBPS_LDFLAGS}" \
|
||||||
|
python2 tools/gn/bootstrap/bootstrap.py -s -v --skip-generate-buildfiles
|
||||||
|
|
||||||
|
# we need to generate ppc64 stuff for libvpx as it's not shipped
|
||||||
|
# this has to be done before unbundling, but after gn is built
|
||||||
|
# comment out if we switch back to system libvpx again later
|
||||||
|
case "$XBPS_TARGET_MACHINE" in
|
||||||
|
ppc64*)
|
||||||
|
pushd third_party/libvpx
|
||||||
|
mkdir -p source/config/linux/ppc64
|
||||||
|
# need PATH to find gn
|
||||||
|
PATH="${wrksrc}/${build_wrksrc}/out/Release:$PATH" \
|
||||||
|
./generate_gni.sh || \
|
||||||
|
msg_error "failed to generate libvpx gni"
|
||||||
|
popd
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
# reusable system library settings
|
||||||
|
local use_system="
|
||||||
|
ffmpeg
|
||||||
|
flac
|
||||||
|
fontconfig
|
||||||
|
freetype
|
||||||
|
harfbuzz-ng
|
||||||
|
libdrm
|
||||||
|
libevent
|
||||||
|
libjpeg
|
||||||
|
libpng
|
||||||
|
libwebp
|
||||||
|
libxml
|
||||||
|
libxslt
|
||||||
|
opus
|
||||||
|
re2
|
||||||
|
snappy
|
||||||
|
"
|
||||||
|
for _lib in $use_system libjpeg_turbo; do
|
||||||
|
msg_normal "Removing buildscripts for system provided $_lib\n"
|
||||||
|
find -type f -path "*third_party/$_lib/*" \
|
||||||
|
\! -path "*third_party/$_lib/chromium/*" \
|
||||||
|
\! -path "*third_party/$_lib/google/*" \
|
||||||
|
\! -path './base/third_party/icu/*' \
|
||||||
|
\! -path './third_party/pdfium/third_party/freetype/include/pstables.h' \
|
||||||
|
\! -path './third_party/harfbuzz-ng/utils/hb_scoped.h' \
|
||||||
|
\! -regex '.*\.\(gn\|gni\|isolate\|py\)' \
|
||||||
|
-delete
|
||||||
|
done
|
||||||
|
|
||||||
|
|
||||||
|
msg_normal "Replacing gn files\n"
|
||||||
|
python2 build/linux/unbundle/replace_gn_files.py --system-libraries \
|
||||||
|
$use_system
|
||||||
|
third_party/libaddressinput/chromium/tools/update-strings.py
|
||||||
|
}
|
||||||
|
|
||||||
|
do_configure() {
|
||||||
|
local target_arch="$(_get_chromium_arch ${XBPS_TARGET_MACHINE})"
|
||||||
|
local host_arch="$(_get_chromium_arch ${XBPS_MACHINE})"
|
||||||
|
# the build system will set march for use, adding it to cflags will break builds
|
||||||
|
export CXXFLAGS=$( shopt -s extglob; echo ${CXXFLAGS/-march=*([^ ])} )
|
||||||
|
export CFLAGS=$( shopt -s extglob; echo ${CFLAGS/-march=*([^ ])} )
|
||||||
|
export CFLAGS=${CFLAGS/-g/}
|
||||||
|
export CXXFLAGS=${CXXFLAGS/-g/}
|
||||||
|
local conf=()
|
||||||
|
cd third_party/electron_node
|
||||||
|
if [ "$CROSS_BUILD" ]; then
|
||||||
|
conf_args=" --dest-cpu=${target_arch} --cross-compiling"
|
||||||
|
fi
|
||||||
|
./configure --prefix=/usr \
|
||||||
|
--shared-zlib \
|
||||||
|
--shared-libuv \
|
||||||
|
--shared-openssl \
|
||||||
|
--shared-cares \
|
||||||
|
--openssl-use-def-ca-store \
|
||||||
|
--without-npm \
|
||||||
|
--without-dtrace \
|
||||||
|
--without-bundled-v8 \
|
||||||
|
${conf_args}
|
||||||
|
|
||||||
|
cd "$wrksrc/$build_wrksrc"/electron
|
||||||
|
yarn install
|
||||||
|
cd "$wrksrc/$build_wrksrc"
|
||||||
|
|
||||||
|
if [ "$build_option_clang" ]; then
|
||||||
|
export CC=clang
|
||||||
|
export CXX=clang++
|
||||||
|
export HOST_CC=clang
|
||||||
|
export HOST_CXX=clang++
|
||||||
|
else
|
||||||
|
export CXXFLAGS="$CXXFLAGS -fpermissive"
|
||||||
|
export BUILD_CXXFLAGS="$BUILD_CXXFLAGS -fpermissive"
|
||||||
|
export BUILD_AR="$AR_host"
|
||||||
|
export BUILD_NM="$NM_host"
|
||||||
|
fi
|
||||||
|
|
||||||
|
conf+=(
|
||||||
|
'blink_symbol_level=0'
|
||||||
|
'clang_use_chrome_plugins=false'
|
||||||
|
'custom_toolchain="//build/toolchain/linux/unbundle:default"'
|
||||||
|
)
|
||||||
|
if [ "$CROSS_BUILD" ]; then
|
||||||
|
conf+=(
|
||||||
|
'host_toolchain="//build/toolchain/linux/unbundle:host"'
|
||||||
|
'v8_snapshot_toolchain="//build/toolchain/linux/unbundle:host"'
|
||||||
|
"host_pkg_config=\"$PKG_CONFIG_FOR_BUILD\""
|
||||||
|
"pkg_config=\"$PKG_CONFIG\""
|
||||||
|
)
|
||||||
|
else
|
||||||
|
conf+=(
|
||||||
|
'host_toolchain="//build/toolchain/linux/unbundle:default"'
|
||||||
|
'v8_snapshot_toolchain="//build/toolchain/linux/unbundle:default"'
|
||||||
|
)
|
||||||
|
fi
|
||||||
|
if [ "$build_option_sndio" ]; then
|
||||||
|
conf+=(
|
||||||
|
'use_sndio=true'
|
||||||
|
)
|
||||||
|
fi
|
||||||
|
if [ -n "$XBPS_DEBUG_PKGS" ]; then
|
||||||
|
conf+=('symbol_level=1')
|
||||||
|
else
|
||||||
|
conf+=('symbol_level=0')
|
||||||
|
fi
|
||||||
|
conf+=(
|
||||||
|
'enable_hangout_services_extension=true'
|
||||||
|
'enable_nacl_nonsfi=false'
|
||||||
|
'enable_nacl=false'
|
||||||
|
'enable_precompiled_headers=false'
|
||||||
|
'fatal_linker_warnings=false'
|
||||||
|
'ffmpeg_branding="Chrome"'
|
||||||
|
'fieldtrial_testing_like_official_build=true'
|
||||||
|
'gold_path="/usr/bin/ld.gold"'
|
||||||
|
'icu_use_data_file=true'
|
||||||
|
"is_clang=$(vopt_if clang true false)"
|
||||||
|
'is_component_build=false'
|
||||||
|
"is_debug=$_is_debug"
|
||||||
|
'proprietary_codecs=true'
|
||||||
|
'treat_warnings_as_errors=false'
|
||||||
|
'use_allocator_shim=false'
|
||||||
|
'use_allocator="none"'
|
||||||
|
'use_cups=true'
|
||||||
|
'use_custom_libcxx=false'
|
||||||
|
'use_gnome_keyring=false'
|
||||||
|
'use_gold=false'
|
||||||
|
'use_lld=false'
|
||||||
|
'use_system_libwayland=true'
|
||||||
|
"use_pulseaudio=$(vopt_if pulseaudio 'true' 'false')"
|
||||||
|
"rtc_use_pipewire=$(vopt_if pipewire true false)"
|
||||||
|
'rtc_pipewire_version="0.3"'
|
||||||
|
'use_sysroot=false'
|
||||||
|
'use_system_harfbuzz=true'
|
||||||
|
"target_cpu=\"$target_arch\""
|
||||||
|
"host_cpu=\"$host_arch\""
|
||||||
|
'import("//electron/build/args/release.gn")'
|
||||||
|
)
|
||||||
|
|
||||||
|
msg_normal "Configuring build\n"
|
||||||
|
out/Release/gn gen out/$_buildtype --args="${conf[*]}"
|
||||||
|
}
|
||||||
|
|
||||||
|
do_build() {
|
||||||
|
export CXXFLAGS=$( shopt -s extglob; echo ${CXXFLAGS/-march=*([^ ])} )
|
||||||
|
export CFLAGS=$( shopt -s extglob; echo ${CFLAGS/-march=*([^ ])} )
|
||||||
|
export CFLAGS=${CFLAGS/-g/}
|
||||||
|
export CXXFLAGS=${CXXFLAGS/-g/}
|
||||||
|
if [ "$build_option_clang" ]; then
|
||||||
|
export CC=clang
|
||||||
|
export CXX=clang++
|
||||||
|
export HOST_CC=clang
|
||||||
|
export HOST_CXX=clang++
|
||||||
|
else
|
||||||
|
export BUILD_CXXFLAGS="$BUILD_CXXFLAGS -fpermissive"
|
||||||
|
export CXXFLAGS="$CXXFLAGS -fpermissive"
|
||||||
|
export BUILD_AR="$AR_host"
|
||||||
|
export BUILD_NM="$NM_host"
|
||||||
|
fi
|
||||||
|
msg_normal "Ninja turtles GO!\n"
|
||||||
|
ninja ${makejobs} -C out/$_buildtype electron third_party/electron_node:headers
|
||||||
|
# finish rest of the build
|
||||||
|
strip -s out/$_buildtype/electron
|
||||||
|
ninja ${makejobs} -C out/$_buildtype electron_dist_zip
|
||||||
|
}
|
||||||
|
|
||||||
|
do_install() {
|
||||||
|
vmkdir /usr/lib/$pkgname
|
||||||
|
vmkdir /usr/include/$pkgname
|
||||||
|
bsdtar -xf out/$_buildtype/dist.zip -C "$DESTDIR/usr/lib/$pkgname"
|
||||||
|
|
||||||
|
chmod u+s "$DESTDIR/usr/lib/$pkgname/chrome-sandbox"
|
||||||
|
|
||||||
|
cp out/$_buildtype/gen/node_headers.tar.gz "$DESTDIR"/usr/include/$pkgname
|
||||||
|
|
||||||
|
vlicense ${wrksrc}/src/LICENSE chromium.LICENSE
|
||||||
|
vlicense ${wrksrc}/src/electron/LICENSE electron.LICENSE
|
||||||
|
vlicense ${wrksrc}/src/third_party/electron_node/LICENSE node.LICENSE
|
||||||
|
|
||||||
|
vmkdir /usr/bin
|
||||||
|
ln -s ../lib/$pkgname/electron "$DESTDIR"/usr/bin/$pkgname
|
||||||
|
}
|
||||||
2
srcpkgs/electron13/update
Normal file
2
srcpkgs/electron13/update
Normal file
|
|
@ -0,0 +1,2 @@
|
||||||
|
site=https://www.electronjs.org/releases/stable?version=${version%%.*}
|
||||||
|
pattern='tag/v\K[\d\.]+(?=")'
|
||||||
Loading…
Add table
Reference in a new issue