Map zlib to zlib-ng

Remove the zlib port implementation and instead create an empty zlib port that depends on zlib-ng.

Author: donny-dont

.github/workflows/build.yaml

@@ -44,15 +44,15 @@ jobs:
       - name: Read zlib config
         if: steps.zlib.outcome == 'success' || steps.zlib.outcome == 'failure'
         continue-on-error: true
-        run: Get-Content ./buildtrees/zlib/config-${{ matrix.triplet }}-out.log
+        run: Get-Content ./buildtrees/zlib-ng/config-${{ matrix.triplet }}-out.log
       - name: Read zlib debug build log
         if: steps.zlib.outcome == 'success' || steps.zlib.outcome == 'failure'
         continue-on-error: true
-        run: Get-Content ./buildtrees/zlib/install-${{ matrix.triplet }}-dbg-out.log
+        run: Get-Content ./buildtrees/zlib-ng/install-${{ matrix.triplet }}-dbg-out.log
       - name: Read zlib release build log
         if: steps.zlib.outcome == 'success' || steps.zlib.outcome == 'failure'
         continue-on-error: true
-        run: Get-Content ./buildtrees/zlib/install-${{ matrix.triplet }}-rel-out.log
+        run: Get-Content ./buildtrees/zlib-ng/install-${{ matrix.triplet }}-rel-out.log
 
       - name: Build brotli
         id: brotli

README.md

@@ -22,7 +22,6 @@
 | Library | Version | Release Date |
 |---|:---:|:---:|
 | [icu](http://site.icu-project.org) | 76.1 | 2024-10-24 |
-| [zlib](https://github.com/zlib-ng/zlib-ng) | 2.2.2 | 2024-09-17 |
 | [curl](https://curl.se) | 8.11.0 | 2024-11-05 |
 | [libxml2](http://xmlsoft.org) | 2.13.5 | 2024-11-12 |
 | [sqlite](http://sqlite.org) | 3.47.0 | 2024-10-21 |

ports/zlib/portfile.cmake

@@ -1,39 +1,2 @@
-set(VERSION 2.2.2)
-
-set(FILENAME "zlib-ng-${VERSION}.zip")
-set(URLS "https://github.com/zlib-ng/zlib-ng/archive/refs/tags/${VERSION}.zip")
-
-# Get archive
-vcpkg_download_distfile(ARCHIVE
-    URLS ${URLS}
-    FILENAME ${FILENAME}
-    SHA512 98586b3ce67bf481ccb94f3263340dffde10c3735218b0c60173a91fe931f4e40a772691c7d19b691a167ae9709f62efcc247c2711d15cf19ca3bd318cab9689
-)
-
-# Extract archive
-vcpkg_extract_source_archive_ex(
-    OUT_SOURCE_PATH SOURCE_PATH
-    ARCHIVE ${ARCHIVE}
-    REF ${VERSION}
-    PATCHES ${PATCHES}
-)
-
-# Run CMake build
-vcpkg_cmake_configure(
-    SOURCE_PATH ${SOURCE_PATH}
-    OPTIONS
-        -DZLIB_COMPAT=ON
-        -DZLIB_ENABLE_TESTS=OFF
-    OPTIONS_DEBUG
-        -DSKIP_INSTALL_HEADERS=ON
-)
-
-vcpkg_cmake_install()
-vcpkg_copy_pdbs()
-vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/ZLIB)
-vcpkg_fixup_pkgconfig()
-
-# Prepare distribution
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
-file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/zlib RENAME copyright)
-file(WRITE ${CURRENT_PACKAGES_DIR}/share/zlib/version "${VERSION}")
+# Mapping zlib-ng to zlib
+set(VCPKG_POLICY_EMPTY_PACKAGE enabled)

ports/zlib/vcpkg.json

@@ -1,17 +1,10 @@
 {
   "name": "zlib",
-  "version": "2.2.2",
+  "version-string": "zlib-ng",
   "description": "A compression library",
   "homepage": "https://github.com/zlib-ng/zlib-ng",
   "license": "Zlib",
   "dependencies": [
-    {
-      "name": "vcpkg-cmake",
-      "host": true
-    },
-    {
-      "name": "vcpkg-cmake-config",
-      "host": true
-    }
+    "zlib-ng"
   ]
 }

triplets/x64-windows-webkit.cmake

@@ -8,3 +8,9 @@ if (PORT STREQUAL "highway")
 elseif (PORT STREQUAL "pixman")
     set(VCPKG_LIBRARY_LINKAGE static)
 endif ()
+
+# Turn on zlib compatibility
+if (PORT STREQUAL "zlib-ng")
+    set(ZLIB_COMPAT ON)
+    set(VCPKG_CMAKE_CONFIGURE_OPTIONS "-DZLIB_COMPAT=${ZLIB_COMPAT}")
+endif ()