diff --git a/ports/zstd/install_pkgpc.patch b/ports/zstd/install_pkgpc.patch deleted file mode 100644 index a0582d98b21..00000000000 --- a/ports/zstd/install_pkgpc.patch +++ /dev/null @@ -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}") diff --git a/ports/zstd/no-static-suffix.patch b/ports/zstd/no-static-suffix.patch index 4e61f96b87d..89916f45e35 100644 --- a/ports/zstd/no-static-suffix.patch +++ b/ports/zstd/no-static-suffix.patch @@ -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)) diff --git a/ports/zstd/portfile.cmake b/ports/zstd/portfile.cmake index 6d7aa4df883..bf0755930c5 100644 --- a/ports/zstd/portfile.cmake +++ b/ports/zstd/portfile.cmake @@ -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 ) diff --git a/ports/zstd/vcpkg.json b/ports/zstd/vcpkg.json index d683b33e7de..bef08d955df 100644 --- a/ports/zstd/vcpkg.json +++ b/ports/zstd/vcpkg.json @@ -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", diff --git a/versions/baseline.json b/versions/baseline.json index a41b2293642..5a848712d4e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -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", diff --git a/versions/z-/zstd.json b/versions/z-/zstd.json index baed7ff3395..bb8ed1fd483 100644 --- a/versions/z-/zstd.json +++ b/versions/z-/zstd.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "16ff2b227a85c9f483480a6bb6d5eb0103ceee44", + "version": "1.5.4", + "port-version": 0 + }, { "git-tree": "f4504092df840f4dbb1ca00d2782e58dcee475b7", "version": "1.5.2",