diff --git a/ports/zstd/fix-windows-rc-compile.patch b/ports/zstd/fix-windows-rc-compile.patch new file mode 100644 index 0000000000..7abde73919 --- /dev/null +++ b/ports/zstd/fix-windows-rc-compile.patch @@ -0,0 +1,13 @@ +diff --git a/build/cmake/lib/CMakeLists.txt b/build/cmake/lib/CMakeLists.txt +index 5d514ccb..dd79efb7 100644 +--- a/build/cmake/lib/CMakeLists.txt ++++ b/build/cmake/lib/CMakeLists.txt +@@ -123,7 +123,7 @@ set(PUBLIC_INCLUDE_DIRS ${LIBRARY_DIR}) + set(library_targets) + if (ZSTD_BUILD_SHARED) + add_library(libzstd_shared SHARED ${Sources} ${Headers} ${PlatformDependResources}) +- target_include_directories(libzstd_shared INTERFACE $) ++ target_include_directories(libzstd_shared PUBLIC $) + list(APPEND library_targets libzstd_shared) + if (ZSTD_MULTITHREAD_SUPPORT) + set_property(TARGET libzstd_shared APPEND PROPERTY COMPILE_DEFINITIONS "ZSTD_MULTITHREAD") diff --git a/ports/zstd/portfile.cmake b/ports/zstd/portfile.cmake index 86c59cfb89..8b6058f3dd 100644 --- a/ports/zstd/portfile.cmake +++ b/ports/zstd/portfile.cmake @@ -2,11 +2,12 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebook/zstd REF "v${VERSION}" - SHA512 356994e0d8188ce97590bf86b602eb50cbcb2f951594afb9c2d6e03cc68f966862505afc4a50e76efd55e4cfb11dbc9b15c7837b7827a961a1311ef72cd23505 + SHA512 ca12dffd86618ca008e1ecc79056c1129cb4e61668bf13a3cd5b2fa5c93bc9c92c80f64c1870c68b9c20009d9b3a834eac70db72242d5106125a1c53cccf8de8 HEAD_REF dev PATCHES no-static-suffix.patch fix-emscripten-and-clang-cl.patch + fix-windows-rc-compile.patch ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" ZSTD_BUILD_STATIC) diff --git a/ports/zstd/usage b/ports/zstd/usage index f01a2f5cfb..ea1dc0ac78 100644 --- a/ports/zstd/usage +++ b/ports/zstd/usage @@ -1,4 +1,4 @@ -The package zstd provides CMake targets: +zstd provides CMake targets: - find_package(zstd CONFIG REQUIRED) - target_link_libraries(main PRIVATE $,zstd::libzstd_shared,zstd::libzstd_static>) + find_package(zstd CONFIG REQUIRED) + target_link_libraries(main PRIVATE zstd::libzstd) diff --git a/ports/zstd/vcpkg.json b/ports/zstd/vcpkg.json index 2baf0003b9..db3c87d44d 100644 --- a/ports/zstd/vcpkg.json +++ b/ports/zstd/vcpkg.json @@ -1,7 +1,6 @@ { "name": "zstd", - "version": "1.5.5", - "port-version": 2, + "version": "1.5.6", "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 76afd11dc0..1842e5f756 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -9641,8 +9641,8 @@ "port-version": 0 }, "zstd": { - "baseline": "1.5.5", - "port-version": 2 + "baseline": "1.5.6", + "port-version": 0 }, "zstr": { "baseline": "1.0.7", diff --git a/versions/z-/zstd.json b/versions/z-/zstd.json index 42b93ffcb8..6ed59ec7f1 100644 --- a/versions/z-/zstd.json +++ b/versions/z-/zstd.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "796171d4d359b6786b8e1380fb6da8e677a9087b", + "version": "1.5.6", + "port-version": 0 + }, { "git-tree": "259dc461801ecb946995e13fd3d94b1381d02441", "version": "1.5.5",