early-access version 2853
This commit is contained in:
pineappleEA
12
externals/vcpkg/ports/qt5-webengine/build_1.patch
vendored
Executable file
12
externals/vcpkg/ports/qt5-webengine/build_1.patch
vendored
Executable file
@@ -0,0 +1,12 @@
|
||||
diff --git a/src/3rdparty/chromium/third_party/angle/BUILD.gn b/src/3rdparty/chromium/third_party/angle/BUILD.gn
|
||||
index fb57176..fa84cc5 100644
|
||||
--- a/src/3rdparty/chromium/third_party/angle/BUILD.gn
|
||||
+++ b/src/3rdparty/chromium/third_party/angle/BUILD.gn
|
||||
@@ -131,7 +131,6 @@ config("extra_warnings") {
|
||||
# Enable more default warnings on Windows.
|
||||
if (is_win) {
|
||||
cflags += [
|
||||
- "/we4244", # Conversion: possible loss of data.
|
||||
"/we4312", # Conversion: greater size.
|
||||
"/we4456", # Variable shadowing.
|
||||
"/we4458", # declaration hides class member.
|
||||
24
externals/vcpkg/ports/qt5-webengine/build_2.patch
vendored
Executable file
24
externals/vcpkg/ports/qt5-webengine/build_2.patch
vendored
Executable file
@@ -0,0 +1,24 @@
|
||||
diff --git a/src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/circular_queue.h b/src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/circular_queue.h
|
||||
index 18ca770..5585a67 100644
|
||||
--- a/src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/circular_queue.h
|
||||
+++ b/src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/circular_queue.h
|
||||
@@ -74,16 +74,16 @@ class CircularQueue {
|
||||
return queue_->Get(pos_);
|
||||
}
|
||||
|
||||
- const T* operator->() const {
|
||||
+ T* operator->() const {
|
||||
return const_cast<CircularQueue<T>::Iterator*>(this)->operator->();
|
||||
}
|
||||
|
||||
T& operator*() { return *(operator->()); }
|
||||
- const T& operator*() const { return *(operator->()); }
|
||||
+ T& operator*() const { return *(operator->()); }
|
||||
|
||||
value_type& operator[](difference_type i) { return *(*this + i); }
|
||||
|
||||
- const value_type& operator[](difference_type i) const {
|
||||
+ value_type& operator[](difference_type i) const {
|
||||
return const_cast<CircularQueue<T>::Iterator&>(*this)[i];
|
||||
}
|
||||
|
||||
12
externals/vcpkg/ports/qt5-webengine/common.pri.patch
vendored
Executable file
12
externals/vcpkg/ports/qt5-webengine/common.pri.patch
vendored
Executable file
@@ -0,0 +1,12 @@
|
||||
diff --git a/src/buildtools/config/common.pri b/src/buildtools/config/common.pri
|
||||
#latest diff --git a/src/buildtools/config/common.pri b/src/buildtools/config/common.pri
|
||||
index 97d39535c..dc09da43a 100644
|
||||
--- a/src/buildtools/config/common.pri
|
||||
+++ b/src/buildtools/config/common.pri
|
||||
@@ -57,5 +57,5 @@
|
||||
precompile_header {
|
||||
- gn_args += enable_precompiled_headers=true
|
||||
+ gn_args += enable_precompiled_headers=false
|
||||
} else {
|
||||
gn_args += enable_precompiled_headers=false
|
||||
}
|
||||
13
externals/vcpkg/ports/qt5-webengine/gl.patch
vendored
Executable file
13
externals/vcpkg/ports/qt5-webengine/gl.patch
vendored
Executable file
@@ -0,0 +1,13 @@
|
||||
diff --git a/src/3rdparty/chromium/ui/gl/gl_bindings_autogen_gl.h b/src/3rdparty/chromium/ui/gl/gl_bindings_autogen_gl.h
|
||||
index d54583e8b..1921185f8 100644
|
||||
--- a/src/3rdparty/chromium/ui/gl/gl_bindings_autogen_gl.h
|
||||
+++ b/src/3rdparty/chromium/ui/gl/gl_bindings_autogen_gl.h
|
||||
@@ -16,7 +16,7 @@
|
||||
namespace gl {
|
||||
|
||||
class GLContext;
|
||||
-
|
||||
+typedef void *GLeglImageOES;
|
||||
typedef void(GL_BINDING_CALL* glActiveShaderProgramProc)(GLuint pipeline,
|
||||
GLuint program);
|
||||
typedef void(GL_BINDING_CALL* glActiveTextureProc)(GLenum texture);
|
||||
62
externals/vcpkg/ports/qt5-webengine/portfile.cmake
vendored
Executable file
62
externals/vcpkg/ports/qt5-webengine/portfile.cmake
vendored
Executable file
@@ -0,0 +1,62 @@
|
||||
vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
|
||||
string(LENGTH "${CURRENT_BUILDTREES_DIR}" buildtrees_path_length)
|
||||
if(buildtrees_path_length GREATER 35 AND CMAKE_HOST_WIN32)
|
||||
vcpkg_buildpath_length_warning(35)
|
||||
message(WARNING "The ${PORT} source was will be extracted to ${CURRENT_BUILDTREES_DIR} , which has more then 35 characters in length.")
|
||||
message(FATAL_ERROR "terminating due to ${CURRENT_BUILDTREES_DIR} being too long.")
|
||||
endif()
|
||||
#set(VCPKG_BUILD_TYPE release) #You probably want to set this to reduce build type and space requirements
|
||||
message(STATUS "${PORT} requires a lot of free disk space (>100GB), ram (>8 GB) and time (>2h per configuration) to be successfully build.\n\
|
||||
-- As such ${PORT} is currently experimental.\n\
|
||||
-- If ${PORT} fails post build validation please try manually reducing VCPKG_MAX_CONCURRENCY and open up an issue if it still cannot build. \n\
|
||||
-- If it fails due to post validation the successfully installed files can be found in ${CURRENT_PACKAGES_DIR} \n\
|
||||
-- and just need to be copied into ${CURRENT_INSTALLED_DIR}")
|
||||
if(NOT VCPKG_TARGET_IS_WINDOWS)
|
||||
message(STATUS "If ${PORT} directly fails ${PORT} might require additional prerequisites on Linux and OSX. Please check the configure logs.\n")
|
||||
endif()
|
||||
include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake)
|
||||
|
||||
vcpkg_find_acquire_program(FLEX)
|
||||
vcpkg_find_acquire_program(BISON)
|
||||
vcpkg_find_acquire_program(GPERF)
|
||||
vcpkg_find_acquire_program(PYTHON2)
|
||||
vcpkg_find_acquire_program(NINJA)
|
||||
set(NODEJS "${CURRENT_HOST_INSTALLED_DIR}/tools/node/node${VCPKG_HOST_EXECUTABLE_SUFFIX}")
|
||||
get_filename_component(FLEX_DIR "${FLEX}" DIRECTORY )
|
||||
get_filename_component(BISON_DIR "${BISON}" DIRECTORY )
|
||||
get_filename_component(PYTHON2_DIR "${PYTHON2}" DIRECTORY )
|
||||
get_filename_component(GPERF_DIR "${GPERF}" DIRECTORY )
|
||||
get_filename_component(NINJA_DIR "${NINJA}" DIRECTORY )
|
||||
get_filename_component(NODEJS_DIR "${NODEJS}" DIRECTORY )
|
||||
|
||||
if(WIN32) # WIN32 HOST probably has win_flex and win_bison!
|
||||
if(NOT EXISTS "${FLEX_DIR}/flex${VCPKG_HOST_EXECUTABLE_SUFFIX}")
|
||||
file(CREATE_LINK "${FLEX}" "${FLEX_DIR}/flex${VCPKG_HOST_EXECUTABLE_SUFFIX}")
|
||||
endif()
|
||||
if(NOT EXISTS "${BISON_DIR}/BISON${VCPKG_HOST_EXECUTABLE_SUFFIX}")
|
||||
file(CREATE_LINK "${BISON}" "${BISON_DIR}/bison${VCPKG_HOST_EXECUTABLE_SUFFIX}")
|
||||
endif()
|
||||
endif()
|
||||
|
||||
vcpkg_add_to_path(PREPEND "${FLEX_DIR}")
|
||||
vcpkg_add_to_path(PREPEND "${BISON_DIR}")
|
||||
vcpkg_add_to_path(PREPEND "${PYTHON2_DIR}")
|
||||
vcpkg_add_to_path(PREPEND "${GPERF_DIR}")
|
||||
vcpkg_add_to_path(PREPEND "${NINJA_DIR}")
|
||||
vcpkg_add_to_path(PREPEND "${NODEJS_DIR}")
|
||||
|
||||
set(PATCHES common.pri.patch
|
||||
gl.patch
|
||||
build_1.patch
|
||||
build_2.patch
|
||||
workaround-msvc2022-ice.patch)
|
||||
|
||||
set(OPTIONS)
|
||||
if("proprietary-codecs" IN_LIST FEATURES)
|
||||
list(APPEND OPTIONS "-webengine-proprietary-codecs")
|
||||
endif()
|
||||
if(NOT VCPKG_TARGET_IS_WINDOWS)
|
||||
list(APPEND OPTIONS "-webengine-system-libwebp" "-webengine-system-ffmpeg" "-webengine-system-icu")
|
||||
endif()
|
||||
|
||||
qt_submodule_installation(PATCHES ${PATCHES} BUILD_OPTIONS ${OPTIONS})
|
||||
35
externals/vcpkg/ports/qt5-webengine/vcpkg.json
vendored
Executable file
35
externals/vcpkg/ports/qt5-webengine/vcpkg.json
vendored
Executable file
@@ -0,0 +1,35 @@
|
||||
{
|
||||
"name": "qt5-webengine",
|
||||
"version": "5.15.4",
|
||||
"port-version": 2,
|
||||
"description": "Qt5 webengine Module;",
|
||||
"license": null,
|
||||
"supports": "!static",
|
||||
"dependencies": [
|
||||
{
|
||||
"name": "atlmfc",
|
||||
"platform": "windows"
|
||||
},
|
||||
{
|
||||
"name": "ffmpeg",
|
||||
"default-features": false,
|
||||
"platform": "!windows"
|
||||
},
|
||||
{
|
||||
"name": "qt5-base",
|
||||
"default-features": false
|
||||
},
|
||||
"qt5-declarative",
|
||||
"qt5-location",
|
||||
"qt5-quickcontrols",
|
||||
"qt5-quickcontrols2",
|
||||
"qt5-tools",
|
||||
"qt5-webchannel",
|
||||
"vcpkg-tool-nodejs"
|
||||
],
|
||||
"features": {
|
||||
"proprietary-codecs": {
|
||||
"description": "Enable proprietary-codecs in qtwebengine"
|
||||
}
|
||||
}
|
||||
}
|
||||
101
externals/vcpkg/ports/qt5-webengine/workaround-msvc2022-ice.patch
vendored
Executable file
101
externals/vcpkg/ports/qt5-webengine/workaround-msvc2022-ice.patch
vendored
Executable file
@@ -0,0 +1,101 @@
|
||||
--- a/src/3rdparty/chromium/base/hash/md5_constexpr_internal.h
|
||||
+++ b/src/3rdparty/chromium/base/hash/md5_constexpr_internal.h
|
||||
@@ -281,15 +281,63 @@ struct MD5CE {
|
||||
return IntermediateDataToMD5Digest(ProcessMessage(data, n));
|
||||
}
|
||||
|
||||
- static constexpr uint64_t Hash64(const char* data, uint32_t n) {
|
||||
- IntermediateData intermediate = ProcessMessage(data, n);
|
||||
- return (static_cast<uint64_t>(SwapEndian(intermediate.a)) << 32) |
|
||||
- static_cast<uint64_t>(SwapEndian(intermediate.b));
|
||||
+ static constexpr uint64_t Hash64(const char* message, uint32_t n) {
|
||||
+ const uint32_t m = GetPaddedMessageLength(n);
|
||||
+ IntermediateData intermediate0 = kInitialIntermediateData;
|
||||
+ for (uint32_t offset = 0; offset < m; offset += 64) {
|
||||
+ RoundData data = {
|
||||
+ GetPaddedMessageWord(message, n, m, offset),
|
||||
+ GetPaddedMessageWord(message, n, m, offset + 4),
|
||||
+ GetPaddedMessageWord(message, n, m, offset + 8),
|
||||
+ GetPaddedMessageWord(message, n, m, offset + 12),
|
||||
+ GetPaddedMessageWord(message, n, m, offset + 16),
|
||||
+ GetPaddedMessageWord(message, n, m, offset + 20),
|
||||
+ GetPaddedMessageWord(message, n, m, offset + 24),
|
||||
+ GetPaddedMessageWord(message, n, m, offset + 28),
|
||||
+ GetPaddedMessageWord(message, n, m, offset + 32),
|
||||
+ GetPaddedMessageWord(message, n, m, offset + 36),
|
||||
+ GetPaddedMessageWord(message, n, m, offset + 40),
|
||||
+ GetPaddedMessageWord(message, n, m, offset + 44),
|
||||
+ GetPaddedMessageWord(message, n, m, offset + 48),
|
||||
+ GetPaddedMessageWord(message, n, m, offset + 52),
|
||||
+ GetPaddedMessageWord(message, n, m, offset + 56),
|
||||
+ GetPaddedMessageWord(message, n, m, offset + 60)};
|
||||
+ IntermediateData intermediate1 = intermediate0;
|
||||
+ for (uint32_t i = 0; i < 64; ++i)
|
||||
+ intermediate1 = ApplyStep(i, data, intermediate1);
|
||||
+ intermediate0 = Add(intermediate0, intermediate1);
|
||||
+ }
|
||||
+ return (static_cast<uint64_t>(SwapEndian(intermediate0.a)) << 32) |
|
||||
+ static_cast<uint64_t>(SwapEndian(intermediate0.b));
|
||||
}
|
||||
|
||||
- static constexpr uint32_t Hash32(const char* data, uint32_t n) {
|
||||
- IntermediateData intermediate = ProcessMessage(data, n);
|
||||
- return SwapEndian(intermediate.a);
|
||||
+ static constexpr uint32_t Hash32(const char* message, uint32_t n) {
|
||||
+ const uint32_t m = GetPaddedMessageLength(n);
|
||||
+ IntermediateData intermediate0 = kInitialIntermediateData;
|
||||
+ for (uint32_t offset = 0; offset < m; offset += 64) {
|
||||
+ RoundData data = {
|
||||
+ GetPaddedMessageWord(message, n, m, offset),
|
||||
+ GetPaddedMessageWord(message, n, m, offset + 4),
|
||||
+ GetPaddedMessageWord(message, n, m, offset + 8),
|
||||
+ GetPaddedMessageWord(message, n, m, offset + 12),
|
||||
+ GetPaddedMessageWord(message, n, m, offset + 16),
|
||||
+ GetPaddedMessageWord(message, n, m, offset + 20),
|
||||
+ GetPaddedMessageWord(message, n, m, offset + 24),
|
||||
+ GetPaddedMessageWord(message, n, m, offset + 28),
|
||||
+ GetPaddedMessageWord(message, n, m, offset + 32),
|
||||
+ GetPaddedMessageWord(message, n, m, offset + 36),
|
||||
+ GetPaddedMessageWord(message, n, m, offset + 40),
|
||||
+ GetPaddedMessageWord(message, n, m, offset + 44),
|
||||
+ GetPaddedMessageWord(message, n, m, offset + 48),
|
||||
+ GetPaddedMessageWord(message, n, m, offset + 52),
|
||||
+ GetPaddedMessageWord(message, n, m, offset + 56),
|
||||
+ GetPaddedMessageWord(message, n, m, offset + 60)};
|
||||
+ IntermediateData intermediate1 = intermediate0;
|
||||
+ for (uint32_t i = 0; i < 64; ++i)
|
||||
+ intermediate1 = ApplyStep(i, data, intermediate1);
|
||||
+ intermediate0 = Add(intermediate0, intermediate1);
|
||||
+ }
|
||||
+ return SwapEndian(intermediate0.a);
|
||||
}
|
||||
};
|
||||
|
||||
--- a/src/3rdparty/chromium/net/third_party/quiche/src/quic/core/quic_versions.h
|
||||
+++ b/src/3rdparty/chromium/net/third_party/quiche/src/quic/core/quic_versions.h
|
||||
@@ -26,6 +26,7 @@
|
||||
#include <string>
|
||||
#include <vector>
|
||||
|
||||
+#include "absl/base/macros.h"
|
||||
#include "net/third_party/quiche/src/quic/core/quic_tag.h"
|
||||
#include "net/third_party/quiche/src/quic/core/quic_types.h"
|
||||
#include "net/third_party/quiche/src/quic/platform/api/quic_export.h"
|
||||
@@ -181,8 +182,14 @@ QUIC_EXPORT_PRIVATE constexpr bool ParsedQuicVersionIsValid(
|
||||
transport_version == QUIC_VERSION_RESERVED_FOR_NEGOTIATION;
|
||||
if (!transport_version_is_valid) {
|
||||
// Iterators are not constexpr in C++14 which Chrome uses.
|
||||
- constexpr auto supported_transport_versions = SupportedTransportVersions();
|
||||
- for (size_t i = 0; i < supported_transport_versions.size(); ++i) {
|
||||
+ constexpr QuicTransportVersion supported_transport_versions[] = {
|
||||
+ QUIC_VERSION_IETF_DRAFT_29,
|
||||
+ QUIC_VERSION_IETF_DRAFT_27,
|
||||
+ QUIC_VERSION_51,
|
||||
+ QUIC_VERSION_50,
|
||||
+ QUIC_VERSION_46,
|
||||
+ QUIC_VERSION_43};
|
||||
+ for (size_t i = 0; i < ABSL_ARRAYSIZE(supported_transport_versions); ++i) {
|
||||
const QuicTransportVersion& trans_vers = supported_transport_versions[i];
|
||||
if (trans_vers == transport_version) {
|
||||
transport_version_is_valid = true;
|
||||
|
||||
Reference in New Issue
Block a user