diff --git a/ports/libkml/fix-mingw.patch b/ports/libkml/fix-mingw.patch new file mode 100644 index 00000000000000..32a2a80fda9fe8 --- /dev/null +++ b/ports/libkml/fix-mingw.patch @@ -0,0 +1,41 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 028f50a..bb63ffb 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -26,6 +26,9 @@ set(LIBKML_DATA_DIR ${CMAKE_SOURCE_DIR}/testdata CACHE "Directory containing te + if(CMAKE_COMPILER_IS_GNUCXX) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wno-unused-parameter -pedantic -fno-rtti") + set(TEST_FLAGS "-Wall -Wextra -Wno-unused-parameter -fno-rtti -DGTEST_HAS_RTTI=0") ++if(WIN32) ++ add_definitions(-DUNICODE -D_UNICODE) ++endif() + + else() + if(MSVC) +diff --git a/src/kml/base/file_win32.cc b/src/kml/base/file_win32.cc +index 28ccb36..6ba79cd 100644 +--- a/src/kml/base/file_win32.cc ++++ b/src/kml/base/file_win32.cc +@@ -34,7 +34,9 @@ + #include "kml/base/file.h" + #include + #include ++#ifndef __MINGW32__ + #include ++#endif + #include + + namespace kmlbase { +diff --git a/src/kml/base/string_util.cc b/src/kml/base/string_util.cc +index b3a9654..842f1cd 100644 +--- a/src/kml/base/string_util.cc ++++ b/src/kml/base/string_util.cc +@@ -113,7 +113,7 @@ bool StringEndsWith(const string& str, const string& end) { + } + + bool StringCaseEqual(const string& a, const string& b) { +-#ifdef WIN32 ++#if defined(WIN32) && !defined(__MINGW32__) + # define strncasecmp(s1, s2, n) _strnicmp (s1, s2, n) + #endif + return a.size() == b.size() && strncasecmp(a.data(), b.data(), a.size()) == 0; diff --git a/ports/libkml/fix-minizip.patch b/ports/libkml/fix-minizip.patch new file mode 100644 index 00000000000000..358f664a3974e7 --- /dev/null +++ b/ports/libkml/fix-minizip.patch @@ -0,0 +1,72 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 9728ead..028f50a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -110,9 +110,9 @@ else() + list(APPEND MINIZIP_DEPENDS ZLIB) + endif() + +-find_package(MiniZip) ++find_package(MINIZIP NAMES minizip REQUIRED) + if(MINIZIP_FOUND) +- include_directories(${MINIZIP_INCLUDE_DIR}) ++ set(MINIZIP_LIBRARY minizip::minizip) + else() + include(External_minizip) + list(APPEND KMLBASE_DEPENDS MINIZIP) +diff --git a/cmake/LibKMLConfig.cmake.in b/cmake/LibKMLConfig.cmake.in +index 3e295f4..97826df 100644 +--- a/cmake/LibKMLConfig.cmake.in ++++ b/cmake/LibKMLConfig.cmake.in +@@ -1,3 +1,6 @@ ++include(CMakeFindDependencyMacro) ++find_dependency(minizip CONFIG) ++ + # Compute paths + get_filename_component(LIBKML_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH) + +diff --git a/src/kml/base/contrib/minizip/iomem_simple.c b/src/kml/base/contrib/minizip/iomem_simple.c +index be89226..6be61d5 100644 +--- a/src/kml/base/contrib/minizip/iomem_simple.c ++++ b/src/kml/base/contrib/minizip/iomem_simple.c +@@ -219,7 +219,7 @@ int ZCALLBACK mem_error (opaque, stream) + return 0; + } + +-ZEXTERN void* ZEXPORT mem_simple_create_file(zlib_filefunc_def* api, void* buffer, size_t buf_len) ++extern void* mem_simple_create_file(zlib_filefunc_def* api, void* buffer, size_t buf_len) + { + MEMFILE* handle = malloc(sizeof(*handle)); + api->zopen_file = NULL; +diff --git a/src/kml/base/contrib/minizip/iomem_simple.h b/src/kml/base/contrib/minizip/iomem_simple.h +index ec11396..515e24e 100644 +--- a/src/kml/base/contrib/minizip/iomem_simple.h ++++ b/src/kml/base/contrib/minizip/iomem_simple.h +@@ -70,7 +70,7 @@ void fill_fopen_filefunc OF((zlib_filefunc_def* pzlib_filefunc_def)); + * This declaration is from the proposed iomem_simple package found at + * http://code.trak.dk. See iomem_simple.c + */ +-extern void* ZEXPORT mem_simple_create_file(zlib_filefunc_def* pzlib_filefunc_def, void* buffer, size_t buflen); ++extern void* mem_simple_create_file(zlib_filefunc_def* pzlib_filefunc_def, void* buffer, size_t buflen); + + #ifdef __cplusplus + } +diff --git a/src/kml/base/contrib/minizip/unzip.c b/src/kml/base/contrib/minizip/unzip.c +index a062863..fb69189 100644 +--- a/src/kml/base/contrib/minizip/unzip.c ++++ b/src/kml/base/contrib/minizip/unzip.c +@@ -43,6 +43,14 @@ woven in by Terry Thorsen 1/2003. + #include "unzip.h" + #include "iomem_simple.h" + #undef NOUNCRYPT ++#ifdef ZEXPORT ++# undef ZEXPORT ++#endif ++#define ZEXPORT ++#ifdef ZEXTERN ++# undef ZEXTERN ++#endif ++#define ZEXTERN extern + + #ifdef STDC + # include diff --git a/ports/libkml/portfile.cmake b/ports/libkml/portfile.cmake index ce54b1c7e39eed..4019646c3d5f5f 100644 --- a/ports/libkml/portfile.cmake +++ b/ports/libkml/portfile.cmake @@ -1,3 +1,7 @@ +if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) + vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +endif() + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libkml/libkml @@ -6,26 +10,31 @@ vcpkg_from_github( HEAD_REF master PATCHES patch_empty_literal_on_vc.patch + fix-mingw.patch + fix-minizip.patch ) -file(REMOVE ${SOURCE_PATH}/cmake/External_boost.cmake) +file(REMOVE + "${SOURCE_PATH}/cmake/External_boost.cmake" + "${SOURCE_PATH}/cmake/External_expat.cmake" + "${SOURCE_PATH}/cmake/External_minizip.cmake" + "${SOURCE_PATH}/cmake/External_uriparser.cmake" + "${SOURCE_PATH}/cmake/External_zlib.cmake" + "${SOURCE_PATH}/src/kml/base/contrib/minizip/ioapi.h" +) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() - -if (VCPKG_TARGET_IS_WINDOWS) - vcpkg_fixup_cmake_targets(CONFIG_PATH cmake) -elseif (VCPKG_TARGET_IS_LINUX) - vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/libkml) -elseif (VCPKG_TARGET_IS_OSX) - vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/libkml) +vcpkg_fixup_pkgconfig() +if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_cmake_config_fixup(CONFIG_PATH cmake) +else() + vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/libkml) endif() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) -vcpkg_fixup_pkgconfig() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/libkml/vcpkg.json b/ports/libkml/vcpkg.json index fa70197a25326d..8a7c9c661ba188 100644 --- a/ports/libkml/vcpkg.json +++ b/ports/libkml/vcpkg.json @@ -1,19 +1,23 @@ { "name": "libkml", - "version-string": "1.3.0", - "port-version": 8, + "version": "1.3.0", + "port-version": 9, "description": "Reference implementation of OGC KML 2.2", "homepage": "https://github.com/libkml/libkml", + "license": "BSD-3-Clause", "dependencies": [ "boost-smart-ptr", "expat", + "minizip", + "uriparser", { - "name": "minizip", - "features": [ - "bzip2" - ] + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true }, - "uriparser", "zlib" ] } diff --git a/ports/minizip/CMakeLists.txt b/ports/minizip/CMakeLists.txt index c17ab8974230b6..313450b96294bf 100644 --- a/ports/minizip/CMakeLists.txt +++ b/ports/minizip/CMakeLists.txt @@ -1,10 +1,5 @@ cmake_minimum_required(VERSION 3.8) -project(minizip C) - -set(PROJECT_VERSION 1.2.11) -set(PROJECT_VERSION_MAJOR 1) -set(PROJECT_VERSION_MINOR 2) -set(PROJECT_VERSION_PATCH 11) +project(minizip VERSION 1.2.13 LANGUAGES C) if(MSVC) add_compile_options(/W3 /wd4005 /wd4996 /wd4018 -D_CRT_SECURE_NO_WARNINGS) diff --git a/ports/minizip/portfile.cmake b/ports/minizip/portfile.cmake index 5e5a56e38ad1c6..211a1fc10b5117 100644 --- a/ports/minizip/portfile.cmake +++ b/ports/minizip/portfile.cmake @@ -1,10 +1,12 @@ +# When this port is updated, the minizip port should be updated at the same time + vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO madler/zlib - REF v1.2.11 - SHA512 104c62ed1228b5f1199bc037081861576900eb0697a226cafa62a35c4c890b5cb46622e399f9aad82ee5dfb475bae26ae75e2bd6da3d261361b1c8b996970faf + REF v1.2.13 + SHA512 44b834fbfb50cca229209b8dbe1f96b258f19a49f5df23b80970b716371d856a4adf525edb4c6e0e645b180ea949cb90f5365a1d896160f297f56794dd888659 HEAD_REF master PATCHES 0001-remove-ifndef-NOUNCRYPT.patch @@ -13,7 +15,8 @@ vcpkg_from_github( ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - bzip2 ENABLE_BZIP2 + FEATURES + bzip2 ENABLE_BZIP2 ) configure_file(${CMAKE_CURRENT_LIST_DIR}/minizipConfig.cmake.in ${SOURCE_PATH}/cmake/minizipConfig.cmake.in COPYONLY) @@ -43,4 +46,5 @@ if ("bzip2" IN_LIST FEATURES) endforeach() endif() -file(INSTALL ${SOURCE_PATH}/contrib/minizip/MiniZip64_info.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(INSTALL "${SOURCE_PATH}/contrib/minizip/MiniZip64_info.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/minizip/usage b/ports/minizip/usage new file mode 100644 index 00000000000000..38a6340661d627 --- /dev/null +++ b/ports/minizip/usage @@ -0,0 +1,4 @@ +minizip provides CMake targets: + + find_package(minizip CONFIG REQUIRED) + target_link_libraries(main PRIVATE minizip::minizip) diff --git a/ports/minizip/vcpkg.json b/ports/minizip/vcpkg.json index c8bc8dbb6d4518..7ffbbafe9532ed 100644 --- a/ports/minizip/vcpkg.json +++ b/ports/minizip/vcpkg.json @@ -1,9 +1,9 @@ { "name": "minizip", - "version-semver": "1.2.11", - "port-version": 10, + "version-semver": "1.2.13", "description": "Zip compression library", "homepage": "https://github.com/madler/zlib", + "license": "Zlib", "supports": "!uwp", "dependencies": [ "zlib" diff --git a/ports/zlib/0002-skip-building-examples.patch b/ports/zlib/0002-skip-building-examples.patch new file mode 100644 index 00000000000000..8183f2ab20b0d2 --- /dev/null +++ b/ports/zlib/0002-skip-building-examples.patch @@ -0,0 +1,17 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b412dc7..f46c8e6 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -194,6 +194,7 @@ endif() + # Example binaries + #============================================================================ + ++if (0) + add_executable(example test/example.c) + target_link_libraries(example zlib) + add_test(example example) +@@ -211,3 +212,4 @@ if(HAVE_OFF64_T) + target_link_libraries(minigzip64 zlib) + set_target_properties(minigzip64 PROPERTIES COMPILE_FLAGS "-D_FILE_OFFSET_BITS=64") + endif() ++endif() diff --git a/ports/zlib/0003-build-static-or-shared-not-both.patch b/ports/zlib/0003-build-static-or-shared-not-both.patch new file mode 100644 index 00000000000000..c9f2ecf19762e8 --- /dev/null +++ b/ports/zlib/0003-build-static-or-shared-not-both.patch @@ -0,0 +1,53 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f46c8e6..6fa5575 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -121,9 +121,11 @@ set(ZLIB_SRCS + ) + + if(NOT MINGW) ++ if(BUILD_SHARED_LIBS) + set(ZLIB_DLL_SRCS + win32/zlib1.rc # If present will override custom build rule below. + ) ++ endif() + endif() + + # parse the full version number from zlib.h and include in ZLIB_FULL_VERSION +@@ -144,13 +146,16 @@ if(MINGW) + -I ${CMAKE_CURRENT_BINARY_DIR} + -o ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj + -i ${CMAKE_CURRENT_SOURCE_DIR}/win32/zlib1.rc) ++ if(BUILD_SHARED_LIBS) + set(ZLIB_DLL_SRCS ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj) ++ endif() + endif(MINGW) + +-add_library(zlib SHARED ${ZLIB_SRCS} ${ZLIB_DLL_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS}) +-add_library(zlibstatic STATIC ${ZLIB_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS}) ++add_library(zlib ${ZLIB_SRCS} ${ZLIB_ASMS} ${ZLIB_DLL_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS}) ++if (BUILD_SHARED_LIBS) + set_target_properties(zlib PROPERTIES DEFINE_SYMBOL ZLIB_DLL) + set_target_properties(zlib PROPERTIES SOVERSION 1) ++endif() + + if(NOT CYGWIN) + # This property causes shared libraries on Linux to have the full version +@@ -165,7 +170,7 @@ endif() + + if(UNIX) + # On unix-like platforms the library is almost always called libz +- set_target_properties(zlib zlibstatic PROPERTIES OUTPUT_NAME z) ++ set_target_properties(zlib PROPERTIES OUTPUT_NAME z) + if(NOT APPLE) + set_target_properties(zlib PROPERTIES LINK_FLAGS "-Wl,--version-script,\"${CMAKE_CURRENT_SOURCE_DIR}/zlib.map\"") + endif() +@@ -175,7 +180,7 @@ elseif(BUILD_SHARED_LIBS AND WIN32) + endif() + + if(NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL ) +- install(TARGETS zlib zlibstatic ++ install(TARGETS zlib + RUNTIME DESTINATION "${INSTALL_BIN_DIR}" + ARCHIVE DESTINATION "${INSTALL_LIB_DIR}" + LIBRARY DESTINATION "${INSTALL_LIB_DIR}" ) diff --git a/ports/zlib/0002-android-build-mingw.patch b/ports/zlib/0004-android-and-mingw-fixes.patch similarity index 52% rename from ports/zlib/0002-android-build-mingw.patch rename to ports/zlib/0004-android-and-mingw-fixes.patch index 188499df0b758b..e93173f24618b8 100644 --- a/ports/zlib/0002-android-build-mingw.patch +++ b/ports/zlib/0004-android-and-mingw-fixes.patch @@ -1,7 +1,17 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt ---- a/CMakeLists.txt (date 1618364429263) -+++ b/CMakeLists.txt (date 1618364429263) -@@ -170,7 +170,7 @@ +index 6fa5575..7c345db 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -56,7 +56,7 @@ endif() + # + check_include_file(unistd.h Z_HAVE_UNISTD_H) + +-if(MSVC) ++if(WIN32) + set(CMAKE_DEBUG_POSTFIX "d") + add_definitions(-D_CRT_SECURE_NO_DEPRECATE) + add_definitions(-D_CRT_NONSTDC_NO_DEPRECATE) +@@ -133,7 +133,7 @@ file(READ ${CMAKE_CURRENT_SOURCE_DIR}/zlib.h _zlib_h_contents) string(REGEX REPLACE ".*#define[ \t]+ZLIB_VERSION[ \t]+\"([-0-9A-Za-z.]+)\".*" "\\1" ZLIB_FULL_VERSION ${_zlib_h_contents}) @@ -10,12 +20,12 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt # This gets us DLL resource information when compiling on MinGW. if(NOT CMAKE_RC_COMPILER) set(CMAKE_RC_COMPILER windres.exe) -@@ -186,7 +186,7 @@ +@@ -149,7 +149,7 @@ if(MINGW) if(BUILD_SHARED_LIBS) - set(ZLIB_DLL_SRCS ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj) + set(ZLIB_DLL_SRCS ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj) endif() -endif(MINGW) +endif(MINGW AND NOT ANDROID) add_library(zlib ${ZLIB_SRCS} ${ZLIB_ASMS} ${ZLIB_DLL_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS}) - set_target_properties(zlib PROPERTIES DEFINE_SYMBOL ZLIB_DLL) + if (BUILD_SHARED_LIBS) diff --git a/ports/zlib/add_debug_postfix_on_mingw.patch b/ports/zlib/add_debug_postfix_on_mingw.patch deleted file mode 100644 index 22172ccfcaaef0..00000000000000 --- a/ports/zlib/add_debug_postfix_on_mingw.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 0fe939d..e4fc213 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -59,7 +59,7 @@ endif() - # - check_include_file(unistd.h Z_HAVE_UNISTD_H) - --if(MSVC) -+if(WIN32) - set(CMAKE_DEBUG_POSTFIX "d") - add_definitions(-D_CRT_SECURE_NO_DEPRECATE) - add_definitions(-D_CRT_NONSTDC_NO_DEPRECATE) diff --git a/ports/zlib/cmake_dont_build_more_than_needed.patch b/ports/zlib/cmake_dont_build_more_than_needed.patch deleted file mode 100644 index ed073e0410500c..00000000000000 --- a/ports/zlib/cmake_dont_build_more_than_needed.patch +++ /dev/null @@ -1,74 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 0fe939d..a1291d5 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -7,6 +7,7 @@ set(VERSION "1.2.12") - - option(ASM686 "Enable building i686 assembly implementation") - option(AMD64 "Enable building amd64 assembly implementation") -+option(SKIP_BUILD_EXAMPLES "Skip build of the examples" OFF) - - set(INSTALL_BIN_DIR "${CMAKE_INSTALL_PREFIX}/bin" CACHE PATH "Installation directory for executables") - set(INSTALL_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib" CACHE PATH "Installation directory for libraries") -@@ -124,9 +125,11 @@ set(ZLIB_SRCS - ) - - if(NOT MINGW) -- set(ZLIB_DLL_SRCS -- win32/zlib1.rc # If present will override custom build rule below. -- ) -+ if(BUILD_SHARED_LIBS) -+ set(ZLIB_DLL_SRCS -+ win32/zlib1.rc # If present will override custom build rule below. -+ ) -+ endif() - endif() - - if(CMAKE_COMPILER_IS_GNUCC) -@@ -180,11 +183,12 @@ if(MINGW) - -I ${CMAKE_CURRENT_BINARY_DIR} - -o ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj - -i ${CMAKE_CURRENT_SOURCE_DIR}/win32/zlib1.rc) -- set(ZLIB_DLL_SRCS ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj) -+ if(BUILD_SHARED_LIBS) -+ set(ZLIB_DLL_SRCS ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj) -+ endif() - endif(MINGW) - --add_library(zlib SHARED ${ZLIB_SRCS} ${ZLIB_ASMS} ${ZLIB_DLL_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS}) --add_library(zlibstatic STATIC ${ZLIB_SRCS} ${ZLIB_ASMS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS}) -+add_library(zlib ${ZLIB_SRCS} ${ZLIB_ASMS} ${ZLIB_DLL_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS}) - set_target_properties(zlib PROPERTIES DEFINE_SYMBOL ZLIB_DLL) - set_target_properties(zlib PROPERTIES SOVERSION 1) - -@@ -201,7 +205,7 @@ endif() - - if(UNIX) - # On unix-like platforms the library is almost always called libz -- set_target_properties(zlib zlibstatic PROPERTIES OUTPUT_NAME z) -+ set_target_properties(zlib PROPERTIES OUTPUT_NAME z) - if(NOT APPLE) - set_target_properties(zlib PROPERTIES LINK_FLAGS "-Wl,--version-script,\"${CMAKE_CURRENT_SOURCE_DIR}/zlib.map\"") - endif() -@@ -211,7 +215,7 @@ elseif(BUILD_SHARED_LIBS AND WIN32) - endif() - - if(NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL ) -- install(TARGETS zlib zlibstatic -+ install(TARGETS zlib - RUNTIME DESTINATION "${INSTALL_BIN_DIR}" - ARCHIVE DESTINATION "${INSTALL_LIB_DIR}" - LIBRARY DESTINATION "${INSTALL_LIB_DIR}" ) -@@ -230,6 +234,7 @@ endif() - # Example binaries - #============================================================================ - -+if (NOT SKIP_BUILD_EXAMPLES) - add_executable(example test/example.c) - target_link_libraries(example zlib) - add_test(example example) -@@ -247,3 +252,4 @@ if(HAVE_OFF64_T) - target_link_libraries(minigzip64 zlib) - set_target_properties(minigzip64 PROPERTIES COMPILE_FLAGS "-D_FILE_OFFSET_BITS=64") - endif() -+endif() diff --git a/ports/zlib/portfile.cmake b/ports/zlib/portfile.cmake index f1699178f92f8f..402a837a9122f3 100644 --- a/ports/zlib/portfile.cmake +++ b/ports/zlib/portfile.cmake @@ -1,20 +1,15 @@ -set(VERSION 1.2.12) - -vcpkg_download_distfile(ARCHIVE_FILE - URLS "https://www.zlib.net/zlib-${VERSION}.tar.gz" - FILENAME "zlib1212.tar.gz" - SHA512 cc2366fa45d5dfee1f983c8c51515e0cff959b61471e2e8d24350dea22d3f6fcc50723615a911b046ffc95f51ba337d39ae402131a55e6d1541d3b095d6c0a14 -) - -vcpkg_extract_source_archive_ex( +# When this port is updated, the minizip port should be updated at the same time +vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE ${ARCHIVE_FILE} - REF ${VERSION} + REPO madler/zlib + REF v1.2.13 + SHA512 44b834fbfb50cca229209b8dbe1f96b258f19a49f5df23b80970b716371d856a4adf525edb4c6e0e645b180ea949cb90f5365a1d896160f297f56794dd888659 + HEAD_REF master PATCHES - "cmake_dont_build_more_than_needed.patch" - "0001-Prevent-invalid-inclusions-when-HAVE_-is-set-to-0.patch" - "add_debug_postfix_on_mingw.patch" - "0002-android-build-mingw.patch" + 0001-Prevent-invalid-inclusions-when-HAVE_-is-set-to-0.patch + 0002-skip-building-examples.patch + 0003-build-static-or-shared-not-both.patch + 0004-android-and-mingw-fixes.patch ) # This is generated during the cmake build @@ -25,7 +20,6 @@ vcpkg_configure_cmake( PREFER_NINJA OPTIONS -DSKIP_INSTALL_FILES=ON - -DSKIP_BUILD_EXAMPLES=ON OPTIONS_DEBUG -DSKIP_INSTALL_HEADERS=ON ) @@ -53,4 +47,11 @@ file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/LICENSE DESTINATION ${CURRENT_PACKAGES_DI vcpkg_copy_pdbs() -file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/zconf.h" "ifdef ZLIB_DLL" "if 0") +else() + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/zconf.h" "ifdef ZLIB_DLL" "if 1") +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) diff --git a/ports/zlib/vcpkg.json b/ports/zlib/vcpkg.json index d147fad30bfc28..3670198d144397 100644 --- a/ports/zlib/vcpkg.json +++ b/ports/zlib/vcpkg.json @@ -1,6 +1,6 @@ { "name": "zlib", - "version": "1.2.12", + "version": "1.2.13", "description": "A compression library", "homepage": "https://www.zlib.net/" } diff --git a/versions/baseline.json b/versions/baseline.json index 01c672678cf56b..df3d596e49852d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3698,7 +3698,7 @@ }, "libkml": { "baseline": "1.3.0", - "port-version": 8 + "port-version": 9 }, "liblas": { "baseline": "1.8.1", @@ -4537,8 +4537,8 @@ "port-version": 1 }, "minizip": { - "baseline": "1.2.11", - "port-version": 10 + "baseline": "1.2.13", + "port-version": 0 }, "minizip-ng": { "baseline": "3.0.5", @@ -7669,7 +7669,11 @@ "port-version": 2 }, "zlib": { +<<<<<<< HEAD "baseline": "1.2.12", +======= + "baseline": "1.2.13", +>>>>>>> e0a9559a9 ([zlib, minizip] Update to 1.2.13, and embed the ZLIB_DLL setting. (#27226)) "port-version": 0 }, "zlib-ng": { diff --git a/versions/l-/libkml.json b/versions/l-/libkml.json index 8b24a120d2d2bf..5797ff9428b39e 100644 --- a/versions/l-/libkml.json +++ b/versions/l-/libkml.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9941e66029546372544fed13066e9a9756981dd3", + "version": "1.3.0", + "port-version": 9 + }, { "git-tree": "1ce9dd050baf9ae42da2bb0c6d0feae1241b6e01", "version-string": "1.3.0", diff --git a/versions/m-/minizip.json b/versions/m-/minizip.json index 5931b7c3204379..55c880d4d8b114 100644 --- a/versions/m-/minizip.json +++ b/versions/m-/minizip.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "c0843dcfad42a538a772797a3f50627b5c8d411a", + "version-semver": "1.2.13", + "port-version": 0 + }, + { + "git-tree": "65a32bfac58033a215e271db94d5e022fce816e3", + "version-semver": "1.2.12", + "port-version": 0 + }, + { + "git-tree": "528703ed8d2b78aeaa55695765535efafa24540b", + "version-semver": "1.2.11", + "port-version": 11 + }, { "git-tree": "c3bec48dc73b936a25a26a9ec1941aac9e39fcf1", "version-semver": "1.2.11", diff --git a/versions/z-/zlib.json b/versions/z-/zlib.json index b7830cc6d249e0..9528646a6ed8d1 100644 --- a/versions/z-/zlib.json +++ b/versions/z-/zlib.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "ad5a49006f73b45b715299515f31164131b51982", + "version": "1.2.13", + "port-version": 0 + }, + { + "git-tree": "d40d86865ecbcc5b54d21f840dd2212556aeadd5", + "version": "1.2.12", + "port-version": 2 + }, + { + "git-tree": "ecc4c064d4911faf12d8bf5fd6bcd5c556d89774", + "version": "1.2.12", + "port-version": 1 + }, { "git-tree": "9c4edb1fabbd87dd236a200ba55eaf241cd8c8d0", "version": "1.2.12",