mirror of
https://github.com/microsoft/vcpkg.git
synced 2025-01-14 02:38:03 +08:00
[protobuf] Update to 5.29.0 (#42400)
This commit is contained in:
parent
d2b6159679
commit
eb61a953b1
@ -5,6 +5,12 @@ vcpkg_download_distfile(
|
|||||||
FILENAME 282776acaf2c894791d2b5d4c294a28cfa2d4138.patch
|
FILENAME 282776acaf2c894791d2b5d4c294a28cfa2d4138.patch
|
||||||
)
|
)
|
||||||
|
|
||||||
|
vcpkg_download_distfile(
|
||||||
|
PROTOBUF_29_PATCH
|
||||||
|
URLS https://github.com/apache/brpc/commit/8d1ee6d06ffdf84a33bd083463663ece5fb9e7a9.patch?full_index=1
|
||||||
|
SHA512 d271aadc636c97bc3b2ad514558e7ae0f41af076b98346169f13f4e79be6165a69a9aa0da83c7db8ddfca5689e3d67afc8dd14ecd893f54441bde1135eafaf8e
|
||||||
|
FILENAME 8d1ee6d06ffdf84a33bd083463663ece5fb9e7a9.patch
|
||||||
|
)
|
||||||
vcpkg_from_github(
|
vcpkg_from_github(
|
||||||
OUT_SOURCE_PATH SOURCE_PATH
|
OUT_SOURCE_PATH SOURCE_PATH
|
||||||
REPO apache/brpc
|
REPO apache/brpc
|
||||||
@ -15,6 +21,7 @@ vcpkg_from_github(
|
|||||||
fix-build.patch
|
fix-build.patch
|
||||||
fix-warnings.patch
|
fix-warnings.patch
|
||||||
${PROTOBUF_V5_PATCH}
|
${PROTOBUF_V5_PATCH}
|
||||||
|
${PROTOBUF_29_PATCH}
|
||||||
)
|
)
|
||||||
|
|
||||||
vcpkg_cmake_configure(
|
vcpkg_cmake_configure(
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "brpc",
|
"name": "brpc",
|
||||||
"version": "1.11.0",
|
"version": "1.11.0",
|
||||||
|
"port-version": 1,
|
||||||
"description": "Industrial-grade RPC framework used throughout Baidu, with 1,000,000+ instances and thousands kinds of services, called \"baidu-rpc\" inside Baidu.",
|
"description": "Industrial-grade RPC framework used throughout Baidu, with 1,000,000+ instances and thousands kinds of services, called \"baidu-rpc\" inside Baidu.",
|
||||||
"homepage": "https://github.com/apache/brpc",
|
"homepage": "https://github.com/apache/brpc",
|
||||||
"license": "Apache-2.0",
|
"license": "Apache-2.0",
|
||||||
|
@ -1,22 +0,0 @@
|
|||||||
diff --git a/src/google/protobuf/parse_context.h b/src/google/protobuf/parse_context.h
|
|
||||||
index d40e71c1d..22ed8212d 100644
|
|
||||||
--- a/src/google/protobuf/parse_context.h
|
|
||||||
+++ b/src/google/protobuf/parse_context.h
|
|
||||||
@@ -635,7 +635,7 @@ inline const char* VarintParseSlow(const char* p, uint32_t res, uint64_t* out) {
|
|
||||||
return tmp.first;
|
|
||||||
}
|
|
||||||
|
|
||||||
-#ifdef __aarch64__
|
|
||||||
+#if defined(__aarch64__) && !defined(_MSC_VER)
|
|
||||||
// Generally, speaking, the ARM-optimized Varint decode algorithm is to extract
|
|
||||||
// and concatenate all potentially valid data bits, compute the actual length
|
|
||||||
// of the Varint, and mask off the data bits which are not actually part of the
|
|
||||||
@@ -866,7 +866,7 @@ static const char* VarintParseSlowArm(const char* p, uint64_t* out,
|
|
||||||
// The caller must ensure that p points to at least 10 valid bytes.
|
|
||||||
template <typename T>
|
|
||||||
PROTOBUF_NODISCARD const char* VarintParse(const char* p, T* out) {
|
|
||||||
-#if defined(__aarch64__) && defined(ABSL_IS_LITTLE_ENDIAN)
|
|
||||||
+#if defined(__aarch64__) && defined(ABSL_IS_LITTLE_ENDIAN) && !defined(_MSC_VER)
|
|
||||||
// This optimization is not supported in big endian mode
|
|
||||||
uint64_t first8;
|
|
||||||
std::memcpy(&first8, p, sizeof(first8));
|
|
@ -2,13 +2,12 @@ vcpkg_from_github(
|
|||||||
OUT_SOURCE_PATH SOURCE_PATH
|
OUT_SOURCE_PATH SOURCE_PATH
|
||||||
REPO protocolbuffers/protobuf
|
REPO protocolbuffers/protobuf
|
||||||
REF "v${VERSION}"
|
REF "v${VERSION}"
|
||||||
SHA512 a188d109f317c0cff1d57c3d81b307ff46db816774af2eb4edc39b136725bb3ed70fafbcffcdf9465f6f948a1e7dfc0175f75b17acd414e5ae543939a510688a
|
SHA512 6cb70c9a93cfc784632b78836d685d78260680a81559df11d94d32d1c62f0794747a16bba215ad09a4e40396deebe964dbe0b21605b1f4eb026c7f0e8f9f7ed8
|
||||||
HEAD_REF master
|
HEAD_REF master
|
||||||
PATCHES
|
PATCHES
|
||||||
fix-static-build.patch
|
fix-static-build.patch
|
||||||
fix-default-proto-file-path.patch
|
fix-default-proto-file-path.patch
|
||||||
fix-utf8-range.patch
|
fix-utf8-range.patch
|
||||||
fix-arm64-msvc.patch
|
|
||||||
fix-install-dirs.patch
|
fix-install-dirs.patch
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "protobuf",
|
"name": "protobuf",
|
||||||
"version": "5.28.3",
|
"version": "5.29.0",
|
||||||
"description": "Google's language-neutral, platform-neutral, extensible mechanism for serializing structured data.",
|
"description": "Google's language-neutral, platform-neutral, extensible mechanism for serializing structured data.",
|
||||||
"homepage": "https://github.com/protocolbuffers/protobuf",
|
"homepage": "https://github.com/protocolbuffers/protobuf",
|
||||||
"license": "BSD-3-Clause",
|
"license": "BSD-3-Clause",
|
||||||
|
@ -1,5 +1,10 @@
|
|||||||
{
|
{
|
||||||
"versions": [
|
"versions": [
|
||||||
|
{
|
||||||
|
"git-tree": "ca90d56aa3099689d6003e66c1093ca01934543c",
|
||||||
|
"version": "1.11.0",
|
||||||
|
"port-version": 1
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"git-tree": "8473c99ec8eaf2d3fba5b34501f26cdd8b37d438",
|
"git-tree": "8473c99ec8eaf2d3fba5b34501f26cdd8b37d438",
|
||||||
"version": "1.11.0",
|
"version": "1.11.0",
|
||||||
|
@ -1402,7 +1402,7 @@
|
|||||||
},
|
},
|
||||||
"brpc": {
|
"brpc": {
|
||||||
"baseline": "1.11.0",
|
"baseline": "1.11.0",
|
||||||
"port-version": 0
|
"port-version": 1
|
||||||
},
|
},
|
||||||
"brunocodutra-metal": {
|
"brunocodutra-metal": {
|
||||||
"baseline": "2.1.4",
|
"baseline": "2.1.4",
|
||||||
@ -7221,7 +7221,7 @@
|
|||||||
"port-version": 0
|
"port-version": 0
|
||||||
},
|
},
|
||||||
"protobuf": {
|
"protobuf": {
|
||||||
"baseline": "5.28.3",
|
"baseline": "5.29.0",
|
||||||
"port-version": 0
|
"port-version": 0
|
||||||
},
|
},
|
||||||
"protobuf-c": {
|
"protobuf-c": {
|
||||||
|
@ -1,5 +1,10 @@
|
|||||||
{
|
{
|
||||||
"versions": [
|
"versions": [
|
||||||
|
{
|
||||||
|
"git-tree": "8d7ae72e8a78bdc3bda1d3c02fffd99241844800",
|
||||||
|
"version": "5.29.0",
|
||||||
|
"port-version": 0
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"git-tree": "255021688a2d0cb1df1211ccf3b7a52a7f97be76",
|
"git-tree": "255021688a2d0cb1df1211ccf3b7a52a7f97be76",
|
||||||
"version": "5.28.3",
|
"version": "5.28.3",
|
||||||
|
Loading…
x
Reference in New Issue
Block a user