New package: electron10-10.1.3
[ci skip]
This commit is contained in:
parent
83c2f3759d
commit
2b18652bdd
43 changed files with 6116 additions and 0 deletions
|
@ -0,0 +1,23 @@
|
|||
--- a/third_party/crashpad/crashpad/util/linux/ptracer.cc
|
||||
+++ b/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 {
|
||||
|
||||
--- a/third_party/crashpad/crashpad/compat/linux/sys/ptrace.h
|
||||
+++ b/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,31 @@
|
|||
diff --git a/base/threading/platform_thread_linux.cc b/base/threading/platform_thread_linux.cc
|
||||
index 095c49b..5044bb8 100644
|
||||
--- a/base/threading/platform_thread_linux.cc
|
||||
+++ b/base/threading/platform_thread_linux.cc
|
||||
@@ -186,7 +186,7 @@ void TerminateOnThread() {}
|
||||
|
||||
size_t GetDefaultThreadStackSize(const pthread_attr_t& attributes) {
|
||||
#if !defined(THREAD_SANITIZER)
|
||||
- return 0;
|
||||
+ return (1 << 23);
|
||||
#else
|
||||
// ThreadSanitizer bloats the stack heavily. Evidence has been that the
|
||||
// default stack size isn't enough for some browser tests.
|
||||
diff --git a/chrome/app/shutdown_signal_handlers_posix.cc b/chrome/app/shutdown_signal_handlers_posix.cc
|
||||
index 621d441..be21106 100644
|
||||
--- a/chrome/app/shutdown_signal_handlers_posix.cc
|
||||
+++ b/chrome/app/shutdown_signal_handlers_posix.cc
|
||||
@@ -187,11 +187,11 @@ void InstallShutdownSignalHandlers(
|
||||
g_shutdown_pipe_read_fd = pipefd[0];
|
||||
g_shutdown_pipe_write_fd = pipefd[1];
|
||||
#if !defined(ADDRESS_SANITIZER)
|
||||
- const size_t kShutdownDetectorThreadStackSize = PTHREAD_STACK_MIN * 2;
|
||||
+ const size_t kShutdownDetectorThreadStackSize = PTHREAD_STACK_MIN * 2 *8;
|
||||
#else
|
||||
// ASan instrumentation bloats the stack frames, so we need to increase the
|
||||
// stack size to avoid hitting the guard page.
|
||||
- const size_t kShutdownDetectorThreadStackSize = PTHREAD_STACK_MIN * 4;
|
||||
+ const size_t kShutdownDetectorThreadStackSize = PTHREAD_STACK_MIN * 4 *8;
|
||||
#endif
|
||||
ShutdownDetector* detector = new ShutdownDetector(
|
||||
g_shutdown_pipe_read_fd, std::move(shutdown_callback), task_runner);
|
|
@ -0,0 +1,176 @@
|
|||
diff --git a/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc b/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
|
||||
index 348ab6e..4550f9e 100644
|
||||
--- ./sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
|
||||
+++ ./sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
|
||||
@@ -139,21 +139,11 @@ namespace sandbox {
|
||||
// present (as in newer versions of posix_spawn).
|
||||
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 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);
|
||||
+ 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;
|
||||
|
||||
// The following two flags are the two important flags in any vfork-emulating
|
||||
// clone call. EPERM any clone call that contains both of them.
|
||||
@@ -163,7 +153,7 @@ ResultExpr RestrictCloneToThreadsAndEPERMFork() {
|
||||
AnyOf((flags & (CLONE_VM | CLONE_THREAD)) == 0,
|
||||
(flags & kImportantCloneVforkFlags) == kImportantCloneVforkFlags);
|
||||
|
||||
- return If(IsAndroid() ? android_test : glibc_test, Allow())
|
||||
+ return If(thread_clone_ok, Allow())
|
||||
.ElseIf(is_fork_or_clone_vfork, Error(EPERM))
|
||||
.Else(CrashSIGSYSClone());
|
||||
}
|
||||
diff --git a/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc b/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
|
||||
index 7dbcc87..589262f 100644
|
||||
--- ./sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
|
||||
+++ ./sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
|
||||
@@ -391,6 +391,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.
|
||||
@@ -403,7 +404,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:
|
||||
@@ -513,6 +513,8 @@ bool SyscallSets::IsAllowedAddressSpaceAccess(int sysno) {
|
||||
case __NR_mlock:
|
||||
case __NR_munlock:
|
||||
case __NR_munmap:
|
||||
+ case __NR_mremap:
|
||||
+ case __NR_membarrier:
|
||||
return true;
|
||||
case __NR_madvise:
|
||||
case __NR_mincore:
|
||||
@@ -530,7 +532,6 @@ bool SyscallSets::IsAllowedAddressSpaceAccess(int sysno) {
|
||||
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/system_headers/arm64_linux_syscalls.h b/sandbox/linux/system_headers/arm64_linux_syscalls.h
|
||||
index 59d0eab..7ae7002 100644
|
||||
--- ./sandbox/linux/system_headers/arm64_linux_syscalls.h
|
||||
+++ ./sandbox/linux/system_headers/arm64_linux_syscalls.h
|
||||
@@ -1063,4 +1063,8 @@
|
||||
#define __NR_memfd_create 279
|
||||
#endif
|
||||
|
||||
+#if !defined(__NR_membarrier)
|
||||
+#define __NR_membarrier 283
|
||||
+#endif
|
||||
+
|
||||
#endif // SANDBOX_LINUX_SYSTEM_HEADERS_ARM64_LINUX_SYSCALLS_H_
|
||||
diff --git a/sandbox/linux/system_headers/arm_linux_syscalls.h b/sandbox/linux/system_headers/arm_linux_syscalls.h
|
||||
index 1addd53..7843b5e 100644
|
||||
--- ./sandbox/linux/system_headers/arm_linux_syscalls.h
|
||||
+++ ./sandbox/linux/system_headers/arm_linux_syscalls.h
|
||||
@@ -1385,6 +1385,10 @@
|
||||
#define __NR_memfd_create (__NR_SYSCALL_BASE+385)
|
||||
#endif
|
||||
|
||||
+#if !defined(__NR_membarrier)
|
||||
+#define __NR_membarrier (__NR_SYSCALL_BASE+389)
|
||||
+#endif
|
||||
+
|
||||
// ARM private syscalls.
|
||||
#if !defined(__ARM_NR_BASE)
|
||||
#define __ARM_NR_BASE (__NR_SYSCALL_BASE + 0xF0000)
|
||||
diff --git a/sandbox/linux/system_headers/mips64_linux_syscalls.h b/sandbox/linux/system_headers/mips64_linux_syscalls.h
|
||||
index ec75815..612fcfa 100644
|
||||
--- ./sandbox/linux/system_headers/mips64_linux_syscalls.h
|
||||
+++ ./sandbox/linux/system_headers/mips64_linux_syscalls.h
|
||||
@@ -1271,4 +1271,8 @@
|
||||
#define __NR_memfd_create (__NR_Linux + 314)
|
||||
#endif
|
||||
|
||||
+#if !defined(__NR_membarrier)
|
||||
+#define __NR_membarrier (__NR_Linux + 318)
|
||||
+#endif
|
||||
+
|
||||
#endif // SANDBOX_LINUX_SYSTEM_HEADERS_MIPS64_LINUX_SYSCALLS_H_
|
||||
diff --git a/sandbox/linux/system_headers/mips_linux_syscalls.h b/sandbox/linux/system_headers/mips_linux_syscalls.h
|
||||
index ddbf97f..1742acd 100644
|
||||
--- ./sandbox/linux/system_headers/mips_linux_syscalls.h
|
||||
+++ ./sandbox/linux/system_headers/mips_linux_syscalls.h
|
||||
@@ -1433,4 +1433,8 @@
|
||||
#define __NR_memfd_create (__NR_Linux + 354)
|
||||
#endif
|
||||
|
||||
+#if !defined(__NR_membarrier)
|
||||
+#define __NR_membarrier (__NR_Linux + 358)
|
||||
+#endif
|
||||
+
|
||||
#endif // SANDBOX_LINUX_SYSTEM_HEADERS_MIPS_LINUX_SYSCALLS_H_
|
||||
diff --git a/sandbox/linux/system_headers/x86_32_linux_syscalls.h b/sandbox/linux/system_headers/x86_32_linux_syscalls.h
|
||||
index a6afc62..7ed0a3b 100644
|
||||
--- ./sandbox/linux/system_headers/x86_32_linux_syscalls.h
|
||||
+++ ./sandbox/linux/system_headers/x86_32_linux_syscalls.h
|
||||
@@ -1422,5 +1422,9 @@
|
||||
#define __NR_memfd_create 356
|
||||
#endif
|
||||
|
||||
+#if !defined(__NR_membarrier)
|
||||
+#define __NR_membarrier 375
|
||||
+#endif
|
||||
+
|
||||
#endif // SANDBOX_LINUX_SYSTEM_HEADERS_X86_32_LINUX_SYSCALLS_H_
|
||||
|
||||
diff --git a/sandbox/linux/system_headers/x86_64_linux_syscalls.h b/sandbox/linux/system_headers/x86_64_linux_syscalls.h
|
||||
index 349504a..ea3c7c9 100644
|
||||
--- ./sandbox/linux/system_headers/x86_64_linux_syscalls.h
|
||||
+++ ./sandbox/linux/system_headers/x86_64_linux_syscalls.h
|
||||
@@ -1290,5 +1290,9 @@
|
||||
#define __NR_memfd_create 319
|
||||
#endif
|
||||
|
||||
+#if !defined(__NR_membarrier)
|
||||
+#define __NR_membarrier 324
|
||||
+#endif
|
||||
+
|
||||
#endif // SANDBOX_LINUX_SYSTEM_HEADERS_X86_64_LINUX_SYSCALLS_H_
|
||||
|
||||
diff --git a/services/service_manager/sandbox/linux/bpf_renderer_policy_linux.cc b/services/service_manager/sandbox/linux/bpf_renderer_policy_linux.cc
|
||||
index 017f13c..50aeec3 100644
|
||||
--- ./services/service_manager/sandbox/linux/bpf_renderer_policy_linux.cc
|
||||
+++ ./services/service_manager/sandbox/linux/bpf_renderer_policy_linux.cc
|
||||
@@ -88,10 +88,10 @@ ResultExpr RendererProcessPolicy::EvaluateSyscall(int sysno) const {
|
||||
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:
|
|
@ -0,0 +1,10 @@
|
|||
--- a/mojo/public/cpp/platform/named_platform_channel_posix.cc.orig 2020-07-19 13:26:10.696171063 -0400
|
||||
+++ b/mojo/public/cpp/platform/named_platform_channel_posix.cc 2020-07-19 13:26:43.680151714 -0400
|
||||
@@ -5,6 +5,7 @@
|
||||
#include "mojo/public/cpp/platform/named_platform_channel.h"
|
||||
|
||||
#include <errno.h>
|
||||
+#include <string.h>
|
||||
#include <sys/socket.h>
|
||||
#include <sys/un.h>
|
||||
#include <unistd.h>
|
|
@ -0,0 +1,13 @@
|
|||
diff --git a/third_party/nasm/config/config-linux.h b/third_party/nasm/config/config-linux.h
|
||||
index 7eb7c20..882b736 100644
|
||||
--- a/third_party/nasm/config/config-linux.h
|
||||
+++ b/third_party/nasm/config/config-linux.h
|
||||
@@ -117,7 +117,7 @@
|
||||
#define HAVE_ACCESS 1
|
||||
|
||||
/* Define to 1 if you have the `canonicalize_file_name' function. */
|
||||
-#define HAVE_CANONICALIZE_FILE_NAME 1
|
||||
+/* #undef HAVE_CANONICALIZE_FILE_NAME */
|
||||
|
||||
/* Define to 1 if you have the `cpu_to_le16' intrinsic function. */
|
||||
/* #undef HAVE_CPU_TO_LE16 */
|
|
@ -0,0 +1,45 @@
|
|||
diff --git a/base/allocator/allocator_shim_internals.h b/base/allocator/allocator_shim_internal
|
||||
s.h
|
||||
index 0196f89..bb42b5d 100644
|
||||
--- a/base/allocator/allocator_shim_internals.h
|
||||
+++ b/base/allocator/allocator_shim_internals.h
|
||||
@@ -7,7 +7,9 @@
|
||||
|
||||
#if defined(__GNUC__)
|
||||
|
||||
+#if defined(__GLIBC__)
|
||||
#include <sys/cdefs.h> // for __THROW
|
||||
+#endif
|
||||
|
||||
#ifndef __THROW // Not a glibc system
|
||||
#ifdef _NOEXCEPT // LLVM libc++ uses noexcept instead
|
||||
diff --git a/third_party/libsync/src/include/sync/sync.h b/third_party/libsync/src/include/sync/sync.h
|
||||
index 50ed0ac..7552a49 100644
|
||||
--- a/third_party/libsync/src/include/sync/sync.h
|
||||
+++ b/third_party/libsync/src/include/sync/sync.h
|
||||
@@ -19,12 +19,13 @@
|
||||
#ifndef __SYS_CORE_SYNC_H
|
||||
#define __SYS_CORE_SYNC_H
|
||||
|
||||
-#include <sys/cdefs.h>
|
||||
#include <stdint.h>
|
||||
|
||||
#include <linux/types.h>
|
||||
|
||||
-__BEGIN_DECLS
|
||||
+#ifdef __cplusplus
|
||||
+extern "C" {
|
||||
+#endif /* __cplusplus */
|
||||
|
||||
struct sync_legacy_merge_data {
|
||||
int32_t fd2;
|
||||
@@ -158,6 +159,8 @@ struct sync_pt_info *sync_pt_info(struct sync_fence_info_data *info,
|
||||
struct sync_pt_info *itr);
|
||||
void sync_fence_info_free(struct sync_fence_info_data *info);
|
||||
|
||||
-__END_DECLS
|
||||
+#ifdef __cplusplus
|
||||
+}
|
||||
+#endif /* __cplusplus */
|
||||
|
||||
#endif /* __SYS_CORE_SYNC_H */
|
|
@ -0,0 +1,18 @@
|
|||
--- a/sandbox/linux/suid/sandbox.c 2019-11-19 09:28:05.000000000 +0800
|
||||
+++ b/sandbox/linux/suid/sandbox.c 2020-04-24 11:50:12.719880728 +0800
|
||||
@@ -42,6 +42,15 @@
|
||||
#define CLONE_NEWNET 0x40000000
|
||||
#endif
|
||||
|
||||
+#ifndef TEMP_FAILURE_RETRY
|
||||
+#define TEMP_FAILURE_RETRY(expression) \
|
||||
+ (__extension__ \
|
||||
+ ({ long int __result; \
|
||||
+ do __result = (long int) (expression); \
|
||||
+ while (__result == -1L && errno == EINTR); \
|
||||
+ __result; }))
|
||||
+#endif
|
||||
+
|
||||
static bool DropRoot();
|
||||
|
||||
#define HANDLE_EINTR(x) TEMP_FAILURE_RETRY(x)
|
|
@ -0,0 +1,61 @@
|
|||
diff --git a/net/dns/dns_config_service_posix.cc b/net/dns/dns_config_service_posix.cc
|
||||
index 2f94832..2dd1a98 100644
|
||||
--- a/net/dns/dns_config_service_posix.cc
|
||||
+++ b/net/dns/dns_config_service_posix.cc
|
||||
@@ -150,7 +150,7 @@ ConfigParsePosixResult ReadDnsConfig(DnsConfig* dns_config) {
|
||||
#if !defined(OS_ANDROID)
|
||||
ConfigParsePosixResult result;
|
||||
// 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(OS_LINUX) && !defined(__GLIBC__))
|
||||
// Note: res_ninit in glibc always returns 0 and sets RES_INIT.
|
||||
// res_init behaves the same way.
|
||||
memset(&_res, 0, sizeof(_res));
|
||||
@@ -173,7 +173,7 @@ ConfigParsePosixResult ReadDnsConfig(DnsConfig* dns_config) {
|
||||
#else
|
||||
res_nclose(&res);
|
||||
#endif // defined(OS_MACOSX) || defined(OS_FREEBSD)
|
||||
-#endif // defined(OS_OPENBSD)
|
||||
+#endif // defined(OS_OPENBSD) || defined(OS_FUCHSIA) || (defined(OS_LINUX) && !defined(__GLIBC__))
|
||||
|
||||
#if defined(OS_MACOSX) && !defined(OS_IOS)
|
||||
ConfigParsePosixResult error = DnsConfigWatcher::CheckDnsConfig();
|
||||
diff --git a/net/dns/dns_reloader.cc b/net/dns/dns_reloader.cc
|
||||
index 952cff4..4b366f4 100644
|
||||
--- a/net/dns/dns_reloader.cc
|
||||
+++ b/net/dns/dns_reloader.cc
|
||||
@@ -4,7 +4,7 @@
|
||||
|
||||
#include "net/dns/dns_reloader.h"
|
||||
|
||||
-#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_OPENBSD) && \
|
||||
+#if defined(OS_POSIX) && defined(__GLIBC__) && !defined(OS_MACOSX) && !defined(OS_OPENBSD) && \
|
||||
!defined(OS_ANDROID) && !defined(OS_FUCHSIA)
|
||||
|
||||
#include <resolv.h>
|
||||
diff --git a/net/dns/host_resolver_manager.cc b/net/dns/host_resolver_manager.cc
|
||||
index e8dea46..c86a830 100644
|
||||
--- a/net/dns/host_resolver_manager.cc
|
||||
+++ b/net/dns/host_resolver_manager.cc
|
||||
@@ -2386,7 +2386,7 @@ HostResolverManager::HostResolverManager(
|
||||
NetworkChangeNotifier::AddConnectionTypeObserver(this);
|
||||
if (system_dns_config_notifier_)
|
||||
system_dns_config_notifier_->AddObserver(this);
|
||||
-#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_OPENBSD) && \
|
||||
+#if defined(OS_POSIX) && defined(__GLIBC__) && !defined(OS_MACOSX) && !defined(OS_OPENBSD) && \
|
||||
!defined(OS_ANDROID)
|
||||
EnsureDnsReloaderInit();
|
||||
#endif
|
||||
diff --git a/net/dns/host_resolver_proc.cc b/net/dns/host_resolver_proc.cc
|
||||
index 0824540..3384978 100644
|
||||
--- a/net/dns/host_resolver_proc.cc
|
||||
+++ b/net/dns/host_resolver_proc.cc
|
||||
@@ -197,7 +197,7 @@ int SystemHostResolverCall(const std::string& host,
|
||||
base::ScopedBlockingCall scoped_blocking_call(FROM_HERE,
|
||||
base::BlockingType::WILL_BLOCK);
|
||||
|
||||
-#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_OPENBSD) && \
|
||||
+#if defined(OS_POSIX) && defined(__GLIBC__) && !defined(OS_MACOSX) && !defined(OS_OPENBSD) && \
|
||||
!defined(OS_ANDROID) && !defined(OS_FUCHSIA)
|
||||
DnsReloaderMaybeReload();
|
||||
#endif
|
|
@ -0,0 +1,96 @@
|
|||
diff --git a/base/debug/stack_trace_posix.cc b/base/debug/stack_trace_posix.cc
|
||||
index de2f356..f697c66 100644
|
||||
--- a/base/debug/stack_trace_posix.cc
|
||||
+++ b/base/debug/stack_trace_posix.cc
|
||||
@@ -27,7 +27,7 @@
|
||||
#if !defined(USE_SYMBOLIZE)
|
||||
#include <cxxabi.h>
|
||||
#endif
|
||||
-#if !defined(__UCLIBC__) && !defined(_AIX)
|
||||
+#if defined(__GLIBC__) && !defined(__UCLIBC__) && !defined(_AIX)
|
||||
#include <execinfo.h>
|
||||
#endif
|
||||
|
||||
@@ -86,7 +86,7 @@ void DemangleSymbols(std::string* text) {
|
||||
// Note: code in this function is NOT async-signal safe (std::string uses
|
||||
// malloc internally).
|
||||
|
||||
-#if !defined(__UCLIBC__) && !defined(_AIX)
|
||||
+#if defined(__GLIBC__) && !defined(__UCLIBC__) && !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 @@ void DemangleSymbols(std::string* text) {
|
||||
search_from = mangled_start + 2;
|
||||
}
|
||||
}
|
||||
-#endif // !defined(__UCLIBC__) && !defined(_AIX)
|
||||
+#endif // defined(__GLIBC__) && !defined(__UCLIBC__) && !defined(_AIX)
|
||||
}
|
||||
#endif // !defined(USE_SYMBOLIZE)
|
||||
|
||||
@@ -133,7 +133,7 @@ class BacktraceOutputHandler {
|
||||
virtual ~BacktraceOutputHandler() = default;
|
||||
};
|
||||
|
||||
-#if !defined(__UCLIBC__) && !defined(_AIX)
|
||||
+#if defined(__GLIBC__) && !defined(__UCLIBC__) && !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 @@ void ProcessBacktrace(void* const* trace,
|
||||
}
|
||||
#endif // defined(USE_SYMBOLIZE)
|
||||
}
|
||||
-#endif // !defined(__UCLIBC__) && !defined(_AIX)
|
||||
+#endif // defined(__GLIBC__) && !defined(__UCLIBC__) && !defined(_AIX)
|
||||
|
||||
void PrintToStderr(const char* output) {
|
||||
// NOTE: This code MUST be async-signal safe (it's used by in-process
|
||||
@@ -828,7 +828,7 @@ size_t CollectStackTrace(void** trace, size_t count) {
|
||||
// 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(__UCLIBC__) && !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));
|
||||
@@ -841,13 +841,13 @@ void StackTrace::PrintWithPrefix(const char* prefix_string) const {
|
||||
// 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(__UCLIBC__) && !defined(_AIX)
|
||||
PrintBacktraceOutputHandler handler;
|
||||
ProcessBacktrace(trace_, count_, prefix_string, &handler);
|
||||
#endif
|
||||
}
|
||||
|
||||
-#if !defined(__UCLIBC__) && !defined(_AIX)
|
||||
+#if defined(__GLIBC__) && !defined(__UCLIBC__) && !defined(_AIX)
|
||||
void StackTrace::OutputToStreamWithPrefix(std::ostream* os,
|
||||
const char* prefix_string) const {
|
||||
StreamBacktraceOutputHandler handler(os);
|
||||
diff --git a/third_party/swiftshader/third_party/llvm-subzero/build/Linux/include/llvm/Config/config.h b/third_party/swiftshader/third_party/llvm-subzero/build/Linux/include/llvm/Config/config.h
|
||||
index 798f150..97acc7c 100644
|
||||
--- a/third_party/swiftshader/third_party/llvm-subzero/build/Linux/include/llvm/Config/config.h
|
||||
+++ b/third_party/swiftshader/third_party/llvm-subzero/build/Linux/include/llvm/Config/config.h
|
||||
@@ -14,7 +14,7 @@
|
||||
#define ENABLE_CRASH_OVERRIDES 1
|
||||
|
||||
/* Define to 1 if you have the `backtrace' function. */
|
||||
-#define HAVE_BACKTRACE 1
|
||||
+/* #undef HAVE_BACKTRACE */
|
||||
|
||||
/* Define to 1 if you have the <CrashReporterClient.h> header file. */
|
||||
/* #undef HAVE_CRASHREPORTERCLIENT_H */
|
||||
@@ -55,7 +55,7 @@
|
||||
#define HAVE_ERRNO_H 1
|
||||
|
||||
/* Define to 1 if you have the <execinfo.h> header file. */
|
||||
-#define HAVE_EXECINFO_H 1
|
||||
+/* #undef HAVE_EXECINFO_H */
|
||||
|
||||
/* Define to 1 if you have the <fcntl.h> header file. */
|
||||
#define HAVE_FCNTL_H 1
|
|
@ -0,0 +1,25 @@
|
|||
diff --git a/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc b/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
|
||||
index b895f6d..4f13352 100644
|
||||
--- a/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
|
||||
+++ b/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
|
||||
@@ -490,7 +490,9 @@ bool ExceptionHandler::SimulateSignalDelivery(int sig) {
|
||||
siginfo.si_code = SI_USER;
|
||||
siginfo.si_pid = getpid();
|
||||
ucontext_t context;
|
||||
+#if defined(__GLIBC__)
|
||||
getcontext(&context);
|
||||
+#endif
|
||||
return HandleSignal(sig, &siginfo, &context);
|
||||
}
|
||||
|
||||
@@ -675,8 +677,10 @@ 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)
|
||||
+#endif
|
||||
return false;
|
||||
|
||||
#if defined(__i386__)
|
|
@ -0,0 +1,54 @@
|
|||
--- a/base/trace_event/malloc_dump_provider.cc.orig
|
||||
+++ b/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);
|
||||
|
||||
--- a/base/process/process_metrics_posix.cc.orig 2019-10-24 11:10:48.553159245 -0400
|
||||
+++ b/base/process/process_metrics_posix.cc 2019-10-24 11:14:29.025025854 -0400
|
||||
@@ -110,14 +110,14 @@
|
||||
malloc_statistics_t stats = {0};
|
||||
malloc_zone_statistics(nullptr, &stats);
|
||||
return stats.size_in_use;
|
||||
-#elif defined(OS_LINUX) || defined(OS_ANDROID)
|
||||
+#elif defined(__GLIBC__) || 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
|
||||
--- a/third_party/swiftshader/third_party/llvm-subzero/lib/Support/Unix/Process.inc
|
||||
+++ b/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;
|
||||
|
||||
--- a/third_party/swiftshader/third_party/llvm-10.0/configs/linux/include/llvm/Config/config.h.orig 2019-09-30 13:03:42.556880537 -0400
|
||||
+++ b/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,18 @@
|
|||
diff --git a/third_party/lss/linux_syscall_support.h b/third_party/lss/linux_syscall_support.h
|
||||
index 5d9c2e8..2682349 100644
|
||||
--- a/third_party/lss/linux_syscall_support.h
|
||||
+++ b/third_party/lss/linux_syscall_support.h
|
||||
@@ -166,6 +166,13 @@ extern "C" {
|
||||
# undef __NR_waitpid
|
||||
#endif
|
||||
|
||||
+#ifdef pread64
|
||||
+#undef pread64
|
||||
+#endif
|
||||
+#ifdef pwrite64
|
||||
+#undef pwrite64
|
||||
+#endif
|
||||
+
|
||||
/* As glibc often provides subtly incompatible data structures (and implicit
|
||||
* wrapper functions that convert them), we provide our own kernel data
|
||||
* structures for use by the system calls.
|
|
@ -0,0 +1,13 @@
|
|||
diff --git a/net/socket/udp_socket_posix.cc b/net/socket/udp_socket_posix.cc
|
||||
index 08bf79c..3ee5353 100644
|
||||
--- a/net/socket/udp_socket_posix.cc
|
||||
+++ b/net/socket/udp_socket_posix.cc
|
||||
@@ -1194,7 +1194,7 @@ SendResult UDPSocketPosixSender::InternalSendmmsgBuffers(
|
||||
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, nullptr, 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) {
|
|
@ -0,0 +1,41 @@
|
|||
diff --git a/third_party/blink/renderer/platform/wtf/stack_util.cc b/third_party/blink/renderer/platform/wtf/stack_util.cc
|
||||
index b242164..1a0b519 100644
|
||||
--- a/third_party/blink/renderer/platform/wtf/stack_util.cc
|
||||
+++ b/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).
|
||||
@@ -55,6 +55,9 @@ size_t GetUnderestimatedStackSize() {
|
||||
pthread_attr_destroy(&attr);
|
||||
#endif
|
||||
|
||||
+#if defined(OS_LINUX) && !defined(__GLIBC__)
|
||||
+ return 0;
|
||||
+#else
|
||||
// Return a 512k stack size, (conservatively) assuming the following:
|
||||
// - that size is much lower than the pthreads default (x86 pthreads has a 2M
|
||||
// default.)
|
||||
@@ -62,6 +65,8 @@ size_t GetUnderestimatedStackSize() {
|
||||
// low as 512k.
|
||||
//
|
||||
return 512 * 1024;
|
||||
+#endif
|
||||
+
|
||||
#elif defined(OS_MACOSX)
|
||||
// pthread_get_stacksize_np() returns too low a value for the main thread on
|
||||
// OSX 10.9,
|
||||
@@ -97,7 +102,7 @@ return Threading::ThreadStackSize();
|
||||
}
|
||||
|
||||
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;
|
|
@ -0,0 +1,44 @@
|
|||
diff --git a/base/debug/stack_trace.cc b/base/debug/stack_trace.cc
|
||||
index d8ca822..ffe1f08 100644
|
||||
--- a/base/debug/stack_trace.cc
|
||||
+++ b/base/debug/stack_trace.cc
|
||||
@@ -225,7 +225,9 @@ void StackTrace::Print() const {
|
||||
}
|
||||
|
||||
void StackTrace::OutputToStream(std::ostream* os) const {
|
||||
+#if defined(__GLIBC__) && !defined(__UCLIBC__) && !defined(_AIX)
|
||||
OutputToStreamWithPrefix(os, nullptr);
|
||||
+#endif
|
||||
}
|
||||
|
||||
std::string StackTrace::ToString() const {
|
||||
@@ -233,14 +233,14 @@ std::string StackTrace::ToString() const {
|
||||
}
|
||||
std::string StackTrace::ToStringWithPrefix(const char* prefix_string) const {
|
||||
std::stringstream stream;
|
||||
-#if !defined(__UCLIBC__) && !defined(_AIX)
|
||||
+#if defined(__GLIBC__) && !defined(__UCLIBC__) && !defined(_AIX)
|
||||
OutputToStreamWithPrefix(&stream, prefix_string);
|
||||
#endif
|
||||
return stream.str();
|
||||
}
|
||||
|
||||
std::ostream& operator<<(std::ostream& os, const StackTrace& s) {
|
||||
-#if !defined(__UCLIBC__) & !defined(_AIX)
|
||||
+#if defined(__GLIBC__) && !defined(__UCLIBC__) & !defined(_AIX)
|
||||
s.OutputToStream(&os);
|
||||
#else
|
||||
os << "StackTrace::OutputToStream not implemented.";
|
||||
diff --git a/base/logging.cc b/base/logging.cc
|
||||
index 36b8bfc..dd830fe 100644
|
||||
--- a/base/logging.cc
|
||||
+++ b/base/logging.cc
|
||||
@@ -607,7 +607,7 @@ LogMessage::LogMessage(const char* file, int line, LogSeverity severity,
|
||||
LogMessage::~LogMessage() {
|
||||
size_t stack_start = stream_.tellp();
|
||||
#if !defined(OFFICIAL_BUILD) && !defined(OS_NACL) && !defined(__UCLIBC__) && \
|
||||
- !defined(OS_AIX)
|
||||
+ !defined(OS_AIX) && defined(__GLIBC__)
|
||||
if (severity_ == LOG_FATAL && !base::debug::BeingDebugged()) {
|
||||
// Include a stack trace on a fatal, unless a debugger is attached.
|
||||
base::debug::StackTrace stack_trace;
|
|
@ -0,0 +1,14 @@
|
|||
diff --git a/content/public/common/socket_permission_request.h b/content/public/common/socket_permission_request.h
|
||||
index 7316621..6171219 100644
|
||||
--- a/content/public/common/socket_permission_request.h
|
||||
+++ b/content/public/common/socket_permission_request.h
|
||||
@@ -9,6 +9,9 @@
|
||||
|
||||
#include <string>
|
||||
|
||||
+#ifdef TCP_LISTEN
|
||||
+#undef TCP_LISTEN
|
||||
+#endif
|
||||
|
||||
namespace content {
|
||||
|
|
@ -0,0 +1,179 @@
|
|||
diff --git sandbox/linux/bpf_dsl/seccomp_macros.h sandbox/linux/bpf_dsl/seccomp_macros.h
|
||||
index a6aec544e..2a4a7f1bc 100644
|
||||
--- a/sandbox/linux/bpf_dsl/seccomp_macros.h
|
||||
+++ b/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
|
||||
--- a/sandbox/linux/seccomp-bpf/syscall.cc
|
||||
+++ b/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
|
||||
--- a/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.h
|
||||
+++ b/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
|
||||
diff --git third_party/breakpad/BUILD.gn third_party/breakpad/BUILD.gn
|
||||
index f9a60e37..25f3a0b7 100644
|
||||
--- a/third_party/breakpad/BUILD.gn
|
||||
+++ b/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
|
||||
--- a/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.cc
|
||||
+++ b/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
|
||||
--- a/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc
|
||||
+++ b/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
|
||||
--- a/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
|
||||
+++ b/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
|
||||
--- a/third_party/crashpad/crashpad/snapshot/linux/signal_context.h
|
||||
+++ b/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
|
||||
--- a/third_party/crashpad/crashpad/util/linux/thread_info.h
|
||||
+++ b/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
|
||||
--- a/third_party/lss/linux_syscall_support.h
|
||||
+++ b/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.
|
64
srcpkgs/electron10/files/patches/chromium-83-gcc-10.patch
Normal file
64
srcpkgs/electron10/files/patches/chromium-83-gcc-10.patch
Normal file
|
@ -0,0 +1,64 @@
|
|||
From e473f41284ccc8fa4bc4622d087194b18a1ec23a Mon Sep 17 00:00:00 2001
|
||||
From: Stephan Hartmann <stha09@googlemail.com>
|
||||
Date: Tue, 7 Apr 2020 16:37:10 +0000
|
||||
Subject: [PATCH] GCC: fix includes for gcc-10
|
||||
|
||||
---
|
||||
chrome/browser/search/background/ntp_backgrounds.h | 1 +
|
||||
third_party/webrtc/call/rtx_receive_stream.h | 1 +
|
||||
.../webrtc/modules/audio_processing/aec3/clockdrift_detector.h | 1 +
|
||||
ui/gfx/linux/drm_util_linux.h | 2 ++
|
||||
5 files changed, 6 insertions(+)
|
||||
|
||||
diff --git a/chrome/browser/search/background/ntp_backgrounds.h b/chrome/browser/search/background/ntp_backgrounds.h
|
||||
index 7afc0a2..ea5818e 100644
|
||||
--- a/chrome/browser/search/background/ntp_backgrounds.h
|
||||
+++ b/chrome/browser/search/background/ntp_backgrounds.h
|
||||
@@ -6,6 +6,7 @@
|
||||
#define CHROME_BROWSER_SEARCH_BACKGROUND_NTP_BACKGROUNDS_H_
|
||||
|
||||
#include <array>
|
||||
+#include <cstddef>
|
||||
|
||||
class GURL;
|
||||
|
||||
diff --git a/third_party/webrtc/call/rtx_receive_stream.h b/third_party/webrtc/call/rtx_receive_stream.h
|
||||
index 8ffa440..113a816 100644
|
||||
--- a/third_party/webrtc/call/rtx_receive_stream.h
|
||||
+++ b/third_party/webrtc/call/rtx_receive_stream.h
|
||||
@@ -12,6 +12,7 @@
|
||||
#define CALL_RTX_RECEIVE_STREAM_H_
|
||||
|
||||
#include <map>
|
||||
+#include <cstdint>
|
||||
|
||||
#include "call/rtp_packet_sink_interface.h"
|
||||
|
||||
diff --git a/third_party/webrtc/modules/audio_processing/aec3/clockdrift_detector.h b/third_party/webrtc/modules/audio_processing/aec3/clockdrift_detector.h
|
||||
index 22528c9..69e624e 100644
|
||||
--- a/third_party/webrtc/modules/audio_processing/aec3/clockdrift_detector.h
|
||||
+++ b/third_party/webrtc/modules/audio_processing/aec3/clockdrift_detector.h
|
||||
@@ -12,6 +12,7 @@
|
||||
#define MODULES_AUDIO_PROCESSING_AEC3_CLOCKDRIFT_DETECTOR_H_
|
||||
|
||||
#include <array>
|
||||
+#include <cstddef>
|
||||
|
||||
namespace webrtc {
|
||||
|
||||
diff --git a/ui/gfx/linux/drm_util_linux.h b/ui/gfx/linux/drm_util_linux.h
|
||||
index 86ff2eb..990f12c 100644
|
||||
--- a/ui/gfx/linux/drm_util_linux.h
|
||||
+++ b/ui/gfx/linux/drm_util_linux.h
|
||||
@@ -7,6 +7,8 @@
|
||||
|
||||
#include "ui/gfx/buffer_types.h"
|
||||
|
||||
+#include <cstdint>
|
||||
+
|
||||
namespace ui {
|
||||
|
||||
int GetFourCCFormatFromBufferFormat(gfx::BufferFormat format);
|
||||
--
|
||||
2.24.1
|
||||
|
|
@ -0,0 +1,15 @@
|
|||
--- a/build/config/ui.gni 2020-06-25 00:39:28.000000000 +0200
|
||||
+++ - 2020-08-22 18:01:01.182749726 +0200
|
||||
@@ -47,8 +47,10 @@
|
||||
# Make sure glib is not used if building for ChromeOS/Chromecast
|
||||
assert(!use_glib || (is_linux && !is_chromeos && !is_chromecast))
|
||||
|
||||
-# Whether to use atk, the Accessibility ToolKit library
|
||||
-use_atk = is_desktop_linux && !is_chromecast && use_glib
|
||||
+declare_args() {
|
||||
+ # Whether to use atk, the Accessibility ToolKit library
|
||||
+ use_atk = is_desktop_linux && !is_chromecast && use_glib
|
||||
+}
|
||||
# =============================================
|
||||
# PLEASE DO NOT ADD MORE FLAGS TO THIS FILE
|
||||
# =============================================
|
21
srcpkgs/electron10/files/patches/chromium-ffmpeg-4.3.patch
Normal file
21
srcpkgs/electron10/files/patches/chromium-ffmpeg-4.3.patch
Normal file
|
@ -0,0 +1,21 @@
|
|||
diff --git a/media/base/media.cc b/media/base/media.cc
|
||||
index c282ee49a03..a298b40c79b 100644
|
||||
--- a/media/base/media.cc
|
||||
+++ b/media/base/media.cc
|
||||
@@ -14,6 +14,7 @@
|
||||
#include "third_party/libyuv/include/libyuv.h"
|
||||
|
||||
#if BUILDFLAG(ENABLE_FFMPEG)
|
||||
+#include <limits>
|
||||
#include "third_party/ffmpeg/ffmpeg_features.h" // nogncheck
|
||||
extern "C" {
|
||||
#include <libavutil/cpu.h>
|
||||
@@ -41,7 +42,7 @@ class MediaInitializer {
|
||||
|
||||
#if BUILDFLAG(USE_ALLOCATOR_SHIM)
|
||||
// Remove allocation limit from ffmpeg, so calls go down to shim layer.
|
||||
- av_max_alloc(0);
|
||||
+ av_max_alloc(std::numeric_limits<size_t>::max());
|
||||
#endif // BUILDFLAG(USE_ALLOCATOR_SHIM)
|
||||
|
||||
#endif // BUILDFLAG(ENABLE_FFMPEG)
|
20
srcpkgs/electron10/files/patches/chromium-gcc-shared.patch
Normal file
20
srcpkgs/electron10/files/patches/chromium-gcc-shared.patch
Normal file
|
@ -0,0 +1,20 @@
|
|||
--- a/build/toolchain/gcc_toolchain.gni 2019-11-19 02:27:43.000000000 +0100
|
||||
+++ - 2020-07-21 00:59:09.201421469 +0200
|
||||
@@ -371,7 +371,7 @@
|
||||
# .TOC file, overwrite it, otherwise, don't change it.
|
||||
tocfile = sofile + ".TOC"
|
||||
|
||||
- link_command = "$ld -shared -Wl,-soname=\"$soname\" {{ldflags}}${extra_ldflags} -o \"$unstripped_sofile\" @\"$rspfile\""
|
||||
+ link_command = "$ld -shared -Wl,-soname=\"$soname\" {{ldflags}}${extra_ldflags} -o \"$unstripped_sofile\" -shared @\"$rspfile\""
|
||||
|
||||
# Generate a map file to be used for binary size analysis.
|
||||
# Map file adds ~10% to the link time on a z620.
|
||||
@@ -450,7 +450,7 @@
|
||||
unstripped_sofile = sofile
|
||||
}
|
||||
|
||||
- command = "$ld -shared {{ldflags}}${extra_ldflags} -o \"$unstripped_sofile\" -Wl,-soname=\"$soname\" @\"$rspfile\""
|
||||
+ command = "$ld -shared {{ldflags}}${extra_ldflags} -o \"$unstripped_sofile\" -Wl,-soname=\"$soname\" -shared @\"$rspfile\""
|
||||
|
||||
if (defined(invoker.strip)) {
|
||||
strip_command = "${invoker.strip} -o \"$sofile\" \"$unstripped_sofile\""
|
24
srcpkgs/electron10/files/patches/chromium-libc_malloc.patch
Normal file
24
srcpkgs/electron10/files/patches/chromium-libc_malloc.patch
Normal file
|
@ -0,0 +1,24 @@
|
|||
--- a/base/process/memory_linux.cc 2020-09-21 20:39:01.000000000 +0200
|
||||
+++ - 2020-10-02 20:23:17.972108815 +0200
|
||||
@@ -23,6 +23,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;
|
||||
@@ -135,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
|
14
srcpkgs/electron10/files/patches/chromium-skia-harmony.patch
Normal file
14
srcpkgs/electron10/files/patches/chromium-skia-harmony.patch
Normal file
|
@ -0,0 +1,14 @@
|
|||
--- a/third_party/skia/src/ports/SkFontHost_FreeType.cpp.orig 2019-07-19 11:08:34.770972665 +0000
|
||||
+++ b/third_party/skia/src/ports/SkFontHost_FreeType.cpp 2019-07-19 11:08:44.274442065 +0000
|
||||
@@ -128,9 +128,9 @@ public:
|
||||
: fGetVarDesignCoordinates(nullptr)
|
||||
, fGetVarAxisFlags(nullptr)
|
||||
, fLibrary(nullptr)
|
||||
- , fIsLCDSupported(false)
|
||||
+ , fIsLCDSupported(true)
|
||||
, fLightHintingIsYOnly(false)
|
||||
- , fLCDExtra(0)
|
||||
+ , fLCDExtra(2)
|
||||
{
|
||||
if (FT_New_Library(&gFTMemory, &fLibrary)) {
|
||||
return;
|
|
@ -0,0 +1,11 @@
|
|||
--- src/build/toolchain/linux/unbundle/BUILD.gn 2020-07-21 17:36:34.064748261 +0200
|
||||
+++ - 2020-07-21 17:39:03.115740522 +0200
|
||||
@@ -35,7 +35,7 @@
|
||||
extra_ldflags = getenv("BUILD_LDFLAGS")
|
||||
|
||||
toolchain_args = {
|
||||
- current_cpu = current_cpu
|
||||
+ current_cpu = host_cpu
|
||||
current_os = current_os
|
||||
}
|
||||
}
|
|
@ -0,0 +1,81 @@
|
|||
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" ]
|
||||
@@ -401,6 +403,8 @@ static_library("libvp9rc") {
|
||||
} else {
|
||||
sources = libvpx_srcs_arm64
|
||||
}
|
||||
+ } else if (current_cpu == "ppc64") {
|
||||
+ sources = libvpx_srcs_ppc64
|
||||
}
|
||||
sources += [ "//third_party/libvpx/source/libvpx/vp9/ratectrl_rtc.cc" ]
|
||||
sources += [ "//third_party/libvpx/source/libvpx/vp9/ratectrl_rtc.h" ]
|
||||
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
|
||||
|
3655
srcpkgs/electron10/files/patches/chromium-xxx-ppc64le-support.patch
Normal file
3655
srcpkgs/electron10/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=['content/test/**', 'test/cctest/wasm/**'],
|
||||
committer_name="Electron Scripts", committer_email="scripts@electron")
|
||||
|
||||
|
148
srcpkgs/electron10/files/sndio-files/audio_manager_openbsd.cc
Normal file
148
srcpkgs/electron10/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/electron10/files/sndio-files/audio_manager_openbsd.h
Normal file
65
srcpkgs/electron10/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/electron10/files/sndio-files/sndio_input.cc
Normal file
200
srcpkgs/electron10/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/electron10/files/sndio-files/sndio_input.h
Normal file
91
srcpkgs/electron10/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/electron10/files/sndio-files/sndio_output.cc
Normal file
183
srcpkgs/electron10/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/electron10/files/sndio-files/sndio_output.h
Normal file
86
srcpkgs/electron10/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 &&
|
351
srcpkgs/electron10/template
Normal file
351
srcpkgs/electron10/template
Normal file
|
@ -0,0 +1,351 @@
|
|||
# Template file for 'electron10'
|
||||
pkgname=electron10
|
||||
version=10.1.3
|
||||
_nodever=12.16.3
|
||||
_chromiumver=85.0.4183.121
|
||||
revision=1
|
||||
archs="x86_64* i686* aarch64* ppc64le*"
|
||||
build_wrksrc="src"
|
||||
create_wrksrc=yes
|
||||
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)"
|
||||
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"
|
||||
short_desc="Cross platform application development 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="b50e2b86abb3641a664a87d92cb09835e6d0ea5b81c4d3e031f041c75ea74158
|
||||
e018547e54566410fb365d9f3dae10037c30fca5debe6ba8baceef3ad3b03d28
|
||||
dcd0a1e619ff326399ca8fd87f61c255f4d1e9bff47860064993f01e4ff37fe1"
|
||||
|
||||
no_generic_pkgconfig_link=yes
|
||||
lib32disabled=yes
|
||||
nodebug=yes
|
||||
nopie=yes # contains tools that are not PIE, enables PIE itself
|
||||
|
||||
build_options="pulseaudio sndio clang"
|
||||
build_options_default="pulseaudio sndio clang"
|
||||
|
||||
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
|
||||
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 -p1 "$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/
|
||||
|
||||
# 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=*([^ ])} )
|
||||
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
|
||||
|
||||
# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
|
||||
# Note: These are for Void Linux use ONLY.
|
||||
conf+=(
|
||||
'google_api_key="AIzaSyA9gWazKaHaNIPPg2hrMj6_ZSG8AFmq738"'
|
||||
'google_default_client_id="126659149423-hoo6ickbk3p1u2qjsdsp0ddciurfvb4t.apps.googleusercontent.com"'
|
||||
'google_default_client_secret="_ozIx2D-DKm_se_2NPwV4l5b"'
|
||||
)
|
||||
|
||||
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
|
||||
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"
|
||||
'is_desktop_linux=true'
|
||||
'linux_use_bundled_binutils=false'
|
||||
'proprietary_codecs=true'
|
||||
'symbol_level=0'
|
||||
'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_pulseaudio=$(vopt_if pulseaudio 'true' 'false')"
|
||||
'use_sysroot=false'
|
||||
'use_system_harfbuzz=true'
|
||||
"target_cpu=\"$target_arch\""
|
||||
"host_cpu=\"$host_arch\""
|
||||
'import("//electron/build/args/release.gn")'
|
||||
)
|
||||
|
||||
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
|
||||
|
||||
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=*([^ ])} )
|
||||
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/electron10/update
Normal file
2
srcpkgs/electron10/update
Normal file
|
@ -0,0 +1,2 @@
|
|||
site=https://www.electronjs.org/releases/stable?version=${version%%.*}
|
||||
pattern='tag/v\K[\d\.]+(?=")'
|
Loading…
Reference in a new issue