mirror of
https://github.com/microsoft/vcpkg.git
synced 2025-01-15 02:35:49 +08:00
[zstd] update to 1.4.9 (#16865)
* [zstd] update to 1.4.9 Fixes #16642 Update zstd to the latest version 1.4.9: https://github.com/facebook/zstd/releases/tag/v1.4.9 * update baseline / version * Update vcpkg.json * Update vcpkg.json apply suggested diff file * attempt to fix build errors (missing file libzstd?) * Update zstd.json * Update portfile.cmake * fix version Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com>
This commit is contained in:
parent
f22705fd15
commit
13640c5671
@ -1,12 +0,0 @@
|
||||
diff --git a/build/cmake/CMakeModules/AddZstdCompilationFlags.cmake b/build/cmake/CMakeModules/AddZstdCompilationFlags.cmake
|
||||
index 7adca875..8835d1c6 100644
|
||||
--- a/build/cmake/CMakeModules/AddZstdCompilationFlags.cmake 2019-11-04 17:54:32.000000000 +0000
|
||||
+++ b/build/cmake/CMakeModules/AddZstdCompilationFlags.cmake 2020-09-09 20:54:13.817515706 +0000
|
||||
@@ -52,7 +52,6 @@
|
||||
CMAKE_CXX_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_RELWITHDEBINFO)
|
||||
if( ${flag_var} )
|
||||
separate_arguments(${flag_var})
|
||||
- list(REMOVE_DUPLICATES ${flag_var})
|
||||
string(REPLACE ";" " " ${flag_var} "${${flag_var}}")
|
||||
endif()
|
||||
endforeach ()
|
@ -1,5 +0,0 @@
|
||||
Source: zstd
|
||||
Version: 1.4.5
|
||||
Port-Version: 1
|
||||
Description: Zstandard - Fast real-time compression algorithm
|
||||
Homepage: https://facebook.github.io/zstd/
|
@ -1,13 +0,0 @@
|
||||
diff --git a/lib/decompress/zstd_decompress.c b/lib/decompress/zstd_decompress.c
|
||||
index be5c7cfc3..539190998 100644
|
||||
--- a/lib/decompress/zstd_decompress.c
|
||||
+++ b/lib/decompress/zstd_decompress.c
|
||||
@@ -721,7 +721,7 @@ static size_t ZSTD_decompressMultiFrame(ZSTD_DCtx* dctx,
|
||||
decodedSize = ZSTD_decompressLegacy(dst, dstCapacity, src, frameSize, dict, dictSize);
|
||||
if (ZSTD_isError(decodedSize)) return decodedSize;
|
||||
|
||||
- assert(decodedSize <=- dstCapacity);
|
||||
+ assert(decodedSize <= dstCapacity);
|
||||
dst = (BYTE*)dst + decodedSize;
|
||||
dstCapacity -= decodedSize;
|
||||
|
@ -1,12 +0,0 @@
|
||||
diff --git a/build/cmake/lib/CMakeLists.txt b/build/cmake/lib/CMakeLists.txt
|
||||
index 4274cbdd3..ea1b5f088 100644
|
||||
--- a/build/cmake/lib/CMakeLists.txt
|
||||
+++ b/build/cmake/lib/CMakeLists.txt
|
||||
@@ -163,6 +163,7 @@ install(TARGETS ${library_targets}
|
||||
INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
|
||||
ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
|
||||
LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
|
||||
+ RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
|
||||
)
|
||||
|
||||
# uninstall target
|
@ -1,13 +1,14 @@
|
||||
diff --git a/build/cmake/lib/CMakeLists.txt b/build/cmake/lib/CMakeLists.txt
|
||||
index 666da60c1..4274cbdd3 100644
|
||||
index 179c9762..f86efdbc 100644
|
||||
--- a/build/cmake/lib/CMakeLists.txt
|
||||
+++ b/build/cmake/lib/CMakeLists.txt
|
||||
@@ -134,7 +134,7 @@ if (ZSTD_BUILD_STATIC)
|
||||
OUTPUT_NAME ${STATIC_LIBRARY_BASE_NAME})
|
||||
endif ()
|
||||
|
||||
-if (UNIX)
|
||||
|
||||
-if (UNIX OR MINGW)
|
||||
+if (1)
|
||||
# pkg-config
|
||||
set(PREFIX "${CMAKE_INSTALL_PREFIX}")
|
||||
set(LIBDIR "${CMAKE_INSTALL_LIBDIR}")
|
||||
set(EXEC_PREFIX "\${prefix}")
|
||||
|
@ -1,14 +1,11 @@
|
||||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO facebook/zstd
|
||||
REF b706286adbba780006a47ef92df0ad7a785666b6 # v1.4.5
|
||||
SHA512 1be43e8cc1dad9dd59036f86a7dd579b8fcbf16b3ebae62f38aa0397f45ab0eab2e97e924cede40428fa9125a2e5e567694bb04a0c9ec0c4275a79cd2ef8eb11
|
||||
REF v1.4.9
|
||||
SHA512 f529db9c094f9ae26428bf1fdfcc91c6d783d400980e0f0d802d2cf13c2be2931465ef568907e03841ff76a369a1447e7371f8799d8526edb9a513ba5c6db133
|
||||
HEAD_REF dev
|
||||
PATCHES
|
||||
0002-crosscompile-windows.patch
|
||||
fix_assert.patch
|
||||
install_pkgpc.patch
|
||||
install_dll.patch
|
||||
)
|
||||
|
||||
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
|
||||
|
6
ports/zstd/vcpkg.json
Normal file
6
ports/zstd/vcpkg.json
Normal file
@ -0,0 +1,6 @@
|
||||
{
|
||||
"name": "zstd",
|
||||
"version": "1.4.9",
|
||||
"description": "Zstandard - Fast real-time compression algorithm",
|
||||
"homepage": "https://facebook.github.io/zstd/"
|
||||
}
|
@ -6529,8 +6529,8 @@
|
||||
"port-version": 0
|
||||
},
|
||||
"zstd": {
|
||||
"baseline": "1.4.5",
|
||||
"port-version": 1
|
||||
"baseline": "1.4.9",
|
||||
"port-version": 0
|
||||
},
|
||||
"zstr": {
|
||||
"baseline": "1.0.4",
|
||||
|
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "3a0ffa2a8fe8246a3937d9f6a77d577e351dd445",
|
||||
"version": "1.4.9",
|
||||
"port-version": 0
|
||||
},
|
||||
{
|
||||
"git-tree": "b592e9dd5ab7aa6c1b46e0d23e0d31093edd73ca",
|
||||
"version-string": "1.4.5",
|
||||
|
Loading…
x
Reference in New Issue
Block a user