diff --git a/ports/zlib-ng/fix-cmake.patch b/ports/zlib-ng/fix-cmake.patch deleted file mode 100644 index 5cf08b86..00000000 --- a/ports/zlib-ng/fix-cmake.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 8bcfaf7..3d11f12 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1208,9 +1208,11 @@ if(NOT SKIP_INSTALL_FILES AND NOT SKIP_INSTALL_ALL) - endif() - endif() - install(TARGETS ${ZLIB_INSTALL_LIBRARIES} -- EXPORT ${EXPORT_NAME} -- DESTINATION "${CMAKE_INSTALL_LIBDIR}") -- install(EXPORT ${EXPORT_NAME} -+ EXPORT ${EXPORT_NAME}Config -+ RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" -+ ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" -+ LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}") -+ install(EXPORT ${EXPORT_NAME}Config - DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${EXPORT_NAME}" - NAMESPACE ${EXPORT_NAME}::) - endif() diff --git a/ports/zlib-ng/portfile.cmake b/ports/zlib-ng/portfile.cmake index 8941eb98..863178f1 100644 --- a/ports/zlib-ng/portfile.cmake +++ b/ports/zlib-ng/portfile.cmake @@ -1,11 +1,9 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO zlib-ng/zlib-ng - REF 2.1.6 - SHA512 59ef586c09b9a63788475abfd6dd59ed602316b38f543f801bea802ff8bec8b55a89bee90375b8bbffa3bdebc7d92a00903f4b7c94cdc1a53a36e2e1fd71d13a - HEAD_REF develop - PATCHES - fix-cmake.patch + REF 2.2.2 + SHA512 3cb3e97ee1d20e1f3cdf0efcdf55aee0e3a192f9a2ae781cd209b1d37620c48f2ada345fb1f4357315b1cb5e09b7ea5fcdfa2fd54f7b4ac5dcb6e73860000aad + HEAD_REF 2.2.x ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS @@ -23,10 +21,11 @@ vcpkg_cmake_configure( -DSKIP_INSTALL_FILES=OFF -DZLIB_ENABLE_TESTS=OFF -DZLIBNG_ENABLE_TESTS=OFF - -DWITH_NEW_STRATEGIES=ON + -DWITH_GZFILEOP=ON -DWITH_NATIVE_INSTRUCTIONS=OFF # `-march=native` breaks `check_c_source_compiles` OPTIONS_DEBUG -DWITH_OPTIM=OFF + -DWITH_INFLATE_STRICT=ON ) vcpkg_cmake_install() vcpkg_copy_pdbs() diff --git a/ports/zlib-ng/vcpkg.json b/ports/zlib-ng/vcpkg.json index 3cbe75de..00fb97da 100644 --- a/ports/zlib-ng/vcpkg.json +++ b/ports/zlib-ng/vcpkg.json @@ -1,6 +1,6 @@ { "name": "zlib-ng", - "version": "2.1.6", + "version": "2.2.2", "description": "zlib replacement with optimizations for 'next generation' systems", "homepage": "https://github.com/zlib-ng/zlib-ng", "license": "Zlib", diff --git a/ports/zlib/portfile.cmake b/ports/zlib/portfile.cmake new file mode 100644 index 00000000..d257aea0 --- /dev/null +++ b/ports/zlib/portfile.cmake @@ -0,0 +1,7 @@ +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) + +if(VCPKG_TARGET_IS_WINDOWS) + message(STATUS "The port will install 'zlib-ng[zlib-compat]' instead") +else() + message(STATUS "The port is empty. Expect the platform SDK provides ZLIB") +endif() diff --git a/ports/zlib/vcpkg.json b/ports/zlib/vcpkg.json new file mode 100644 index 00000000..5c6950e3 --- /dev/null +++ b/ports/zlib/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "zlib", + "version-date": "2024-10-03", + "description": "Redirection to zlib-ng or system installed ZLIB", + "homepage": "https://github.com/zlib-ng/zlib-ng", + "license": "Zlib", + "dependencies": [ + { + "name": "zlib-ng", + "features": [ + "zlib-compat" + ], + "platform": "windows" + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index b936603a..5c251d3f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -232,8 +232,12 @@ "baseline": "2021-10-15", "port-version": 1 }, + "zlib": { + "baseline": "2024-10-03", + "port-version": 0 + }, "zlib-ng": { - "baseline": "2.1.6", + "baseline": "2.2.2", "port-version": 0 } } diff --git a/versions/z-/zlib-ng.json b/versions/z-/zlib-ng.json index eb7c1470..d937fa75 100644 --- a/versions/z-/zlib-ng.json +++ b/versions/z-/zlib-ng.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c199d90e06c3e38a2b4547ba00d11aca04473316", + "version": "2.2.2", + "port-version": 0 + }, { "git-tree": "8eeae331a085e2e8447359500c84bcb701e29eb6", "version": "2.1.6", diff --git a/versions/z-/zlib.json b/versions/z-/zlib.json new file mode 100644 index 00000000..ae61d764 --- /dev/null +++ b/versions/z-/zlib.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "3b67832abed02d23c17e5098dfc2483015319acb", + "version-date": "2024-10-03", + "port-version": 0 + } + ] +}