[zstd] Update to 1.5.4 (#29652)

* [zstd] Update to 1.5.4

* [zstd] Update version files
This commit is contained in:
Rémy Tassoux 2023-02-16 19:22:24 +01:00 committed by GitHub
parent 1f29c82a8e
commit c1f00045e9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 10 additions and 20 deletions

View File

@ -1,13 +0,0 @@
diff --git a/build/cmake/lib/CMakeLists.txt b/build/cmake/lib/CMakeLists.txt
index 5f75665..dabc9d5 100644
--- a/build/cmake/lib/CMakeLists.txt
+++ b/build/cmake/lib/CMakeLists.txt
@@ -130,7 +130,7 @@ if (ZSTD_BUILD_STATIC)
OUTPUT_NAME ${STATIC_LIBRARY_BASE_NAME})
endif ()
-if (UNIX OR MINGW)
+if (1)
# pkg-config
set(PREFIX "${CMAKE_INSTALL_PREFIX}")
set(EXEC_PREFIX "\${prefix}")

View File

@ -2,7 +2,7 @@ diff --git a/build/cmake/lib/CMakeLists.txt b/build/cmake/lib/CMakeLists.txt
index 8234060..765f003 100644
--- a/build/cmake/lib/CMakeLists.txt
+++ b/build/cmake/lib/CMakeLists.txt
@@ -112,7 +112,7 @@ endif ()
@@ -118,7 +118,7 @@ endif ()
# With MSVC static library needs to be renamed to avoid conflict with import library
if (MSVC OR (WIN32 AND CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND NOT MINGW))

View File

@ -3,10 +3,9 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO facebook/zstd
REF "v${VERSION}"
SHA512 e107508a41fca50845cc2494e64adaba93efb95a2fa486fc962510a8ba4b2180d93067cae9870f119e88e5e8b28a046bc2240b0b23cdd8933d1fb1a6a9668c1e
SHA512 b6f64850ceb6cfed831fff3c43508d2a72338862a96dd9430b1d3ebbfcee40201c8b6dcf8b6b603e252bb96f3f283c9cb07da7f24414187f5f1fea3b51e01863
HEAD_REF dev
PATCHES
install_pkgpc.patch
no-static-suffix.patch
)

View File

@ -1,7 +1,6 @@
{
"name": "zstd",
"version": "1.5.2",
"port-version": 3,
"version": "1.5.4",
"description": "Zstandard - Fast real-time compression algorithm",
"homepage": "https://facebook.github.io/zstd/",
"license": "BSD-3-Clause OR GPL-2.0-only",

View File

@ -8581,8 +8581,8 @@
"port-version": 0
},
"zstd": {
"baseline": "1.5.2",
"port-version": 3
"baseline": "1.5.4",
"port-version": 0
},
"zstr": {
"baseline": "1.0.7",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "16ff2b227a85c9f483480a6bb6d5eb0103ceee44",
"version": "1.5.4",
"port-version": 0
},
{
"git-tree": "f4504092df840f4dbb1ca00d2782e58dcee475b7",
"version": "1.5.2",