Compare commits
No commits in common. "c8" and "c8-beta" have entirely different histories.
2
.gitignore
vendored
2
.gitignore
vendored
@ -1,2 +1,2 @@
|
||||
SOURCES/webkitgtk-2.52.3.tar.xz
|
||||
SOURCES/webkitgtk-2.42.5.tar.xz
|
||||
SOURCES/webkitgtk-keys.gpg
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
17f9b127618040a5f3fcbb70e37ea16ab6d69b0b SOURCES/webkitgtk-2.52.3.tar.xz
|
||||
04b10b8a486542c4551269c20b18b5c1c6cb4f94 SOURCES/webkitgtk-keys.gpg
|
||||
c3ffb2beaac56f1089029f2254482f48d9e3db37 SOURCES/webkitgtk-2.42.5.tar.xz
|
||||
cf57cbbadf2a07c6ede1c886f9742b7d352460c0 SOURCES/webkitgtk-keys.gpg
|
||||
|
||||
@ -1,329 +0,0 @@
|
||||
From a98fdf70489a743d3ee98f91758e043ffee9f9ca Mon Sep 17 00:00:00 2001
|
||||
From: Shu-yu Guo <syg@apple.com>
|
||||
Date: Fri, 17 Apr 2026 16:10:11 -0500
|
||||
Subject: [PATCH] Cherry-pick 7cda001308f2.
|
||||
https://bugs.webkit.org/show_bug.cgi?id=306638
|
||||
|
||||
[JSC] Fix !ENABLE(JIT) build
|
||||
https://bugs.webkit.org/show_bug.cgi?id=306638
|
||||
rdar://169822205
|
||||
|
||||
Reviewed by NOBODY (OOPS!).
|
||||
|
||||
* Source/JavaScriptCore/jit/ExecutableAllocator.h:
|
||||
(JSC::performJITMemcpy):
|
||||
* Source/JavaScriptCore/llint/InPlaceInterpreter.asm:
|
||||
* Source/JavaScriptCore/llint/LLIntData.cpp:
|
||||
(JSC::LLInt::initialize):
|
||||
* Source/JavaScriptCore/wasm/WasmCallee.cpp:
|
||||
* Source/WTF/wtf/PlatformEnable.h:
|
||||
---
|
||||
.../JavaScriptCore/jit/ExecutableAllocator.h | 8 ++
|
||||
.../llint/InPlaceInterpreter.asm | 8 +-
|
||||
Source/JavaScriptCore/llint/LLIntData.cpp | 81 +++++++++++++++----
|
||||
Source/JavaScriptCore/wasm/WasmCallee.cpp | 18 ++++-
|
||||
Source/WTF/wtf/PlatformEnable.h | 2 +-
|
||||
5 files changed, 93 insertions(+), 24 deletions(-)
|
||||
|
||||
diff --git a/Source/JavaScriptCore/jit/ExecutableAllocator.h b/Source/JavaScriptCore/jit/ExecutableAllocator.h
|
||||
index 3e8efce28cfe..cb81579c8703 100644
|
||||
--- a/Source/JavaScriptCore/jit/ExecutableAllocator.h
|
||||
+++ b/Source/JavaScriptCore/jit/ExecutableAllocator.h
|
||||
@@ -390,6 +390,14 @@ WTF_ALLOW_UNSAFE_BUFFER_USAGE_BEGIN
|
||||
WTF_ALLOW_UNSAFE_BUFFER_USAGE_END
|
||||
}
|
||||
|
||||
+template<RepatchingInfo>
|
||||
+inline void* performJITMemcpy(void *dst, const void *src, size_t n)
|
||||
+{
|
||||
+WTF_ALLOW_UNSAFE_BUFFER_USAGE_BEGIN
|
||||
+ return memcpy(dst, src, n);
|
||||
+WTF_ALLOW_UNSAFE_BUFFER_USAGE_END
|
||||
+}
|
||||
+
|
||||
inline bool isJITPC(void*) { return false; }
|
||||
#endif // ENABLE(JIT)
|
||||
|
||||
diff --git a/Source/JavaScriptCore/llint/InPlaceInterpreter.asm b/Source/JavaScriptCore/llint/InPlaceInterpreter.asm
|
||||
index 64db9cdb21df..dac1faa5260a 100644
|
||||
--- a/Source/JavaScriptCore/llint/InPlaceInterpreter.asm
|
||||
+++ b/Source/JavaScriptCore/llint/InPlaceInterpreter.asm
|
||||
@@ -420,7 +420,7 @@ end
|
||||
|
||||
# OSR
|
||||
macro ipintPrologueOSR(increment)
|
||||
-if JIT
|
||||
+if WEBASSEMBLY_BBQJIT
|
||||
loadp UnboxedWasmCalleeStackSlot[cfr], ws0
|
||||
baddis increment, Wasm::IPIntCallee::m_tierUpCounter + Wasm::IPIntTierUpCounter::m_counter[ws0], .continue
|
||||
|
||||
@@ -457,11 +457,11 @@ end
|
||||
if ARMv7
|
||||
break # FIXME: ipint support.
|
||||
end # ARMv7
|
||||
-end # JIT
|
||||
+end # WEBASSEMBLY_BBQJIT
|
||||
end
|
||||
|
||||
macro ipintLoopOSR(increment)
|
||||
-if JIT and not ARMv7
|
||||
+if WEBASSEMBLY_BBQJIT and not ARMv7
|
||||
validateOpcodeConfig(ws0)
|
||||
loadp UnboxedWasmCalleeStackSlot[cfr], ws0
|
||||
baddis increment, Wasm::IPIntCallee::m_tierUpCounter + Wasm::IPIntTierUpCounter::m_counter[ws0], .continue
|
||||
@@ -492,7 +492,7 @@ end
|
||||
end
|
||||
|
||||
macro ipintEpilogueOSR(increment)
|
||||
-if JIT and not ARMv7
|
||||
+if WEBASSEMBLY_BBQJIT and not ARMv7
|
||||
loadp UnboxedWasmCalleeStackSlot[cfr], ws0
|
||||
baddis increment, Wasm::IPIntCallee::m_tierUpCounter + Wasm::IPIntTierUpCounter::m_counter[ws0], .continue
|
||||
|
||||
diff --git a/Source/JavaScriptCore/llint/LLIntData.cpp b/Source/JavaScriptCore/llint/LLIntData.cpp
|
||||
index 5d7c88f72571..2509dc4132f3 100644
|
||||
--- a/Source/JavaScriptCore/llint/LLIntData.cpp
|
||||
+++ b/Source/JavaScriptCore/llint/LLIntData.cpp
|
||||
@@ -199,8 +199,28 @@ void initialize()
|
||||
#if CPU(ARM64E)
|
||||
|
||||
#if ENABLE(JIT_CAGE)
|
||||
- if (Options::useJITCage())
|
||||
+ if (Options::useJITCage()) {
|
||||
g_jscConfig.llint.gateMap[static_cast<unsigned>(Gate::jitCagePtr)] = jitCagePtrThunk().code().taggedPtr();
|
||||
+#if ENABLE(WEBASSEMBLY)
|
||||
+ // JSPI JITCage gates
|
||||
+ g_jscConfig.llint.gateMap[static_cast<unsigned>(Gate::jspiResignReturnPCs)] = jspiResignReturnPCsThunk().code().taggedPtr();
|
||||
+ g_jscConfig.llint.gateMap[static_cast<unsigned>(Gate::jspiExecuteSliceEntry)] = jspiExecuteSliceEntryThunk().code().taggedPtr();
|
||||
+ // jspiExitImplantedSlice is stored untagged because it's used as a return address
|
||||
+ // (not as a jump target) and will be signed by JITCage with the stack pointer diversifier.
|
||||
+ g_jscConfig.llint.gateMap[static_cast<unsigned>(Gate::jspiExitImplantedSlice)] = jspiExitImplantedSliceThunk().code().untaggedPtr();
|
||||
+#endif // ENABLE(WEBASSEMBLY)
|
||||
+ }
|
||||
+#endif
|
||||
+
|
||||
+#if ENABLE(JIT)
|
||||
+#define INITIALIZE_JS_GATE_JIT_PATH(name, tag) \
|
||||
+ if (Options::useJIT()) { \
|
||||
+ codeRef8.construct(createJSGateThunk(retagCodePtr<void*, CFunctionPtrTag, OperationPtrTag>(LLInt::getCodeFunctionPtr<CFunctionPtrTag>(name##_return_location)), tag, #name)); \
|
||||
+ codeRef16.construct(createJSGateThunk(retagCodePtr<void*, CFunctionPtrTag, OperationPtrTag>(LLInt::getWide16CodeFunctionPtr<CFunctionPtrTag>(name##_return_location)), tag, #name "_wide16")); \
|
||||
+ codeRef32.construct(createJSGateThunk(retagCodePtr<void*, CFunctionPtrTag, OperationPtrTag>(LLInt::getWide32CodeFunctionPtr<CFunctionPtrTag>(name##_return_location)), tag, #name "_wide32")); \
|
||||
+ } else
|
||||
+#else
|
||||
+#define INITIALIZE_JS_GATE_JIT_PATH(name, tag)
|
||||
#endif
|
||||
|
||||
#define INITIALIZE_JS_GATE(name, tag) \
|
||||
@@ -208,11 +228,7 @@ void initialize()
|
||||
static LazyNeverDestroyed<MacroAssemblerCodeRef<NativeToJITGatePtrTag>> codeRef8; \
|
||||
static LazyNeverDestroyed<MacroAssemblerCodeRef<NativeToJITGatePtrTag>> codeRef16; \
|
||||
static LazyNeverDestroyed<MacroAssemblerCodeRef<NativeToJITGatePtrTag>> codeRef32; \
|
||||
- if (Options::useJIT()) { \
|
||||
- codeRef8.construct(createJSGateThunk(retagCodePtr<void*, CFunctionPtrTag, OperationPtrTag>(LLInt::getCodeFunctionPtr<CFunctionPtrTag>(name##_return_location)), tag, #name)); \
|
||||
- codeRef16.construct(createJSGateThunk(retagCodePtr<void*, CFunctionPtrTag, OperationPtrTag>(LLInt::getWide16CodeFunctionPtr<CFunctionPtrTag>(name##_return_location)), tag, #name "_wide16")); \
|
||||
- codeRef32.construct(createJSGateThunk(retagCodePtr<void*, CFunctionPtrTag, OperationPtrTag>(LLInt::getWide32CodeFunctionPtr<CFunctionPtrTag>(name##_return_location)), tag, #name "_wide32")); \
|
||||
- } else { \
|
||||
+ INITIALIZE_JS_GATE_JIT_PATH(name, tag) { \
|
||||
codeRef8.construct(LLInt::getCodeRef<NativeToJITGatePtrTag>(js_trampoline_##name)); \
|
||||
codeRef16.construct(LLInt::getWide16CodeRef<NativeToJITGatePtrTag>(js_trampoline_##name)); \
|
||||
codeRef32.construct(LLInt::getWide32CodeRef<NativeToJITGatePtrTag>(js_trampoline_##name)); \
|
||||
@@ -226,16 +242,23 @@ void initialize()
|
||||
|
||||
#if ENABLE(WEBASSEMBLY)
|
||||
|
||||
+#if ENABLE(JIT)
|
||||
+#define INITIALIZE_WASM_GATE_JIT_PATH(name, tag) \
|
||||
+ if (Options::useJIT()) { \
|
||||
+ codeRef8.construct(createWasmGateThunk(retagCodePtr<void*, CFunctionPtrTag, OperationPtrTag>(LLInt::getCodeFunctionPtr<CFunctionPtrTag>(name##_return_location)), tag, #name)); \
|
||||
+ codeRef16.construct(createWasmGateThunk(retagCodePtr<void*, CFunctionPtrTag, OperationPtrTag>(LLInt::getWide16CodeFunctionPtr<CFunctionPtrTag>(name##_return_location)), tag, #name "_wide16")); \
|
||||
+ codeRef32.construct(createWasmGateThunk(retagCodePtr<void*, CFunctionPtrTag, OperationPtrTag>(LLInt::getWide32CodeFunctionPtr<CFunctionPtrTag>(name##_return_location)), tag, #name "_wide32")); \
|
||||
+ } else
|
||||
+#else
|
||||
+#define INITIALIZE_WASM_GATE_JIT_PATH(name, tag)
|
||||
+#endif
|
||||
+
|
||||
#define INITIALIZE_WASM_GATE(name, tag) \
|
||||
do { \
|
||||
static LazyNeverDestroyed<MacroAssemblerCodeRef<NativeToJITGatePtrTag>> codeRef8; \
|
||||
static LazyNeverDestroyed<MacroAssemblerCodeRef<NativeToJITGatePtrTag>> codeRef16; \
|
||||
static LazyNeverDestroyed<MacroAssemblerCodeRef<NativeToJITGatePtrTag>> codeRef32; \
|
||||
- if (Options::useJIT()) { \
|
||||
- codeRef8.construct(createWasmGateThunk(retagCodePtr<void*, CFunctionPtrTag, OperationPtrTag>(LLInt::getCodeFunctionPtr<CFunctionPtrTag>(name##_return_location)), tag, #name)); \
|
||||
- codeRef16.construct(createWasmGateThunk(retagCodePtr<void*, CFunctionPtrTag, OperationPtrTag>(LLInt::getWide16CodeFunctionPtr<CFunctionPtrTag>(name##_return_location)), tag, #name "_wide16")); \
|
||||
- codeRef32.construct(createWasmGateThunk(retagCodePtr<void*, CFunctionPtrTag, OperationPtrTag>(LLInt::getWide32CodeFunctionPtr<CFunctionPtrTag>(name##_return_location)), tag, #name "_wide32")); \
|
||||
- } else { \
|
||||
+ INITIALIZE_WASM_GATE_JIT_PATH(name, tag) { \
|
||||
codeRef8.construct(LLInt::getCodeRef<NativeToJITGatePtrTag>(wasm_trampoline_##name)); \
|
||||
codeRef16.construct(LLInt::getWide16CodeRef<NativeToJITGatePtrTag>(wasm_trampoline_##name)); \
|
||||
codeRef32.construct(LLInt::getWide32CodeRef<NativeToJITGatePtrTag>(wasm_trampoline_##name)); \
|
||||
@@ -253,10 +276,12 @@ void initialize()
|
||||
// This is key to entering the interpreter.
|
||||
{
|
||||
static LazyNeverDestroyed<MacroAssemblerCodeRef<VMEntryToJITGatePtrTag>> codeRef;
|
||||
+#if ENABLE(JIT)
|
||||
if (Options::useJIT()) {
|
||||
auto gateCodeRef = createJSGateThunk(retagCodePtr<void*, CFunctionPtrTag, OperationPtrTag>(&vmEntryToJavaScriptGateAfter), JSEntryPtrTag, "vmEntryToJavaScript");
|
||||
codeRef.construct(gateCodeRef.retagged<VMEntryToJITGatePtrTag>());
|
||||
} else
|
||||
+#endif
|
||||
codeRef.construct(MacroAssemblerCodeRef<VMEntryToJITGatePtrTag>::createSelfManagedCodeRef(CodePtr<VMEntryToJITGatePtrTag>::fromTaggedPtr(retagCodePtr<void*, CFunctionPtrTag, VMEntryToJITGatePtrTag>(&vmEntryToJavaScriptTrampoline))));
|
||||
g_jscConfig.llint.gateMap[static_cast<unsigned>(Gate::vmEntryToJavaScript)] = codeRef.get().code().taggedPtr();
|
||||
}
|
||||
@@ -268,79 +293,103 @@ void initialize()
|
||||
|
||||
{
|
||||
static LazyNeverDestroyed<MacroAssemblerCodeRef<NativeToJITGatePtrTag>> codeRef;
|
||||
+#if ENABLE(JIT)
|
||||
if (Options::useJIT())
|
||||
codeRef.construct(createTailCallGate(JSEntryPtrTag, true));
|
||||
else
|
||||
+#endif
|
||||
codeRef.construct(MacroAssemblerCodeRef<NativeToJITGatePtrTag>::createSelfManagedCodeRef(CodePtr<NativeToJITGatePtrTag>::fromTaggedPtr(retagCodePtr<void*, CFunctionPtrTag, NativeToJITGatePtrTag>(&tailCallJSEntryTrampoline))));
|
||||
g_jscConfig.llint.gateMap[static_cast<unsigned>(Gate::tailCallJSEntryPtrTag)]= codeRef.get().code().taggedPtr();
|
||||
}
|
||||
{
|
||||
static LazyNeverDestroyed<MacroAssemblerCodeRef<NativeToJITGatePtrTag>> codeRef;
|
||||
+#if ENABLE(JIT)
|
||||
if (Options::useJIT())
|
||||
codeRef.construct(createTailCallGate(JSEntryPtrTag, true));
|
||||
else
|
||||
+#endif
|
||||
codeRef.construct(MacroAssemblerCodeRef<NativeToJITGatePtrTag>::createSelfManagedCodeRef(CodePtr<NativeToJITGatePtrTag>::fromTaggedPtr(retagCodePtr<void*, CFunctionPtrTag, NativeToJITGatePtrTag>(&tailCallJSEntrySlowPathTrampoline))));
|
||||
g_jscConfig.llint.gateMap[static_cast<unsigned>(Gate::tailCallJSEntrySlowPathPtrTag)] = codeRef.get().code().taggedPtr();
|
||||
}
|
||||
{
|
||||
static LazyNeverDestroyed<MacroAssemblerCodeRef<NativeToJITGatePtrTag>> codeRef;
|
||||
+#if ENABLE(JIT)
|
||||
if (Options::useJIT())
|
||||
codeRef.construct(createTailCallGate(JSEntryPtrTag, false));
|
||||
else
|
||||
+#endif
|
||||
codeRef.construct(MacroAssemblerCodeRef<NativeToJITGatePtrTag>::createSelfManagedCodeRef(CodePtr<NativeToJITGatePtrTag>::fromTaggedPtr(retagCodePtr<void*, CFunctionPtrTag, NativeToJITGatePtrTag>(&tailCallWithoutUntagJSEntryTrampoline))));
|
||||
g_jscConfig.llint.gateMap[static_cast<unsigned>(Gate::tailCallWithoutUntagJSEntryPtrTag)]= codeRef.get().code().taggedPtr();
|
||||
}
|
||||
{
|
||||
static LazyNeverDestroyed<MacroAssemblerCodeRef<NativeToJITGatePtrTag>> codeRef;
|
||||
+#if ENABLE(JIT)
|
||||
if (Options::useJIT())
|
||||
codeRef.construct(createWasmTailCallGate(WasmEntryPtrTag));
|
||||
else
|
||||
+#endif
|
||||
codeRef.construct(MacroAssemblerCodeRef<NativeToJITGatePtrTag>::createSelfManagedCodeRef(CodePtr<NativeToJITGatePtrTag>::fromTaggedPtr(retagCodePtr<void*, CFunctionPtrTag, NativeToJITGatePtrTag>(&wasmTailCallTrampoline))));
|
||||
g_jscConfig.llint.gateMap[static_cast<unsigned>(Gate::wasmTailCallWasmEntryPtrTag)]= codeRef.get().code().taggedPtr();
|
||||
}
|
||||
{
|
||||
static LazyNeverDestroyed<MacroAssemblerCodeRef<NativeToJITGatePtrTag>> codeRef;
|
||||
+#if ENABLE(JIT)
|
||||
if (Options::useJIT())
|
||||
codeRef.construct(createWasmTailCallGate(WasmEntryPtrTag));
|
||||
else
|
||||
+#endif
|
||||
codeRef.construct(MacroAssemblerCodeRef<NativeToJITGatePtrTag>::createSelfManagedCodeRef(CodePtr<NativeToJITGatePtrTag>::fromTaggedPtr(retagCodePtr<void*, CFunctionPtrTag, NativeToJITGatePtrTag>(&wasmTailCallTrampoline))));
|
||||
g_jscConfig.llint.gateMap[static_cast<unsigned>(Gate::wasmIPIntTailCallWasmEntryPtrTag)]= codeRef.get().code().taggedPtr();
|
||||
}
|
||||
{
|
||||
static LazyNeverDestroyed<MacroAssemblerCodeRef<NativeToJITGatePtrTag>> codeRef;
|
||||
+#if ENABLE(JIT)
|
||||
if (Options::useJIT())
|
||||
codeRef.construct(exceptionHandlerGateThunk());
|
||||
else
|
||||
+#endif
|
||||
codeRef.construct(MacroAssemblerCodeRef<NativeToJITGatePtrTag>::createSelfManagedCodeRef(CodePtr<NativeToJITGatePtrTag>::fromTaggedPtr(retagCodePtr<void*, CFunctionPtrTag, NativeToJITGatePtrTag>(&exceptionHandlerTrampoline))));
|
||||
g_jscConfig.llint.gateMap[static_cast<unsigned>(Gate::exceptionHandler)] = codeRef.get().code().taggedPtr();
|
||||
}
|
||||
{
|
||||
static LazyNeverDestroyed<MacroAssemblerCodeRef<NativeToJITGatePtrTag>> codeRef;
|
||||
+#if ENABLE(JIT)
|
||||
if (Options::useJIT())
|
||||
codeRef.construct(returnFromLLIntGateThunk());
|
||||
else
|
||||
+#endif
|
||||
codeRef.construct(MacroAssemblerCodeRef<NativeToJITGatePtrTag>::createSelfManagedCodeRef(CodePtr<NativeToJITGatePtrTag>::fromTaggedPtr(retagCodePtr<void*, CFunctionPtrTag, NativeToJITGatePtrTag>(&returnFromLLIntTrampoline))));
|
||||
g_jscConfig.llint.gateMap[static_cast<unsigned>(Gate::returnFromLLInt)] = codeRef.get().code().taggedPtr();
|
||||
}
|
||||
|
||||
+#if ENABLE(JIT)
|
||||
if (Options::useJIT()) {
|
||||
g_jscConfig.llint.gateMap[static_cast<unsigned>(Gate::loopOSREntry)] = loopOSREntryGateThunk().code().taggedPtr();
|
||||
g_jscConfig.llint.gateMap[static_cast<unsigned>(Gate::entryOSREntry)] = entryOSREntryGateThunk().code().taggedPtr();
|
||||
g_jscConfig.llint.gateMap[static_cast<unsigned>(Gate::wasmOSREntry)] = wasmOSREntryGateThunk().code().taggedPtr();
|
||||
- } else {
|
||||
+ } else
|
||||
+#endif
|
||||
+ {
|
||||
g_jscConfig.llint.gateMap[static_cast<unsigned>(Gate::loopOSREntry)] = LLInt::getCodeRef<NativeToJITGatePtrTag>(loop_osr_entry_gate).code().taggedPtr();
|
||||
g_jscConfig.llint.gateMap[static_cast<unsigned>(Gate::entryOSREntry)] = nullptr;
|
||||
g_jscConfig.llint.gateMap[static_cast<unsigned>(Gate::wasmOSREntry)] = nullptr;
|
||||
}
|
||||
|
||||
+#if ENABLE(JIT)
|
||||
+#define INITIALIZE_TAG_AND_UNTAG_THUNKS_JIT_PATH(name) \
|
||||
+ if (Options::useJIT()) { \
|
||||
+ tagCodeRef.construct(tagGateThunk(retagCodePtr<void*, CFunctionPtrTag, OperationPtrTag>(name##TagGateAfter))); \
|
||||
+ untagCodeRef.construct(untagGateThunk(retagCodePtr<void*, CFunctionPtrTag, OperationPtrTag>(name##UntagGateAfter))); \
|
||||
+ } else
|
||||
+#else
|
||||
+#define INITIALIZE_TAG_AND_UNTAG_THUNKS_JIT_PATH(name)
|
||||
+#endif
|
||||
+
|
||||
#define INITIALIZE_TAG_AND_UNTAG_THUNKS(name) \
|
||||
do { \
|
||||
static LazyNeverDestroyed<MacroAssemblerCodeRef<NativeToJITGatePtrTag>> tagCodeRef; \
|
||||
static LazyNeverDestroyed<MacroAssemblerCodeRef<NativeToJITGatePtrTag>> untagCodeRef; \
|
||||
- if (Options::useJIT()) { \
|
||||
- tagCodeRef.construct(tagGateThunk(retagCodePtr<void*, CFunctionPtrTag, OperationPtrTag>(name##TagGateAfter))); \
|
||||
- untagCodeRef.construct(untagGateThunk(retagCodePtr<void*, CFunctionPtrTag, OperationPtrTag>(name##UntagGateAfter))); \
|
||||
- } else { \
|
||||
+ INITIALIZE_TAG_AND_UNTAG_THUNKS_JIT_PATH(name) { \
|
||||
tagCodeRef.construct(LLInt::getCodeRef<NativeToJITGatePtrTag>(js_trampoline_##name##_tag)); \
|
||||
untagCodeRef.construct(LLInt::getCodeRef<NativeToJITGatePtrTag>(js_trampoline_##name##_untag)); \
|
||||
} \
|
||||
diff --git a/Source/JavaScriptCore/wasm/WasmCallee.cpp b/Source/JavaScriptCore/wasm/WasmCallee.cpp
|
||||
index 94a845ab47e4..b689f00143ab 100644
|
||||
--- a/Source/JavaScriptCore/wasm/WasmCallee.cpp
|
||||
+++ b/Source/JavaScriptCore/wasm/WasmCallee.cpp
|
||||
@@ -55,13 +55,25 @@ WTF_MAKE_COMPACT_TZONE_ALLOCATED_IMPL(Callee);
|
||||
WTF_MAKE_COMPACT_TZONE_ALLOCATED_IMPL(JITCallee);
|
||||
WTF_MAKE_COMPACT_TZONE_ALLOCATED_IMPL(JSToWasmCallee);
|
||||
WTF_MAKE_COMPACT_TZONE_ALLOCATED_IMPL(WasmToJSCallee);
|
||||
+WTF_MAKE_COMPACT_TZONE_ALLOCATED_IMPL(IPIntCallee);
|
||||
+WTF_MAKE_COMPACT_TZONE_ALLOCATED_IMPL(WasmBuiltinCallee);
|
||||
+
|
||||
+#if ENABLE(JIT)
|
||||
WTF_MAKE_COMPACT_TZONE_ALLOCATED_IMPL(JSToWasmICCallee);
|
||||
+#endif
|
||||
+
|
||||
+#if ENABLE(WEBASSEMBLY_BBQJIT) || ENABLE(WEBASSEMBLY_OMGJIT)
|
||||
WTF_MAKE_COMPACT_TZONE_ALLOCATED_IMPL(OptimizingJITCallee);
|
||||
+#endif
|
||||
+
|
||||
+#if ENABLE(WEBASSEMBLY_BBQJIT)
|
||||
+WTF_MAKE_COMPACT_TZONE_ALLOCATED_IMPL(BBQCallee);
|
||||
+#endif
|
||||
+
|
||||
+#if ENABLE(WEBASSEMBLY_OMGJIT)
|
||||
WTF_MAKE_COMPACT_TZONE_ALLOCATED_IMPL(OMGCallee);
|
||||
WTF_MAKE_COMPACT_TZONE_ALLOCATED_IMPL(OMGOSREntryCallee);
|
||||
-WTF_MAKE_COMPACT_TZONE_ALLOCATED_IMPL(BBQCallee);
|
||||
-WTF_MAKE_COMPACT_TZONE_ALLOCATED_IMPL(IPIntCallee);
|
||||
-WTF_MAKE_COMPACT_TZONE_ALLOCATED_IMPL(WasmBuiltinCallee);
|
||||
+#endif
|
||||
|
||||
Callee::Callee(Wasm::CompilationMode compilationMode)
|
||||
: NativeCallee(NativeCallee::Category::Wasm, ImplementationVisibility::Private)
|
||||
diff --git a/Source/WTF/wtf/PlatformEnable.h b/Source/WTF/wtf/PlatformEnable.h
|
||||
index 9c20eb45de48..1561e5ecc85a 100644
|
||||
--- a/Source/WTF/wtf/PlatformEnable.h
|
||||
+++ b/Source/WTF/wtf/PlatformEnable.h
|
||||
@@ -1006,7 +1006,7 @@
|
||||
#define ENABLE_JIT_OPERATION_DISASSEMBLY 1
|
||||
#endif
|
||||
|
||||
-#if CPU(ARM64E)
|
||||
+#if CPU(ARM64E) && ENABLE(JIT)
|
||||
#define ENABLE_JIT_SIGN_ASSEMBLER_BUFFER 1
|
||||
#endif
|
||||
|
||||
--
|
||||
2.53.0
|
||||
|
||||
@ -1,34 +1,36 @@
|
||||
From a36c4b810651f0c4a66142514da0acc338995431 Mon Sep 17 00:00:00 2001
|
||||
From: Michael Catanzaro <mcatanzaro@redhat.com>
|
||||
Date: Tue, 23 Sep 2025 15:47:39 -0500
|
||||
Subject: [PATCH] Build against cairo 1.15
|
||||
|
||||
---
|
||||
Source/cmake/OptionsGTK.cmake | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/Source/cmake/OptionsGTK.cmake b/Source/cmake/OptionsGTK.cmake
|
||||
index a70213b2edf5..eea6eb87ad4b 100644
|
||||
index 526fe7cfe0cf..7650ea1bade2 100644
|
||||
--- a/Source/cmake/OptionsGTK.cmake
|
||||
+++ b/Source/cmake/OptionsGTK.cmake
|
||||
@@ -9,7 +9,7 @@ set(USER_AGENT_BRANDING "" CACHE STRING "Branding to add to user agent string")
|
||||
@@ -13,7 +13,7 @@ endif ()
|
||||
|
||||
set(USER_AGENT_BRANDING "" CACHE STRING "Branding to add to user agent string")
|
||||
|
||||
# Update Source/WTF/wtf/Platform.h to match required GLib versions.
|
||||
find_package(GLib 2.56.0 REQUIRED COMPONENTS GioUnix Thread Module)
|
||||
-find_package(Cairo 1.16.0 REQUIRED)
|
||||
+find_package(Cairo 1.14.0 REQUIRED)
|
||||
find_package(LibGcrypt 1.7.0 REQUIRED)
|
||||
find_package(Soup3 3.0.0 REQUIRED)
|
||||
find_package(Tasn1 REQUIRED)
|
||||
@@ -134,7 +134,7 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_THUNDER PRIVATE ${ENABLE_DEVELOPER_MODE}
|
||||
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_PERIODIC_MEMORY_MONITOR PRIVATE ON)
|
||||
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_POINTER_LOCK PRIVATE ON)
|
||||
find_package(Fontconfig 2.13.0 REQUIRED)
|
||||
find_package(Freetype 2.9.0 REQUIRED)
|
||||
find_package(LibGcrypt 1.6.0 REQUIRED)
|
||||
@@ -91,6 +91,14 @@ else ()
|
||||
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_RESOURCE_USAGE PRIVATE OFF)
|
||||
endif ()
|
||||
|
||||
+# Enable variation fonts when cairo >= 1.16, fontconfig >= 2.13.0, freetype >= 2.9.0 and harfbuzz >= 1.4.2.
|
||||
+if (("${PC_CAIRO_VERSION}" VERSION_GREATER "1.16.0" OR "${PC_CAIRO_VERSION}" STREQUAL "1.16.0")
|
||||
+ AND ("${PC_FONTCONFIG_VERSION}" VERSION_GREATER "2.13.0" OR "${PC_FONTCONFIG_VERSION}" STREQUAL "2.13.0")
|
||||
+ AND ("${FREETYPE_VERSION_STRING}" VERSION_GREATER "2.9.0" OR "${FREETYPE_VERSION_STRING}" STREQUAL "2.9.0")
|
||||
+ AND ("${PC_HARFBUZZ_VERSION}" VERSION_GREATER "1.4.2" OR "${PC_HARFBUZZ_VERSION}" STREQUAL "1.4.2"))
|
||||
+ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_VARIATION_FONTS PRIVATE ON)
|
||||
+endif ()
|
||||
+
|
||||
# Public options shared with other WebKit ports. Do not add any options here
|
||||
# without approval from a GTK reviewer. There must be strong reason to support
|
||||
# changing the value of the option.
|
||||
@@ -149,7 +157,6 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_POINTER_LOCK PRIVATE ON)
|
||||
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SERVICE_WORKER PRIVATE ON)
|
||||
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SHAREABLE_RESOURCE PRIVATE ON)
|
||||
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SPEECH_SYNTHESIS PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES})
|
||||
-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_VARIATION_FONTS PRIVATE ON)
|
||||
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_VARIATION_FONTS PRIVATE OFF)
|
||||
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_API_STATISTICS PRIVATE ON)
|
||||
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_CODECS PRIVATE ON)
|
||||
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_CODECS PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES})
|
||||
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_RTC PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES})
|
||||
--
|
||||
2.53.0
|
||||
|
||||
|
||||
@ -1,51 +0,0 @@
|
||||
From ee1a6eb354e881e211b7004e465828a669be5156 Mon Sep 17 00:00:00 2001
|
||||
From: Michael Catanzaro <mcatanzaro@redhat.com>
|
||||
Date: Tue, 23 Sep 2025 15:46:28 -0500
|
||||
Subject: [PATCH] Suppress some build warnings
|
||||
|
||||
---
|
||||
Source/ThirdParty/libsysprof-capture/CMakeLists.txt | 1 +
|
||||
Source/cmake/WebKitCompilerFlags.cmake | 8 +-------
|
||||
2 files changed, 2 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/Source/ThirdParty/libsysprof-capture/CMakeLists.txt b/Source/ThirdParty/libsysprof-capture/CMakeLists.txt
|
||||
index 7ea8f0469ad7..13a9e390643a 100644
|
||||
--- a/Source/ThirdParty/libsysprof-capture/CMakeLists.txt
|
||||
+++ b/Source/ThirdParty/libsysprof-capture/CMakeLists.txt
|
||||
@@ -46,6 +46,7 @@ target_link_libraries(SysProfCapture
|
||||
|
||||
WEBKIT_ADD_TARGET_C_FLAGS(SysProfCapture
|
||||
-Wno-implicit-function-declaration
|
||||
+ -Wno-int-conversion
|
||||
-Wno-sign-compare
|
||||
-Wno-unused-parameter
|
||||
)
|
||||
diff --git a/Source/cmake/WebKitCompilerFlags.cmake b/Source/cmake/WebKitCompilerFlags.cmake
|
||||
index 7eb24e774b40..fe7eedd20507 100644
|
||||
--- a/Source/cmake/WebKitCompilerFlags.cmake
|
||||
+++ b/Source/cmake/WebKitCompilerFlags.cmake
|
||||
@@ -130,11 +130,6 @@ if (DEVELOPER_MODE AND DEVELOPER_MODE_FATAL_WARNINGS)
|
||||
else ()
|
||||
set(FATAL_WARNINGS_FLAG -Werror)
|
||||
endif ()
|
||||
-
|
||||
- check_cxx_compiler_flag(${FATAL_WARNINGS_FLAG} CXX_COMPILER_SUPPORTS_WERROR)
|
||||
- if (CXX_COMPILER_SUPPORTS_WERROR)
|
||||
- set(DEVELOPER_MODE_CXX_FLAGS ${FATAL_WARNINGS_FLAG})
|
||||
- endif ()
|
||||
endif ()
|
||||
|
||||
if (DEVELOPER_MODE OR ARM)
|
||||
@@ -188,8 +183,7 @@ if (COMPILER_IS_GCC_OR_CLANG)
|
||||
-Wno-psabi
|
||||
-Wno-nullability-completeness)
|
||||
|
||||
- # GCC < 12.0 gives false warnings for mismatched-new-delete <https://webkit.org/b/241516>
|
||||
- if ((CMAKE_CXX_COMPILER_ID MATCHES "GNU") AND (CMAKE_CXX_COMPILER_VERSION VERSION_LESS "12.0.0"))
|
||||
+ if (CMAKE_CXX_COMPILER_ID MATCHES "GNU")
|
||||
WEBKIT_PREPEND_GLOBAL_COMPILER_FLAGS(-Wno-mismatched-new-delete)
|
||||
WEBKIT_PREPEND_GLOBAL_COMPILER_FLAGS(-Wno-uninitialized)
|
||||
endif ()
|
||||
--
|
||||
2.53.0
|
||||
|
||||
@ -1,26 +0,0 @@
|
||||
From 2de7d9e8776e5c49b889c8eaeec49f53e62f55b8 Mon Sep 17 00:00:00 2001
|
||||
From: Michael Catanzaro <mcatanzaro@redhat.com>
|
||||
Date: Tue, 7 Oct 2025 11:19:06 -0500
|
||||
Subject: [PATCH] Suppress warning about WEBKIT_FORCE_SANDBOX for Evolution
|
||||
|
||||
---
|
||||
Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp b/Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp
|
||||
index 329dbe6a0281..80b9609a47be 100644
|
||||
--- a/Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp
|
||||
+++ b/Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp
|
||||
@@ -154,7 +154,8 @@ void WebProcessPool::platformInitialize(NeedsGlobalStaticInitialization)
|
||||
else {
|
||||
static bool once = false;
|
||||
if (!once) {
|
||||
- g_warning("WEBKIT_FORCE_SANDBOX no longer allows disabling the sandbox. Use WEBKIT_DISABLE_SANDBOX_THIS_IS_DANGEROUS=1 instead.");
|
||||
+ if (g_strcmp0(g_get_prgname(), "evolution"))
|
||||
+ g_warning("WEBKIT_FORCE_SANDBOX no longer allows disabling the sandbox. Use WEBKIT_DISABLE_SANDBOX_THIS_IS_DANGEROUS=1 instead.");
|
||||
once = true;
|
||||
}
|
||||
}
|
||||
--
|
||||
2.53.0
|
||||
|
||||
@ -1,26 +1,14 @@
|
||||
From e13100155debec49c5ded3740901ac2a3c669370 Mon Sep 17 00:00:00 2001
|
||||
From: Michael Catanzaro <mcatanzaro@redhat.com>
|
||||
Date: Tue, 7 Oct 2025 11:18:05 -0500
|
||||
Subject: [PATCH] Use a single web process for Evolution
|
||||
|
||||
---
|
||||
Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp | 3 +++
|
||||
1 file changed, 3 insertions(+)
|
||||
|
||||
diff --git a/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp b/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp
|
||||
index 5cbc8739a2fe..5778f7a2da72 100644
|
||||
index a30f5b13be26..72ad006cde21 100644
|
||||
--- a/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp
|
||||
+++ b/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp
|
||||
@@ -457,6 +457,9 @@ static void webkitWebContextConstructed(GObject* object)
|
||||
@@ -438,6 +438,9 @@ static void webkitWebContextConstructed(GObject* object)
|
||||
}
|
||||
configuration->setTimeZoneOverride(String::fromUTF8(priv->timeZoneOverride.span()));
|
||||
configuration.setTimeZoneOverride(String::fromUTF8(priv->timeZoneOverride.data(), priv->timeZoneOverride.length()));
|
||||
|
||||
+ if (!g_strcmp0(g_get_prgname(), "evolution"))
|
||||
+ configuration->setUsesSingleWebProcess(true);
|
||||
+ configuration.setUsesSingleWebProcess(true);
|
||||
+
|
||||
#if !ENABLE(2022_GLIB_API)
|
||||
if (!priv->websiteDataManager)
|
||||
priv->websiteDataManager = adoptGRef(webkit_website_data_manager_new("local-storage-directory", priv->localStorageDirectory.data(), nullptr));
|
||||
--
|
||||
2.53.0
|
||||
|
||||
|
||||
@ -1,28 +0,0 @@
|
||||
From f3a8648a0c5902b0e44c26bba1a882ff296a6c8d Mon Sep 17 00:00:00 2001
|
||||
From: Michael Catanzaro <mcatanzaro@gnome.org>
|
||||
Date: Mon, 6 Apr 2026 18:05:37 -0500
|
||||
Subject: [PATCH] Make g-ir-scanner warnings nonfatal
|
||||
|
||||
Otherwise, the build fails whenever it sees an unrecognized annotation,
|
||||
which is not great whenever WebKit starts using new annotations that do
|
||||
not exist in old RHELs.
|
||||
---
|
||||
Source/cmake/FindGI.cmake | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/Source/cmake/FindGI.cmake b/Source/cmake/FindGI.cmake
|
||||
index 8cf372f3b172..cb724a418020 100644
|
||||
--- a/Source/cmake/FindGI.cmake
|
||||
+++ b/Source/cmake/FindGI.cmake
|
||||
@@ -342,7 +342,7 @@ function(GI_INTROSPECT namespace nsversion header)
|
||||
VERBATIM
|
||||
COMMAND_EXPAND_LISTS
|
||||
COMMAND ${CMAKE_COMMAND} -E env "CC=${CMAKE_C_COMPILER}" "CFLAGS=${CMAKE_C_FLAGS}"
|
||||
- "${GI_SCANNER_EXE}" --quiet --warn-all --warn-error --no-libtool
|
||||
+ "${GI_SCANNER_EXE}" --quiet --warn-all --no-libtool
|
||||
"--output=${gir_path}"
|
||||
"--library=$<TARGET_FILE_BASE_NAME:${opt_TARGET}>"
|
||||
"--library-path=$<TARGET_FILE_DIR:${opt_TARGET}>"
|
||||
--
|
||||
2.53.0
|
||||
|
||||
@ -1,417 +1,3 @@
|
||||
From faa96c8ff6fa906beaa5daf8e36bc1f865a9cf66 Mon Sep 17 00:00:00 2001
|
||||
From: Michael Catanzaro <mcatanzaro@redhat.com>
|
||||
Date: Fri, 4 Apr 2025 13:58:05 -0500
|
||||
Subject: [PATCH] Build against GLib 2.56
|
||||
|
||||
---
|
||||
Source/WTF/wtf/Platform.h | 2 +-
|
||||
Source/WTF/wtf/URL.h | 4 ++--
|
||||
Source/WTF/wtf/glib/GRefPtr.h | 2 ++
|
||||
Source/WTF/wtf/glib/SocketConnection.cpp | 13 ++++++++++++-
|
||||
Source/WTF/wtf/glib/URLGLib.cpp | 2 ++
|
||||
Source/WebCore/platform/LowPowerModeNotifier.h | 2 ++
|
||||
.../platform/glib/LowPowerModeNotifierGLib.cpp | 8 ++++++++
|
||||
.../platform/network/soup/CertificateInfoSoup.cpp | 8 ++++++++
|
||||
Source/WebKit/NetworkProcess/glib/DNSCache.cpp | 12 ++++++++++++
|
||||
Source/WebKit/NetworkProcess/glib/DNSCache.h | 2 ++
|
||||
.../NetworkProcess/glib/WebKitCachedResolver.cpp | 6 ++++++
|
||||
.../glib/WebKitOverridingResolver.cpp | 4 ++++
|
||||
Source/WebKit/Shared/glib/ArgumentCodersGLib.cpp | 6 ++++++
|
||||
Source/cmake/OptionsGTK.cmake | 7 ++++++-
|
||||
Tools/MiniBrowser/gtk/BrowserSettingsDialog.c | 3 ++-
|
||||
Tools/MiniBrowser/gtk/main.c | 3 ++-
|
||||
16 files changed, 77 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h
|
||||
index 0c3ba74482f6..57a1b5126290 100644
|
||||
--- a/Source/WTF/wtf/Platform.h
|
||||
+++ b/Source/WTF/wtf/Platform.h
|
||||
@@ -92,7 +92,7 @@
|
||||
|
||||
#if USE(GLIB)
|
||||
#define GLIB_VERSION_MIN_REQUIRED GLIB_VERSION_2_56
|
||||
-#define GLIB_VERSION_MAX_ALLOWED GLIB_VERSION_2_70
|
||||
+#define GLIB_VERSION_MAX_ALLOWED GLIB_VERSION_2_56
|
||||
#endif
|
||||
|
||||
#if PLATFORM(GTK)
|
||||
diff --git a/Source/WTF/wtf/URL.h b/Source/WTF/wtf/URL.h
|
||||
index 677314b5c781..f739e6df4892 100644
|
||||
--- a/Source/WTF/wtf/URL.h
|
||||
+++ b/Source/WTF/wtf/URL.h
|
||||
@@ -27,7 +27,7 @@
|
||||
|
||||
#include <wtf/text/WTFString.h>
|
||||
|
||||
-#if USE(GLIB)
|
||||
+#if USE(GLIB) && HAVE(GURI)
|
||||
#include <wtf/glib/GRefPtr.h>
|
||||
#endif
|
||||
|
||||
@@ -240,7 +240,7 @@ public:
|
||||
WTF_EXPORT_PRIVATE static NSURL *emptyNSURL();
|
||||
#endif
|
||||
|
||||
-#if USE(GLIB)
|
||||
+#if USE(GLIB) && HAVE(GURI)
|
||||
WTF_EXPORT_PRIVATE URL(GUri*);
|
||||
WTF_EXPORT_PRIVATE GRefPtr<GUri> createGUri() const;
|
||||
#endif
|
||||
diff --git a/Source/WTF/wtf/glib/GRefPtr.h b/Source/WTF/wtf/glib/GRefPtr.h
|
||||
index 46d25f00cc69..d3a764808a6f 100644
|
||||
--- a/Source/WTF/wtf/glib/GRefPtr.h
|
||||
+++ b/Source/WTF/wtf/glib/GRefPtr.h
|
||||
@@ -329,7 +329,9 @@ WTF_DEFINE_GREF_TRAITS_INLINE(GMainLoop, g_main_loop_ref, g_main_loop_unref)
|
||||
WTF_DEFINE_GREF_TRAITS_INLINE(GMappedFile, g_mapped_file_ref, g_mapped_file_unref)
|
||||
WTF_DEFINE_GREF_TRAITS_INLINE(GPtrArray, g_ptr_array_ref, g_ptr_array_unref)
|
||||
WTF_DEFINE_GREF_TRAITS_INLINE(GSource, g_source_ref, g_source_unref)
|
||||
+#if HAVE(GURI)
|
||||
WTF_DEFINE_GREF_TRAITS_INLINE(GUri, g_uri_ref, g_uri_unref)
|
||||
+#endif
|
||||
WTF_DEFINE_GREF_TRAITS_INLINE(GVariantBuilder, g_variant_builder_ref, g_variant_builder_unref)
|
||||
WTF_DEFINE_GREF_TRAITS_INLINE(GVariant, g_variant_ref_sink, g_variant_unref, g_variant_is_floating)
|
||||
|
||||
diff --git a/Source/WTF/wtf/glib/SocketConnection.cpp b/Source/WTF/wtf/glib/SocketConnection.cpp
|
||||
index b74955924938..4ea234a93c30 100644
|
||||
--- a/Source/WTF/wtf/glib/SocketConnection.cpp
|
||||
+++ b/Source/WTF/wtf/glib/SocketConnection.cpp
|
||||
@@ -166,7 +166,18 @@ bool SocketConnection::readMessage()
|
||||
GRefPtr<GVariant> parameters;
|
||||
if (!it->value.first.isNull()) {
|
||||
GUniquePtr<GVariantType> variantType(g_variant_type_new(it->value.first.data()));
|
||||
- parameters = g_variant_new_from_data(variantType.get(), messageData.data(), messageData.size(), FALSE, nullptr, nullptr);
|
||||
+ // g_variant_new_from_data() requires the memory to be properly aligned for the type being loaded,
|
||||
+ // but it's not possible to know the alignment because g_variant_type_info_query() is not public API.
|
||||
+ // Since GLib 2.60 g_variant_new_from_data() already checks the alignment and reallocates the buffer
|
||||
+ // in aligned memory only if needed. For older versions we can simply ensure the memory is 8 aligned.
|
||||
+WTF_ALLOW_UNSAFE_BUFFER_USAGE_BEGIN
|
||||
+ auto* alignedMemory = fastAlignedMalloc(8, messageData.size());
|
||||
+ memcpy(alignedMemory, messageData.data(), messageData.size());
|
||||
+WTF_ALLOW_UNSAFE_BUFFER_USAGE_END
|
||||
+ GRefPtr<GBytes> bytes = g_bytes_new_with_free_func(alignedMemory, messageData.size(), [](gpointer data) {
|
||||
+ fastAlignedFree(data);
|
||||
+ }, alignedMemory);
|
||||
+ parameters = g_variant_new_from_bytes(variantType.get(), bytes.get(), FALSE);
|
||||
if (messageIsByteSwapped(flags))
|
||||
parameters = adoptGRef(g_variant_byteswap(parameters.get()));
|
||||
}
|
||||
diff --git a/Source/WTF/wtf/glib/URLGLib.cpp b/Source/WTF/wtf/glib/URLGLib.cpp
|
||||
index 589dc1b52f8f..f67fe780f333 100644
|
||||
--- a/Source/WTF/wtf/glib/URLGLib.cpp
|
||||
+++ b/Source/WTF/wtf/glib/URLGLib.cpp
|
||||
@@ -35,6 +35,7 @@
|
||||
|
||||
namespace WTF {
|
||||
|
||||
+#if HAVE(GURI)
|
||||
URL::URL(GUri* uri)
|
||||
{
|
||||
if (!uri) {
|
||||
@@ -56,6 +57,7 @@ GRefPtr<GUri> URL::createGUri() const
|
||||
static_cast<GUriFlags>(G_URI_FLAGS_HAS_PASSWORD | G_URI_FLAGS_ENCODED_PATH | G_URI_FLAGS_ENCODED_QUERY | G_URI_FLAGS_ENCODED_FRAGMENT | G_URI_FLAGS_SCHEME_NORMALIZE | G_URI_FLAGS_PARSE_RELAXED),
|
||||
nullptr));
|
||||
}
|
||||
+#endif
|
||||
|
||||
bool URL::hostIsIPAddress(StringView host)
|
||||
{
|
||||
diff --git a/Source/WebCore/platform/LowPowerModeNotifier.h b/Source/WebCore/platform/LowPowerModeNotifier.h
|
||||
index c8f2051d77f6..e2ea0dae3292 100644
|
||||
--- a/Source/WebCore/platform/LowPowerModeNotifier.h
|
||||
+++ b/Source/WebCore/platform/LowPowerModeNotifier.h
|
||||
@@ -61,8 +61,10 @@ private:
|
||||
RetainPtr<WebLowPowerModeObserver> m_observer;
|
||||
LowPowerModeChangeCallback m_callback;
|
||||
#elif USE(GLIB)
|
||||
+#if GLIB_CHECK_VERSION(2, 69, 1)
|
||||
LowPowerModeChangeCallback m_callback;
|
||||
GRefPtr<GPowerProfileMonitor> m_powerProfileMonitor;
|
||||
+#endif
|
||||
bool m_lowPowerModeEnabled { false };
|
||||
#endif
|
||||
};
|
||||
diff --git a/Source/WebCore/platform/glib/LowPowerModeNotifierGLib.cpp b/Source/WebCore/platform/glib/LowPowerModeNotifierGLib.cpp
|
||||
index c9bf6a774f49..546a974075c6 100644
|
||||
--- a/Source/WebCore/platform/glib/LowPowerModeNotifierGLib.cpp
|
||||
+++ b/Source/WebCore/platform/glib/LowPowerModeNotifierGLib.cpp
|
||||
@@ -28,10 +28,13 @@ namespace WebCore {
|
||||
|
||||
|
||||
LowPowerModeNotifier::LowPowerModeNotifier(LowPowerModeChangeCallback&& callback)
|
||||
+#if GLIB_CHECK_VERSION(2, 69, 1)
|
||||
: m_callback(WTF::move(callback))
|
||||
, m_powerProfileMonitor(adoptGRef(g_power_profile_monitor_dup_default()))
|
||||
, m_lowPowerModeEnabled(g_power_profile_monitor_get_power_saver_enabled(m_powerProfileMonitor.get()))
|
||||
+#endif
|
||||
{
|
||||
+#if GLIB_CHECK_VERSION(2, 69, 1)
|
||||
g_signal_connect_swapped(m_powerProfileMonitor.get(), "notify::power-saver-enabled", G_CALLBACK(+[] (LowPowerModeNotifier* self, GParamSpec*, GPowerProfileMonitor* monitor) {
|
||||
bool powerSaverEnabled = g_power_profile_monitor_get_power_saver_enabled(monitor);
|
||||
if (self->m_lowPowerModeEnabled != powerSaverEnabled) {
|
||||
@@ -39,11 +42,16 @@ LowPowerModeNotifier::LowPowerModeNotifier(LowPowerModeChangeCallback&& callback
|
||||
self->m_callback(self->m_lowPowerModeEnabled);
|
||||
}
|
||||
}), this);
|
||||
+#else
|
||||
+ UNUSED_PARAM(callback);
|
||||
+#endif
|
||||
}
|
||||
|
||||
LowPowerModeNotifier::~LowPowerModeNotifier()
|
||||
{
|
||||
+#if GLIB_CHECK_VERSION(2, 69, 1)
|
||||
g_signal_handlers_disconnect_by_data(m_powerProfileMonitor.get(), this);
|
||||
+#endif
|
||||
}
|
||||
|
||||
bool LowPowerModeNotifier::isLowPowerModeEnabled() const
|
||||
diff --git a/Source/WebCore/platform/network/soup/CertificateInfoSoup.cpp b/Source/WebCore/platform/network/soup/CertificateInfoSoup.cpp
|
||||
index fb5773d56767..bc10fda05f78 100644
|
||||
--- a/Source/WebCore/platform/network/soup/CertificateInfoSoup.cpp
|
||||
+++ b/Source/WebCore/platform/network/soup/CertificateInfoSoup.cpp
|
||||
@@ -73,9 +73,11 @@ CertificateInfo CertificateInfo::isolatedCopy() const
|
||||
certificatesDataList.append(certificateData.release());
|
||||
}
|
||||
|
||||
+#if GLIB_CHECK_VERSION(2, 69, 0)
|
||||
GUniqueOutPtr<char> privateKey;
|
||||
GUniqueOutPtr<char> privateKeyPKCS11Uri;
|
||||
g_object_get(m_certificate.get(), "private-key-pem", &privateKey.outPtr(), "private-key-pkcs11-uri", &privateKeyPKCS11Uri.outPtr(), nullptr);
|
||||
+#endif
|
||||
|
||||
GType certificateType = g_tls_backend_get_certificate_type(g_tls_backend_get_default());
|
||||
GRefPtr<GTlsCertificate> certificate;
|
||||
@@ -86,8 +88,10 @@ CertificateInfo CertificateInfo::isolatedCopy() const
|
||||
certificateType, nullptr, nullptr,
|
||||
"certificate-pem", certificateData.get(),
|
||||
"issuer", issuer,
|
||||
+#if GLIB_CHECK_VERSION(2, 69, 0)
|
||||
"private-key-pem", certificatesDataList.isEmpty() ? privateKey.get() : nullptr,
|
||||
"private-key-pkcs11-uri", certificatesDataList.isEmpty() ? privateKeyPKCS11Uri.get() : nullptr,
|
||||
+#endif
|
||||
nullptr)));
|
||||
RELEASE_ASSERT(certificate);
|
||||
issuer = certificate.get();
|
||||
@@ -101,6 +105,7 @@ std::optional<CertificateSummary> CertificateInfo::summary() const
|
||||
if (!m_certificate)
|
||||
return std::nullopt;
|
||||
|
||||
+#if GLIB_CHECK_VERSION(2, 69, 0)
|
||||
CertificateSummary summaryInfo;
|
||||
|
||||
GRefPtr<GDateTime> validNotBefore;
|
||||
@@ -125,6 +130,9 @@ std::optional<CertificateSummary> CertificateInfo::summary() const
|
||||
}
|
||||
|
||||
return summaryInfo;
|
||||
+#else
|
||||
+ return std::nullopt;
|
||||
+#endif
|
||||
}
|
||||
|
||||
} // namespace WebCore
|
||||
diff --git a/Source/WebKit/NetworkProcess/glib/DNSCache.cpp b/Source/WebKit/NetworkProcess/glib/DNSCache.cpp
|
||||
index 5ecfdc770d9b..38911a681028 100644
|
||||
--- a/Source/WebKit/NetworkProcess/glib/DNSCache.cpp
|
||||
+++ b/Source/WebKit/NetworkProcess/glib/DNSCache.cpp
|
||||
@@ -50,9 +50,17 @@ DNSCache::DNSCacheMap& DNSCache::mapForType(Type type)
|
||||
case Type::Default:
|
||||
return m_dnsMap;
|
||||
case Type::IPv4Only:
|
||||
+#if GLIB_CHECK_VERSION(2, 59, 0)
|
||||
return m_ipv4Map;
|
||||
+#else
|
||||
+ return m_dnsMap;
|
||||
+#endif
|
||||
case Type::IPv6Only:
|
||||
+#if GLIB_CHECK_VERSION(2, 59, 0)
|
||||
return m_ipv6Map;
|
||||
+#else
|
||||
+ return m_dnsMap;
|
||||
+#endif
|
||||
}
|
||||
|
||||
RELEASE_ASSERT_NOT_REACHED();
|
||||
@@ -118,16 +126,20 @@ void DNSCache::removeExpiredResponsesFired()
|
||||
{
|
||||
Locker locker { m_lock };
|
||||
removeExpiredResponsesInMap(m_dnsMap);
|
||||
+#if GLIB_CHECK_VERSION(2, 59, 0)
|
||||
removeExpiredResponsesInMap(m_ipv4Map);
|
||||
removeExpiredResponsesInMap(m_ipv6Map);
|
||||
+#endif
|
||||
}
|
||||
|
||||
void DNSCache::clear()
|
||||
{
|
||||
Locker locker { m_lock };
|
||||
m_dnsMap.clear();
|
||||
+#if GLIB_CHECK_VERSION(2, 59, 0)
|
||||
m_ipv4Map.clear();
|
||||
m_ipv6Map.clear();
|
||||
+#endif
|
||||
}
|
||||
|
||||
} // namespace WebKit
|
||||
diff --git a/Source/WebKit/NetworkProcess/glib/DNSCache.h b/Source/WebKit/NetworkProcess/glib/DNSCache.h
|
||||
index 30332200b7ec..f0b6ac73389b 100644
|
||||
--- a/Source/WebKit/NetworkProcess/glib/DNSCache.h
|
||||
+++ b/Source/WebKit/NetworkProcess/glib/DNSCache.h
|
||||
@@ -64,8 +64,10 @@ private:
|
||||
|
||||
Lock m_lock;
|
||||
DNSCacheMap m_dnsMap WTF_GUARDED_BY_LOCK(m_lock);
|
||||
+#if GLIB_CHECK_VERSION(2, 59, 0)
|
||||
DNSCacheMap m_ipv4Map;
|
||||
DNSCacheMap m_ipv6Map;
|
||||
+#endif
|
||||
RunLoop::Timer m_expiredTimer;
|
||||
};
|
||||
|
||||
diff --git a/Source/WebKit/NetworkProcess/glib/WebKitCachedResolver.cpp b/Source/WebKit/NetworkProcess/glib/WebKitCachedResolver.cpp
|
||||
index 27399475ab7a..10f189484a2f 100644
|
||||
--- a/Source/WebKit/NetworkProcess/glib/WebKitCachedResolver.cpp
|
||||
+++ b/Source/WebKit/NetworkProcess/glib/WebKitCachedResolver.cpp
|
||||
@@ -67,7 +67,9 @@ static Vector<GRefPtr<GInetAddress>> addressListGListToVector(GList* addressList
|
||||
|
||||
struct LookupAsyncData {
|
||||
CString hostname;
|
||||
+#if GLIB_CHECK_VERSION(2, 59, 0)
|
||||
DNSCache::Type dnsCacheType { DNSCache::Type::Default };
|
||||
+#endif
|
||||
};
|
||||
WEBKIT_DEFINE_ASYNC_DATA_STRUCT(LookupAsyncData)
|
||||
|
||||
@@ -117,6 +119,7 @@ static GList* webkitCachedResolverLookupByNameFinish(GResolver* resolver, GAsync
|
||||
return static_cast<GList*>(g_task_propagate_pointer(G_TASK(result), error));
|
||||
}
|
||||
|
||||
+#if GLIB_CHECK_VERSION(2, 59, 0)
|
||||
static inline DNSCache::Type dnsCacheType(GResolverNameLookupFlags flags)
|
||||
{
|
||||
// A cache is kept for each type of response to avoid the overcomplication of combining or filtering results.
|
||||
@@ -177,6 +180,7 @@ static GList* webkitCachedResolverLookupByNameWithFlagsFinish(GResolver* resolve
|
||||
|
||||
return static_cast<GList*>(g_task_propagate_pointer(G_TASK(result), error));
|
||||
}
|
||||
+#endif // GLIB_CHECK_VERSION(2, 59, 0)
|
||||
|
||||
static char* webkitCachedResolverLookupByAddress(GResolver* resolver, GInetAddress* address, GCancellable* cancellable, GError** error)
|
||||
{
|
||||
@@ -219,9 +223,11 @@ static void webkit_cached_resolver_class_init(WebKitCachedResolverClass* klass)
|
||||
resolverClass->lookup_by_name = webkitCachedResolverLookupByName;
|
||||
resolverClass->lookup_by_name_async = webkitCachedResolverLookupByNameAsync;
|
||||
resolverClass->lookup_by_name_finish = webkitCachedResolverLookupByNameFinish;
|
||||
+#if GLIB_CHECK_VERSION(2, 59, 0)
|
||||
resolverClass->lookup_by_name_with_flags = webkitCachedResolverLookupByNameWithFlags;
|
||||
resolverClass->lookup_by_name_with_flags_async = webkitCachedResolverLookupByNameWithFlagsAsync;
|
||||
resolverClass->lookup_by_name_with_flags_finish = webkitCachedResolverLookupByNameWithFlagsFinish;
|
||||
+#endif
|
||||
resolverClass->lookup_by_address = webkitCachedResolverLookupByAddress;
|
||||
resolverClass->lookup_by_address_async = webkitCachedResolverLookupByAddressAsync;
|
||||
resolverClass->lookup_by_address_finish = webkitCachedResolverLookupByAddressFinish;
|
||||
diff --git a/Source/WebKit/NetworkProcess/glib/WebKitOverridingResolver.cpp b/Source/WebKit/NetworkProcess/glib/WebKitOverridingResolver.cpp
|
||||
index c09d90cbd1dc..76a9ae84fb7e 100644
|
||||
--- a/Source/WebKit/NetworkProcess/glib/WebKitOverridingResolver.cpp
|
||||
+++ b/Source/WebKit/NetworkProcess/glib/WebKitOverridingResolver.cpp
|
||||
@@ -90,6 +90,7 @@ static GList* webkitOverridingResolverLookupByNameFinish(GResolver* resolver, GA
|
||||
return static_cast<GList*>(g_task_propagate_pointer(G_TASK(result), error));
|
||||
}
|
||||
|
||||
+#if GLIB_CHECK_VERSION(2, 59, 0)
|
||||
static GList* createLoobackAddressList(WebKitOverridingResolver* resolver, GResolverNameLookupFlags flags)
|
||||
{
|
||||
GList* list = nullptr;
|
||||
@@ -129,6 +130,7 @@ static GList* webkitOverridingResolverLookupByNameWithFlagsFinish(GResolver* res
|
||||
|
||||
return static_cast<GList*>(g_task_propagate_pointer(G_TASK(result), error));
|
||||
}
|
||||
+#endif // GLIB_CHECK_VERSION(2, 59, 0)
|
||||
|
||||
static char* webkitOverridingResolverLookupByAddress(GResolver* resolver, GInetAddress* address, GCancellable* cancellable, GError** error)
|
||||
{
|
||||
@@ -166,9 +168,11 @@ static void webkit_overriding_resolver_class_init(WebKitOverridingResolverClass*
|
||||
resolverClass->lookup_by_name = webkitOverridingResolverLookupByName;
|
||||
resolverClass->lookup_by_name_async = webkitOverridingResolverLookupByNameAsync;
|
||||
resolverClass->lookup_by_name_finish = webkitOverridingResolverLookupByNameFinish;
|
||||
+#if GLIB_CHECK_VERSION(2, 59, 0)
|
||||
resolverClass->lookup_by_name_with_flags = webkitOverridingResolverLookupByNameWithFlags;
|
||||
resolverClass->lookup_by_name_with_flags_async = webkitOverridingResolverLookupByNameWithFlagsAsync;
|
||||
resolverClass->lookup_by_name_with_flags_finish = webkitOverridingResolverLookupByNameWithFlagsFinish;
|
||||
+#endif
|
||||
resolverClass->lookup_by_address = webkitOverridingResolverLookupByAddress;
|
||||
resolverClass->lookup_by_address_async = webkitOverridingResolverLookupByAddressAsync;
|
||||
resolverClass->lookup_by_address_finish = webkitOverridingResolverLookupByAddressFinish;
|
||||
diff --git a/Source/WebKit/Shared/glib/ArgumentCodersGLib.cpp b/Source/WebKit/Shared/glib/ArgumentCodersGLib.cpp
|
||||
index 6112a107f99a..b569c48de5ba 100644
|
||||
--- a/Source/WebKit/Shared/glib/ArgumentCodersGLib.cpp
|
||||
+++ b/Source/WebKit/Shared/glib/ArgumentCodersGLib.cpp
|
||||
@@ -121,11 +121,13 @@ void ArgumentCoder<GRefPtr<GTlsCertificate>>::encode(Encoder& encoder, const GRe
|
||||
|
||||
encoder << certificatesData;
|
||||
|
||||
+#if GLIB_CHECK_VERSION(2, 69, 0)
|
||||
GRefPtr<GByteArray> privateKey;
|
||||
GUniqueOutPtr<char> privateKeyPKCS11Uri;
|
||||
g_object_get(certificate.get(), "private-key", &privateKey.outPtr(), "private-key-pkcs11-uri", &privateKeyPKCS11Uri.outPtr(), nullptr);
|
||||
encoder << privateKey;
|
||||
encoder << CString(privateKeyPKCS11Uri.get());
|
||||
+#endif
|
||||
}
|
||||
|
||||
std::optional<GRefPtr<GTlsCertificate>> ArgumentCoder<GRefPtr<GTlsCertificate>>::decode(Decoder& decoder)
|
||||
@@ -138,6 +140,7 @@ std::optional<GRefPtr<GTlsCertificate>> ArgumentCoder<GRefPtr<GTlsCertificate>>:
|
||||
if (!certificatesData->size())
|
||||
return GRefPtr<GTlsCertificate>();
|
||||
|
||||
+#if GLIB_CHECK_VERSION(2, 69, 0)
|
||||
std::optional<GRefPtr<GByteArray>> privateKey;
|
||||
decoder >> privateKey;
|
||||
if (!privateKey) [[unlikely]]
|
||||
@@ -147,6 +150,7 @@ std::optional<GRefPtr<GTlsCertificate>> ArgumentCoder<GRefPtr<GTlsCertificate>>:
|
||||
decoder >> privateKeyPKCS11Uri;
|
||||
if (!privateKeyPKCS11Uri) [[unlikely]]
|
||||
return std::nullopt;
|
||||
+#endif
|
||||
|
||||
GType certificateType = g_tls_backend_get_certificate_type(g_tls_backend_get_default());
|
||||
GRefPtr<GTlsCertificate> certificate;
|
||||
@@ -157,8 +161,10 @@ std::optional<GRefPtr<GTlsCertificate>> ArgumentCoder<GRefPtr<GTlsCertificate>>:
|
||||
certificateType, nullptr, nullptr,
|
||||
"certificate", certificateData.get(),
|
||||
"issuer", issuer,
|
||||
+#if GLIB_CHECK_VERSION(2, 69, 0)
|
||||
"private-key", i == certificatesData->size() - 1 ? privateKey->get() : nullptr,
|
||||
"private-key-pkcs11-uri", i == certificatesData->size() - 1 ? privateKeyPKCS11Uri->data() : nullptr,
|
||||
+#endif
|
||||
nullptr)));
|
||||
issuer = certificate.get();
|
||||
i++;
|
||||
diff --git a/Source/cmake/OptionsGTK.cmake b/Source/cmake/OptionsGTK.cmake
|
||||
index a5ebd3e3d879..ce1791f7a470 100644
|
||||
--- a/Source/cmake/OptionsGTK.cmake
|
||||
+++ b/Source/cmake/OptionsGTK.cmake
|
||||
@@ -8,7 +8,7 @@ SET_PROJECT_VERSION(2 52 3)
|
||||
set(USER_AGENT_BRANDING "" CACHE STRING "Branding to add to user agent string")
|
||||
|
||||
# Update Source/WTF/wtf/Platform.h to match required GLib versions.
|
||||
-find_package(GLib 2.70.0 REQUIRED COMPONENTS GioUnix Thread Module)
|
||||
+find_package(GLib 2.56.0 REQUIRED COMPONENTS GioUnix Thread Module)
|
||||
find_package(Cairo 1.16.0 REQUIRED)
|
||||
find_package(LibGcrypt 1.7.0 REQUIRED)
|
||||
find_package(Soup3 3.0.0 REQUIRED)
|
||||
@@ -258,6 +258,11 @@ if (ENABLED_COMPILER_SANITIZERS)
|
||||
set(ENABLE_DOCUMENTATION OFF)
|
||||
endif ()
|
||||
|
||||
+# GUri is available in GLib since version 2.66, but we only want to use it if version is >= 2.67.1.
|
||||
+if (PC_GLIB_VERSION VERSION_GREATER "2.67.1" OR PC_GLIB_VERSION STREQUAL "2.67.1")
|
||||
+ SET_AND_EXPOSE_TO_BUILD(HAVE_GURI 1)
|
||||
+endif ()
|
||||
+
|
||||
if (ENABLE_GAMEPAD)
|
||||
find_package(Manette 0.2.4)
|
||||
if (NOT Manette_FOUND)
|
||||
diff --git a/Tools/MiniBrowser/gtk/BrowserSettingsDialog.c b/Tools/MiniBrowser/gtk/BrowserSettingsDialog.c
|
||||
index ef000cd2b910..432c97257048 100644
|
||||
--- a/Tools/MiniBrowser/gtk/BrowserSettingsDialog.c
|
||||
@ -431,10 +17,10 @@ index ef000cd2b910..432c97257048 100644
|
||||
|
||||
static void featureTreeViewRenderCategoryData(GtkTreeViewColumn *column, GtkCellRenderer *renderer, GtkTreeModel *model, GtkTreeIter *iter, gpointer data)
|
||||
diff --git a/Tools/MiniBrowser/gtk/main.c b/Tools/MiniBrowser/gtk/main.c
|
||||
index d3fbb968ee46..4f49ad82f9fd 100644
|
||||
index 8be643a54151..ae82b41400b5 100644
|
||||
--- a/Tools/MiniBrowser/gtk/main.c
|
||||
+++ b/Tools/MiniBrowser/gtk/main.c
|
||||
@@ -266,7 +266,7 @@ static gboolean parseFeaturesOptionCallback(const gchar *option, const gchar *va
|
||||
@@ -273,7 +273,7 @@ static gboolean parseFeaturesOptionCallback(const gchar *option, const gchar *va
|
||||
"features, prefixes '-' and '!' disable features. Names are case-insensitive. Example:\n"
|
||||
"\n %s --features='!DirPseudo,+WebAnimationsCustomEffects,webgl'\n\n"
|
||||
"Available features (+/- = enabled/disabled by default):\n\n", g_get_prgname());
|
||||
@ -443,14 +29,11 @@ index d3fbb968ee46..4f49ad82f9fd 100644
|
||||
for (gsize i = 0; i < webkit_feature_list_get_length(featureList); i++) {
|
||||
WebKitFeature *feature = webkit_feature_list_get(featureList, i);
|
||||
g_print(" %c %s (%s)",
|
||||
@@ -277,6 +277,7 @@ static gboolean parseFeaturesOptionCallback(const gchar *option, const gchar *va
|
||||
@@ -284,6 +284,7 @@ static gboolean parseFeaturesOptionCallback(const gchar *option, const gchar *va
|
||||
g_print(": %s", webkit_feature_get_name(feature));
|
||||
g_print("\n");
|
||||
}
|
||||
+ g_type_class_unref(statusEnum);
|
||||
exit(EXIT_SUCCESS);
|
||||
}
|
||||
|
||||
--
|
||||
2.53.0
|
||||
|
||||
|
||||
19
SOURCES/glib-dep.patch
Normal file
19
SOURCES/glib-dep.patch
Normal file
@ -0,0 +1,19 @@
|
||||
diff --git a/glib-dep.patch b/glib-dep.patch
|
||||
new file mode 100644
|
||||
index 0000000..dbc0ab6
|
||||
--- /dev/null
|
||||
+++ b/glib-dep.patch
|
||||
@@ -0,0 +1,13 @@
|
||||
+diff --git a/Source/WTF/wtf/glib/Sandbox.cpp b/Source/WTF/wtf/glib/Sandbox.cpp
|
||||
+index 9b07bb8cb5a9b..a8169511fe851 100644
|
||||
+--- a/Source/WTF/wtf/glib/Sandbox.cpp
|
||||
++++ b/Source/WTF/wtf/glib/Sandbox.cpp
|
||||
+@@ -58,7 +58,7 @@ bool isInsideUnsupportedContainer()
|
||||
+ int waitStatus = 0;
|
||||
+ gboolean spawnSucceeded = g_spawn_sync(nullptr, const_cast<char**>(bwrapArgs), nullptr,
|
||||
+ G_SPAWN_STDERR_TO_DEV_NULL, nullptr, nullptr, nullptr, nullptr, &waitStatus, nullptr);
|
||||
+- supportedContainer = spawnSucceeded && g_spawn_check_wait_status(waitStatus, nullptr);
|
||||
++ supportedContainer = spawnSucceeded && g_spawn_check_exit_status(waitStatus, nullptr);
|
||||
+ if (!supportedContainer)
|
||||
+ WTFLogAlways("Bubblewrap does not work inside of this container, sandboxing will be disabled.");
|
||||
+ }
|
||||
483
SOURCES/gstreamer-1.16.1.patch
Normal file
483
SOURCES/gstreamer-1.16.1.patch
Normal file
@ -0,0 +1,483 @@
|
||||
diff --git a/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp b/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp
|
||||
index 77a0d6507240..353fb87900ba 100644
|
||||
--- a/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp
|
||||
+++ b/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp
|
||||
@@ -479,7 +479,6 @@ bool MediaPlayerPrivateGStreamer::doSeek(const MediaTime& position, float rate)
|
||||
|
||||
auto seekStart = toGstClockTime(startTime);
|
||||
auto seekStop = toGstClockTime(endTime);
|
||||
- GST_DEBUG_OBJECT(pipeline(), "[Seek] Performing actual seek to %" GST_TIMEP_FORMAT " (endTime: %" GST_TIMEP_FORMAT ") at rate %f", &seekStart, &seekStop, rate);
|
||||
return gst_element_seek(m_pipeline.get(), rate, GST_FORMAT_TIME, m_seekFlags, GST_SEEK_TYPE_SET, seekStart, GST_SEEK_TYPE_SET, seekStop);
|
||||
}
|
||||
|
||||
@@ -3296,9 +3295,6 @@ static uint32_t fourccValue(GstVideoFormat format)
|
||||
case GST_VIDEO_FORMAT_P010_10LE:
|
||||
case GST_VIDEO_FORMAT_P010_10BE:
|
||||
return uint32_t(DMABufFormat::FourCC::P010);
|
||||
- case GST_VIDEO_FORMAT_P016_LE:
|
||||
- case GST_VIDEO_FORMAT_P016_BE:
|
||||
- return uint32_t(DMABufFormat::FourCC::P016);
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
From bbc469a2b43531275243850693af65f5f7d11bc6 Mon Sep 17 00:00:00 2001
|
||||
From: Michael Catanzaro <mcatanzaro@redhat.com>
|
||||
Date: Wed, 20 Sep 2023 13:07:44 -0500
|
||||
Subject: [PATCH 1/2] Revert GStreamer 1.18 dependency
|
||||
|
||||
This reverts https://commits.webkit.org/263218@main
|
||||
---
|
||||
.../AudioSourceProviderGStreamer.cpp | 5 +-
|
||||
.../gstreamer/GLVideoSinkGStreamer.cpp | 11 ++--
|
||||
.../gstreamer/GStreamerAudioMixer.cpp | 2 +-
|
||||
.../graphics/gstreamer/GStreamerCommon.cpp | 52 +++++++++++++++++++
|
||||
.../graphics/gstreamer/GStreamerCommon.h | 16 ++++++
|
||||
.../gstreamer/GStreamerRegistryScanner.cpp | 9 +++-
|
||||
.../gstreamer/MediaPlayerPrivateGStreamer.cpp | 46 +++++++++++++---
|
||||
.../gstreamer/MediaPlayerPrivateGStreamer.h | 1 +
|
||||
Source/cmake/GStreamerChecks.cmake | 2 +-
|
||||
9 files changed, 127 insertions(+), 17 deletions(-)
|
||||
|
||||
diff --git a/Source/WebCore/platform/audio/gstreamer/AudioSourceProviderGStreamer.cpp b/Source/WebCore/platform/audio/gstreamer/AudioSourceProviderGStreamer.cpp
|
||||
index a97e6431802c..d8b1a1f4bd8b 100644
|
||||
--- a/Source/WebCore/platform/audio/gstreamer/AudioSourceProviderGStreamer.cpp
|
||||
+++ b/Source/WebCore/platform/audio/gstreamer/AudioSourceProviderGStreamer.cpp
|
||||
@@ -122,7 +122,10 @@ AudioSourceProviderGStreamer::AudioSourceProviderGStreamer(MediaStreamTrackPriva
|
||||
g_signal_connect_swapped(decodebin, "pad-added", G_CALLBACK(+[](AudioSourceProviderGStreamer* provider, GstPad* pad) {
|
||||
auto padCaps = adoptGRef(gst_pad_query_caps(pad, nullptr));
|
||||
bool isAudio = doCapsHaveType(padCaps.get(), "audio");
|
||||
- RELEASE_ASSERT(isAudio);
|
||||
+ if (webkitGstCheckVersion(1, 18, 0))
|
||||
+ RELEASE_ASSERT(isAudio);
|
||||
+ else if (!isAudio)
|
||||
+ return;
|
||||
|
||||
auto sinkPad = adoptGRef(gst_element_get_static_pad(provider->m_audioSinkBin.get(), "sink"));
|
||||
gst_pad_link(pad, sinkPad.get());
|
||||
diff --git a/Source/WebCore/platform/graphics/gstreamer/GLVideoSinkGStreamer.cpp b/Source/WebCore/platform/graphics/gstreamer/GLVideoSinkGStreamer.cpp
|
||||
index 1a7480828861..f3a51be68534 100644
|
||||
--- a/Source/WebCore/platform/graphics/gstreamer/GLVideoSinkGStreamer.cpp
|
||||
+++ b/Source/WebCore/platform/graphics/gstreamer/GLVideoSinkGStreamer.cpp
|
||||
@@ -186,12 +186,13 @@ static void webKitGLVideoSinkGetProperty(GObject* object, guint propertyId, GVal
|
||||
WebKitGLVideoSink* sink = WEBKIT_GL_VIDEO_SINK(object);
|
||||
|
||||
switch (propertyId) {
|
||||
- case PROP_STATS: {
|
||||
- GUniqueOutPtr<GstStructure> stats;
|
||||
- g_object_get(sink->priv->appSink.get(), "stats", &stats.outPtr(), nullptr);
|
||||
- gst_value_set_structure(value, stats.get());
|
||||
+ case PROP_STATS:
|
||||
+ if (webkitGstCheckVersion(1, 18, 0)) {
|
||||
+ GUniqueOutPtr<GstStructure> stats;
|
||||
+ g_object_get(sink->priv->appSink.get(), "stats", &stats.outPtr(), nullptr);
|
||||
+ gst_value_set_structure(value, stats.get());
|
||||
+ }
|
||||
break;
|
||||
- }
|
||||
default:
|
||||
G_OBJECT_WARN_INVALID_PROPERTY_ID(object, propertyId, paramSpec);
|
||||
RELEASE_ASSERT_NOT_REACHED();
|
||||
diff --git a/Source/WebCore/platform/graphics/gstreamer/GStreamerAudioMixer.cpp b/Source/WebCore/platform/graphics/gstreamer/GStreamerAudioMixer.cpp
|
||||
index ad4b1ae3f77e..fb7e617b5d56 100644
|
||||
--- a/Source/WebCore/platform/graphics/gstreamer/GStreamerAudioMixer.cpp
|
||||
+++ b/Source/WebCore/platform/graphics/gstreamer/GStreamerAudioMixer.cpp
|
||||
@@ -32,7 +32,7 @@ GST_DEBUG_CATEGORY_STATIC(webkit_media_gst_audio_mixer_debug);
|
||||
|
||||
bool GStreamerAudioMixer::isAvailable()
|
||||
{
|
||||
- return isGStreamerPluginAvailable("inter") && isGStreamerPluginAvailable("audiomixer");
|
||||
+ return webkitGstCheckVersion(1, 18, 0) && isGStreamerPluginAvailable("inter") && isGStreamerPluginAvailable("audiomixer");
|
||||
}
|
||||
|
||||
GStreamerAudioMixer& GStreamerAudioMixer::singleton()
|
||||
diff --git a/Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.cpp b/Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.cpp
|
||||
index 794beaa6932a..5f6b3826f182 100644
|
||||
--- a/Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.cpp
|
||||
+++ b/Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.cpp
|
||||
@@ -105,6 +105,24 @@ GstPad* webkitGstGhostPadFromStaticTemplate(GstStaticPadTemplate* staticPadTempl
|
||||
return pad;
|
||||
}
|
||||
|
||||
+#if !GST_CHECK_VERSION(1, 18, 0)
|
||||
+void webkitGstVideoFormatInfoComponent(const GstVideoFormatInfo* info, guint plane, gint components[GST_VIDEO_MAX_COMPONENTS])
|
||||
+{
|
||||
+ guint c, i = 0;
|
||||
+
|
||||
+ /* Reverse mapping of info->plane. */
|
||||
+ for (c = 0; c < GST_VIDEO_FORMAT_INFO_N_COMPONENTS(info); c++) {
|
||||
+ if (GST_VIDEO_FORMAT_INFO_PLANE(info, c) == plane) {
|
||||
+ components[i] = c;
|
||||
+ i++;
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ for (c = i; c < GST_VIDEO_MAX_COMPONENTS; c++)
|
||||
+ components[c] = -1;
|
||||
+}
|
||||
+#endif
|
||||
+
|
||||
#if ENABLE(VIDEO)
|
||||
bool getVideoSizeAndFormatFromCaps(const GstCaps* caps, WebCore::IntSize& size, GstVideoFormat& format, int& pixelAspectRatioNumerator, int& pixelAspectRatioDenominator, int& stride)
|
||||
{
|
||||
@@ -748,6 +766,36 @@ String gstStructureToJSONString(const GstStructure* structure)
|
||||
return value->toJSONString();
|
||||
}
|
||||
|
||||
+#if !GST_CHECK_VERSION(1, 18, 0)
|
||||
+GstClockTime webkitGstElementGetCurrentRunningTime(GstElement* element)
|
||||
+{
|
||||
+ g_return_val_if_fail(GST_IS_ELEMENT(element), GST_CLOCK_TIME_NONE);
|
||||
+
|
||||
+ auto baseTime = gst_element_get_base_time(element);
|
||||
+ if (!GST_CLOCK_TIME_IS_VALID(baseTime)) {
|
||||
+ GST_DEBUG_OBJECT(element, "Could not determine base time");
|
||||
+ return GST_CLOCK_TIME_NONE;
|
||||
+ }
|
||||
+
|
||||
+ auto clock = adoptGRef(gst_element_get_clock(element));
|
||||
+ if (!clock) {
|
||||
+ GST_DEBUG_OBJECT(element, "Element has no clock");
|
||||
+ return GST_CLOCK_TIME_NONE;
|
||||
+ }
|
||||
+
|
||||
+ auto clockTime = gst_clock_get_time(clock.get());
|
||||
+ if (!GST_CLOCK_TIME_IS_VALID(clockTime))
|
||||
+ return GST_CLOCK_TIME_NONE;
|
||||
+
|
||||
+ if (clockTime < baseTime) {
|
||||
+ GST_DEBUG_OBJECT(element, "Got negative current running time");
|
||||
+ return GST_CLOCK_TIME_NONE;
|
||||
+ }
|
||||
+
|
||||
+ return clockTime - baseTime;
|
||||
+}
|
||||
+#endif
|
||||
+
|
||||
GstClockTime webkitGstInitTime()
|
||||
{
|
||||
return s_webkitGstInitTime;
|
||||
@@ -805,6 +853,7 @@ PlatformVideoColorSpace videoColorSpaceFromInfo(const GstVideoInfo& info)
|
||||
case GST_VIDEO_TRANSFER_BT709:
|
||||
colorSpace.transfer = PlatformVideoTransferCharacteristics::Bt709;
|
||||
break;
|
||||
+#if GST_CHECK_VERSION(1, 18, 0)
|
||||
case GST_VIDEO_TRANSFER_BT601:
|
||||
colorSpace.transfer = PlatformVideoTransferCharacteristics::Smpte170m;
|
||||
break;
|
||||
@@ -817,6 +866,7 @@ PlatformVideoColorSpace videoColorSpaceFromInfo(const GstVideoInfo& info)
|
||||
case GST_VIDEO_TRANSFER_BT2020_10:
|
||||
colorSpace.transfer = PlatformVideoTransferCharacteristics::Bt2020_10bit;
|
||||
break;
|
||||
+#endif
|
||||
case GST_VIDEO_TRANSFER_BT2020_12:
|
||||
colorSpace.transfer = PlatformVideoTransferCharacteristics::Bt2020_12bit;
|
||||
break;
|
||||
@@ -935,6 +985,7 @@ void fillVideoInfoColorimetryFromColorSpace(GstVideoInfo* info, const PlatformVi
|
||||
case PlatformVideoTransferCharacteristics::Bt709:
|
||||
GST_VIDEO_INFO_COLORIMETRY(info).transfer = GST_VIDEO_TRANSFER_BT709;
|
||||
break;
|
||||
+#if GST_CHECK_VERSION(1, 18, 0)
|
||||
case PlatformVideoTransferCharacteristics::Smpte170m:
|
||||
GST_VIDEO_INFO_COLORIMETRY(info).transfer = GST_VIDEO_TRANSFER_BT601;
|
||||
break;
|
||||
@@ -947,6 +998,7 @@ void fillVideoInfoColorimetryFromColorSpace(GstVideoInfo* info, const PlatformVi
|
||||
case PlatformVideoTransferCharacteristics::Bt2020_10bit:
|
||||
GST_VIDEO_INFO_COLORIMETRY(info).transfer = GST_VIDEO_TRANSFER_BT2020_10;
|
||||
break;
|
||||
+#endif
|
||||
case PlatformVideoTransferCharacteristics::Bt2020_12bit:
|
||||
GST_VIDEO_INFO_COLORIMETRY(info).transfer = GST_VIDEO_TRANSFER_BT2020_12;
|
||||
break;
|
||||
diff --git a/Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.h b/Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.h
|
||||
index fae7ef96d6c5..65ef4bfefdaa 100644
|
||||
--- a/Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.h
|
||||
+++ b/Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.h
|
||||
@@ -56,6 +56,15 @@ inline bool webkitGstCheckVersion(guint major, guint minor, guint micro)
|
||||
return true;
|
||||
}
|
||||
|
||||
+// gst_video_format_info_component() is GStreamer 1.18 API, so for older versions we use a local
|
||||
+// vendored copy of the function.
|
||||
+#if !GST_CHECK_VERSION(1, 18, 0)
|
||||
+#define GST_VIDEO_MAX_COMPONENTS 4
|
||||
+void webkitGstVideoFormatInfoComponent(const GstVideoFormatInfo*, guint, gint components[GST_VIDEO_MAX_COMPONENTS]);
|
||||
+
|
||||
+#define gst_video_format_info_component webkitGstVideoFormatInfoComponent
|
||||
+#endif
|
||||
+
|
||||
#define GST_VIDEO_CAPS_TYPE_PREFIX "video/"
|
||||
#define GST_AUDIO_CAPS_TYPE_PREFIX "audio/"
|
||||
#define GST_TEXT_CAPS_TYPE_PREFIX "text/"
|
||||
@@ -323,6 +332,13 @@ GstElement* makeGStreamerBin(const char* description, bool ghostUnlinkedPads);
|
||||
|
||||
String gstStructureToJSONString(const GstStructure*);
|
||||
|
||||
+// gst_element_get_current_running_time() is GStreamer 1.18 API, so for older versions we use a local
|
||||
+// vendored copy of the function.
|
||||
+#if !GST_CHECK_VERSION(1, 18, 0)
|
||||
+GstClockTime webkitGstElementGetCurrentRunningTime(GstElement*);
|
||||
+#define gst_element_get_current_running_time webkitGstElementGetCurrentRunningTime
|
||||
+#endif
|
||||
+
|
||||
GstClockTime webkitGstInitTime();
|
||||
|
||||
PlatformVideoColorSpace videoColorSpaceFromCaps(const GstCaps*);
|
||||
diff --git a/Source/WebCore/platform/graphics/gstreamer/GStreamerRegistryScanner.cpp b/Source/WebCore/platform/graphics/gstreamer/GStreamerRegistryScanner.cpp
|
||||
index 7cd1926e6d15..032f086b43c0 100644
|
||||
--- a/Source/WebCore/platform/graphics/gstreamer/GStreamerRegistryScanner.cpp
|
||||
+++ b/Source/WebCore/platform/graphics/gstreamer/GStreamerRegistryScanner.cpp
|
||||
@@ -900,8 +900,13 @@ GStreamerRegistryScanner::CodecLookupResult GStreamerRegistryScanner::isAVC1Code
|
||||
return checkH264Caps(makeString("video/x-h264, level=(string)", maxLevelString).utf8().data());
|
||||
}
|
||||
|
||||
- GST_DEBUG("Checking video decoders for constrained caps");
|
||||
- return checkH264Caps(makeString("video/x-h264, level=(string)", level, ", profile=(string)", profile).utf8().data());
|
||||
+ if (webkitGstCheckVersion(1, 18, 0)) {
|
||||
+ GST_DEBUG("Checking video decoders for constrained caps");
|
||||
+ return checkH264Caps(makeString("video/x-h264, level=(string)", level, ", profile=(string)", profile).utf8().data());
|
||||
+ }
|
||||
+
|
||||
+ GST_DEBUG("Falling back to unconstrained caps");
|
||||
+ return checkH264Caps("video/x-h264");
|
||||
}
|
||||
|
||||
const char* GStreamerRegistryScanner::configurationNameForLogging(Configuration configuration) const
|
||||
diff --git a/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp b/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp
|
||||
index aad2c0bc432b..77a0d6507240 100644
|
||||
--- a/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp
|
||||
+++ b/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp
|
||||
@@ -4114,7 +4114,29 @@ GstElement* MediaPlayerPrivateGStreamer::createVideoSink()
|
||||
g_signal_connect_swapped(m_videoSink.get(), "repaint-cancelled", G_CALLBACK(repaintCancelledCallback), this);
|
||||
}
|
||||
|
||||
- return m_videoSink.get();
|
||||
+ GstElement* videoSink = nullptr;
|
||||
+ if (!webkitGstCheckVersion(1, 18, 0)) {
|
||||
+ m_fpsSink = makeGStreamerElement("fpsdisplaysink", "sink");
|
||||
+ if (m_fpsSink) {
|
||||
+ g_object_set(m_fpsSink.get(), "silent", TRUE , nullptr);
|
||||
+
|
||||
+ // Turn off text overlay unless tracing is enabled.
|
||||
+ if (gst_debug_category_get_threshold(webkit_media_player_debug) < GST_LEVEL_TRACE)
|
||||
+ g_object_set(m_fpsSink.get(), "text-overlay", FALSE , nullptr);
|
||||
+
|
||||
+ if (gstObjectHasProperty(m_fpsSink.get(), "video-sink")) {
|
||||
+ g_object_set(m_fpsSink.get(), "video-sink", m_videoSink.get(), nullptr);
|
||||
+ videoSink = m_fpsSink.get();
|
||||
+ } else
|
||||
+ m_fpsSink = nullptr;
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ if (!m_fpsSink)
|
||||
+ videoSink = m_videoSink.get();
|
||||
+
|
||||
+ ASSERT(videoSink);
|
||||
+ return videoSink;
|
||||
}
|
||||
|
||||
void MediaPlayerPrivateGStreamer::setStreamVolumeElement(GstStreamVolume* volume)
|
||||
@@ -4147,16 +4169,26 @@ bool MediaPlayerPrivateGStreamer::updateVideoSinkStatistics()
|
||||
if (!m_videoSink)
|
||||
return false;
|
||||
|
||||
+ if (!webkitGstCheckVersion(1, 18, 0) && !m_fpsSink)
|
||||
+ return false;
|
||||
+
|
||||
uint64_t totalVideoFrames = 0;
|
||||
uint64_t droppedVideoFrames = 0;
|
||||
- GUniqueOutPtr<GstStructure> stats;
|
||||
- g_object_get(m_videoSink.get(), "stats", &stats.outPtr(), nullptr);
|
||||
+ if (webkitGstCheckVersion(1, 18, 0)) {
|
||||
+ GUniqueOutPtr<GstStructure> stats;
|
||||
+ g_object_get(m_videoSink.get(), "stats", &stats.outPtr(), nullptr);
|
||||
|
||||
- if (!gst_structure_get_uint64(stats.get(), "rendered", &totalVideoFrames))
|
||||
- return false;
|
||||
+ if (!gst_structure_get_uint64(stats.get(), "rendered", &totalVideoFrames))
|
||||
+ return false;
|
||||
|
||||
- if (!gst_structure_get_uint64(stats.get(), "dropped", &droppedVideoFrames))
|
||||
- return false;
|
||||
+ if (!gst_structure_get_uint64(stats.get(), "dropped", &droppedVideoFrames))
|
||||
+ return false;
|
||||
+ } else if (m_fpsSink) {
|
||||
+ unsigned renderedFrames, droppedFrames;
|
||||
+ g_object_get(m_fpsSink.get(), "frames-rendered", &renderedFrames, "frames-dropped", &droppedFrames, nullptr);
|
||||
+ totalVideoFrames = renderedFrames;
|
||||
+ droppedVideoFrames = droppedFrames;
|
||||
+ }
|
||||
|
||||
// Caching is required so that metrics queries performed after EOS still return valid values.
|
||||
if (totalVideoFrames)
|
||||
diff --git a/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h b/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h
|
||||
index e0cdb0a2d01f..f33a674481e1 100644
|
||||
--- a/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h
|
||||
+++ b/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h
|
||||
@@ -578,6 +578,7 @@ private:
|
||||
uint64_t m_networkReadPosition { 0 };
|
||||
mutable uint64_t m_readPositionAtLastDidLoadingProgress { 0 };
|
||||
|
||||
+ GRefPtr<GstElement> m_fpsSink { nullptr };
|
||||
uint64_t m_totalVideoFrames { 0 };
|
||||
uint64_t m_droppedVideoFrames { 0 };
|
||||
uint64_t m_decodedVideoFrames { 0 };
|
||||
diff --git a/Source/cmake/GStreamerChecks.cmake b/Source/cmake/GStreamerChecks.cmake
|
||||
index 5380617afc9c..8774f1d2aca8 100644
|
||||
--- a/Source/cmake/GStreamerChecks.cmake
|
||||
+++ b/Source/cmake/GStreamerChecks.cmake
|
||||
@@ -36,7 +36,7 @@ if (ENABLE_VIDEO OR ENABLE_WEB_AUDIO)
|
||||
list(APPEND GSTREAMER_COMPONENTS webrtc)
|
||||
endif ()
|
||||
|
||||
- find_package(GStreamer 1.18.4 REQUIRED COMPONENTS ${GSTREAMER_COMPONENTS})
|
||||
+ find_package(GStreamer 1.16.2 REQUIRED COMPONENTS ${GSTREAMER_COMPONENTS})
|
||||
|
||||
if (ENABLE_WEB_AUDIO)
|
||||
if (NOT PC_GSTREAMER_AUDIO_FOUND OR NOT PC_GSTREAMER_FFT_FOUND)
|
||||
--
|
||||
2.41.0
|
||||
|
||||
From 9046961d80cc168aab253e3e0eda2268bd956293 Mon Sep 17 00:00:00 2001
|
||||
From: Michael Catanzaro <mcatanzaro@redhat.com>
|
||||
Date: Wed, 20 Sep 2023 13:09:28 -0500
|
||||
Subject: [PATCH 2/2] Revert GStreamer 1.16 dependency
|
||||
|
||||
This (mostly) reverts https://commits.webkit.org/256284@main
|
||||
---
|
||||
.../gstreamer/GLVideoSinkGStreamer.cpp | 20 ++++++++++++++++++-
|
||||
.../gstreamer/eme/GStreamerEMEUtilities.h | 10 ++++++++++
|
||||
...bKitCommonEncryptionDecryptorGStreamer.cpp | 7 +++++--
|
||||
Source/cmake/GStreamerChecks.cmake | 2 +-
|
||||
4 files changed, 35 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/Source/WebCore/platform/graphics/gstreamer/GLVideoSinkGStreamer.cpp b/Source/WebCore/platform/graphics/gstreamer/GLVideoSinkGStreamer.cpp
|
||||
index f3a51be68534..bf8ebeda1725 100644
|
||||
--- a/Source/WebCore/platform/graphics/gstreamer/GLVideoSinkGStreamer.cpp
|
||||
+++ b/Source/WebCore/platform/graphics/gstreamer/GLVideoSinkGStreamer.cpp
|
||||
@@ -88,7 +88,25 @@ static void webKitGLVideoSinkConstructed(GObject* object)
|
||||
ASSERT(colorconvert);
|
||||
gst_bin_add_many(GST_BIN_CAST(sink), upload, colorconvert, sink->priv->appSink.get(), nullptr);
|
||||
|
||||
- GRefPtr<GstCaps> caps = adoptGRef(gst_caps_from_string("video/x-raw, format = (string) " GST_GL_CAPS_FORMAT));
|
||||
+ // Workaround until we can depend on GStreamer 1.16.2.
|
||||
+ // https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/commit/8d32de090554cf29fe359f83aa46000ba658a693
|
||||
+ // Forcing a color conversion to RGBA here allows glupload to internally use
|
||||
+ // an uploader that adds a VideoMeta, through the TextureUploadMeta caps
|
||||
+ // feature, without needing the patch above. However this specific caps
|
||||
+ // feature is going to be removed from GStreamer so it is considered a
|
||||
+ // short-term workaround. This code path most likely will have a negative
|
||||
+ // performance impact on embedded platforms as well. Downstream embedders
|
||||
+ // are highly encouraged to cherry-pick the patch linked above in their BSP
|
||||
+ // and set the WEBKIT_GST_NO_RGBA_CONVERSION environment variable until
|
||||
+ // GStreamer 1.16.2 is released.
|
||||
+ // See also https://bugs.webkit.org/show_bug.cgi?id=201422
|
||||
+ GRefPtr<GstCaps> caps;
|
||||
+ if (webkitGstCheckVersion(1, 16, 2) || getenv("WEBKIT_GST_NO_RGBA_CONVERSION"))
|
||||
+ caps = adoptGRef(gst_caps_from_string("video/x-raw, format = (string) " GST_GL_CAPS_FORMAT));
|
||||
+ else {
|
||||
+ GST_INFO_OBJECT(sink, "Forcing RGBA as GStreamer is not new enough.");
|
||||
+ caps = adoptGRef(gst_caps_from_string("video/x-raw, format = (string) RGBA"));
|
||||
+ }
|
||||
gst_caps_set_features(caps.get(), 0, gst_caps_features_new(GST_CAPS_FEATURE_MEMORY_GL_MEMORY, nullptr));
|
||||
g_object_set(sink->priv->appSink.get(), "caps", caps.get(), nullptr);
|
||||
|
||||
diff --git a/Source/WebCore/platform/graphics/gstreamer/eme/GStreamerEMEUtilities.h b/Source/WebCore/platform/graphics/gstreamer/eme/GStreamerEMEUtilities.h
|
||||
index 6dbf6a67dfd1..184c5c3e5f77 100644
|
||||
--- a/Source/WebCore/platform/graphics/gstreamer/eme/GStreamerEMEUtilities.h
|
||||
+++ b/Source/WebCore/platform/graphics/gstreamer/eme/GStreamerEMEUtilities.h
|
||||
@@ -61,8 +61,10 @@ public:
|
||||
const String& systemId() const { return m_systemId; }
|
||||
String payloadContainerType() const
|
||||
{
|
||||
+#if GST_CHECK_VERSION(1, 16, 0)
|
||||
if (m_systemId == GST_PROTECTION_UNSPECIFIED_SYSTEM_ID ""_s)
|
||||
return "webm"_s;
|
||||
+#endif
|
||||
return "cenc"_s;
|
||||
}
|
||||
|
||||
@@ -111,8 +113,10 @@ public:
|
||||
static constexpr auto s_WidevineKeySystem = "com.widevine.alpha"_s;
|
||||
static constexpr auto s_PlayReadyUUID = WEBCORE_GSTREAMER_EME_UTILITIES_PLAYREADY_UUID ""_s;
|
||||
static constexpr std::array<ASCIILiteral, 2> s_PlayReadyKeySystems = { "com.microsoft.playready"_s, "com.youtube.playready"_s };
|
||||
+#if GST_CHECK_VERSION(1, 16, 0)
|
||||
static constexpr auto s_unspecifiedUUID = GST_PROTECTION_UNSPECIFIED_SYSTEM_ID ""_s;
|
||||
static constexpr auto s_unspecifiedKeySystem = GST_PROTECTION_UNSPECIFIED_SYSTEM_ID ""_s;
|
||||
+#endif
|
||||
|
||||
static bool isClearKeyKeySystem(const String& keySystem)
|
||||
{
|
||||
@@ -144,6 +148,7 @@ public:
|
||||
return equalIgnoringASCIICase(uuid, s_PlayReadyUUID);
|
||||
}
|
||||
|
||||
+#if GST_CHECK_VERSION(1, 16, 0)
|
||||
static bool isUnspecifiedKeySystem(const String& keySystem)
|
||||
{
|
||||
return equalIgnoringASCIICase(keySystem, s_unspecifiedKeySystem);
|
||||
@@ -153,6 +158,7 @@ public:
|
||||
{
|
||||
return equalIgnoringASCIICase(uuid, s_unspecifiedUUID);
|
||||
}
|
||||
+#endif
|
||||
|
||||
static const char* keySystemToUuid(const String& keySystem)
|
||||
{
|
||||
@@ -165,8 +171,10 @@ public:
|
||||
if (isPlayReadyKeySystem(keySystem))
|
||||
return s_PlayReadyUUID;
|
||||
|
||||
+#if GST_CHECK_VERSION(1, 16, 0)
|
||||
if (isUnspecifiedKeySystem(keySystem))
|
||||
return s_unspecifiedUUID;
|
||||
+#endif
|
||||
|
||||
ASSERT_NOT_REACHED();
|
||||
return { };
|
||||
@@ -183,8 +191,10 @@ public:
|
||||
if (isPlayReadyUUID(uuid))
|
||||
return s_PlayReadyKeySystems[0];
|
||||
|
||||
+#if GST_CHECK_VERSION(1, 16, 0)
|
||||
if (isUnspecifiedUUID(uuid))
|
||||
return s_unspecifiedKeySystem;
|
||||
+#endif
|
||||
|
||||
ASSERT_NOT_REACHED();
|
||||
return ""_s;
|
||||
diff --git a/Source/WebCore/platform/graphics/gstreamer/eme/WebKitCommonEncryptionDecryptorGStreamer.cpp b/Source/WebCore/platform/graphics/gstreamer/eme/WebKitCommonEncryptionDecryptorGStreamer.cpp
|
||||
index 0cde37e1f83f..a7bbf7fc569c 100644
|
||||
--- a/Source/WebCore/platform/graphics/gstreamer/eme/WebKitCommonEncryptionDecryptorGStreamer.cpp
|
||||
+++ b/Source/WebCore/platform/graphics/gstreamer/eme/WebKitCommonEncryptionDecryptorGStreamer.cpp
|
||||
@@ -171,8 +171,11 @@ static GstCaps* transformCaps(GstBaseTransform* base, GstPadDirection direction,
|
||||
|
||||
// GST_PROTECTION_UNSPECIFIED_SYSTEM_ID was added in the GStreamer
|
||||
// developement git master which will ship as version 1.16.0.
|
||||
- gst_structure_set_name(outgoingStructure.get(), !g_strcmp0(klass->protectionSystemId(self),
|
||||
- GST_PROTECTION_UNSPECIFIED_SYSTEM_ID) ? "application/x-webm-enc" : "application/x-cenc");
|
||||
+ gst_structure_set_name(outgoingStructure.get(),
|
||||
+#if GST_CHECK_VERSION(1, 16, 0)
|
||||
+ !g_strcmp0(klass->protectionSystemId(self), GST_PROTECTION_UNSPECIFIED_SYSTEM_ID) ? "application/x-webm-enc" :
|
||||
+#endif
|
||||
+ "application/x-cenc");
|
||||
}
|
||||
}
|
||||
|
||||
diff --git a/Source/cmake/GStreamerChecks.cmake b/Source/cmake/GStreamerChecks.cmake
|
||||
index 8774f1d2aca8..d43093ec7824 100644
|
||||
--- a/Source/cmake/GStreamerChecks.cmake
|
||||
+++ b/Source/cmake/GStreamerChecks.cmake
|
||||
@@ -36,7 +36,7 @@ if (ENABLE_VIDEO OR ENABLE_WEB_AUDIO)
|
||||
list(APPEND GSTREAMER_COMPONENTS webrtc)
|
||||
endif ()
|
||||
|
||||
- find_package(GStreamer 1.16.2 REQUIRED COMPONENTS ${GSTREAMER_COMPONENTS})
|
||||
+ find_package(GStreamer 1.14.0 REQUIRED COMPONENTS ${GSTREAMER_COMPONENTS})
|
||||
|
||||
if (ENABLE_WEB_AUDIO)
|
||||
if (NOT PC_GSTREAMER_AUDIO_FOUND OR NOT PC_GSTREAMER_FFT_FOUND)
|
||||
--
|
||||
2.41.0
|
||||
|
||||
@ -1,524 +0,0 @@
|
||||
From 757b61bda6fa34c3bd2de45eeccc976b10c5b035 Mon Sep 17 00:00:00 2001
|
||||
From: Michael Catanzaro <mcatanzaro@redhat.com>
|
||||
Date: Fri, 4 Apr 2025 14:00:12 -0500
|
||||
Subject: [PATCH] Build against GStreamer 1.16
|
||||
|
||||
---
|
||||
.../AudioSourceProviderGStreamer.cpp | 3 +-
|
||||
.../gstreamer/GLVideoSinkGStreamer.cpp | 36 ++++----
|
||||
.../gstreamer/GStreamerAudioMixer.cpp | 2 +-
|
||||
.../graphics/gstreamer/GStreamerCommon.cpp | 82 +++++++++++++------
|
||||
.../graphics/gstreamer/GStreamerCommon.h | 15 ++++
|
||||
.../gstreamer/MediaPlayerPrivateGStreamer.cpp | 30 +------
|
||||
.../CoordinatedPlatformLayerBufferVideo.cpp | 14 +---
|
||||
.../gstreamer/GStreamerCodecUtilities.cpp | 39 +++++----
|
||||
.../VideoEncoderPrivateGStreamer.cpp | 16 ----
|
||||
Source/cmake/GStreamerChecks.cmake | 4 +-
|
||||
10 files changed, 121 insertions(+), 120 deletions(-)
|
||||
|
||||
diff --git a/Source/WebCore/platform/audio/gstreamer/AudioSourceProviderGStreamer.cpp b/Source/WebCore/platform/audio/gstreamer/AudioSourceProviderGStreamer.cpp
|
||||
index 33037a80b0ca..20c3cdc80b31 100644
|
||||
--- a/Source/WebCore/platform/audio/gstreamer/AudioSourceProviderGStreamer.cpp
|
||||
+++ b/Source/WebCore/platform/audio/gstreamer/AudioSourceProviderGStreamer.cpp
|
||||
@@ -141,7 +141,8 @@ AudioSourceProviderGStreamer::AudioSourceProviderGStreamer(MediaStreamTrackPriva
|
||||
g_signal_connect_swapped(decodebin, "pad-added", G_CALLBACK(+[](AudioSourceProviderGStreamer* provider, GstPad* pad) {
|
||||
auto padCaps = adoptGRef(gst_pad_query_caps(pad, nullptr));
|
||||
bool isAudio = doCapsHaveType(padCaps.get(), "audio"_s);
|
||||
- RELEASE_ASSERT(isAudio);
|
||||
+ if (!isAudio)
|
||||
+ return;
|
||||
|
||||
auto sinkPad = adoptGRef(gst_element_get_static_pad(provider->m_audioSinkBin.get(), "sink"));
|
||||
gst_pad_link(pad, sinkPad.get());
|
||||
diff --git a/Source/WebCore/platform/graphics/gstreamer/GLVideoSinkGStreamer.cpp b/Source/WebCore/platform/graphics/gstreamer/GLVideoSinkGStreamer.cpp
|
||||
index f247b617d9c3..eadb3b0e97ba 100644
|
||||
--- a/Source/WebCore/platform/graphics/gstreamer/GLVideoSinkGStreamer.cpp
|
||||
+++ b/Source/WebCore/platform/graphics/gstreamer/GLVideoSinkGStreamer.cpp
|
||||
@@ -70,20 +70,10 @@ WEBKIT_DEFINE_TYPE_WITH_CODE(WebKitGLVideoSink, webkit_gl_video_sink, GST_TYPE_B
|
||||
GST_DEBUG_CATEGORY_INIT(webkit_gl_video_sink_debug, "webkitglvideosink", 0, "GL video sink element"))
|
||||
|
||||
#if USE(GBM)
|
||||
-static bool s_isDMABufDisabled;
|
||||
+static bool s_isDMABufDisabled = true;
|
||||
|
||||
static void initializeDMABufAvailability()
|
||||
{
|
||||
- static std::once_flag onceFlag;
|
||||
- std::call_once(onceFlag, [] {
|
||||
- if (!gst_check_version(1, 20, 0))
|
||||
- return;
|
||||
-
|
||||
- auto value = CStringView::unsafeFromUTF8(g_getenv("WEBKIT_GST_DMABUF_SINK_DISABLED"));
|
||||
- s_isDMABufDisabled = !value.isEmpty() && (equalLettersIgnoringASCIICase(value.span(), "true"_s) || equalLettersIgnoringASCIICase(value.span(), "1"_s));
|
||||
- if (!s_isDMABufDisabled && !DRMDeviceManager::singleton().mainGBMDevice(DRMDeviceManager::NodeType::Render))
|
||||
- s_isDMABufDisabled = true;
|
||||
- });
|
||||
}
|
||||
#endif
|
||||
|
||||
@@ -129,7 +119,19 @@ static void webKitGLVideoSinkConstructed(GObject* object)
|
||||
if (!s_isDMABufDisabled)
|
||||
gst_caps_append(caps.get(), buildDMABufCaps().leakRef());
|
||||
#endif
|
||||
- GRefPtr<GstCaps> glCaps = adoptGRef(gst_caps_from_string("video/x-raw, format = (string) " GST_GL_CAPS_FORMAT));
|
||||
+ // Workaround until we can depend on GStreamer 1.16.2.
|
||||
+ // https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/commit/8d32de090554cf29fe359f83aa46000ba658a693
|
||||
+ // Forcing a color conversion to RGBA here allows glupload to internally use
|
||||
+ // an uploader that adds a VideoMeta, through the TextureUploadMeta caps
|
||||
+ // feature, without needing the patch above. However this specific caps
|
||||
+ // feature is going to be removed from GStreamer so it is considered a
|
||||
+ // short-term workaround. This code path most likely will have a negative
|
||||
+ // performance impact on embedded platforms as well. Downstream embedders
|
||||
+ // are highly encouraged to cherry-pick the patch linked above in their BSP
|
||||
+ // and set the WEBKIT_GST_NO_RGBA_CONVERSION environment variable until
|
||||
+ // GStreamer 1.16.2 is released.
|
||||
+ // See also https://bugs.webkit.org/show_bug.cgi?id=201422
|
||||
+ GRefPtr<GstCaps> glCaps = adoptGRef(gst_caps_from_string("video/x-raw, format = (string) RGBA"));
|
||||
gst_caps_set_features(glCaps.get(), 0, gst_caps_features_new(GST_CAPS_FEATURE_MEMORY_GL_MEMORY, nullptr));
|
||||
gst_caps_append(caps.get(), glCaps.leakRef());
|
||||
|
||||
@@ -171,17 +173,11 @@ static GstStateChangeReturn webKitGLVideoSinkChangeState(GstElement* element, Gs
|
||||
return GST_ELEMENT_CLASS(webkit_gl_video_sink_parent_class)->change_state(element, transition);
|
||||
}
|
||||
|
||||
-static void webKitGLVideoSinkGetProperty(GObject* object, guint propertyId, GValue* value, GParamSpec* paramSpec)
|
||||
+static void webKitGLVideoSinkGetProperty(GObject* object, guint propertyId, GValue*, GParamSpec* paramSpec)
|
||||
{
|
||||
- WebKitGLVideoSink* sink = WEBKIT_GL_VIDEO_SINK(object);
|
||||
-
|
||||
switch (propertyId) {
|
||||
- case WEBKIT_GL_VIDEO_SINK_PROP_STATS: {
|
||||
- GUniqueOutPtr<GstStructure> stats;
|
||||
- g_object_get(sink->priv->appSink.get(), "stats", &stats.outPtr(), nullptr);
|
||||
- gst_value_set_structure(value, stats.get());
|
||||
+ case WEBKIT_GL_VIDEO_SINK_PROP_STATS:
|
||||
break;
|
||||
- }
|
||||
default:
|
||||
G_OBJECT_WARN_INVALID_PROPERTY_ID(object, propertyId, paramSpec);
|
||||
RELEASE_ASSERT_NOT_REACHED();
|
||||
diff --git a/Source/WebCore/platform/graphics/gstreamer/GStreamerAudioMixer.cpp b/Source/WebCore/platform/graphics/gstreamer/GStreamerAudioMixer.cpp
|
||||
index afbe4777dbc7..d414525f0cb6 100644
|
||||
--- a/Source/WebCore/platform/graphics/gstreamer/GStreamerAudioMixer.cpp
|
||||
+++ b/Source/WebCore/platform/graphics/gstreamer/GStreamerAudioMixer.cpp
|
||||
@@ -32,7 +32,7 @@ GST_DEBUG_CATEGORY_STATIC(webkit_media_gst_audio_mixer_debug);
|
||||
|
||||
bool GStreamerAudioMixer::isAvailable()
|
||||
{
|
||||
- return isGStreamerPluginAvailable("inter"_s) && isGStreamerPluginAvailable("audiomixer"_s);
|
||||
+ return false;
|
||||
}
|
||||
|
||||
GStreamerAudioMixer& GStreamerAudioMixer::singleton()
|
||||
diff --git a/Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.cpp b/Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.cpp
|
||||
index a78ef36c5eec..de77a6ef4760 100644
|
||||
--- a/Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.cpp
|
||||
+++ b/Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.cpp
|
||||
@@ -137,6 +137,25 @@ static GstClockTime s_webkitGstInitTime;
|
||||
}
|
||||
|
||||
#if ENABLE(VIDEO)
|
||||
+
|
||||
+#if !GST_CHECK_VERSION(1, 18, 0)
|
||||
+void webkitGstVideoFormatInfoComponent(const GstVideoFormatInfo* info, guint plane, gint components[GST_VIDEO_MAX_COMPONENTS])
|
||||
+{
|
||||
+ guint c, i = 0;
|
||||
+
|
||||
+ /* Reverse mapping of info->plane. */
|
||||
+ for (c = 0; c < GST_VIDEO_FORMAT_INFO_N_COMPONENTS(info); c++) {
|
||||
+ if (GST_VIDEO_FORMAT_INFO_PLANE(info, c) == plane) {
|
||||
+ components[i] = c;
|
||||
+ i++;
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ for (c = i; c < GST_VIDEO_MAX_COMPONENTS; c++)
|
||||
+ components[c] = -1;
|
||||
+}
|
||||
+#endif
|
||||
+
|
||||
bool getVideoSizeAndFormatFromCaps(const GstCaps* caps, WebCore::IntSize& size, GstVideoFormat& format, int& pixelAspectRatioNumerator, int& pixelAspectRatioDenominator, int& stride, double& frameRate, PlatformVideoColorSpace& colorSpace)
|
||||
{
|
||||
if (!doCapsHaveType(caps, GST_VIDEO_CAPS_TYPE_PREFIX)) {
|
||||
@@ -725,31 +744,6 @@ void deinitializeGStreamer()
|
||||
teardownVideoEncoderSingleton();
|
||||
teardownGStreamerImageDecoders();
|
||||
#endif
|
||||
-
|
||||
- bool isLeaksTracerActive = false;
|
||||
- auto activeTracers = gst_tracing_get_active_tracers();
|
||||
- while (activeTracers) {
|
||||
- auto tracer = adoptGRef(GST_TRACER_CAST(activeTracers->data));
|
||||
- if (!isLeaksTracerActive && equal(unsafeSpan(G_OBJECT_TYPE_NAME(G_OBJECT(tracer.get()))), "GstLeaksTracer"_s))
|
||||
- isLeaksTracerActive = true;
|
||||
- activeTracers = g_list_delete_link(activeTracers, activeTracers);
|
||||
- }
|
||||
-
|
||||
- if (!isLeaksTracerActive)
|
||||
- return;
|
||||
-
|
||||
- // Make sure there is no active pipeline left. Those might trigger deadlocks during gst_deinit().
|
||||
- {
|
||||
- Locker locker { s_activePipelinesMapLock };
|
||||
- for (auto& pipeline : activePipelinesMap().values()) {
|
||||
- GST_DEBUG("Pipeline %" GST_PTR_FORMAT " was left running. Forcing clean-up.", pipeline.get());
|
||||
- disconnectSimpleBusMessageCallback(pipeline.get());
|
||||
- gst_element_set_state(pipeline.get(), GST_STATE_NULL);
|
||||
- }
|
||||
- activePipelinesMap().clear();
|
||||
- }
|
||||
-
|
||||
- gst_deinit();
|
||||
}
|
||||
|
||||
unsigned getGstPlayFlag(ASCIILiteral nick)
|
||||
@@ -839,7 +833,7 @@ GstMappedFrame::GstMappedFrame(const GRefPtr<GstSample>& sample, GstMapFlags fla
|
||||
return;
|
||||
|
||||
gst_video_alignment_reset(&m_alignment);
|
||||
- gst_video_info_align_full(&info, &m_alignment, m_planeSizes.data());
|
||||
+ gst_video_info_align(&info, &m_alignment);
|
||||
}
|
||||
|
||||
GstMappedFrame::~GstMappedFrame()
|
||||
@@ -918,6 +912,8 @@ int GstMappedFrame::planeStride(uint32_t planeIndex) const
|
||||
return GST_VIDEO_FRAME_PLANE_STRIDE(&m_frame, planeIndex);
|
||||
}
|
||||
|
||||
+#define GST_VIDEO_INFO_PLANE_HEIGHT(i,p,sizes) ((i)->stride[p] == 0 ? 0 : sizes[p] / (i)->stride[p])
|
||||
+
|
||||
size_t GstMappedFrame::planeHeight(uint32_t planeIndex) const
|
||||
{
|
||||
RELEASE_ASSERT(isValid());
|
||||
@@ -1611,6 +1607,36 @@ String gstStructureToJSONString(const GstStructure* structure)
|
||||
return value->toJSONString();
|
||||
}
|
||||
|
||||
+#if !GST_CHECK_VERSION(1, 18, 0)
|
||||
+GstClockTime webkitGstElementGetCurrentRunningTime(GstElement* element)
|
||||
+{
|
||||
+ g_return_val_if_fail(GST_IS_ELEMENT(element), GST_CLOCK_TIME_NONE);
|
||||
+
|
||||
+ auto baseTime = gst_element_get_base_time(element);
|
||||
+ if (!GST_CLOCK_TIME_IS_VALID(baseTime)) {
|
||||
+ GST_DEBUG_OBJECT(element, "Could not determine base time");
|
||||
+ return GST_CLOCK_TIME_NONE;
|
||||
+ }
|
||||
+
|
||||
+ auto clock = adoptGRef(gst_element_get_clock(element));
|
||||
+ if (!clock) {
|
||||
+ GST_DEBUG_OBJECT(element, "Element has no clock");
|
||||
+ return GST_CLOCK_TIME_NONE;
|
||||
+ }
|
||||
+
|
||||
+ auto clockTime = gst_clock_get_time(clock.get());
|
||||
+ if (!GST_CLOCK_TIME_IS_VALID(clockTime))
|
||||
+ return GST_CLOCK_TIME_NONE;
|
||||
+
|
||||
+ if (clockTime < baseTime) {
|
||||
+ GST_DEBUG_OBJECT(element, "Got negative current running time");
|
||||
+ return GST_CLOCK_TIME_NONE;
|
||||
+ }
|
||||
+
|
||||
+ return clockTime - baseTime;
|
||||
+}
|
||||
+#endif
|
||||
+
|
||||
GstClockTime webkitGstInitTime()
|
||||
{
|
||||
return s_webkitGstInitTime;
|
||||
@@ -1668,6 +1694,7 @@ PlatformVideoColorSpace videoColorSpaceFromInfo(const GstVideoInfo& info)
|
||||
case GST_VIDEO_TRANSFER_BT709:
|
||||
colorSpace.transfer = PlatformVideoTransferCharacteristics::Bt709;
|
||||
break;
|
||||
+#if GST_CHECK_VERSION(1, 18, 0)
|
||||
case GST_VIDEO_TRANSFER_BT601:
|
||||
colorSpace.transfer = PlatformVideoTransferCharacteristics::Smpte170m;
|
||||
break;
|
||||
@@ -1680,6 +1707,7 @@ PlatformVideoColorSpace videoColorSpaceFromInfo(const GstVideoInfo& info)
|
||||
case GST_VIDEO_TRANSFER_BT2020_10:
|
||||
colorSpace.transfer = PlatformVideoTransferCharacteristics::Bt2020_10bit;
|
||||
break;
|
||||
+#endif
|
||||
case GST_VIDEO_TRANSFER_BT2020_12:
|
||||
colorSpace.transfer = PlatformVideoTransferCharacteristics::Bt2020_12bit;
|
||||
break;
|
||||
@@ -1798,6 +1826,7 @@ void fillVideoInfoColorimetryFromColorSpace(GstVideoInfo* info, const PlatformVi
|
||||
case PlatformVideoTransferCharacteristics::Bt709:
|
||||
GST_VIDEO_INFO_COLORIMETRY(info).transfer = GST_VIDEO_TRANSFER_BT709;
|
||||
break;
|
||||
+#if GST_CHECK_VERSION(1, 18, 0)
|
||||
case PlatformVideoTransferCharacteristics::Smpte170m:
|
||||
GST_VIDEO_INFO_COLORIMETRY(info).transfer = GST_VIDEO_TRANSFER_BT601;
|
||||
break;
|
||||
@@ -1810,6 +1839,7 @@ void fillVideoInfoColorimetryFromColorSpace(GstVideoInfo* info, const PlatformVi
|
||||
case PlatformVideoTransferCharacteristics::Bt2020_10bit:
|
||||
GST_VIDEO_INFO_COLORIMETRY(info).transfer = GST_VIDEO_TRANSFER_BT2020_10;
|
||||
break;
|
||||
+#endif
|
||||
case PlatformVideoTransferCharacteristics::Bt2020_12bit:
|
||||
GST_VIDEO_INFO_COLORIMETRY(info).transfer = GST_VIDEO_TRANSFER_BT2020_12;
|
||||
break;
|
||||
diff --git a/Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.h b/Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.h
|
||||
index b4fd887c4036..79873050f8d9 100644
|
||||
--- a/Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.h
|
||||
+++ b/Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.h
|
||||
@@ -78,6 +78,14 @@ inline bool gst_check_version(guint major, guint minor, guint micro)
|
||||
}
|
||||
#endif
|
||||
|
||||
+#if !GST_CHECK_VERSION(1, 18, 0)
|
||||
+// gst_video_format_info_component() is GStreamer 1.18 API, so for older versions we use a local
|
||||
+// vendored copy of the function.
|
||||
+#define GST_VIDEO_MAX_COMPONENTS 4
|
||||
+void webkitGstVideoFormatInfoComponent(const GstVideoFormatInfo*, guint, gint components[GST_VIDEO_MAX_COMPONENTS]);
|
||||
+#define gst_video_format_info_component webkitGstVideoFormatInfoComponent
|
||||
+#endif
|
||||
+
|
||||
#define GST_VIDEO_CAPS_TYPE_PREFIX "video/"_s
|
||||
#define GST_AUDIO_CAPS_TYPE_PREFIX "audio/"_s
|
||||
#define GST_TEXT_CAPS_TYPE_PREFIX "text/"_s
|
||||
@@ -317,6 +325,13 @@ Vector<T> gstStructureGetList(const GstStructure*, CStringView key);
|
||||
|
||||
String gstStructureToJSONString(const GstStructure*);
|
||||
|
||||
+#if !GST_CHECK_VERSION(1, 18, 0)
|
||||
+// gst_element_get_current_running_time() is GStreamer 1.18 API, so for older versions we use a local
|
||||
+// vendored copy of the function.
|
||||
+GstClockTime webkitGstElementGetCurrentRunningTime(GstElement*);
|
||||
+#define gst_element_get_current_running_time webkitGstElementGetCurrentRunningTime
|
||||
+#endif
|
||||
+
|
||||
GstClockTime webkitGstInitTime();
|
||||
|
||||
PlatformVideoColorSpace videoColorSpaceFromCaps(const GstCaps*);
|
||||
diff --git a/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp b/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp
|
||||
index 34a8785843bb..ecf19035a27d 100644
|
||||
--- a/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp
|
||||
+++ b/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp
|
||||
@@ -630,8 +630,6 @@ bool MediaPlayerPrivateGStreamer::doSeek(const SeekTarget& target, float rate, b
|
||||
auto seekStop = toGstClockTime(endTime);
|
||||
auto event = adoptGRef(gst_event_new_seek(rate, GST_FORMAT_TIME, seekFlags, GST_SEEK_TYPE_SET, seekStart, GST_SEEK_TYPE_SET, seekStop));
|
||||
|
||||
- GST_DEBUG_OBJECT(pipeline(), "[Seek] Performing actual seek to %" GST_TIMEP_FORMAT " (endTime: %" GST_TIMEP_FORMAT ") at rate %f", &seekStart, &seekStop, rate);
|
||||
-
|
||||
if (isAsync) {
|
||||
auto data = createAsyncSeekData();
|
||||
data->event = WTF::move(event);
|
||||
@@ -4428,33 +4426,7 @@ void MediaPlayerPrivateGStreamer::setStreamVolumeElement(GstStreamVolume* volume
|
||||
|
||||
bool MediaPlayerPrivateGStreamer::updateVideoSinkStatistics()
|
||||
{
|
||||
- if (!m_videoSink)
|
||||
- return false;
|
||||
-
|
||||
- GUniqueOutPtr<GstStructure> stats;
|
||||
- g_object_get(m_videoSink.get(), "stats", &stats.outPtr(), nullptr);
|
||||
- if (!stats)
|
||||
- return false;
|
||||
-
|
||||
- auto totalVideoFrames = gstStructureGet<uint64_t>(stats.get(), "rendered"_s);
|
||||
- auto droppedVideoFrames = gstStructureGet<uint64_t>(stats.get(), "dropped"_s);
|
||||
- auto averageRate = gstStructureGet<double>(stats.get(), "average-rate"_s);
|
||||
-
|
||||
- if (!totalVideoFrames || !droppedVideoFrames || !averageRate)
|
||||
- return false;
|
||||
-
|
||||
- // Caching is required so that metrics queries performed after EOS still return valid values.
|
||||
- if (*totalVideoFrames)
|
||||
- m_totalVideoFrames = *totalVideoFrames;
|
||||
- if (*droppedVideoFrames)
|
||||
- m_droppedVideoFrames = *droppedVideoFrames;
|
||||
-
|
||||
- if (*averageRate && m_videoInfo) {
|
||||
- double frameRate;
|
||||
- gst_util_fraction_to_double(GST_VIDEO_INFO_FPS_N(&m_videoInfo->info), GST_VIDEO_INFO_FPS_D(&m_videoInfo->info), &frameRate);
|
||||
- m_averageFrameRate = *averageRate * frameRate;
|
||||
- }
|
||||
- return true;
|
||||
+ return false;
|
||||
}
|
||||
|
||||
std::optional<VideoPlaybackQualityMetrics> MediaPlayerPrivateGStreamer::videoPlaybackQualityMetrics()
|
||||
diff --git a/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedPlatformLayerBufferVideo.cpp b/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedPlatformLayerBufferVideo.cpp
|
||||
index b9905616d55f..ec1e8c4ab19e 100644
|
||||
--- a/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedPlatformLayerBufferVideo.cpp
|
||||
+++ b/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedPlatformLayerBufferVideo.cpp
|
||||
@@ -103,7 +103,7 @@ std::unique_ptr<CoordinatedPlatformLayerBuffer> CoordinatedPlatformLayerBufferVi
|
||||
// When not having a texture, we map the frame here and upload the pixels to a texture in the
|
||||
// compositor thread, in paintToTextureMapper(), which also allows us to use the texture mapper
|
||||
// bitmap texture pool.
|
||||
- auto caps = adoptGRef(gst_video_info_to_caps(videoInfo));
|
||||
+ auto caps = adoptGRef(gst_video_info_to_caps((GstVideoInfo *)videoInfo));
|
||||
auto sample = adoptGRef(gst_sample_new(buffer, caps.get(), nullptr, nullptr));
|
||||
m_videoFrame.emplace(GstMappedFrame(sample, GST_MAP_READ));
|
||||
if (!*m_videoFrame) {
|
||||
@@ -190,10 +190,7 @@ std::unique_ptr<CoordinatedPlatformLayerBuffer> CoordinatedPlatformLayerBufferVi
|
||||
colorSpace = DMABufBuffer::ColorSpace::Bt709;
|
||||
else if (gst_video_colorimetry_matches(&GST_VIDEO_INFO_COLORIMETRY(videoInfo), GST_VIDEO_COLORIMETRY_BT2020))
|
||||
colorSpace = DMABufBuffer::ColorSpace::Bt2020;
|
||||
- else if (gst_video_colorimetry_matches(&GST_VIDEO_INFO_COLORIMETRY(videoInfo), GST_VIDEO_COLORIMETRY_BT2100_PQ)) {
|
||||
- colorSpace = DMABufBuffer::ColorSpace::Bt2020;
|
||||
- transferFunction = DMABufBuffer::TransferFunction::Pq;
|
||||
- } else if (gst_video_colorimetry_matches(&GST_VIDEO_INFO_COLORIMETRY(videoInfo), GST_VIDEO_COLORIMETRY_SMPTE240M))
|
||||
+ else if (gst_video_colorimetry_matches(&GST_VIDEO_INFO_COLORIMETRY(videoInfo), GST_VIDEO_COLORIMETRY_SMPTE240M))
|
||||
colorSpace = DMABufBuffer::ColorSpace::Smpte240M;
|
||||
dmabuf->setColorSpace(colorSpace);
|
||||
dmabuf->setTransferFunction(transferFunction);
|
||||
@@ -210,7 +207,7 @@ std::unique_ptr<CoordinatedPlatformLayerBuffer> CoordinatedPlatformLayerBufferVi
|
||||
#if USE(GSTREAMER_GL)
|
||||
std::unique_ptr<CoordinatedPlatformLayerBuffer> CoordinatedPlatformLayerBufferVideo::createBufferFromGLMemory(GstBuffer* buffer, const GstVideoInfo* videoInfo)
|
||||
{
|
||||
- auto caps = adoptGRef(gst_video_info_to_caps(videoInfo));
|
||||
+ auto caps = adoptGRef(gst_video_info_to_caps((GstVideoInfo *)videoInfo));
|
||||
auto sample = adoptGRef(gst_sample_new(buffer, caps.get(), nullptr, nullptr));
|
||||
m_videoFrame.emplace(GstMappedFrame(sample, static_cast<GstMapFlags>(GST_MAP_READ | GST_MAP_GL)));
|
||||
if (!*m_videoFrame) {
|
||||
@@ -255,10 +252,7 @@ std::unique_ptr<CoordinatedPlatformLayerBuffer> CoordinatedPlatformLayerBufferVi
|
||||
yuvToRgbColorSpace = CoordinatedPlatformLayerBufferYUV::YuvToRgbColorSpace::Bt709;
|
||||
else if (gst_video_colorimetry_matches(&GST_VIDEO_INFO_COLORIMETRY(m_videoFrame->info()), GST_VIDEO_COLORIMETRY_BT2020))
|
||||
yuvToRgbColorSpace = CoordinatedPlatformLayerBufferYUV::YuvToRgbColorSpace::Bt2020;
|
||||
- else if (gst_video_colorimetry_matches(&GST_VIDEO_INFO_COLORIMETRY(m_videoFrame->info()), GST_VIDEO_COLORIMETRY_BT2100_PQ)) {
|
||||
- yuvToRgbColorSpace = CoordinatedPlatformLayerBufferYUV::YuvToRgbColorSpace::Bt2020;
|
||||
- transferFunction = CoordinatedPlatformLayerBufferYUV::TransferFunction::Pq;
|
||||
- } else if (gst_video_colorimetry_matches(&GST_VIDEO_INFO_COLORIMETRY(m_videoFrame->info()), GST_VIDEO_COLORIMETRY_SMPTE240M))
|
||||
+ else if (gst_video_colorimetry_matches(&GST_VIDEO_INFO_COLORIMETRY(m_videoFrame->info()), GST_VIDEO_COLORIMETRY_SMPTE240M))
|
||||
yuvToRgbColorSpace = CoordinatedPlatformLayerBufferYUV::YuvToRgbColorSpace::Smpte240M;
|
||||
|
||||
return CoordinatedPlatformLayerBufferYUV::create(numberOfPlanes, WTF::move(planes), WTF::move(yuvPlane), WTF::move(yuvPlaneOffset), yuvToRgbColorSpace, transferFunction, m_size, m_flags, nullptr);
|
||||
diff --git a/Source/WebCore/platform/gstreamer/GStreamerCodecUtilities.cpp b/Source/WebCore/platform/gstreamer/GStreamerCodecUtilities.cpp
|
||||
index 643ef5a67982..b5e35f09bcf1 100644
|
||||
--- a/Source/WebCore/platform/gstreamer/GStreamerCodecUtilities.cpp
|
||||
+++ b/Source/WebCore/platform/gstreamer/GStreamerCodecUtilities.cpp
|
||||
@@ -254,9 +254,10 @@ static std::pair<GRefPtr<GstCaps>, GRefPtr<GstCaps>> vpxCapsFromCodecString(cons
|
||||
GST_VIDEO_INFO_COLORIMETRY(&info).transfer = GST_VIDEO_TRANSFER_BT709;
|
||||
else if (transfer == VPConfigurationTransferCharacteristics::BT_470_7_BG)
|
||||
GST_VIDEO_INFO_COLORIMETRY(&info).transfer = GST_VIDEO_TRANSFER_GAMMA28;
|
||||
- else if (transfer == VPConfigurationTransferCharacteristics::BT_601_7)
|
||||
- GST_VIDEO_INFO_COLORIMETRY(&info).transfer = GST_VIDEO_TRANSFER_BT601;
|
||||
- else if (transfer == VPConfigurationTransferCharacteristics::SMPTE_ST_240)
|
||||
+ else if (transfer == VPConfigurationTransferCharacteristics::BT_601_7) {
|
||||
+ GST_WARNING("VPConfigurationTransferCharacteristics::BT_601_7 not supported");
|
||||
+ GST_VIDEO_INFO_COLORIMETRY(&info).transfer = GST_VIDEO_TRANSFER_UNKNOWN;
|
||||
+ } else if (transfer == VPConfigurationTransferCharacteristics::SMPTE_ST_240)
|
||||
GST_VIDEO_INFO_COLORIMETRY(&info).transfer = GST_VIDEO_TRANSFER_SMPTE240M;
|
||||
else if (transfer == VPConfigurationTransferCharacteristics::Linear)
|
||||
GST_VIDEO_INFO_COLORIMETRY(&info).transfer = GST_VIDEO_TRANSFER_GAMMA10;
|
||||
@@ -269,17 +270,21 @@ static std::pair<GRefPtr<GstCaps>, GRefPtr<GstCaps>> vpxCapsFromCodecString(cons
|
||||
else if (transfer == VPConfigurationTransferCharacteristics::IEC_61966_2_1) {
|
||||
GST_WARNING("VPConfigurationTransferCharacteristics::IEC_61966_2_1 not supported");
|
||||
GST_VIDEO_INFO_COLORIMETRY(&info).transfer = GST_VIDEO_TRANSFER_UNKNOWN;
|
||||
- } else if (transfer == VPConfigurationTransferCharacteristics::BT_2020_10bit)
|
||||
- GST_VIDEO_INFO_COLORIMETRY(&info).transfer = GST_VIDEO_TRANSFER_BT2020_10;
|
||||
- else if (transfer == VPConfigurationTransferCharacteristics::BT_2020_12bit)
|
||||
+ } else if (transfer == VPConfigurationTransferCharacteristics::BT_2020_10bit) {
|
||||
+ GST_WARNING("VPConfigurationTransferCharacteristics::BT_2020_10bit not supported");
|
||||
+ GST_VIDEO_INFO_COLORIMETRY(&info).transfer = GST_VIDEO_TRANSFER_UNKNOWN;
|
||||
+ } else if (transfer == VPConfigurationTransferCharacteristics::BT_2020_12bit)
|
||||
GST_VIDEO_INFO_COLORIMETRY(&info).transfer = GST_VIDEO_TRANSFER_BT2020_12;
|
||||
- else if (transfer == VPConfigurationTransferCharacteristics::SMPTE_ST_2084)
|
||||
- GST_VIDEO_INFO_COLORIMETRY(&info).transfer = GST_VIDEO_TRANSFER_SMPTE2084;
|
||||
- else if (transfer == VPConfigurationTransferCharacteristics::SMPTE_ST_428_1) {
|
||||
+ else if (transfer == VPConfigurationTransferCharacteristics::SMPTE_ST_2084) {
|
||||
+ GST_WARNING("VPConfigurationTransferCharacteristics::SMPTE_ST_2084 not supported");
|
||||
+ GST_VIDEO_INFO_COLORIMETRY(&info).transfer = GST_VIDEO_TRANSFER_UNKNOWN;
|
||||
+ } else if (transfer == VPConfigurationTransferCharacteristics::SMPTE_ST_428_1) {
|
||||
GST_WARNING("VPConfigurationTransferCharacteristics::SMPTE_ST_428_1 not supported");
|
||||
GST_VIDEO_INFO_COLORIMETRY(&info).transfer = GST_VIDEO_TRANSFER_UNKNOWN;
|
||||
- } else if (transfer == VPConfigurationTransferCharacteristics::BT_2100_HLG)
|
||||
- GST_VIDEO_INFO_COLORIMETRY(&info).transfer = GST_VIDEO_TRANSFER_ARIB_STD_B67;
|
||||
+ } else if (transfer == VPConfigurationTransferCharacteristics::BT_2100_HLG) {
|
||||
+ GST_WARNING("VPConfigurationTransferCharacteristics::BT_2100_HLG not supported");
|
||||
+ GST_VIDEO_INFO_COLORIMETRY(&info).transfer = GST_VIDEO_TRANSFER_UNKNOWN;
|
||||
+ }
|
||||
|
||||
auto matrix = parameters->matrixCoefficients;
|
||||
if (matrix == VPConfigurationMatrixCoefficients::Identity)
|
||||
@@ -422,7 +427,8 @@ static std::pair<GRefPtr<GstCaps>, GRefPtr<GstCaps>> av1CapsFromCodecString(cons
|
||||
GST_VIDEO_INFO_COLORIMETRY(&info).transfer = GST_VIDEO_TRANSFER_GAMMA28;
|
||||
break;
|
||||
case AV1ConfigurationTransferCharacteristics::BT_601_7:
|
||||
- GST_VIDEO_INFO_COLORIMETRY(&info).transfer = GST_VIDEO_TRANSFER_BT601;
|
||||
+ GST_WARNING("AV1ConfigurationTransferCharacteristics::BT_601_7 not supported");
|
||||
+ GST_VIDEO_INFO_COLORIMETRY(&info).transfer = GST_VIDEO_TRANSFER_UNKNOWN;
|
||||
break;
|
||||
case AV1ConfigurationTransferCharacteristics::SMPTE_ST_240:
|
||||
GST_VIDEO_INFO_COLORIMETRY(&info).transfer = GST_VIDEO_TRANSFER_SMPTE240M;
|
||||
@@ -446,20 +452,23 @@ static std::pair<GRefPtr<GstCaps>, GRefPtr<GstCaps>> av1CapsFromCodecString(cons
|
||||
GST_VIDEO_INFO_COLORIMETRY(&info).transfer = GST_VIDEO_TRANSFER_UNKNOWN;
|
||||
break;
|
||||
case AV1ConfigurationTransferCharacteristics::BT_2020_10bit:
|
||||
- GST_VIDEO_INFO_COLORIMETRY(&info).transfer = GST_VIDEO_TRANSFER_BT2020_10;
|
||||
+ GST_WARNING("AV1ConfigurationTransferCharacteristics::BT_2020_10bit not supported");
|
||||
+ GST_VIDEO_INFO_COLORIMETRY(&info).transfer = GST_VIDEO_TRANSFER_UNKNOWN;
|
||||
break;
|
||||
case AV1ConfigurationTransferCharacteristics::BT_2020_12bit:
|
||||
GST_VIDEO_INFO_COLORIMETRY(&info).transfer = GST_VIDEO_TRANSFER_BT2020_12;
|
||||
break;
|
||||
case AV1ConfigurationTransferCharacteristics::SMPTE_ST_2084:
|
||||
- GST_VIDEO_INFO_COLORIMETRY(&info).transfer = GST_VIDEO_TRANSFER_SMPTE2084;
|
||||
+ GST_WARNING("AV1ConfigurationTransferCharacteristics::SMPTE_ST_2084 not supported");
|
||||
+ GST_VIDEO_INFO_COLORIMETRY(&info).transfer = GST_VIDEO_TRANSFER_UNKNOWN;
|
||||
break;
|
||||
case AV1ConfigurationTransferCharacteristics::SMPTE_ST_428_1:
|
||||
GST_WARNING("AV1ConfigurationTransferCharacteristics::SMPTE_ST_428_1 not supported");
|
||||
GST_VIDEO_INFO_COLORIMETRY(&info).transfer = GST_VIDEO_TRANSFER_UNKNOWN;
|
||||
break;
|
||||
case AV1ConfigurationTransferCharacteristics::BT_2100_HLG:
|
||||
- GST_VIDEO_INFO_COLORIMETRY(&info).transfer = GST_VIDEO_TRANSFER_ARIB_STD_B67;
|
||||
+ GST_WARNING("AV1ConfigurationTransferCharacteristics::BT_2100_HLG not supported");
|
||||
+ GST_VIDEO_INFO_COLORIMETRY(&info).transfer = GST_VIDEO_TRANSFER_UNKNOWN;
|
||||
break;
|
||||
};
|
||||
|
||||
diff --git a/Source/WebCore/platform/gstreamer/VideoEncoderPrivateGStreamer.cpp b/Source/WebCore/platform/gstreamer/VideoEncoderPrivateGStreamer.cpp
|
||||
index ceb958629a20..2dac345cdbc5 100644
|
||||
--- a/Source/WebCore/platform/gstreamer/VideoEncoderPrivateGStreamer.cpp
|
||||
+++ b/Source/WebCore/platform/gstreamer/VideoEncoderPrivateGStreamer.cpp
|
||||
@@ -889,22 +889,6 @@ static void webkit_video_encoder_class_init(WebKitVideoEncoderClass* klass)
|
||||
"temporal-scalability-rate-decimator", decimators.get(),
|
||||
"temporal-scalability-target-bitrate", bitrates.get(), nullptr);
|
||||
|
||||
- if (layerFlags) {
|
||||
- GValue layerSyncFlagsValue G_VALUE_INIT;
|
||||
-
|
||||
- g_value_init(&boolValue, G_TYPE_BOOLEAN);
|
||||
- gst_value_array_init(&layerSyncFlagsValue, layerSyncFlags.size());
|
||||
- for (auto& flag : layerSyncFlags) {
|
||||
- g_value_set_boolean(&boolValue, flag);
|
||||
- gst_value_array_append_value(&layerSyncFlagsValue, &boolValue);
|
||||
- }
|
||||
-
|
||||
- g_object_set_property(G_OBJECT(encoder), "temporal-scalability-layer-sync-flags", &layerSyncFlagsValue);
|
||||
- g_value_unset(&layerSyncFlagsValue);
|
||||
- g_value_unset(&boolValue);
|
||||
- gst_util_set_object_arg(G_OBJECT(encoder), "temporal-scalability-layer-flags", layerFlags.characters());
|
||||
- }
|
||||
-
|
||||
ALLOW_DEPRECATED_DECLARATIONS_END;
|
||||
});
|
||||
|
||||
diff --git a/Source/cmake/GStreamerChecks.cmake b/Source/cmake/GStreamerChecks.cmake
|
||||
index 0472cde8df37..aabca8479f22 100644
|
||||
--- a/Source/cmake/GStreamerChecks.cmake
|
||||
+++ b/Source/cmake/GStreamerChecks.cmake
|
||||
@@ -1,6 +1,6 @@
|
||||
if (USE_GSTREAMER)
|
||||
if (USE_GSTREAMER_FULL)
|
||||
- find_package(GStreamer 1.18.4 REQUIRED COMPONENTS full)
|
||||
+ find_package(GStreamer 1.16.1 REQUIRED COMPONENTS full)
|
||||
if (NOT PC_GSTREAMER_FULL_FOUND)
|
||||
message(FATAL_ERROR "GStreamer static library libgstreamer-full-1.0 not found")
|
||||
else ()
|
||||
@@ -20,7 +20,7 @@ if (USE_GSTREAMER)
|
||||
list(APPEND GSTREAMER_COMPONENTS webrtc)
|
||||
endif ()
|
||||
|
||||
- find_package(GStreamer 1.18.4 REQUIRED COMPONENTS ${GSTREAMER_COMPONENTS})
|
||||
+ find_package(GStreamer 1.16.1 REQUIRED COMPONENTS ${GSTREAMER_COMPONENTS})
|
||||
|
||||
if (ENABLE_WEB_AUDIO)
|
||||
if (NOT PC_GSTREAMER_AUDIO_FOUND OR NOT PC_GSTREAMER_FFT_FOUND)
|
||||
--
|
||||
2.53.0
|
||||
|
||||
@ -1,75 +0,0 @@
|
||||
From d2017cd8ab51b24dcd3bda6fb90fec686b9a86ad Mon Sep 17 00:00:00 2001
|
||||
From: Michael Catanzaro <mcatanzaro@redhat.com>
|
||||
Date: Tue, 23 Sep 2025 15:48:27 -0500
|
||||
Subject: [PATCH] Build against harfbuzz 1.7.5
|
||||
|
||||
---
|
||||
.../skia/modules/skshaper/src/SkShaper_harfbuzz.cpp | 11 ++++-------
|
||||
.../platform/graphics/skia/SkiaHarfBuzzFont.cpp | 8 +++++---
|
||||
Source/cmake/OptionsGTK.cmake | 2 +-
|
||||
3 files changed, 10 insertions(+), 11 deletions(-)
|
||||
|
||||
diff --git a/Source/ThirdParty/skia/modules/skshaper/src/SkShaper_harfbuzz.cpp b/Source/ThirdParty/skia/modules/skshaper/src/SkShaper_harfbuzz.cpp
|
||||
index 67c475c0bb54..14a644865348 100644
|
||||
--- a/Source/ThirdParty/skia/modules/skshaper/src/SkShaper_harfbuzz.cpp
|
||||
+++ b/Source/ThirdParty/skia/modules/skshaper/src/SkShaper_harfbuzz.cpp
|
||||
@@ -275,13 +275,10 @@ HBFace create_hb_face(const SkTypeface& typeface) {
|
||||
// hb_face_create always succeeds. Check that the format is minimally recognized first.
|
||||
// hb_face_create_for_tables may still create a working hb_face.
|
||||
// See https://github.com/harfbuzz/harfbuzz/issues/248 .
|
||||
- unsigned int num_hb_faces = hb_face_count(blob.get());
|
||||
- if (0 < num_hb_faces && (unsigned)index < num_hb_faces) {
|
||||
- face.reset(hb_face_create(blob.get(), (unsigned)index));
|
||||
- // Check the number of glyphs as a basic sanitization step.
|
||||
- if (face && hb_face_get_glyph_count(face.get()) == 0) {
|
||||
- face.reset();
|
||||
- }
|
||||
+ face.reset(hb_face_create(blob.get(), (unsigned)index));
|
||||
+ // Check the number of glyphs as a basic sanitization step.
|
||||
+ if (face && hb_face_get_glyph_count(face.get()) == 0) {
|
||||
+ face.reset();
|
||||
}
|
||||
}
|
||||
if (!face) {
|
||||
diff --git a/Source/WebCore/platform/graphics/skia/SkiaHarfBuzzFont.cpp b/Source/WebCore/platform/graphics/skia/SkiaHarfBuzzFont.cpp
|
||||
index 37930ac270ae..90f66d8b63bb 100644
|
||||
--- a/Source/WebCore/platform/graphics/skia/SkiaHarfBuzzFont.cpp
|
||||
+++ b/Source/WebCore/platform/graphics/skia/SkiaHarfBuzzFont.cpp
|
||||
@@ -104,9 +104,10 @@ static HbUniquePtr<hb_face_t> createHarfBuzzFace(SkTypeface& typeface)
|
||||
HbUniquePtr<hb_blob_t> blob(hb_blob_create(reinterpret_cast<const char*>(memory), size, HB_MEMORY_MODE_READONLY, stream.release(), [](void* data) {
|
||||
delete reinterpret_cast<SkStreamAsset*>(data);
|
||||
}));
|
||||
- auto faceCount = hb_face_count(blob.get());
|
||||
- if (faceCount && static_cast<unsigned>(index) < faceCount)
|
||||
- return HbUniquePtr<hb_face_t>(hb_face_create(blob.get(), index));
|
||||
+ HbUniquePtr<hb_face_t> result(hb_face_create(blob.get(), index));
|
||||
+ HbUniquePtr<hb_face_t> empty(hb_face_get_empty());
|
||||
+ if (result.get() != empty.get())
|
||||
+ return result;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -130,6 +131,7 @@ SkiaHarfBuzzFont::SkiaHarfBuzzFont(SkTypeface& typeface)
|
||||
{
|
||||
auto hbFace = createHarfBuzzFace(typeface);
|
||||
HbUniquePtr<hb_font_t> hbFont(hb_font_create(hbFace.get()));
|
||||
+ hb_ot_font_set_funcs(hbFont.get());
|
||||
|
||||
if (int axisCount = typeface.getVariationDesignPosition({ }); axisCount > 0) {
|
||||
Vector<SkFontArguments::VariationPosition::Coordinate> axisValues(axisCount);
|
||||
diff --git a/Source/cmake/OptionsGTK.cmake b/Source/cmake/OptionsGTK.cmake
|
||||
index eea6eb87ad4b..6d5f17debcc7 100644
|
||||
--- a/Source/cmake/OptionsGTK.cmake
|
||||
+++ b/Source/cmake/OptionsGTK.cmake
|
||||
@@ -13,7 +13,7 @@ find_package(Cairo 1.14.0 REQUIRED)
|
||||
find_package(LibGcrypt 1.7.0 REQUIRED)
|
||||
find_package(Soup3 3.0.0 REQUIRED)
|
||||
find_package(Tasn1 REQUIRED)
|
||||
-find_package(HarfBuzz 2.7.4 REQUIRED COMPONENTS ICU)
|
||||
+find_package(HarfBuzz 1.7.5 REQUIRED COMPONENTS ICU)
|
||||
find_package(ICU 70.1 REQUIRED COMPONENTS data i18n uc)
|
||||
find_package(JPEG REQUIRED)
|
||||
find_package(Epoxy 1.5.4 REQUIRED)
|
||||
--
|
||||
2.53.0
|
||||
|
||||
16
SOURCES/i686-build.patch
Normal file
16
SOURCES/i686-build.patch
Normal file
@ -0,0 +1,16 @@
|
||||
From: Alberto Garcia <berto@igalia.com>
|
||||
Subject: Fix FTBFS in i386
|
||||
Bug: https://bugs.webkit.org/show_bug.cgi?id=268739
|
||||
Index: webkitgtk/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp
|
||||
===================================================================
|
||||
--- webkitgtk.orig/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp
|
||||
+++ webkitgtk/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp
|
||||
@@ -336,8 +336,6 @@ JSValue CLoop::execute(OpcodeID entryOpc
|
||||
UNUSED_VARIABLE(t2);
|
||||
UNUSED_VARIABLE(t3);
|
||||
UNUSED_VARIABLE(t5);
|
||||
- UNUSED_VARIABLE(t6);
|
||||
- UNUSED_VARIABLE(t7);
|
||||
|
||||
struct StackPointerScope {
|
||||
StackPointerScope(CLoopStack& stack)
|
||||
1766
SOURCES/icu60.patch
1766
SOURCES/icu60.patch
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
6
SOURCES/webkitgtk-2.40.5.tar.xz.asc
Normal file
6
SOURCES/webkitgtk-2.40.5.tar.xz.asc
Normal file
@ -0,0 +1,6 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iF0EABEDAB0WIQTX/PYc+aLeqzHYG9Pz0yLQ7EWCwwUCZMjRYQAKCRDz0yLQ7EWC
|
||||
wwPPAJ0XUmEmSr4IFQWpbDfPOR9keXY+lwCfVLyOFL8T55psriGN4vkxVZqq+EM=
|
||||
=nGCs
|
||||
-----END PGP SIGNATURE-----
|
||||
@ -1,6 +0,0 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iF0EABEIAB0WIQRao7wzT9fjNp58d7KRxVnb5MkSOwUCaeFIpQAKCRCRxVnb5MkS
|
||||
O8UZAJ9EPfX10mIMYGlbhCCd+qxbeyuYTACfYOdgIlth6/ymZ8mJqPdABc8bQQk=
|
||||
=zK1i
|
||||
-----END PGP SIGNATURE-----
|
||||
@ -6,72 +6,57 @@
|
||||
cp -p %1 _license_files/$(echo '%1' | sed -e 's!/!.!g')
|
||||
|
||||
Name: webkit2gtk3
|
||||
Version: 2.52.3
|
||||
Version: 2.42.5
|
||||
Release: 1%{?dist}
|
||||
Summary: GTK Web content engine library
|
||||
|
||||
License: LGPLv2
|
||||
URL: https://www.webkitgtk.org/
|
||||
Source0: https://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz
|
||||
URL: http://www.webkitgtk.org/
|
||||
Source0: http://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz
|
||||
Source1: https://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz.asc
|
||||
# Use the keys from https://webkitgtk.org/verifying.html
|
||||
# $ gpg --import aperez.key carlosgc.key
|
||||
# $ gpg --export --export-options export-minimal 013A0127AC9C65B34FFA62526C1009B693975393 5AA3BC334FD7E3369E7C77B291C559DBE4C9123B > webkitgtk-keys.gpg
|
||||
# $ gpg --export --export-options export-minimal D7FCF61CF9A2DEAB31D81BD3F3D322D0EC4582C3 5AA3BC334FD7E3369E7C77B291C559DBE4C9123B > webkitgtk-keys.gpg
|
||||
Source2: webkitgtk-keys.gpg
|
||||
|
||||
##
|
||||
## Patches to support older build toolchain
|
||||
##
|
||||
# https://bugs.webkit.org/show_bug.cgi?id=193749
|
||||
Patch0: evolution-shared-secondary-process.patch
|
||||
|
||||
Patch100: compiler-flags.patch
|
||||
# https://bugs.webkit.org/show_bug.cgi?id=235367
|
||||
Patch1: icu60.patch
|
||||
|
||||
##
|
||||
## Patches to support older Evolution
|
||||
##
|
||||
# Partial revert of https://commits.webkit.org/256284@main
|
||||
Patch2: gstreamer-1.16.1.patch
|
||||
|
||||
Patch200: evolution-shared-secondary-process.patch
|
||||
Patch201: evolution-sandbox-warning.patch
|
||||
# Partial revert of https://commits.webkit.org/260744@main
|
||||
Patch3: cairo-1.15.patch
|
||||
|
||||
##
|
||||
## Patches to support older or missing build dependencies
|
||||
##
|
||||
# Avoid dependency on GEnumClass_autoptr
|
||||
Patch4: glib-2.56.patch
|
||||
|
||||
Patch300: glib-2.56.patch
|
||||
Patch301: cairo-1.15.patch
|
||||
Patch302: gstreamer-1.16.patch
|
||||
Patch303: harfbuzz-1.7.5.patch
|
||||
Patch304: libsoup2.patch
|
||||
Patch305: icu60.patch
|
||||
Patch306: g-ir-scanner-nonfatal.patch
|
||||
|
||||
##
|
||||
## Upstream patches to remove, hopefully after next update
|
||||
##
|
||||
|
||||
# https://github.com/WebKit/WebKit/pull/58096
|
||||
Patch400: aarch64-build.patch
|
||||
# https://bugs.webkit.org/show_bug.cgi?id=268739
|
||||
Patch5: i686-build.patch
|
||||
|
||||
BuildRequires: bison
|
||||
BuildRequires: clang
|
||||
BuildRequires: cmake
|
||||
BuildRequires: flex
|
||||
BuildRequires: gcc-toolset-14-libatomic-devel
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: gcc-toolset-13
|
||||
BuildRequires: gettext
|
||||
BuildRequires: git
|
||||
BuildRequires: gnupg2
|
||||
BuildRequires: gperf
|
||||
BuildRequires: hyphen-devel
|
||||
BuildRequires: libatomic
|
||||
BuildRequires: ninja-build
|
||||
BuildRequires: openssl-devel
|
||||
BuildRequires: perl(bigint)
|
||||
BuildRequires: perl(English)
|
||||
BuildRequires: perl(FindBin)
|
||||
BuildRequires: perl(JSON::PP)
|
||||
BuildRequires: python3
|
||||
BuildRequires: ruby
|
||||
BuildRequires: rubygems
|
||||
BuildRequires: rubygem-json
|
||||
BuildRequires: rubygems
|
||||
BuildRequires: shadow-utils
|
||||
BuildRequires: unifdef
|
||||
|
||||
BuildRequires: pkgconfig(atspi-2)
|
||||
@ -99,6 +84,7 @@ BuildRequires: pkgconfig(lcms2)
|
||||
BuildRequires: pkgconfig(libdrm)
|
||||
BuildRequires: pkgconfig(libjpeg)
|
||||
BuildRequires: pkgconfig(libnotify)
|
||||
BuildRequires: pkgconfig(libopenjp2)
|
||||
BuildRequires: pkgconfig(libpcre)
|
||||
BuildRequires: pkgconfig(libpng)
|
||||
BuildRequires: pkgconfig(libseccomp)
|
||||
@ -115,6 +101,8 @@ BuildRequires: pkgconfig(wayland-client)
|
||||
BuildRequires: pkgconfig(wayland-egl)
|
||||
BuildRequires: pkgconfig(wayland-protocols)
|
||||
BuildRequires: pkgconfig(wayland-server)
|
||||
BuildRequires: pkgconfig(wpe-1.0)
|
||||
BuildRequires: pkgconfig(wpebackend-fdo-1.0)
|
||||
BuildRequires: pkgconfig(xt)
|
||||
|
||||
# libepoxy will crash when WebKit tries using GLES2 if it's not installed.
|
||||
@ -148,8 +136,6 @@ Provides: webkit2gtk3-doc = %{version}-%{release}
|
||||
# We're supposed to specify versions here, but these libraries don't do
|
||||
# normal releases. Accordingly, they're not suitable to be system libs.
|
||||
Provides: bundled(angle)
|
||||
Provides: bundled(pdfjs)
|
||||
Provides: bundled(skia)
|
||||
Provides: bundled(xdgmime)
|
||||
|
||||
# Require the jsc subpackage
|
||||
@ -180,8 +166,6 @@ files for developing applications that use %{name}.
|
||||
Summary: JavaScript engine from %{name}
|
||||
Obsoletes: webkitgtk4-jsc < %{version}-%{release}
|
||||
Provides: webkitgtk4-jsc = %{version}-%{release}
|
||||
Provides: bundled(simde)
|
||||
Provides: bundled(simdutf)
|
||||
|
||||
%description jsc
|
||||
This package contains JavaScript engine from %{name}.
|
||||
@ -198,7 +182,7 @@ files for developing applications that use JavaScript engine from %{name}.
|
||||
|
||||
%prep
|
||||
%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}'
|
||||
%autosetup -p1 -n webkitgtk-%{version}
|
||||
%autosetup -p1 -n webkitgtk-%{version} -S git
|
||||
|
||||
# Remove bundled libraries
|
||||
rm -rf Source/ThirdParty/gtest/
|
||||
@ -221,41 +205,42 @@ rm -rf Source/ThirdParty/qunit/
|
||||
%global optflags %(echo %{optflags} | sed 's/-g /-g1 /')
|
||||
%endif
|
||||
|
||||
# The system GCC is too old to build WebKit, so use a GCC Toolset instead.
|
||||
# This prints warnings complaining that it should not be used except in
|
||||
# SCL scriplets, but I can't figure out any other way to make it work.
|
||||
source scl_source enable gcc-toolset-13
|
||||
|
||||
# -DUSE_SYSTEM_MALLOC=ON is really bad for security, but libpas requires
|
||||
# __atomic_compare_exchange_16 which does not seem to be available.
|
||||
mkdir -p %{_target_platform}
|
||||
pushd %{_target_platform}
|
||||
%cmake \
|
||||
-GNinja \
|
||||
-DPORT=GTK \
|
||||
-DCMAKE_BUILD_TYPE=Release \
|
||||
-DCMAKE_C_COMPILER=clang \
|
||||
-DCMAKE_CXX_COMPILER=clang++ \
|
||||
-DUSE_SYSTEM_MALLOC=ON \
|
||||
-DENABLE_JIT=OFF \
|
||||
-DENABLE_BUBBLEWRAP_SANDBOX=OFF \
|
||||
-DENABLE_DOCUMENTATION=OFF \
|
||||
-DENABLE_GAMEPAD=OFF \
|
||||
-DENABLE_MEDIA_RECORDER=OFF \
|
||||
-DENABLE_SPEECH_SYNTHESIS=OFF \
|
||||
-DENABLE_WEB_CODECS=OFF \
|
||||
-DUSE_AVIF=OFF \
|
||||
-DUSE_GSTREAMER_TRANSCODER=OFF \
|
||||
-DUSE_GTK4=OFF \
|
||||
-DUSE_JPEGXL=OFF \
|
||||
-DUSE_LIBBACKTRACE=OFF \
|
||||
-DUSE_SOUP2=ON \
|
||||
-DUSE_SYSTEM_SYSPROF_CAPTURE=OFF \
|
||||
-DUSE_AVIF=OFF \
|
||||
-DENABLE_DOCUMENTATION=OFF \
|
||||
-DUSE_GSTREAMER_TRANSCODER=OFF \
|
||||
-DUSE_JPEGXL=OFF \
|
||||
-DENABLE_GAMEPAD=OFF \
|
||||
%if 0%{?rhel}
|
||||
%ifarch aarch64
|
||||
-DUSE_64KB_PAGE_BLOCK=ON \
|
||||
%endif
|
||||
%ifarch aarch64 s390x
|
||||
-DENABLE_SPELLCHECK=OFF \
|
||||
%endif
|
||||
%endif
|
||||
%{nil}
|
||||
..
|
||||
popd
|
||||
|
||||
# Show the build time in the status
|
||||
export NINJA_STATUS="[%f/%t][%e] "
|
||||
%cmake_build
|
||||
%ninja_build -C %{_target_platform}
|
||||
|
||||
%install
|
||||
%cmake_install
|
||||
%ninja_install -C %{_target_platform}
|
||||
|
||||
%find_lang WebKitGTK-4.0
|
||||
|
||||
@ -317,49 +302,6 @@ export NINJA_STATUS="[%f/%t][%e] "
|
||||
%{_datadir}/gir-1.0/JavaScriptCore-4.0.gir
|
||||
|
||||
%changelog
|
||||
* Wed Apr 22 2026 Michael Catanzaro <mcatanzaro@redhat.com> - 2.52.3-1
|
||||
- Update to 2.52.3
|
||||
|
||||
* Thu Dec 18 2025 Tomas Popela <tpopela@redhat.com> - 2.50.4-1
|
||||
- Update to 2.50.4
|
||||
|
||||
* Thu Dec 04 2025 Michael Catanzaro <mcatanzaro@redhat.com> - 2.50.3-1
|
||||
- Update to 2.50.3
|
||||
|
||||
* Mon Oct 13 2025 Michael Catanzaro <mcatanzaro@redhat.com> - 2.50.1-1
|
||||
- Update to 2.50.1
|
||||
|
||||
* Tue Oct 07 2025 Michael Catanzaro <mcatanzaro@redhat.com> - 2.50.0-1
|
||||
- Update to 2.50.0
|
||||
|
||||
* Fri Aug 08 2025 Michael Catanzaro <mcatanzaro@redhat.com> - 2.48.5-1
|
||||
- Update to 2.48.5
|
||||
|
||||
* Fri May 30 2025 Michael Catanzaro <mcatanzaro@redhat.com> - 2.48.3-1
|
||||
- Update to 2.48.3
|
||||
|
||||
* Thu May 15 2025 Michael Catanzaro <mcatanzaro@redhat.com> - 2.48.2-1
|
||||
- Update to 2.48.2
|
||||
- Reenable JavaScriptCore JIT
|
||||
|
||||
* Fri Apr 11 2025 Michael Catanzaro <mcatanzaro@redhat.com> - 2.48.1-1
|
||||
- Update to 2.48.1
|
||||
|
||||
* Thu Mar 13 2025 Michael Catanzaro <mcatanzaro@redhat.com> - 2.46.6-2
|
||||
- Add patch for CVE-2025-24201
|
||||
|
||||
* Tue Feb 25 2025 Michael Catanzaro <mcatanzaro@redhat.com> - 2.46.6-1
|
||||
- Update to 2.46.6
|
||||
|
||||
* Wed Dec 18 2024 Michael Catanzaro <mcatanzaro@redhat.com> - 2.46.5-1
|
||||
- Update to 2.46.5
|
||||
|
||||
* Mon Nov 25 2024 Michael Catanzaro <mcatanzaro@redhat.com> - 2.46.3-2
|
||||
- Add patch for CVE-2024-44309
|
||||
|
||||
* Fri Nov 08 2024 Michael Catanzaro <mcatanzaro@redhat.com> - 2.46.3-1
|
||||
- Update to 2.46.3
|
||||
|
||||
* Mon Feb 05 2024 Michael Catanzaro <mcatanzaro@redhat.com> - 2.42.5-1
|
||||
- Update to 2.42.5
|
||||
Resolves: RHEL-3961
|
||||
|
||||
Loading…
Reference in New Issue
Block a user