qt6-webengine: update to 6.5.0.
This commit is contained in:
parent
71657a4253
commit
7b921c86a4
srcpkgs/qt6-webengine
patches
0004-riscv-angle.patch0004-riscv-angle.patch.args0005-riscv-crashpad.patch0005-riscv-crashpad.patch.args0006-riscv-dav1d.patch0006-riscv-dav1d.patch.args0007-riscv-sandbox.patch0007-riscv-sandbox.patch.args0100-chromium-revert-9d080c0.patch0101-chromium-102-fenced_frame_utils-include.patch0102-chromium-102-regex_pattern-array.patch0103-chromium-i686-vaapi-fpermissive.patch0104-chromium-libxml-unbundle.patch0107-chromium-cross-build.patch0117-chromium-musl-resolver.patch0124-chromium-enable-i686.patch0129-chromium-sandbox-shed_getparam.patch0155-systypes.patch0200-chromium-sndio.patch0300-chromium-musl-hacks.patch0301-chromium-musl-sandbox.patch0302-chromium-no-mallinfo.patch
template
|
@ -0,0 +1,28 @@
|
|||
Index: chromium-111.0.5563.64/third_party/angle/gni/angle.gni
|
||||
===================================================================
|
||||
--- chromium-111.0.5563.64.orig/third_party/angle/gni/angle.gni
|
||||
+++ chromium-111.0.5563.64/third_party/angle/gni/angle.gni
|
||||
@@ -105,7 +105,8 @@ declare_args() {
|
||||
|
||||
if (current_cpu == "arm64" || current_cpu == "x64" ||
|
||||
current_cpu == "mips64el" || current_cpu == "s390x" ||
|
||||
- current_cpu == "ppc64" || current_cpu == "loong64") {
|
||||
+ current_cpu == "ppc64" || current_cpu == "loong64" ||
|
||||
+ current_cpu == "riscv64") {
|
||||
angle_64bit_current_cpu = true
|
||||
} else if (current_cpu == "arm" || current_cpu == "x86" ||
|
||||
current_cpu == "mipsel" || current_cpu == "s390" ||
|
||||
Index: chromium-111.0.5563.64/third_party/angle/src/common/platform.h
|
||||
===================================================================
|
||||
--- chromium-111.0.5563.64.orig/third_party/angle/src/common/platform.h
|
||||
+++ chromium-111.0.5563.64/third_party/angle/src/common/platform.h
|
||||
@@ -108,7 +108,7 @@
|
||||
#endif
|
||||
|
||||
// Mips and arm devices need to include stddef for size_t.
|
||||
-#if defined(__mips__) || defined(__arm__) || defined(__aarch64__)
|
||||
+#if defined(__mips__) || defined(__arm__) || defined(__aarch64__) || defined(__riscv)
|
||||
# include <stddef.h>
|
||||
#endif
|
||||
|
||||
|
|
@ -0,0 +1 @@
|
|||
-Np1 --directory=src/3rdparty/chromium/
|
|
@ -0,0 +1,778 @@
|
|||
Index: chromium-106.0.5249.91/third_party/crashpad/crashpad/minidump/minidump_context.h
|
||||
===================================================================
|
||||
--- chromium-106.0.5249.91.orig/third_party/crashpad/crashpad/minidump/minidump_context.h
|
||||
+++ chromium-106.0.5249.91/third_party/crashpad/crashpad/minidump/minidump_context.h
|
||||
@@ -637,6 +637,41 @@ struct MinidumpContextMIPS64 {
|
||||
uint64_t fir;
|
||||
};
|
||||
|
||||
+//! \brief 64bit RISC-V-specifc flags for MinidumpContextRISCV64::context_flags.
|
||||
+//! Based on minidump_cpu_riscv64.h from breakpad
|
||||
+enum MinidumpContextRISCV64Flags : uint32_t {
|
||||
+ //! \brief Identifies the context structure as RISCV64.
|
||||
+ kMinidumpContextRISCV64 = 0x00080000,
|
||||
+
|
||||
+ //! \brief Indicates the validity of integer registers.
|
||||
+ //!
|
||||
+ //! Registers `x1`-`x31` and pc are valid.
|
||||
+ kMinidumpContextRISCV64Integer = kMinidumpContextRISCV64 | 0x00000002,
|
||||
+
|
||||
+ //! \brief Indicates the validity of floating point registers.
|
||||
+ //!
|
||||
+ //! Floating point registers `f0`-`f31`, and `fcsr` are valid
|
||||
+ kMinidumpContextRISCV64FloatingPoint = kMinidumpContextRISCV64 | 0x00000004,
|
||||
+
|
||||
+ //! \brief Indicates the validity of all registers.
|
||||
+ kMinidumpContextRISCV64All = kMinidumpContextRISCV64Integer |
|
||||
+ kMinidumpContextRISCV64FloatingPoint,
|
||||
+};
|
||||
+
|
||||
+//! \brief A 64bit RISCV CPU context (register state) carried in a minidump file.
|
||||
+struct MinidumpContextRISCV64 {
|
||||
+ uint64_t context_flags;
|
||||
+
|
||||
+ //! \brief General purpose registers.
|
||||
+ uint64_t regs[32];
|
||||
+
|
||||
+ //! \brief FPU registers.
|
||||
+ uint64_t fpregs[32];
|
||||
+
|
||||
+ //! \brief FPU status register.
|
||||
+ uint64_t fcsr;
|
||||
+};
|
||||
+
|
||||
} // namespace crashpad
|
||||
|
||||
#endif // CRASHPAD_MINIDUMP_MINIDUMP_CONTEXT_H_
|
||||
Index: chromium-106.0.5249.91/third_party/crashpad/crashpad/minidump/minidump_context_writer.cc
|
||||
===================================================================
|
||||
--- chromium-106.0.5249.91.orig/third_party/crashpad/crashpad/minidump/minidump_context_writer.cc
|
||||
+++ chromium-106.0.5249.91/third_party/crashpad/crashpad/minidump/minidump_context_writer.cc
|
||||
@@ -102,6 +102,13 @@ MinidumpContextWriter::CreateFromSnapsho
|
||||
break;
|
||||
}
|
||||
|
||||
+ case kCPUArchitectureRISCV64: {
|
||||
+ context = std::make_unique<MinidumpContextRISCV64Writer>();
|
||||
+ reinterpret_cast<MinidumpContextRISCV64Writer*>(context.get())
|
||||
+ ->InitializeFromSnapshot(context_snapshot->riscv64);
|
||||
+ break;
|
||||
+ }
|
||||
+
|
||||
default: {
|
||||
LOG(ERROR) << "unknown context architecture "
|
||||
<< context_snapshot->architecture;
|
||||
@@ -555,5 +562,42 @@ size_t MinidumpContextMIPS64Writer::Cont
|
||||
DCHECK_GE(state(), kStateFrozen);
|
||||
return sizeof(context_);
|
||||
}
|
||||
+
|
||||
+MinidumpContextRISCV64Writer::MinidumpContextRISCV64Writer()
|
||||
+ : MinidumpContextWriter(), context_() {
|
||||
+ context_.context_flags = kMinidumpContextRISCV64;
|
||||
+}
|
||||
+
|
||||
+MinidumpContextRISCV64Writer::~MinidumpContextRISCV64Writer() = default;
|
||||
+
|
||||
+void MinidumpContextRISCV64Writer::InitializeFromSnapshot(
|
||||
+ const CPUContextRISCV64* context_snapshot) {
|
||||
+ DCHECK_EQ(state(), kStateMutable);
|
||||
+ DCHECK_EQ(context_.context_flags, kMinidumpContextRISCV64);
|
||||
+
|
||||
+ context_.context_flags = kMinidumpContextRISCV64All;
|
||||
+
|
||||
+ static_assert(sizeof(context_.regs) == sizeof(context_snapshot->regs),
|
||||
+ "GPRs size mismatch");
|
||||
+ memcpy(context_.regs, context_snapshot->regs, sizeof(context_.regs));
|
||||
+
|
||||
+ static_assert(sizeof(context_.fpregs) == sizeof(context_snapshot->fpregs),
|
||||
+ "FPRs size mismatch");
|
||||
+ memcpy(context_.fpregs,
|
||||
+ context_snapshot->fpregs,
|
||||
+ sizeof(context_.fpregs));
|
||||
+ context_.fcsr = context_snapshot->fcsr;
|
||||
+}
|
||||
+
|
||||
+bool MinidumpContextRISCV64Writer::WriteObject(
|
||||
+ FileWriterInterface* file_writer) {
|
||||
+ DCHECK_EQ(state(), kStateWritable);
|
||||
+ return file_writer->Write(&context_, sizeof(context_));
|
||||
+}
|
||||
+
|
||||
+size_t MinidumpContextRISCV64Writer::ContextSize() const {
|
||||
+ DCHECK_GE(state(), kStateFrozen);
|
||||
+ return sizeof(context_);
|
||||
+}
|
||||
|
||||
} // namespace crashpad
|
||||
Index: chromium-106.0.5249.91/third_party/crashpad/crashpad/minidump/minidump_context_writer.h
|
||||
===================================================================
|
||||
--- chromium-106.0.5249.91.orig/third_party/crashpad/crashpad/minidump/minidump_context_writer.h
|
||||
+++ chromium-106.0.5249.91/third_party/crashpad/crashpad/minidump/minidump_context_writer.h
|
||||
@@ -369,6 +369,49 @@ class MinidumpContextMIPS64Writer final
|
||||
MinidumpContextMIPS64 context_;
|
||||
};
|
||||
|
||||
+//! \brief The writer for a MinidumpContextRISCV64 structure in a minidump file.
|
||||
+class MinidumpContextRISCV64Writer final : public MinidumpContextWriter {
|
||||
+ public:
|
||||
+ MinidumpContextRISCV64Writer();
|
||||
+
|
||||
+ MinidumpContextRISCV64Writer(const MinidumpContextRISCV64Writer&) = delete;
|
||||
+ MinidumpContextRISCV64Writer& operator=(const MinidumpContextRISCV64Writer&) =
|
||||
+ delete;
|
||||
+
|
||||
+ ~MinidumpContextRISCV64Writer() override;
|
||||
+
|
||||
+ //! \brief Initializes the MinidumpContextRISCV based on \a context_snapshot.
|
||||
+ //!
|
||||
+ //! \param[in] context_snapshot The context snapshot to use as source data.
|
||||
+ //!
|
||||
+ //! \note Valid in #kStateMutable. No mutation of context() may be done before
|
||||
+ //! calling this method, and it is not normally necessary to alter
|
||||
+ //! context() after calling this method.
|
||||
+ void InitializeFromSnapshot(const CPUContextRISCV64* context_snapshot);
|
||||
+
|
||||
+ //! \brief Returns a pointer to the context structure that this object will
|
||||
+ //! write.
|
||||
+ //!
|
||||
+ //! \attention This returns a non-`const` pointer to this object’s private
|
||||
+ //! data so that a caller can populate the context structure directly.
|
||||
+ //! This is done because providing setter interfaces to each field in the
|
||||
+ //! context structure would be unwieldy and cumbersome. Care must be taken
|
||||
+ //! to populate the context structure correctly. The context structure
|
||||
+ //! must only be modified while this object is in the #kStateMutable
|
||||
+ //! state.
|
||||
+ MinidumpContextRISCV64* context() { return &context_; }
|
||||
+
|
||||
+ protected:
|
||||
+ // MinidumpWritable:
|
||||
+ bool WriteObject(FileWriterInterface* file_writer) override;
|
||||
+
|
||||
+ // MinidumpContextWriter:
|
||||
+ size_t ContextSize() const override;
|
||||
+
|
||||
+ private:
|
||||
+ MinidumpContextRISCV64 context_;
|
||||
+};
|
||||
+
|
||||
} // namespace crashpad
|
||||
|
||||
#endif // CRASHPAD_MINIDUMP_MINIDUMP_CONTEXT_WRITER_H_
|
||||
Index: chromium-106.0.5249.91/third_party/crashpad/crashpad/minidump/minidump_misc_info_writer.cc
|
||||
===================================================================
|
||||
--- chromium-106.0.5249.91.orig/third_party/crashpad/crashpad/minidump/minidump_misc_info_writer.cc
|
||||
+++ chromium-106.0.5249.91/third_party/crashpad/crashpad/minidump/minidump_misc_info_writer.cc
|
||||
@@ -175,6 +175,10 @@ std::string MinidumpMiscInfoDebugBuildSt
|
||||
static constexpr char kCPU[] = "mips";
|
||||
#elif defined(ARCH_CPU_MIPS64EL)
|
||||
static constexpr char kCPU[] = "mips64";
|
||||
+#elif defined(ARCH_CPU_RISCV32)
|
||||
+ static constexpr char kCPU[] = "riscv32";
|
||||
+#elif defined(ARCH_CPU_RISCV64)
|
||||
+ static constexpr char kCPU[] = "riscv64";
|
||||
#else
|
||||
#error define kCPU for this CPU
|
||||
#endif
|
||||
Index: chromium-106.0.5249.91/third_party/crashpad/crashpad/snapshot/capture_memory.cc
|
||||
===================================================================
|
||||
--- chromium-106.0.5249.91.orig/third_party/crashpad/crashpad/snapshot/capture_memory.cc
|
||||
+++ chromium-106.0.5249.91/third_party/crashpad/crashpad/snapshot/capture_memory.cc
|
||||
@@ -117,6 +117,16 @@ void CaptureMemory::PointedToByContext(c
|
||||
for (size_t i = 0; i < std::size(context.mipsel->regs); ++i) {
|
||||
MaybeCaptureMemoryAround(delegate, context.mipsel->regs[i]);
|
||||
}
|
||||
+#elif defined(ARCH_CPU_RISCV_FAMILY)
|
||||
+ if (context.architecture == kCPUArchitectureRISCV64) {
|
||||
+ for (size_t i = 0; i < std::size(context.riscv64->regs); ++i) {
|
||||
+ MaybeCaptureMemoryAround(delegate, context.riscv64->regs[i]);
|
||||
+ }
|
||||
+ } else {
|
||||
+ for (size_t i = 0; i < std::size(context.riscv32->regs); ++i) {
|
||||
+ MaybeCaptureMemoryAround(delegate, context.riscv32->regs[i]);
|
||||
+ }
|
||||
+ }
|
||||
#else
|
||||
#error Port.
|
||||
#endif
|
||||
Index: chromium-106.0.5249.91/third_party/crashpad/crashpad/snapshot/cpu_architecture.h
|
||||
===================================================================
|
||||
--- chromium-106.0.5249.91.orig/third_party/crashpad/crashpad/snapshot/cpu_architecture.h
|
||||
+++ chromium-106.0.5249.91/third_party/crashpad/crashpad/snapshot/cpu_architecture.h
|
||||
@@ -43,7 +43,13 @@ enum CPUArchitecture {
|
||||
kCPUArchitectureMIPSEL,
|
||||
|
||||
//! \brief 64-bit MIPSEL.
|
||||
- kCPUArchitectureMIPS64EL
|
||||
+ kCPUArchitectureMIPS64EL,
|
||||
+
|
||||
+ //! \brief 32-bit RISCV.
|
||||
+ kCPUArchitectureRISCV32,
|
||||
+
|
||||
+ //! \brief 64-bit RISCV.
|
||||
+ kCPUArchitectureRISCV64
|
||||
};
|
||||
|
||||
} // namespace crashpad
|
||||
Index: chromium-106.0.5249.91/third_party/crashpad/crashpad/snapshot/cpu_context.cc
|
||||
===================================================================
|
||||
--- chromium-106.0.5249.91.orig/third_party/crashpad/crashpad/snapshot/cpu_context.cc
|
||||
+++ chromium-106.0.5249.91/third_party/crashpad/crashpad/snapshot/cpu_context.cc
|
||||
@@ -226,10 +226,12 @@ bool CPUContext::Is64Bit() const {
|
||||
case kCPUArchitectureX86_64:
|
||||
case kCPUArchitectureARM64:
|
||||
case kCPUArchitectureMIPS64EL:
|
||||
+ case kCPUArchitectureRISCV64:
|
||||
return true;
|
||||
case kCPUArchitectureX86:
|
||||
case kCPUArchitectureARM:
|
||||
case kCPUArchitectureMIPSEL:
|
||||
+ case kCPUArchitectureRISCV32:
|
||||
return false;
|
||||
default:
|
||||
NOTREACHED();
|
||||
Index: chromium-106.0.5249.91/third_party/crashpad/crashpad/snapshot/cpu_context.h
|
||||
===================================================================
|
||||
--- chromium-106.0.5249.91.orig/third_party/crashpad/crashpad/snapshot/cpu_context.h
|
||||
+++ chromium-106.0.5249.91/third_party/crashpad/crashpad/snapshot/cpu_context.h
|
||||
@@ -362,6 +362,20 @@ struct CPUContextMIPS64 {
|
||||
uint64_t fir;
|
||||
};
|
||||
|
||||
+//! \brief A context structure carrying RISCV32 CPU state.
|
||||
+struct CPUContextRISCV32 {
|
||||
+ uint32_t regs[32];
|
||||
+ uint64_t fpregs[32];
|
||||
+ uint32_t fcsr;
|
||||
+};
|
||||
+
|
||||
+//! \brief A context structure carrying RISCV64 CPU state.
|
||||
+struct CPUContextRISCV64 {
|
||||
+ uint64_t regs[32];
|
||||
+ uint64_t fpregs[32];
|
||||
+ uint32_t fcsr;
|
||||
+};
|
||||
+
|
||||
//! \brief A context structure capable of carrying the context of any supported
|
||||
//! CPU architecture.
|
||||
struct CPUContext {
|
||||
@@ -402,6 +416,8 @@ struct CPUContext {
|
||||
CPUContextARM64* arm64;
|
||||
CPUContextMIPS* mipsel;
|
||||
CPUContextMIPS64* mips64;
|
||||
+ CPUContextRISCV32* riscv32;
|
||||
+ CPUContextRISCV64* riscv64;
|
||||
};
|
||||
};
|
||||
|
||||
Index: chromium-106.0.5249.91/third_party/crashpad/crashpad/snapshot/linux/cpu_context_linux.cc
|
||||
===================================================================
|
||||
--- chromium-106.0.5249.91.orig/third_party/crashpad/crashpad/snapshot/linux/cpu_context_linux.cc
|
||||
+++ chromium-106.0.5249.91/third_party/crashpad/crashpad/snapshot/linux/cpu_context_linux.cc
|
||||
@@ -266,6 +266,30 @@ void InitializeCPUContextARM64_OnlyFPSIM
|
||||
context->fpcr = float_context.fpcr;
|
||||
}
|
||||
|
||||
+#elif defined(ARCH_CPU_RISCV_FAMILY)
|
||||
+
|
||||
+template <typename Traits>
|
||||
+void InitializeCPUContextRISCV(
|
||||
+ const typename Traits::SignalThreadContext& thread_context,
|
||||
+ const typename Traits::SignalFloatContext& float_context,
|
||||
+ typename Traits::CPUContext* context) {
|
||||
+ static_assert(sizeof(context->regs) == sizeof(thread_context),
|
||||
+ "registers size mismatch");
|
||||
+ static_assert(sizeof(context->fpregs) == sizeof(float_context.f),
|
||||
+ "fp registers size mismatch");
|
||||
+ memcpy(&context->regs, &thread_context, sizeof(context->regs));
|
||||
+ memcpy(&context->fpregs, &float_context.f, sizeof(context->fpregs));
|
||||
+ context->fcsr = float_context.fcsr;
|
||||
+}
|
||||
+template void InitializeCPUContextRISCV<ContextTraits32>(
|
||||
+ const ContextTraits32::SignalThreadContext& thread_context,
|
||||
+ const ContextTraits32::SignalFloatContext& float_context,
|
||||
+ ContextTraits32::CPUContext* context);
|
||||
+template void InitializeCPUContextRISCV<ContextTraits64>(
|
||||
+ const ContextTraits64::SignalThreadContext& thread_context,
|
||||
+ const ContextTraits64::SignalFloatContext& float_context,
|
||||
+ ContextTraits64::CPUContext* context);
|
||||
+
|
||||
#endif // ARCH_CPU_X86_FAMILY
|
||||
|
||||
} // namespace internal
|
||||
Index: chromium-106.0.5249.91/third_party/crashpad/crashpad/snapshot/linux/cpu_context_linux.h
|
||||
===================================================================
|
||||
--- chromium-106.0.5249.91.orig/third_party/crashpad/crashpad/snapshot/linux/cpu_context_linux.h
|
||||
+++ chromium-106.0.5249.91/third_party/crashpad/crashpad/snapshot/linux/cpu_context_linux.h
|
||||
@@ -174,6 +174,22 @@ void InitializeCPUContextMIPS(
|
||||
|
||||
#endif // ARCH_CPU_MIPS_FAMILY || DOXYGEN
|
||||
|
||||
+#if defined(ARCH_CPU_RISCV_FAMILY) || DOXYGEN
|
||||
+
|
||||
+//! \brief Initializes a CPUContextRISCV structure from native context
|
||||
+//! structures on Linux.
|
||||
+//!
|
||||
+//! \param[in] thread_context The native thread context.
|
||||
+//! \param[in] float_context The native float context.
|
||||
+//! \param[out] context The CPUContextRISCV structure to initialize.
|
||||
+template <typename Traits>
|
||||
+void InitializeCPUContextRISCV(
|
||||
+ const typename Traits::SignalThreadContext& thread_context,
|
||||
+ const typename Traits::SignalFloatContext& float_context,
|
||||
+ typename Traits::CPUContext* context);
|
||||
+
|
||||
+#endif // ARCH_CPU_RISCV_FAMILY || DOXYGEN
|
||||
+
|
||||
} // namespace internal
|
||||
} // namespace crashpad
|
||||
|
||||
Index: chromium-106.0.5249.91/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.cc
|
||||
===================================================================
|
||||
--- chromium-106.0.5249.91.orig/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.cc
|
||||
+++ chromium-106.0.5249.91/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.cc
|
||||
@@ -325,6 +325,61 @@ bool ExceptionSnapshotLinux::ReadContext
|
||||
reader, context_address, context_.mips64);
|
||||
}
|
||||
|
||||
+#elif defined(ARCH_CPU_RISCV_FAMILY)
|
||||
+
|
||||
+template <typename Traits>
|
||||
+static bool ReadContext(ProcessReaderLinux* reader,
|
||||
+ LinuxVMAddress context_address,
|
||||
+ typename Traits::CPUContext* dest_context) {
|
||||
+ const ProcessMemory* memory = reader->Memory();
|
||||
+
|
||||
+ LinuxVMAddress gregs_address = context_address +
|
||||
+ offsetof(UContext<Traits>, mcontext) +
|
||||
+ offsetof(typename Traits::MContext, gregs);
|
||||
+
|
||||
+ typename Traits::SignalThreadContext thread_context;
|
||||
+ if (!memory->Read(gregs_address, sizeof(thread_context), &thread_context)) {
|
||||
+ LOG(ERROR) << "Couldn't read gregs";
|
||||
+ return false;
|
||||
+ }
|
||||
+
|
||||
+ LinuxVMAddress fpregs_address = context_address +
|
||||
+ offsetof(UContext<Traits>, mcontext) +
|
||||
+ offsetof(typename Traits::MContext, fpregs);
|
||||
+
|
||||
+ typename Traits::SignalFloatContext fp_context;
|
||||
+ if (!memory->Read(fpregs_address, sizeof(fp_context), &fp_context)) {
|
||||
+ LOG(ERROR) << "Couldn't read fpregs";
|
||||
+ return false;
|
||||
+ }
|
||||
+
|
||||
+ InitializeCPUContextRISCV<Traits>(thread_context, fp_context, dest_context);
|
||||
+
|
||||
+ return true;
|
||||
+}
|
||||
+
|
||||
+template <>
|
||||
+bool ExceptionSnapshotLinux::ReadContext<ContextTraits32>(
|
||||
+ ProcessReaderLinux* reader,
|
||||
+ LinuxVMAddress context_address) {
|
||||
+ context_.architecture = kCPUArchitectureRISCV32;
|
||||
+ context_.riscv32 = &context_union_.riscv32;
|
||||
+
|
||||
+ return internal::ReadContext<ContextTraits32>(
|
||||
+ reader, context_address, context_.riscv32);
|
||||
+}
|
||||
+
|
||||
+template <>
|
||||
+bool ExceptionSnapshotLinux::ReadContext<ContextTraits64>(
|
||||
+ ProcessReaderLinux* reader,
|
||||
+ LinuxVMAddress context_address) {
|
||||
+ context_.architecture = kCPUArchitectureRISCV64;
|
||||
+ context_.riscv64 = &context_union_.riscv64;
|
||||
+
|
||||
+ return internal::ReadContext<ContextTraits64>(
|
||||
+ reader, context_address, context_.riscv64);
|
||||
+}
|
||||
+
|
||||
#endif // ARCH_CPU_X86_FAMILY
|
||||
|
||||
bool ExceptionSnapshotLinux::Initialize(
|
||||
Index: chromium-106.0.5249.91/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.h
|
||||
===================================================================
|
||||
--- chromium-106.0.5249.91.orig/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.h
|
||||
+++ chromium-106.0.5249.91/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.h
|
||||
@@ -89,6 +89,9 @@ class ExceptionSnapshotLinux final : pub
|
||||
#elif defined(ARCH_CPU_MIPS_FAMILY)
|
||||
CPUContextMIPS mipsel;
|
||||
CPUContextMIPS64 mips64;
|
||||
+#elif defined(ARCH_CPU_RISCV_FAMILY)
|
||||
+ CPUContextRISCV32 riscv32;
|
||||
+ CPUContextRISCV64 riscv64;
|
||||
#endif
|
||||
} context_union_;
|
||||
CPUContext context_;
|
||||
Index: chromium-106.0.5249.91/third_party/crashpad/crashpad/snapshot/linux/process_reader_linux.cc
|
||||
===================================================================
|
||||
--- chromium-106.0.5249.91.orig/third_party/crashpad/crashpad/snapshot/linux/process_reader_linux.cc
|
||||
+++ chromium-106.0.5249.91/third_party/crashpad/crashpad/snapshot/linux/process_reader_linux.cc
|
||||
@@ -127,6 +127,9 @@ void ProcessReaderLinux::Thread::Initial
|
||||
#elif defined(ARCH_CPU_MIPS_FAMILY)
|
||||
stack_pointer = reader->Is64Bit() ? thread_info.thread_context.t64.regs[29]
|
||||
: thread_info.thread_context.t32.regs[29];
|
||||
+#elif defined(ARCH_CPU_RISCV_FAMILY)
|
||||
+ stack_pointer = reader->Is64Bit() ? thread_info.thread_context.t64.sp
|
||||
+ : thread_info.thread_context.t32.sp;
|
||||
#else
|
||||
#error Port.
|
||||
#endif
|
||||
Index: chromium-106.0.5249.91/third_party/crashpad/crashpad/snapshot/linux/signal_context.h
|
||||
===================================================================
|
||||
--- chromium-106.0.5249.91.orig/third_party/crashpad/crashpad/snapshot/linux/signal_context.h
|
||||
+++ chromium-106.0.5249.91/third_party/crashpad/crashpad/snapshot/linux/signal_context.h
|
||||
@@ -422,6 +422,67 @@ static_assert(offsetof(UContext<ContextT
|
||||
"context offset mismatch");
|
||||
#endif
|
||||
|
||||
+#elif defined(ARCH_CPU_RISCV_FAMILY)
|
||||
+
|
||||
+struct MContext32 {
|
||||
+ uint32_t gregs[32];
|
||||
+ uint64_t fpregs[32];
|
||||
+ unsigned int fcsr;
|
||||
+};
|
||||
+
|
||||
+struct MContext64 {
|
||||
+ uint64_t gregs[32];
|
||||
+ uint64_t fpregs[32];
|
||||
+ unsigned int fcsr;
|
||||
+};
|
||||
+
|
||||
+struct ContextTraits32 : public Traits32 {
|
||||
+ using MContext = MContext32;
|
||||
+ using SignalThreadContext = ThreadContext::t32_t;
|
||||
+ using SignalFloatContext = FloatContext::f32_t;
|
||||
+ using CPUContext = CPUContextRISCV32;
|
||||
+};
|
||||
+
|
||||
+struct ContextTraits64 : public Traits64 {
|
||||
+ using MContext = MContext64;
|
||||
+ using SignalThreadContext = ThreadContext::t64_t;
|
||||
+ using SignalFloatContext = FloatContext::f64_t;
|
||||
+ using CPUContext = CPUContextRISCV64;
|
||||
+};
|
||||
+
|
||||
+template <typename Traits>
|
||||
+struct UContext {
|
||||
+ typename Traits::ULong flags;
|
||||
+ typename Traits::Address link;
|
||||
+ SignalStack<Traits> stack;
|
||||
+ Sigset<Traits> sigmask;
|
||||
+ char padding[128 - sizeof(sigmask)];
|
||||
+ typename Traits::Char_64Only padding2[8];
|
||||
+ typename Traits::MContext mcontext;
|
||||
+};
|
||||
+
|
||||
+#if defined(ARCH_CPU_RISCV32)
|
||||
+static_assert(offsetof(UContext<ContextTraits32>, mcontext) ==
|
||||
+ offsetof(ucontext_t, uc_mcontext),
|
||||
+ "context offset mismatch");
|
||||
+static_assert(offsetof(UContext<ContextTraits32>, mcontext.gregs) ==
|
||||
+ offsetof(ucontext_t, uc_mcontext.__gregs),
|
||||
+ "context offset mismatch");
|
||||
+static_assert(offsetof(UContext<ContextTraits32>, mcontext.fpregs) ==
|
||||
+ offsetof(ucontext_t, uc_mcontext.__fpregs),
|
||||
+ "context offset mismatch");
|
||||
+#elif defined(ARCH_CPU_RISCV64)
|
||||
+static_assert(offsetof(UContext<ContextTraits64>, mcontext) ==
|
||||
+ offsetof(ucontext_t, uc_mcontext),
|
||||
+ "context offset mismatch");
|
||||
+static_assert(offsetof(UContext<ContextTraits64>, mcontext.gregs) ==
|
||||
+ offsetof(ucontext_t, uc_mcontext.__gregs),
|
||||
+ "context offset mismatch");
|
||||
+static_assert(offsetof(UContext<ContextTraits64>, mcontext.fpregs) ==
|
||||
+ offsetof(ucontext_t, uc_mcontext.__fpregs),
|
||||
+ "context offset mismatch");
|
||||
+#endif
|
||||
+
|
||||
#else
|
||||
#error Port.
|
||||
#endif // ARCH_CPU_X86_FAMILY
|
||||
Index: chromium-106.0.5249.91/third_party/crashpad/crashpad/snapshot/linux/system_snapshot_linux.cc
|
||||
===================================================================
|
||||
--- chromium-106.0.5249.91.orig/third_party/crashpad/crashpad/snapshot/linux/system_snapshot_linux.cc
|
||||
+++ chromium-106.0.5249.91/third_party/crashpad/crashpad/snapshot/linux/system_snapshot_linux.cc
|
||||
@@ -205,6 +205,9 @@ CPUArchitecture SystemSnapshotLinux::Get
|
||||
#elif defined(ARCH_CPU_MIPS_FAMILY)
|
||||
return process_reader_->Is64Bit() ? kCPUArchitectureMIPS64EL
|
||||
: kCPUArchitectureMIPSEL;
|
||||
+#elif defined(ARCH_CPU_RISCV_FAMILY)
|
||||
+ return process_reader_->Is64Bit() ? kCPUArchitectureRISCV64
|
||||
+ : kCPUArchitectureRISCV32;
|
||||
#else
|
||||
#error port to your architecture
|
||||
#endif
|
||||
@@ -220,6 +223,9 @@ uint32_t SystemSnapshotLinux::CPURevisio
|
||||
#elif defined(ARCH_CPU_MIPS_FAMILY)
|
||||
// Not implementable on MIPS
|
||||
return 0;
|
||||
+#elif defined(ARCH_CPU_RISCV_FAMILY)
|
||||
+ // Not implementable on RISCV
|
||||
+ return 0;
|
||||
#else
|
||||
#error port to your architecture
|
||||
#endif
|
||||
@@ -240,6 +246,9 @@ std::string SystemSnapshotLinux::CPUVend
|
||||
#elif defined(ARCH_CPU_MIPS_FAMILY)
|
||||
// Not implementable on MIPS
|
||||
return std::string();
|
||||
+#elif defined(ARCH_CPU_RISCV_FAMILY)
|
||||
+ // Not implementable on RISCV
|
||||
+ return std::string();
|
||||
#else
|
||||
#error port to your architecture
|
||||
#endif
|
||||
@@ -373,6 +382,9 @@ bool SystemSnapshotLinux::NXEnabled() co
|
||||
#elif defined(ARCH_CPU_MIPS_FAMILY)
|
||||
// Not implementable on MIPS
|
||||
return false;
|
||||
+#elif defined(ARCH_CPU_RISCV_FAMILY)
|
||||
+ // Not implementable on RISCV
|
||||
+ return false;
|
||||
#else
|
||||
#error Port.
|
||||
#endif // ARCH_CPU_X86_FAMILY
|
||||
Index: chromium-106.0.5249.91/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.cc
|
||||
===================================================================
|
||||
--- chromium-106.0.5249.91.orig/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.cc
|
||||
+++ chromium-106.0.5249.91/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.cc
|
||||
@@ -190,6 +190,22 @@ bool ThreadSnapshotLinux::Initialize(
|
||||
thread.thread_info.float_context.f32,
|
||||
context_.mipsel);
|
||||
}
|
||||
+#elif defined(ARCH_CPU_RISCV_FAMILY)
|
||||
+ if (process_reader->Is64Bit()) {
|
||||
+ context_.architecture = kCPUArchitectureRISCV64;
|
||||
+ context_.riscv64 = &context_union_.riscv64;
|
||||
+ InitializeCPUContextRISCV<ContextTraits64>(
|
||||
+ thread.thread_info.thread_context.t64,
|
||||
+ thread.thread_info.float_context.f64,
|
||||
+ context_.riscv64);
|
||||
+ } else {
|
||||
+ context_.architecture = kCPUArchitectureRISCV32;
|
||||
+ context_.riscv32 = &context_union_.riscv32;
|
||||
+ InitializeCPUContextRISCV<ContextTraits32>(
|
||||
+ thread.thread_info.thread_context.t32,
|
||||
+ thread.thread_info.float_context.f32,
|
||||
+ context_.riscv32);
|
||||
+ }
|
||||
#else
|
||||
#error Port.
|
||||
#endif
|
||||
Index: chromium-106.0.5249.91/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.h
|
||||
===================================================================
|
||||
--- chromium-106.0.5249.91.orig/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.h
|
||||
+++ chromium-106.0.5249.91/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.h
|
||||
@@ -74,6 +74,9 @@ class ThreadSnapshotLinux final : public
|
||||
#elif defined(ARCH_CPU_MIPS_FAMILY)
|
||||
CPUContextMIPS mipsel;
|
||||
CPUContextMIPS64 mips64;
|
||||
+#elif defined(ARCH_CPU_RISCV_FAMILY)
|
||||
+ CPUContextRISCV32 riscv32;
|
||||
+ CPUContextRISCV64 riscv64;
|
||||
#else
|
||||
#error Port.
|
||||
#endif // ARCH_CPU_X86_FAMILY
|
||||
Index: chromium-106.0.5249.91/third_party/crashpad/crashpad/util/linux/ptracer.cc
|
||||
===================================================================
|
||||
--- chromium-106.0.5249.91.orig/third_party/crashpad/crashpad/util/linux/ptracer.cc
|
||||
+++ chromium-106.0.5249.91/third_party/crashpad/crashpad/util/linux/ptracer.cc
|
||||
@@ -398,6 +398,51 @@ bool GetThreadArea64(pid_t tid,
|
||||
return true;
|
||||
}
|
||||
|
||||
+#elif defined(ARCH_CPU_RISCV_FAMILY)
|
||||
+
|
||||
+template <typename Destination>
|
||||
+bool GetRegisterSet(pid_t tid, int set, Destination* dest, bool can_log) {
|
||||
+ iovec iov;
|
||||
+ iov.iov_base = dest;
|
||||
+ iov.iov_len = sizeof(*dest);
|
||||
+ if (ptrace(PTRACE_GETREGSET, tid, reinterpret_cast<void*>(set), &iov) != 0) {
|
||||
+ PLOG_IF(ERROR, can_log) << "ptrace";
|
||||
+ return false;
|
||||
+ }
|
||||
+ if (iov.iov_len != sizeof(*dest)) {
|
||||
+ LOG_IF(ERROR, can_log) << "Unexpected registers size";
|
||||
+ return false;
|
||||
+ }
|
||||
+ return true;
|
||||
+}
|
||||
+
|
||||
+bool GetFloatingPointRegisters32(pid_t tid,
|
||||
+ FloatContext* context,
|
||||
+ bool can_log) {
|
||||
+ return false;
|
||||
+}
|
||||
+
|
||||
+bool GetFloatingPointRegisters64(pid_t tid,
|
||||
+ FloatContext* context,
|
||||
+ bool can_log) {
|
||||
+ return GetRegisterSet(tid, NT_PRFPREG, &context->f64.f, can_log);
|
||||
+}
|
||||
+
|
||||
+bool GetThreadArea32(pid_t tid,
|
||||
+ const ThreadContext& context,
|
||||
+ LinuxVMAddress* address,
|
||||
+ bool can_log) {
|
||||
+ return false;
|
||||
+}
|
||||
+
|
||||
+bool GetThreadArea64(pid_t tid,
|
||||
+ const ThreadContext& context,
|
||||
+ LinuxVMAddress* address,
|
||||
+ bool can_log) {
|
||||
+ *address = context.t64.tp;
|
||||
+ return true;
|
||||
+}
|
||||
+
|
||||
#else
|
||||
#error Port.
|
||||
#endif // ARCH_CPU_X86_FAMILY
|
||||
Index: chromium-106.0.5249.91/third_party/crashpad/crashpad/util/linux/thread_info.h
|
||||
===================================================================
|
||||
--- chromium-106.0.5249.91.orig/third_party/crashpad/crashpad/util/linux/thread_info.h
|
||||
+++ chromium-106.0.5249.91/third_party/crashpad/crashpad/util/linux/thread_info.h
|
||||
@@ -79,6 +79,40 @@ union ThreadContext {
|
||||
uint32_t cp0_status;
|
||||
uint32_t cp0_cause;
|
||||
uint32_t padding1_;
|
||||
+#elif defined(ARCH_CPU_RISCV_FAMILY)
|
||||
+ // Reflects user_regs_struct in asm/ptrace.h.
|
||||
+ uint32_t pc;
|
||||
+ uint32_t ra;
|
||||
+ uint32_t sp;
|
||||
+ uint32_t gp;
|
||||
+ uint32_t tp;
|
||||
+ uint32_t t0;
|
||||
+ uint32_t t1;
|
||||
+ uint32_t t2;
|
||||
+ uint32_t s0;
|
||||
+ uint32_t s1;
|
||||
+ uint32_t a0;
|
||||
+ uint32_t a1;
|
||||
+ uint32_t a2;
|
||||
+ uint32_t a3;
|
||||
+ uint32_t a4;
|
||||
+ uint32_t a5;
|
||||
+ uint32_t a6;
|
||||
+ uint32_t a7;
|
||||
+ uint32_t s2;
|
||||
+ uint32_t s3;
|
||||
+ uint32_t s4;
|
||||
+ uint32_t s5;
|
||||
+ uint32_t s6;
|
||||
+ uint32_t s7;
|
||||
+ uint32_t s8;
|
||||
+ uint32_t s9;
|
||||
+ uint32_t s10;
|
||||
+ uint32_t s11;
|
||||
+ uint32_t t3;
|
||||
+ uint32_t t4;
|
||||
+ uint32_t t5;
|
||||
+ uint32_t t6;
|
||||
#else
|
||||
#error Port.
|
||||
#endif // ARCH_CPU_X86_FAMILY
|
||||
@@ -132,6 +166,40 @@ union ThreadContext {
|
||||
uint64_t cp0_badvaddr;
|
||||
uint64_t cp0_status;
|
||||
uint64_t cp0_cause;
|
||||
+#elif defined(ARCH_CPU_RISCV_FAMILY)
|
||||
+ // Reflects user_regs_struct in asm/ptrace.h.
|
||||
+ uint64_t pc;
|
||||
+ uint64_t ra;
|
||||
+ uint64_t sp;
|
||||
+ uint64_t gp;
|
||||
+ uint64_t tp;
|
||||
+ uint64_t t0;
|
||||
+ uint64_t t1;
|
||||
+ uint64_t t2;
|
||||
+ uint64_t s0;
|
||||
+ uint64_t s1;
|
||||
+ uint64_t a0;
|
||||
+ uint64_t a1;
|
||||
+ uint64_t a2;
|
||||
+ uint64_t a3;
|
||||
+ uint64_t a4;
|
||||
+ uint64_t a5;
|
||||
+ uint64_t a6;
|
||||
+ uint64_t a7;
|
||||
+ uint64_t s2;
|
||||
+ uint64_t s3;
|
||||
+ uint64_t s4;
|
||||
+ uint64_t s5;
|
||||
+ uint64_t s6;
|
||||
+ uint64_t s7;
|
||||
+ uint64_t s8;
|
||||
+ uint64_t s9;
|
||||
+ uint64_t s10;
|
||||
+ uint64_t s11;
|
||||
+ uint64_t t3;
|
||||
+ uint64_t t4;
|
||||
+ uint64_t t5;
|
||||
+ uint64_t t6;
|
||||
#else
|
||||
#error Port.
|
||||
#endif // ARCH_CPU_X86_FAMILY
|
||||
@@ -143,11 +211,12 @@ union ThreadContext {
|
||||
using NativeThreadContext = user_regs;
|
||||
#elif defined(ARCH_CPU_MIPS_FAMILY)
|
||||
// No appropriate NativeThreadsContext type available for MIPS
|
||||
+#elif defined(ARCH_CPU_RISCV_FAMILY)
|
||||
#else
|
||||
#error Port.
|
||||
#endif // ARCH_CPU_X86_FAMILY || ARCH_CPU_ARM64
|
||||
|
||||
-#if !defined(ARCH_CPU_MIPS_FAMILY)
|
||||
+#if !defined(ARCH_CPU_MIPS_FAMILY) && !defined(ARCH_CPU_RISCV_FAMILY)
|
||||
#if defined(ARCH_CPU_32_BITS)
|
||||
static_assert(sizeof(t32_t) == sizeof(NativeThreadContext), "Size mismatch");
|
||||
#else // ARCH_CPU_64_BITS
|
||||
@@ -218,6 +287,9 @@ union FloatContext {
|
||||
} fpregs[32];
|
||||
uint32_t fpcsr;
|
||||
uint32_t fpu_id;
|
||||
+#elif defined(ARCH_CPU_RISCV_FAMILY)
|
||||
+ uint64_t f[32];
|
||||
+ uint32_t fcsr;
|
||||
#else
|
||||
#error Port.
|
||||
#endif // ARCH_CPU_X86_FAMILY
|
||||
@@ -252,6 +324,9 @@ union FloatContext {
|
||||
double fpregs[32];
|
||||
uint32_t fpcsr;
|
||||
uint32_t fpu_id;
|
||||
+#elif defined(ARCH_CPU_RISCV_FAMILY)
|
||||
+ uint64_t f[32];
|
||||
+ uint32_t fcsr;
|
||||
#else
|
||||
#error Port.
|
||||
#endif // ARCH_CPU_X86_FAMILY
|
||||
@@ -281,6 +356,7 @@ union FloatContext {
|
||||
static_assert(sizeof(f64) == sizeof(user_fpsimd_struct), "Size mismatch");
|
||||
#elif defined(ARCH_CPU_MIPS_FAMILY)
|
||||
// No appropriate floating point context native type for available MIPS.
|
||||
+#elif defined(ARCH_CPU_RISCV_FAMILY)
|
||||
#else
|
||||
#error Port.
|
||||
#endif // ARCH_CPU_X86
|
||||
Index: chromium-106.0.5249.91/third_party/crashpad/crashpad/util/net/http_transport_libcurl.cc
|
||||
===================================================================
|
||||
--- chromium-106.0.5249.91.orig/third_party/crashpad/crashpad/util/net/http_transport_libcurl.cc
|
||||
+++ chromium-106.0.5249.91/third_party/crashpad/crashpad/util/net/http_transport_libcurl.cc
|
||||
@@ -237,6 +237,8 @@ std::string UserAgent() {
|
||||
#elif defined(ARCH_CPU_BIG_ENDIAN)
|
||||
static constexpr char arch[] = "aarch64_be";
|
||||
#endif
|
||||
+#elif defined(ARCH_CPU_RISCV64)
|
||||
+ static constexpr char arch[] = "riscv64";
|
||||
#else
|
||||
#error Port
|
||||
#endif
|
||||
|
|
@ -0,0 +1 @@
|
|||
-Np1 --directory=src/3rdparty/chromium/
|
|
@ -0,0 +1,44 @@
|
|||
Index: chromium-102.0.5005.61/third_party/dav1d/config/linux/riscv64/config.h
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ chromium-102.0.5005.61/third_party/dav1d/config/linux/riscv64/config.h
|
||||
@@ -0,0 +1,38 @@
|
||||
+/*
|
||||
+ * Autogenerated by the Meson build system.
|
||||
+ * Do not edit, your changes will be lost.
|
||||
+ */
|
||||
+
|
||||
+#pragma once
|
||||
+
|
||||
+#define ARCH_AARCH64 0
|
||||
+
|
||||
+#define ARCH_ARM 0
|
||||
+
|
||||
+#define ARCH_PPC64LE 0
|
||||
+
|
||||
+#define ARCH_X86 0
|
||||
+
|
||||
+#define ARCH_X86_32 0
|
||||
+
|
||||
+#define ARCH_X86_64 0
|
||||
+
|
||||
+#define CONFIG_16BPC 1
|
||||
+
|
||||
+#define CONFIG_8BPC 1
|
||||
+
|
||||
+// #define CONFIG_LOG 1 -- Logging is controlled by Chromium
|
||||
+
|
||||
+#define ENDIANNESS_BIG 0
|
||||
+
|
||||
+#define HAVE_ASM 0
|
||||
+
|
||||
+#define HAVE_AS_FUNC 0
|
||||
+
|
||||
+#define HAVE_CLOCK_GETTIME 1
|
||||
+
|
||||
+#define HAVE_GETAUXVAL 1
|
||||
+
|
||||
+#define HAVE_POSIX_MEMALIGN 1
|
||||
+
|
||||
+#define HAVE_UNISTD_H 1
|
||||
|
|
@ -0,0 +1 @@
|
|||
-Np1 --directory=src/3rdparty/chromium/
|
File diff suppressed because it is too large
Load Diff
|
@ -0,0 +1 @@
|
|||
-Np1 --directory=src/3rdparty/chromium/
|
|
@ -1,154 +0,0 @@
|
|||
Revert 9d080c0934b848ee4a05013c78641e612fcc1e03
|
||||
|
||||
--- qt6-webengine-6.4.2.orig/src/3rdparty/chromium/build/config/sanitizers/BUILD.gn
|
||||
+++ qt6-webengine-6.4.2/src/3rdparty/chromium/build/config/sanitizers/BUILD.gn
|
||||
@@ -271,11 +271,11 @@ config("asan_flags") {
|
||||
if (is_asan) {
|
||||
cflags += [ "-fsanitize=address" ]
|
||||
if (is_win) {
|
||||
- if (!defined(asan_win_blocklist_path)) {
|
||||
- asan_win_blocklist_path =
|
||||
+ if (!defined(asan_win_blacklist_path)) {
|
||||
+ asan_win_blacklist_path =
|
||||
rebase_path("//tools/memory/asan/blocklist_win.txt", root_build_dir)
|
||||
}
|
||||
- cflags += [ "-fsanitize-ignorelist=$asan_win_blocklist_path" ]
|
||||
+ cflags += [ "-fsanitize-blacklist=$asan_win_blacklist_path" ]
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -305,13 +305,13 @@ config("link_shared_library") {
|
||||
config("cfi_flags") {
|
||||
cflags = []
|
||||
if (is_cfi && current_toolchain == default_toolchain) {
|
||||
- if (!defined(cfi_ignorelist_path)) {
|
||||
- cfi_ignorelist_path =
|
||||
+ if (!defined(cfi_blacklist_path)) {
|
||||
+ cfi_blacklist_path =
|
||||
rebase_path("//tools/cfi/ignores.txt", root_build_dir)
|
||||
}
|
||||
cflags += [
|
||||
"-fsanitize=cfi-vcall",
|
||||
- "-fsanitize-ignorelist=$cfi_ignorelist_path",
|
||||
+ "-fsanitize-blacklist=$cfi_blacklist_path",
|
||||
]
|
||||
|
||||
if (use_cfi_cast) {
|
||||
@@ -408,14 +408,14 @@ config("msan_flags") {
|
||||
if (is_msan) {
|
||||
assert(is_linux || is_chromeos,
|
||||
"msan only supported on linux x86_64/ChromeOS")
|
||||
- if (!defined(msan_ignorelist_path)) {
|
||||
- msan_ignorelist_path =
|
||||
- rebase_path("//tools/msan/ignorelist.txt", root_build_dir)
|
||||
+ if (!defined(msan_blacklist_path)) {
|
||||
+ msan_blacklist_path =
|
||||
+ rebase_path("//tools/msan/blacklist.txt", root_build_dir)
|
||||
}
|
||||
cflags = [
|
||||
"-fsanitize=memory",
|
||||
"-fsanitize-memory-track-origins=$msan_track_origins",
|
||||
- "-fsanitize-ignorelist=$msan_ignorelist_path",
|
||||
+ "-fsanitize-blacklist=$msan_blacklist_path",
|
||||
]
|
||||
}
|
||||
}
|
||||
@@ -423,13 +423,13 @@ config("msan_flags") {
|
||||
config("tsan_flags") {
|
||||
if (is_tsan) {
|
||||
assert(is_linux || is_chromeos, "tsan only supported on linux x86_64")
|
||||
- if (!defined(tsan_ignorelist_path)) {
|
||||
- tsan_ignorelist_path =
|
||||
+ if (!defined(tsan_blacklist_path)) {
|
||||
+ tsan_blacklist_path =
|
||||
rebase_path("//tools/memory/tsan_v2/ignores.txt", root_build_dir)
|
||||
}
|
||||
cflags = [
|
||||
"-fsanitize=thread",
|
||||
- "-fsanitize-ignorelist=$tsan_ignorelist_path",
|
||||
+ "-fsanitize-blacklist=$tsan_blacklist_path",
|
||||
]
|
||||
}
|
||||
}
|
||||
@@ -437,8 +437,8 @@ config("tsan_flags") {
|
||||
config("ubsan_flags") {
|
||||
cflags = []
|
||||
if (is_ubsan) {
|
||||
- if (!defined(ubsan_ignorelist_path)) {
|
||||
- ubsan_ignorelist_path =
|
||||
+ if (!defined(ubsan_blacklist_path)) {
|
||||
+ ubsan_blacklist_path =
|
||||
rebase_path("//tools/ubsan/ignorelist.txt", root_build_dir)
|
||||
}
|
||||
cflags += [
|
||||
@@ -455,7 +455,7 @@ config("ubsan_flags") {
|
||||
"-fsanitize=signed-integer-overflow",
|
||||
"-fsanitize=unreachable",
|
||||
"-fsanitize=vla-bound",
|
||||
- "-fsanitize-ignorelist=$ubsan_ignorelist_path",
|
||||
+ "-fsanitize-blacklist=$ubsan_blacklist_path",
|
||||
]
|
||||
if (!is_clang) {
|
||||
# These exposes too much illegal C++14 code to compile on anything stricter than clang:
|
||||
@@ -496,8 +496,8 @@ config("ubsan_no_recover") {
|
||||
|
||||
config("ubsan_security_flags") {
|
||||
if (is_ubsan_security) {
|
||||
- if (!defined(ubsan_security_ignorelist_path)) {
|
||||
- ubsan_security_ignorelist_path =
|
||||
+ if (!defined(ubsan_security_blacklist_path)) {
|
||||
+ ubsan_security_blacklist_path =
|
||||
rebase_path("//tools/ubsan/security_ignorelist.txt", root_build_dir)
|
||||
}
|
||||
cflags = [
|
||||
@@ -505,7 +505,7 @@ config("ubsan_security_flags") {
|
||||
"-fsanitize=shift",
|
||||
"-fsanitize=signed-integer-overflow",
|
||||
"-fsanitize=vla-bound",
|
||||
- "-fsanitize-ignorelist=$ubsan_security_ignorelist_path",
|
||||
+ "-fsanitize-blacklist=$ubsan_security_blacklist_path",
|
||||
]
|
||||
}
|
||||
}
|
||||
@@ -518,13 +518,13 @@ config("ubsan_null_flags") {
|
||||
|
||||
config("ubsan_vptr_flags") {
|
||||
if (is_ubsan_vptr) {
|
||||
- if (!defined(ubsan_vptr_ignorelist_path)) {
|
||||
- ubsan_vptr_ignorelist_path =
|
||||
+ if (!defined(ubsan_vptr_blacklist_path)) {
|
||||
+ ubsan_vptr_blacklist_path =
|
||||
rebase_path("//tools/ubsan/vptr_ignorelist.txt", root_build_dir)
|
||||
}
|
||||
cflags = [
|
||||
"-fsanitize=vptr",
|
||||
- "-fsanitize-ignorelist=$ubsan_vptr_ignorelist_path",
|
||||
+ "-fsanitize-blacklist=$ubsan_vptr_blacklist_path",
|
||||
]
|
||||
if (!is_clang) {
|
||||
# Clang specific flag:
|
||||
--- qt6-webengine-6.4.2.orig/src/3rdparty/chromium/build_overrides/build.gni
|
||||
+++ qt6-webengine-6.4.2/src/3rdparty/chromium/build_overrides/build.gni
|
||||
@@ -43,15 +43,15 @@ declare_args() {
|
||||
# Allows different projects to specify their own suppression/ignore lists for
|
||||
# sanitizer tools.
|
||||
# asan_suppressions_file = "path/to/asan_suppressions.cc"
|
||||
-# asan_win_ignorelist_path = "path/to/asan/blocklist_win.txt"
|
||||
+# asan_win_blacklist_path = "path/to/asan/blocklist_win.txt"
|
||||
# lsan_suppressions_file = "path/to/lsan_suppressions.cc"
|
||||
# tsan_suppressions_file = "path/to/tsan_suppressions.cc"
|
||||
-# tsan_ignorelist_path = "path/to/tsan/ignores.txt"
|
||||
-# msan_ignorelist_path = "path/to/msan/ignorelist.txt"
|
||||
-# ubsan_ignorelist_path = "path/to/ubsan/ignorelist.txt"
|
||||
-# ubsan_vptr_ignorelist_path = "path/to/ubsan/vptr_ignorelist.txt"
|
||||
-# ubsan_security_ignorelist_path = "path/to/ubsan/security_ignorelist.txt"
|
||||
-# cfi_ignorelist_path = "path/to/cfi/ignores.txt"
|
||||
+# tsan_blacklist_path = "path/to/tsan/ignores.txt"
|
||||
+# msan_blacklist_path = "path/to/msan/blacklist.txt"
|
||||
+# ubsan_blacklist_path = "path/to/ubsan/blacklist.txt"
|
||||
+# ubsan_vptr_blacklist_path = "path/to/ubsan/vptr_blacklist.txt"
|
||||
+# ubsan_security_blacklist_path = "path/to/ubsan/security_blacklist.txt"
|
||||
+# cfi_blacklist_path = "path/to/cfi/ignores.txt"
|
||||
|
||||
if (host_os == "mac" || is_apple) {
|
||||
# Needed for is_apple when targeting macOS or iOS, independent of host.
|
|
@ -1,20 +0,0 @@
|
|||
From 7c135a291184b59a59643ed6a8c40b4405ac0175 Mon Sep 17 00:00:00 2001
|
||||
From: Stephan Hartmann <stha09@googlemail.com>
|
||||
Date: Wed, 27 Apr 2022 16:01:01 +0000
|
||||
Subject: [PATCH] IWYU: add cstring for std::strlen in fenced_frame_utils
|
||||
|
||||
---
|
||||
third_party/blink/common/fenced_frame/fenced_frame_utils.cc | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
--- qt6-webengine-6.4.2.orig/src/3rdparty/chromium/third_party/blink/common/fenced_frame/fenced_frame_utils.cc
|
||||
+++ qt6-webengine-6.4.2/src/3rdparty/chromium/third_party/blink/common/fenced_frame/fenced_frame_utils.cc
|
||||
@@ -6,6 +6,8 @@
|
||||
|
||||
#include <cstring>
|
||||
|
||||
+#include <cstring>
|
||||
+
|
||||
#include "base/guid.h"
|
||||
#include "base/strings/string_util.h"
|
||||
|
|
@ -1,14 +0,0 @@
|
|||
--- qt6-webengine-6.4.2.orig/src/3rdparty/chromium/components/autofill/core/browser/BUILD.gn
|
||||
+++ qt6-webengine-6.4.2/src/3rdparty/chromium/components/autofill/core/browser/BUILD.gn
|
||||
@@ -34,6 +34,11 @@ action("regex_patterns_inl_h") {
|
||||
}
|
||||
|
||||
jumbo_static_library("browser") {
|
||||
+ if (is_clang) {
|
||||
+ cflags = [
|
||||
+ "-fbracket-depth=1000",
|
||||
+ ]
|
||||
+ }
|
||||
sources = [
|
||||
"address_normalization_manager.cc",
|
||||
"address_normalization_manager.h",
|
|
@ -1,23 +0,0 @@
|
|||
--- qt6-webengine-6.4.2.orig/src/3rdparty/chromium/media/gpu/vaapi/BUILD.gn
|
||||
+++ qt6-webengine-6.4.2/src/3rdparty/chromium/media/gpu/vaapi/BUILD.gn
|
||||
@@ -14,6 +14,12 @@ import("//ui/gl/features.gni")
|
||||
assert(is_linux || is_chromeos)
|
||||
assert(use_vaapi)
|
||||
|
||||
+config("vaapi_permissive") {
|
||||
+ if (target_cpu == "x86") {
|
||||
+ cflags = [ "-fpermissive" ]
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
generate_stubs("libva_stubs") {
|
||||
extra_header = "va_stub_header.fragment"
|
||||
sigs = [ "va.sigs" ]
|
||||
@@ -89,6 +95,7 @@ source_set("vaapi") {
|
||||
configs += [
|
||||
"//build/config/linux/libva",
|
||||
"//third_party/libvpx:libvpx_config",
|
||||
+ ":vaapi_permissive",
|
||||
]
|
||||
|
||||
deps = [
|
|
@ -1,10 +0,0 @@
|
|||
--- qt6-webengine-6.4.2.orig/src/3rdparty/chromium/build/linux/unbundle/libxml.gn
|
||||
+++ qt6-webengine-6.4.2/src/3rdparty/chromium/build/linux/unbundle/libxml.gn
|
||||
@@ -19,6 +19,7 @@ static_library("libxml_utils") {
|
||||
":xml_reader",
|
||||
":xml_writer",
|
||||
"//base/test:test_support",
|
||||
+ "//services/data_decoder:lib",
|
||||
"//services/data_decoder:xml_parser_fuzzer_deps",
|
||||
]
|
||||
sources = [
|
|
@ -11,10 +11,10 @@
|
|||
# Normally, Android builds are lightly optimized, even for debug builds, to
|
||||
# keep binary size down. Setting this flag to true disables such optimization
|
||||
android_full_debug = false
|
||||
@@ -970,8 +974,13 @@ config("compiler_cpu_abi") {
|
||||
}
|
||||
@@ -1003,8 +1003,13 @@
|
||||
} else if (current_cpu == "arm64") {
|
||||
if (is_clang && !is_android && !is_nacl && !is_fuchsia) {
|
||||
if (is_clang && !is_android && !is_nacl && !is_fuchsia &&
|
||||
!(is_chromeos_lacros && is_chromeos_device)) {
|
||||
- cflags += [ "--target=aarch64-linux-gnu" ]
|
||||
- ldflags += [ "--target=aarch64-linux-gnu" ]
|
||||
+ if (is_musl) {
|
||||
|
|
|
@ -27,17 +27,6 @@
|
|||
}
|
||||
|
||||
bool ScopedResState::IsValid() const {
|
||||
--- qt6-webengine-6.4.2.orig/src/3rdparty/chromium/net/dns/host_resolver_manager.cc
|
||||
+++ qt6-webengine-6.4.2/src/3rdparty/chromium/net/dns/host_resolver_manager.cc
|
||||
@@ -3158,7 +3158,7 @@ HostResolverManager::HostResolverManager
|
||||
if (system_dns_config_notifier_)
|
||||
system_dns_config_notifier_->AddObserver(this);
|
||||
#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_OPENBSD) && \
|
||||
- !BUILDFLAG(IS_ANDROID)
|
||||
+ !BUILDFLAG(IS_ANDROID) && !(BUILDFLAG(IS_LINUX) && !defined(__GLIBC__))
|
||||
EnsureDnsReloaderInit();
|
||||
#endif
|
||||
|
||||
--- qt6-webengine-6.4.2.orig/src/3rdparty/chromium/net/dns/dns_reloader.cc
|
||||
+++ qt6-webengine-6.4.2/src/3rdparty/chromium/net/dns/dns_reloader.cc
|
||||
@@ -7,7 +7,8 @@
|
||||
|
@ -50,8 +39,18 @@
|
|||
|
||||
#include <resolv.h>
|
||||
|
||||
--- qt6-webengine-6.4.2.orig/src/3rdparty/chromium/net/dns/host_resolver_proc.cc
|
||||
+++ qt6-webengine-6.4.2/src/3rdparty/chromium/net/dns/host_resolver_proc.cc
|
||||
--- qt6-webengine-6.4.2.orig/src/3rdparty/chromium/net/dns/host_resolver_system_task.cc
|
||||
+++ qt6-webengine-6.4.2/src/3rdparty/chromium/net/dns/host_resolver_system_task.cc
|
||||
@@ -310,8 +310,7 @@
|
||||
}
|
||||
|
||||
void EnsureSystemHostResolverCallReady() {
|
||||
-#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_OPENBSD) && \
|
||||
- !BUILDFLAG(IS_ANDROID)
|
||||
+#if defined(__GLIBC__)
|
||||
EnsureDnsReloaderInit();
|
||||
#elif BUILDFLAG(IS_WIN)
|
||||
EnsureWinsockInit();
|
||||
@@ -192,7 +192,8 @@ int SystemHostResolverCall(const std::st
|
||||
base::BlockingType::WILL_BLOCK);
|
||||
|
||||
|
|
|
@ -1,17 +0,0 @@
|
|||
--- qt6-webengine-6.4.2.orig/src/3rdparty/chromium/BUILD.gn
|
||||
+++ qt6-webengine-6.4.2/src/3rdparty/chromium/BUILD.gn
|
||||
@@ -1537,14 +1537,6 @@ if (!is_ios && !use_qt) {
|
||||
}
|
||||
}
|
||||
|
||||
-# TODO(cassew): Add more OS's that don't support x86.
|
||||
-is_valid_x86_target =
|
||||
- target_os != "ios" && target_os != "mac" &&
|
||||
- (target_os != "linux" || use_libfuzzer || !build_with_chromium)
|
||||
-assert(
|
||||
- is_valid_x86_target || target_cpu != "x86",
|
||||
- "'target_cpu=x86' is not supported for 'target_os=$target_os'. Consider omitting 'target_cpu' (default) or using 'target_cpu=x64' instead.")
|
||||
-
|
||||
group("chromium_builder_perf") {
|
||||
testonly = true
|
||||
|
|
@ -1,20 +1,17 @@
|
|||
Allow SYS_sched_getparam and SYS_sched_getscheduler
|
||||
musl uses them for pthread_getschedparam()
|
||||
|
||||
source: https://git.alpinelinux.org/aports/commit/community/chromium?id=54af9f8ac24f52d382c5758e2445bf0206eff40e
|
||||
|
||||
--- qt6-webengine-6.4.2.orig/src/3rdparty/chromium/sandbox/policy/linux/bpf_renderer_policy_linux.cc
|
||||
+++ qt6-webengine-6.4.2/src/3rdparty/chromium/sandbox/policy/linux/bpf_renderer_policy_linux.cc
|
||||
@@ -97,10 +97,10 @@ ResultExpr RendererProcessPolicy::Evalua
|
||||
--- a/src/3rdparty/chromium/sandbox/policy/linux/bpf_renderer_policy_linux.cc
|
||||
+++ b/src/3rdparty/chromium/sandbox/policy/linux/bpf_renderer_policy_linux.cc
|
||||
@@ -94,6 +94,11 @@
|
||||
case __NR_pwrite64:
|
||||
case __NR_sched_get_priority_max:
|
||||
case __NR_sched_get_priority_min:
|
||||
+#ifdef __GLIBC__
|
||||
+ case __NR_sched_getparam:
|
||||
+ case __NR_sched_getscheduler:
|
||||
+ case __NR_sched_setscheduler:
|
||||
+#endif
|
||||
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 RestrictSchedTarget(GetPolicyPid(), sysno);
|
||||
case __NR_prlimit64:
|
||||
|
|
|
@ -0,0 +1,11 @@
|
|||
--- a/src/3rdparty/chromium/base/third_party/symbolize/symbolize.h
|
||||
+++ b/src/3rdparty/chromium/base/third_party/symbolize/symbolize.h
|
||||
@@ -58,6 +58,8 @@
|
||||
#include "config.h"
|
||||
#include "glog/logging.h"
|
||||
|
||||
+#include <sys/types.h>
|
||||
+
|
||||
#ifdef HAVE_SYMBOLIZE
|
||||
|
||||
#if defined(__ELF__) // defined by gcc
|
|
@ -1,849 +0,0 @@
|
|||
--- qt6-webengine-6.4.2.orig/src/3rdparty/chromium/media/BUILD.gn
|
||||
+++ qt6-webengine-6.4.2/src/3rdparty/chromium/media/BUILD.gn
|
||||
@@ -78,6 +78,9 @@ config("media_config") {
|
||||
defines += [ "DLOPEN_PULSEAUDIO" ]
|
||||
}
|
||||
}
|
||||
+ if (use_sndio) {
|
||||
+ defines += [ "USE_SNDIO" ]
|
||||
+ }
|
||||
if (use_cras) {
|
||||
defines += [ "USE_CRAS" ]
|
||||
}
|
||||
--- qt6-webengine-6.4.2.orig/src/3rdparty/chromium/media/audio/BUILD.gn
|
||||
+++ qt6-webengine-6.4.2/src/3rdparty/chromium/media/audio/BUILD.gn
|
||||
@@ -245,6 +245,17 @@ source_set("audio") {
|
||||
sources += [ "linux/audio_manager_linux.cc" ]
|
||||
}
|
||||
|
||||
+ if (use_sndio) {
|
||||
+ libs += [ "sndio" ]
|
||||
+ sources += [
|
||||
+ "sndio/audio_manager_sndio.cc",
|
||||
+ "sndio/sndio_input.cc",
|
||||
+ "sndio/sndio_input.h",
|
||||
+ "sndio/sndio_output.cc",
|
||||
+ "sndio/sndio_output.h"
|
||||
+ ]
|
||||
+ }
|
||||
+
|
||||
if (use_alsa) {
|
||||
libs += [ "asound" ]
|
||||
sources += [
|
||||
--- qt6-webengine-6.4.2.orig/src/3rdparty/chromium/media/audio/linux/audio_manager_linux.cc
|
||||
+++ qt6-webengine-6.4.2/src/3rdparty/chromium/media/audio/linux/audio_manager_linux.cc
|
||||
@@ -25,6 +25,11 @@
|
||||
#include "media/audio/pulse/audio_manager_pulse.h"
|
||||
#include "media/audio/pulse/pulse_util.h"
|
||||
#endif
|
||||
+#if defined(USE_SNDIO)
|
||||
+#include "media/audio/sndio/audio_manager_sndio.h"
|
||||
+#include "media/audio/sndio/sndio_input.h"
|
||||
+#include "media/audio/sndio/sndio_output.h"
|
||||
+#endif
|
||||
|
||||
namespace media {
|
||||
|
||||
--- /dev/null
|
||||
+++ qt6-webengine-6.4.2/src/3rdparty/chromium/media/audio/sndio/audio_manager_sndio.cc
|
||||
@@ -0,0 +1,148 @@
|
||||
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
|
||||
+// Use of this source code is governed by a BSD-style license that can be
|
||||
+// found in the LICENSE file.
|
||||
+
|
||||
+#include "media/audio/sndio/audio_manager_sndio.h"
|
||||
+
|
||||
+#include "base/metrics/histogram_macros.h"
|
||||
+#include "base/memory/ptr_util.h"
|
||||
+#include "media/audio/audio_device_description.h"
|
||||
+#include "media/audio/audio_output_dispatcher.h"
|
||||
+#include "media/audio/sndio/sndio_input.h"
|
||||
+#include "media/audio/sndio/sndio_output.h"
|
||||
+#include "media/base/limits.h"
|
||||
+#include "media/base/media_switches.h"
|
||||
+
|
||||
+namespace media {
|
||||
+
|
||||
+
|
||||
+// Maximum number of output streams that can be open simultaneously.
|
||||
+static const int kMaxOutputStreams = 4;
|
||||
+
|
||||
+// Default sample rate for input and output streams.
|
||||
+static const int kDefaultSampleRate = 48000;
|
||||
+
|
||||
+void AddDefaultDevice(AudioDeviceNames* device_names) {
|
||||
+ DCHECK(device_names->empty());
|
||||
+ device_names->push_front(AudioDeviceName::CreateDefault());
|
||||
+}
|
||||
+
|
||||
+bool AudioManagerSndio::HasAudioOutputDevices() {
|
||||
+ return true;
|
||||
+}
|
||||
+
|
||||
+bool AudioManagerSndio::HasAudioInputDevices() {
|
||||
+ return true;
|
||||
+}
|
||||
+
|
||||
+void AudioManagerSndio::GetAudioInputDeviceNames(
|
||||
+ AudioDeviceNames* device_names) {
|
||||
+ DCHECK(device_names->empty());
|
||||
+ AddDefaultDevice(device_names);
|
||||
+}
|
||||
+
|
||||
+void AudioManagerSndio::GetAudioOutputDeviceNames(
|
||||
+ AudioDeviceNames* device_names) {
|
||||
+ AddDefaultDevice(device_names);
|
||||
+}
|
||||
+
|
||||
+const char* AudioManagerSndio::GetName() {
|
||||
+ return "SNDIO";
|
||||
+}
|
||||
+
|
||||
+AudioParameters AudioManagerSndio::GetInputStreamParameters(
|
||||
+ const std::string& device_id) {
|
||||
+ static const int kDefaultInputBufferSize = 1024;
|
||||
+
|
||||
+ int user_buffer_size = GetUserBufferSize();
|
||||
+ int buffer_size = user_buffer_size ?
|
||||
+ user_buffer_size : kDefaultInputBufferSize;
|
||||
+
|
||||
+ return AudioParameters(
|
||||
+ AudioParameters::AUDIO_PCM_LOW_LATENCY, CHANNEL_LAYOUT_STEREO,
|
||||
+ kDefaultSampleRate, buffer_size);
|
||||
+}
|
||||
+
|
||||
+AudioManagerSndio::AudioManagerSndio(std::unique_ptr<AudioThread> audio_thread,
|
||||
+ AudioLogFactory* audio_log_factory)
|
||||
+ : AudioManagerBase(std::move(audio_thread),
|
||||
+ audio_log_factory) {
|
||||
+ DLOG(WARNING) << "AudioManagerSndio";
|
||||
+ SetMaxOutputStreamsAllowed(kMaxOutputStreams);
|
||||
+}
|
||||
+
|
||||
+AudioManagerSndio::~AudioManagerSndio() {
|
||||
+ Shutdown();
|
||||
+}
|
||||
+
|
||||
+AudioOutputStream* AudioManagerSndio::MakeLinearOutputStream(
|
||||
+ const AudioParameters& params,
|
||||
+ const LogCallback& log_callback) {
|
||||
+ DCHECK_EQ(AudioParameters::AUDIO_PCM_LINEAR, params.format());
|
||||
+ return MakeOutputStream(params);
|
||||
+}
|
||||
+
|
||||
+AudioOutputStream* AudioManagerSndio::MakeLowLatencyOutputStream(
|
||||
+ const AudioParameters& params,
|
||||
+ const std::string& device_id,
|
||||
+ const LogCallback& log_callback) {
|
||||
+ DLOG_IF(ERROR, !device_id.empty()) << "Not implemented!";
|
||||
+ DCHECK_EQ(AudioParameters::AUDIO_PCM_LOW_LATENCY, params.format());
|
||||
+ return MakeOutputStream(params);
|
||||
+}
|
||||
+
|
||||
+AudioInputStream* AudioManagerSndio::MakeLinearInputStream(
|
||||
+ const AudioParameters& params,
|
||||
+ const std::string& device_id,
|
||||
+ const LogCallback& log_callback) {
|
||||
+ DCHECK_EQ(AudioParameters::AUDIO_PCM_LINEAR, params.format());
|
||||
+ return MakeInputStream(params);
|
||||
+}
|
||||
+
|
||||
+AudioInputStream* AudioManagerSndio::MakeLowLatencyInputStream(
|
||||
+ const AudioParameters& params,
|
||||
+ const std::string& device_id,
|
||||
+ const LogCallback& log_callback) {
|
||||
+ DCHECK_EQ(AudioParameters::AUDIO_PCM_LOW_LATENCY, params.format());
|
||||
+ return MakeInputStream(params);
|
||||
+}
|
||||
+
|
||||
+AudioParameters AudioManagerSndio::GetPreferredOutputStreamParameters(
|
||||
+ const std::string& output_device_id,
|
||||
+ const AudioParameters& input_params) {
|
||||
+ // TODO(tommi): Support |output_device_id|.
|
||||
+ DLOG_IF(ERROR, !output_device_id.empty()) << "Not implemented!";
|
||||
+ static const int kDefaultOutputBufferSize = 2048;
|
||||
+
|
||||
+ ChannelLayout channel_layout = CHANNEL_LAYOUT_STEREO;
|
||||
+ int sample_rate = kDefaultSampleRate;
|
||||
+ int buffer_size = kDefaultOutputBufferSize;
|
||||
+ if (input_params.IsValid()) {
|
||||
+ sample_rate = input_params.sample_rate();
|
||||
+ channel_layout = input_params.channel_layout();
|
||||
+ buffer_size = std::min(buffer_size, input_params.frames_per_buffer());
|
||||
+ }
|
||||
+
|
||||
+ int user_buffer_size = GetUserBufferSize();
|
||||
+ if (user_buffer_size)
|
||||
+ buffer_size = user_buffer_size;
|
||||
+
|
||||
+ return AudioParameters(
|
||||
+ AudioParameters::AUDIO_PCM_LOW_LATENCY, channel_layout,
|
||||
+ sample_rate, buffer_size);
|
||||
+}
|
||||
+
|
||||
+AudioInputStream* AudioManagerSndio::MakeInputStream(
|
||||
+ const AudioParameters& params) {
|
||||
+ DLOG(WARNING) << "MakeInputStream";
|
||||
+ return new SndioAudioInputStream(this,
|
||||
+ AudioDeviceDescription::kDefaultDeviceId, params);
|
||||
+}
|
||||
+
|
||||
+AudioOutputStream* AudioManagerSndio::MakeOutputStream(
|
||||
+ const AudioParameters& params) {
|
||||
+ DLOG(WARNING) << "MakeOutputStream";
|
||||
+ return new SndioAudioOutputStream(params, this);
|
||||
+}
|
||||
+
|
||||
+} // namespace media
|
||||
--- /dev/null
|
||||
+++ qt6-webengine-6.4.2/src/3rdparty/chromium/media/audio/sndio/audio_manager_sndio.h
|
||||
@@ -0,0 +1,65 @@
|
||||
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
|
||||
+// Use of this source code is governed by a BSD-style license that can be
|
||||
+// found in the LICENSE file.
|
||||
+
|
||||
+#ifndef MEDIA_AUDIO_SNDIO_AUDIO_MANAGER_SNDIO_H_
|
||||
+#define MEDIA_AUDIO_SNDIO_AUDIO_MANAGER_SNDIO_H_
|
||||
+
|
||||
+#include <set>
|
||||
+
|
||||
+#include "base/compiler_specific.h"
|
||||
+#include "base/macros.h"
|
||||
+#include "base/memory/ref_counted.h"
|
||||
+#include "base/threading/thread.h"
|
||||
+#include "media/audio/audio_manager_base.h"
|
||||
+
|
||||
+namespace media {
|
||||
+
|
||||
+class MEDIA_EXPORT AudioManagerSndio : public AudioManagerBase {
|
||||
+ public:
|
||||
+ AudioManagerSndio(std::unique_ptr<AudioThread> audio_thread,
|
||||
+ AudioLogFactory* audio_log_factory);
|
||||
+ ~AudioManagerSndio() override;
|
||||
+
|
||||
+ // Implementation of AudioManager.
|
||||
+ bool HasAudioOutputDevices() override;
|
||||
+ bool HasAudioInputDevices() override;
|
||||
+ void GetAudioInputDeviceNames(AudioDeviceNames* device_names) override;
|
||||
+ void GetAudioOutputDeviceNames(AudioDeviceNames* device_names) override;
|
||||
+ AudioParameters GetInputStreamParameters(
|
||||
+ const std::string& device_id) override;
|
||||
+ const char* GetName() override;
|
||||
+
|
||||
+ // Implementation of AudioManagerBase.
|
||||
+ AudioOutputStream* MakeLinearOutputStream(
|
||||
+ const AudioParameters& params,
|
||||
+ const LogCallback& log_callback) override;
|
||||
+ AudioOutputStream* MakeLowLatencyOutputStream(
|
||||
+ const AudioParameters& params,
|
||||
+ const std::string& device_id,
|
||||
+ const LogCallback& log_callback) override;
|
||||
+ AudioInputStream* MakeLinearInputStream(
|
||||
+ const AudioParameters& params,
|
||||
+ const std::string& device_id,
|
||||
+ const LogCallback& log_callback) override;
|
||||
+ AudioInputStream* MakeLowLatencyInputStream(
|
||||
+ const AudioParameters& params,
|
||||
+ const std::string& device_id,
|
||||
+ const LogCallback& log_callback) override;
|
||||
+
|
||||
+ protected:
|
||||
+ AudioParameters GetPreferredOutputStreamParameters(
|
||||
+ const std::string& output_device_id,
|
||||
+ const AudioParameters& input_params) override;
|
||||
+
|
||||
+ private:
|
||||
+ // Called by MakeLinearOutputStream and MakeLowLatencyOutputStream.
|
||||
+ AudioOutputStream* MakeOutputStream(const AudioParameters& params);
|
||||
+ AudioInputStream* MakeInputStream(const AudioParameters& params);
|
||||
+
|
||||
+ DISALLOW_COPY_AND_ASSIGN(AudioManagerSndio);
|
||||
+};
|
||||
+
|
||||
+} // namespace media
|
||||
+
|
||||
+#endif // MEDIA_AUDIO_SNDIO_AUDIO_MANAGER_SNDIO_H_
|
||||
--- /dev/null
|
||||
+++ qt6-webengine-6.4.2/src/3rdparty/chromium/media/audio/sndio/sndio_input.cc
|
||||
@@ -0,0 +1,200 @@
|
||||
+// Copyright 2013 The Chromium Authors. All rights reserved.
|
||||
+// Use of this source code is governed by a BSD-style license that can be
|
||||
+// found in the LICENSE file.
|
||||
+
|
||||
+#include "base/bind.h"
|
||||
+#include "base/logging.h"
|
||||
+#include "base/macros.h"
|
||||
+#include "media/base/audio_timestamp_helper.h"
|
||||
+#include "media/audio/sndio/audio_manager_sndio.h"
|
||||
+#include "media/audio/audio_manager.h"
|
||||
+#include "media/audio/sndio/sndio_input.h"
|
||||
+
|
||||
+namespace media {
|
||||
+
|
||||
+static const SampleFormat kSampleFormat = kSampleFormatS16;
|
||||
+
|
||||
+void SndioAudioInputStream::OnMoveCallback(void *arg, int delta)
|
||||
+{
|
||||
+ SndioAudioInputStream* self = static_cast<SndioAudioInputStream*>(arg);
|
||||
+
|
||||
+ self->hw_delay += delta;
|
||||
+}
|
||||
+
|
||||
+void *SndioAudioInputStream::ThreadEntry(void *arg) {
|
||||
+ SndioAudioInputStream* self = static_cast<SndioAudioInputStream*>(arg);
|
||||
+
|
||||
+ self->ThreadLoop();
|
||||
+ return NULL;
|
||||
+}
|
||||
+
|
||||
+SndioAudioInputStream::SndioAudioInputStream(AudioManagerBase* manager,
|
||||
+ const std::string& device_name,
|
||||
+ const AudioParameters& params)
|
||||
+ : manager(manager),
|
||||
+ params(params),
|
||||
+ audio_bus(AudioBus::Create(params)),
|
||||
+ state(kClosed) {
|
||||
+}
|
||||
+
|
||||
+SndioAudioInputStream::~SndioAudioInputStream() {
|
||||
+ if (state != kClosed)
|
||||
+ Close();
|
||||
+}
|
||||
+
|
||||
+bool SndioAudioInputStream::Open() {
|
||||
+ struct sio_par par;
|
||||
+ int sig;
|
||||
+
|
||||
+ if (state != kClosed)
|
||||
+ return false;
|
||||
+
|
||||
+ if (params.format() != AudioParameters::AUDIO_PCM_LINEAR &&
|
||||
+ params.format() != AudioParameters::AUDIO_PCM_LOW_LATENCY) {
|
||||
+ LOG(WARNING) << "Unsupported audio format.";
|
||||
+ return false;
|
||||
+ }
|
||||
+
|
||||
+ sio_initpar(&par);
|
||||
+ par.rate = params.sample_rate();
|
||||
+ par.rchan = params.channels();
|
||||
+ par.bits = SampleFormatToBitsPerChannel(kSampleFormat);
|
||||
+ par.bps = par.bits / 8;
|
||||
+ par.sig = sig = par.bits != 8 ? 1 : 0;
|
||||
+ par.le = SIO_LE_NATIVE;
|
||||
+ par.appbufsz = params.frames_per_buffer();
|
||||
+
|
||||
+ hdl = sio_open(SIO_DEVANY, SIO_REC, 0);
|
||||
+
|
||||
+ if (hdl == NULL) {
|
||||
+ LOG(ERROR) << "Couldn't open audio device.";
|
||||
+ return false;
|
||||
+ }
|
||||
+
|
||||
+ if (!sio_setpar(hdl, &par) || !sio_getpar(hdl, &par)) {
|
||||
+ LOG(ERROR) << "Couldn't set audio parameters.";
|
||||
+ goto bad_close;
|
||||
+ }
|
||||
+
|
||||
+ if (par.rate != (unsigned int)params.sample_rate() ||
|
||||
+ par.rchan != (unsigned int)params.channels() ||
|
||||
+ par.bits != (unsigned int)SampleFormatToBitsPerChannel(kSampleFormat) ||
|
||||
+ par.sig != (unsigned int)sig ||
|
||||
+ (par.bps > 1 && par.le != SIO_LE_NATIVE) ||
|
||||
+ (par.bits != par.bps * 8)) {
|
||||
+ LOG(ERROR) << "Unsupported audio parameters.";
|
||||
+ goto bad_close;
|
||||
+ }
|
||||
+ state = kStopped;
|
||||
+ buffer = new char[audio_bus->frames() * params.GetBytesPerFrame(kSampleFormat)];
|
||||
+ sio_onmove(hdl, &OnMoveCallback, this);
|
||||
+ return true;
|
||||
+bad_close:
|
||||
+ sio_close(hdl);
|
||||
+ return false;
|
||||
+}
|
||||
+
|
||||
+void SndioAudioInputStream::Start(AudioInputCallback* cb) {
|
||||
+
|
||||
+ StartAgc();
|
||||
+
|
||||
+ state = kRunning;
|
||||
+ hw_delay = 0;
|
||||
+ callback = cb;
|
||||
+ sio_start(hdl);
|
||||
+ if (pthread_create(&thread, NULL, &ThreadEntry, this) != 0) {
|
||||
+ LOG(ERROR) << "Failed to create real-time thread for recording.";
|
||||
+ sio_stop(hdl);
|
||||
+ state = kStopped;
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
+void SndioAudioInputStream::Stop() {
|
||||
+
|
||||
+ if (state == kStopped)
|
||||
+ return;
|
||||
+
|
||||
+ state = kStopWait;
|
||||
+ pthread_join(thread, NULL);
|
||||
+ sio_stop(hdl);
|
||||
+ state = kStopped;
|
||||
+
|
||||
+ StopAgc();
|
||||
+}
|
||||
+
|
||||
+void SndioAudioInputStream::Close() {
|
||||
+
|
||||
+ if (state == kClosed)
|
||||
+ return;
|
||||
+
|
||||
+ if (state == kRunning)
|
||||
+ Stop();
|
||||
+
|
||||
+ state = kClosed;
|
||||
+ delete [] buffer;
|
||||
+ sio_close(hdl);
|
||||
+
|
||||
+ manager->ReleaseInputStream(this);
|
||||
+}
|
||||
+
|
||||
+double SndioAudioInputStream::GetMaxVolume() {
|
||||
+ // Not supported
|
||||
+ return 0.0;
|
||||
+}
|
||||
+
|
||||
+void SndioAudioInputStream::SetVolume(double volume) {
|
||||
+ // Not supported. Do nothing.
|
||||
+}
|
||||
+
|
||||
+double SndioAudioInputStream::GetVolume() {
|
||||
+ // Not supported.
|
||||
+ return 0.0;
|
||||
+}
|
||||
+
|
||||
+bool SndioAudioInputStream::IsMuted() {
|
||||
+ // Not supported.
|
||||
+ return false;
|
||||
+}
|
||||
+
|
||||
+void SndioAudioInputStream::SetOutputDeviceForAec(
|
||||
+ const std::string& output_device_id) {
|
||||
+ // Not supported.
|
||||
+}
|
||||
+
|
||||
+void SndioAudioInputStream::ThreadLoop(void) {
|
||||
+ size_t todo, n;
|
||||
+ char *data;
|
||||
+ unsigned int nframes;
|
||||
+ double normalized_volume = 0.0;
|
||||
+
|
||||
+ nframes = audio_bus->frames();
|
||||
+
|
||||
+ while (state == kRunning && !sio_eof(hdl)) {
|
||||
+
|
||||
+ GetAgcVolume(&normalized_volume);
|
||||
+
|
||||
+ // read one block
|
||||
+ todo = nframes * params.GetBytesPerFrame(kSampleFormat);
|
||||
+ data = buffer;
|
||||
+ while (todo > 0) {
|
||||
+ n = sio_read(hdl, data, todo);
|
||||
+ if (n == 0)
|
||||
+ return; // unrecoverable I/O error
|
||||
+ todo -= n;
|
||||
+ data += n;
|
||||
+ }
|
||||
+ hw_delay -= nframes;
|
||||
+
|
||||
+ // convert frames count to TimeDelta
|
||||
+ const base::TimeDelta delay = AudioTimestampHelper::FramesToTime(hw_delay,
|
||||
+ params.sample_rate());
|
||||
+
|
||||
+ // push into bus
|
||||
+ audio_bus->FromInterleaved<SignedInt16SampleTypeTraits>(reinterpret_cast<int16_t*>(buffer), nframes);
|
||||
+
|
||||
+ // invoke callback
|
||||
+ callback->OnData(audio_bus.get(), base::TimeTicks::Now() - delay, 1.);
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
+} // namespace media
|
||||
--- /dev/null
|
||||
+++ qt6-webengine-6.4.2/src/3rdparty/chromium/media/audio/sndio/sndio_input.h
|
||||
@@ -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_
|
||||
--- /dev/null
|
||||
+++ qt6-webengine-6.4.2/src/3rdparty/chromium/media/audio/sndio/sndio_output.cc
|
||||
@@ -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<SignedInt16SampleTypeTraits>(count, reinterpret_cast<int16_t*>(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
|
||||
--- /dev/null
|
||||
+++ qt6-webengine-6.4.2/src/3rdparty/chromium/media/audio/sndio/sndio_output.h
|
||||
@@ -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_
|
||||
--- qt6-webengine-6.4.2.orig/src/3rdparty/chromium/media/media_options.gni
|
||||
+++ qt6-webengine-6.4.2/src/3rdparty/chromium/media/media_options.gni
|
||||
@@ -133,6 +133,9 @@ declare_args() {
|
||||
# Enables runtime selection of ALSA library for audio.
|
||||
use_alsa = false
|
||||
|
||||
+ # Enable runtime selection of sndio(7)
|
||||
+ use_sndio = false
|
||||
+
|
||||
# Alsa should be used on non-Android, non-Mac POSIX systems.
|
||||
# Alsa should be used on desktop Chromecast and audio-only Chromecast builds.
|
||||
if (is_posix && !is_android && !is_mac &&
|
|
@ -36,17 +36,3 @@
|
|||
s.OutputToStream(&os);
|
||||
#else
|
||||
os << "StackTrace::OutputToStream not implemented.";
|
||||
--- qt6-webengine-6.4.2.orig/src/3rdparty/chromium/net/socket/udp_socket_posix.cc
|
||||
+++ qt6-webengine-6.4.2/src/3rdparty/chromium/net/socket/udp_socket_posix.cc
|
||||
@@ -1157,7 +1157,11 @@ SendResult UDPSocketPosixSender::Interna
|
||||
msg_iov->push_back({const_cast<char*>(buffer->data()), buffer->length()});
|
||||
msgvec->reserve(buffers.size());
|
||||
for (size_t j = 0; j < buffers.size(); j++)
|
||||
+#ifdef __GLIBC__
|
||||
msgvec->push_back({{nullptr, 0, &msg_iov[j], 1, nullptr, 0, 0}, 0});
|
||||
+#else
|
||||
+ msgvec->push_back({{nullptr, 0, &msg_iov[j], 1, 0, 0, 0}, 0});
|
||||
+#endif
|
||||
int result = HANDLE_EINTR(Sendmmsg(fd, &msgvec[0], buffers.size(), 0));
|
||||
SendResult send_result(0, 0, std::move(buffers));
|
||||
if (result < 0) {
|
||||
|
|
|
@ -67,20 +67,3 @@
|
|||
case __NR_msync:
|
||||
case __NR_munlockall:
|
||||
case __NR_readahead:
|
||||
--- qt6-webengine-6.4.2.orig/src/3rdparty/chromium/sandbox/policy/linux/bpf_renderer_policy_linux.cc
|
||||
+++ qt6-webengine-6.4.2/src/3rdparty/chromium/sandbox/policy/linux/bpf_renderer_policy_linux.cc
|
||||
@@ -99,9 +99,14 @@ ResultExpr RendererProcessPolicy::Evalua
|
||||
case __NR_uname:
|
||||
case __NR_sched_getparam:
|
||||
case __NR_sched_getscheduler:
|
||||
+#ifndef __GLIBC__
|
||||
+ case __NR_sched_setscheduler:
|
||||
+#endif
|
||||
return Allow();
|
||||
case __NR_sched_getaffinity:
|
||||
+#ifdef __GLIBC__
|
||||
case __NR_sched_setscheduler:
|
||||
+#endif
|
||||
return RestrictSchedTarget(GetPolicyPid(), sysno);
|
||||
case __NR_prlimit64:
|
||||
// See crbug.com/662450 and setrlimit comment above.
|
||||
|
|
|
@ -35,17 +35,23 @@
|
|||
#endif
|
||||
--- qt6-webengine-6.4.2.orig/src/3rdparty/chromium/base/trace_event/malloc_dump_provider.cc
|
||||
+++ qt6-webengine-6.4.2/src/3rdparty/chromium/base/trace_event/malloc_dump_provider.cc
|
||||
@@ -174,7 +174,8 @@ void ReportAppleAllocStats(size_t* total
|
||||
@@ -185,7 +185,6 @@
|
||||
#define MALLINFO2_FOUND_IN_LIBC
|
||||
struct mallinfo2 info = mallinfo2();
|
||||
#endif
|
||||
-#endif // defined(__GLIBC__) && defined(__GLIBC_PREREQ)
|
||||
#if !defined(MALLINFO2_FOUND_IN_LIBC)
|
||||
struct mallinfo info = mallinfo();
|
||||
#endif
|
||||
@@ -205,6 +204,7 @@
|
||||
sys_alloc_dump->AddScalar(MemoryAllocatorDump::kNameSize,
|
||||
MemoryAllocatorDump::kUnitsBytes, info.uordblks);
|
||||
}
|
||||
+#endif // defined(__GLIBC__) && defined(__GLIBC_PREREQ)
|
||||
}
|
||||
#endif
|
||||
|
||||
#if (BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) && BUILDFLAG(IS_ANDROID)) || \
|
||||
(!BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) && !BUILDFLAG(IS_WIN) && \
|
||||
- !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_WIN) && !BUILDFLAG(IS_FUCHSIA))
|
||||
+ !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_WIN) && !BUILDFLAG(IS_FUCHSIA) && \
|
||||
+ !(BUILDFLAG(IS_LINUX) && !defined(__GLIBC__)))
|
||||
void ReportMallinfoStats(ProcessMemoryDump* pmd,
|
||||
size_t* total_virtual_size,
|
||||
size_t* resident_size,
|
||||
@@ -339,7 +340,7 @@ bool MallocDumpProvider::OnMemoryDump(co
|
||||
@@ -339,7 +340,7 @@
|
||||
&allocated_objects_count);
|
||||
#elif BUILDFLAG(IS_FUCHSIA)
|
||||
// TODO(fuchsia): Port, see https://crbug.com/706592.
|
||||
|
@ -54,14 +60,3 @@
|
|||
ReportMallinfoStats(/*pmd=*/nullptr, &total_virtual_size, &resident_size,
|
||||
&allocated_objects_size, &allocated_objects_count);
|
||||
#endif
|
||||
--- qt6-webengine-6.4.2.orig/src/3rdparty/chromium/third_party/tflite/src/tensorflow/lite/profiling/memory_info.cc
|
||||
+++ qt6-webengine-6.4.2/src/3rdparty/chromium/third_party/tflite/src/tensorflow/lite/profiling/memory_info.cc
|
||||
@@ -35,7 +35,7 @@ bool MemoryUsage::IsSupported() {
|
||||
|
||||
MemoryUsage GetMemoryUsage() {
|
||||
MemoryUsage result;
|
||||
-#ifdef __linux__
|
||||
+#if defined(__linux__) && defined(__GLIBC__)
|
||||
rusage res;
|
||||
if (getrusage(RUSAGE_SELF, &res) == 0) {
|
||||
result.max_rss_kb = res.ru_maxrss;
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
# Template file for 'qt6-webengine'
|
||||
pkgname=qt6-webengine
|
||||
version=6.4.2
|
||||
revision=2
|
||||
version=6.5.0
|
||||
revision=1
|
||||
build_style=cmake
|
||||
configure_args="
|
||||
-DQT_FEATURE_webengine_system_ffmpeg=ON
|
||||
|
@ -32,7 +32,7 @@ maintainer="John <me@johnnynator.dev>"
|
|||
license="GPL-3.0-only, GPL-2.0-only, LGPL-3.0-only, BSD-3-Clause"
|
||||
homepage="https://www.qt.io"
|
||||
distfiles="https://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtwebengine-everywhere-src-${version}.tar.xz"
|
||||
checksum=ffa945518d1cc8d9ee73523e8d9c2090844f5a2d9c7eac05c4ad079472a119c9
|
||||
checksum=2a10da34a71b307e9ff11ec086455dd20b83d5b0ee6bda499c4ba9221e306f07
|
||||
|
||||
if [ "$XBPS_LIBC" = "musl" ]; then
|
||||
hostmakedepends+=" musl-legacy-compat"
|
||||
|
@ -164,7 +164,7 @@ qt6-webengine-devel_package() {
|
|||
vmove usr/lib/qt6/mkspecs
|
||||
vmove "usr/lib/*.so"
|
||||
vmove "usr/lib/*.prl"
|
||||
vmove usr/share/qt6/modules
|
||||
vmove usr/lib/qt6/modules
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue