Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view

This file was deleted.

54 changes: 0 additions & 54 deletions ports/zlib/0002-build-static-or-shared-not-both.patch

This file was deleted.

30 changes: 0 additions & 30 deletions ports/zlib/0003-android-and-mingw-fixes.patch

This file was deleted.

17 changes: 5 additions & 12 deletions ports/zlib/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -3,24 +3,14 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO madler/zlib
REF v${VERSION}
SHA512 8c9642495bafd6fad4ab9fb67f09b268c69ff9af0f4f20cf15dfc18852ff1f312bd8ca41de761b3f8d8e90e77d79f2ccacd3d4c5b19e475ecf09d021fdfe9088
SHA512 16fea4df307a68cf0035858abe2fd550250618a97590e202037acd18a666f57afc10f8836cbbd472d54a0e76539d0e558cb26f059d53de52ff90634bbf4f47d4
HEAD_REF master
PATCHES
0001-Prevent-invalid-inclusions-when-HAVE_-is-set-to-0.patch
0002-build-static-or-shared-not-both.patch
0003-android-and-mingw-fixes.patch
)

# This is generated during the cmake build
file(REMOVE "${SOURCE_PATH}/zconf.h")

vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS
-DSKIP_INSTALL_FILES=ON
-DZLIB_BUILD_EXAMPLES=OFF
OPTIONS_DEBUG
-DSKIP_INSTALL_HEADERS=ON
-DZLIB_BUILD_TESTING=OFF
)

vcpkg_cmake_install()
Expand All @@ -41,6 +31,7 @@ if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
endif()

vcpkg_fixup_pkgconfig()
vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/zlib")
vcpkg_copy_pdbs()

if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
Expand All @@ -51,3 +42,5 @@ endif()

file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
6 changes: 5 additions & 1 deletion ports/zlib/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,17 @@
{
"name": "zlib",
"version": "1.3.1",
"version": "1.3.2",
"description": "A compression library",
"homepage": "https://www.zlib.net/",
"license": "Zlib",
"dependencies": [
{
"name": "vcpkg-cmake",
"host": true
},
{
"name": "vcpkg-cmake-config",
"host": true
}
]
}
2 changes: 1 addition & 1 deletion versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -11101,7 +11101,7 @@
"port-version": 5
},
"zlib": {
"baseline": "1.3.1",
"baseline": "1.3.2",
"port-version": 0
},
"zlib-ng": {
Expand Down
5 changes: 5 additions & 0 deletions versions/z-/zlib.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "9e9d5bdeb3178e155814654bd8243d08f2872794",
"version": "1.3.2",
"port-version": 0
},
{
"git-tree": "3f05e04b9aededb96786a911a16193cdb711f0c9",
"version": "1.3.1",
Expand Down
Loading