Global
/
vcpkg
mirror of https://github.com/microsoft/vcpkg.git
1
0
Fork 0
Code Activity

[zlib] Update to 1.3.2 (#51235) 

Co-authored-by: Sebastian Schäfer <s.schaefer@dial.de>
This commit is contained in:
Kai Pastor 2026-04-23 22:46:56 +02:00 committed by GitHub
parent b46d9050a9
commit f77737496d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
67 changed files with 320 additions and 338 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ports/apsi/portfile.cmake
View File

@ -30,7 +30,6 @@ endif()
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS
-DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON
-DAPSI_BUILD_TESTS=OFF
-DAPSI_BUILD_CLI=OFF
${FEATURE_OPTIONS}

1
ports/apsi/vcpkg.json
View File

@ -1,6 +1,7 @@
{
"name": "apsi",
"version-semver": "0.11.0",
"port-version": 1,
"description": "APSI is a research library for asymmetric private set intersection.",
"homepage": "https://github.com/microsoft/APSI",
"license": "MIT",

2
ports/coin-or-buildtools/buildtools.patch
View File

@ -7,7 +7,7 @@ index 46501b207..a0ff20a6f 100644
AC_CHECK_HEADER([zlib.h],[coin_has_zlib=yes])
if test x$coin_has_zlib = xyes ; then
- AC_CHECK_LIB([z],[gzopen],[],[coin_has_zlib=no])
+ AC_SEARCH_LIBS([gzopen],[z zlib zlibd],[],[coin_has_zlib=no])
+ AC_SEARCH_LIBS([gzopen],[z zs zlib zd zsd zlibd],[],[coin_has_zlib=no])
fi
if test x$coin_has_zlib = xyes ; then
m4_foreach_w([myvar],[$1],

2
ports/coin-or-buildtools/vcpkg.json
View File

@ -1,7 +1,7 @@
{
"name": "coin-or-buildtools",
"version-date": "2023-02-02",
"port-version": 1,
"port-version": 2,
"description": "Macros and patches for GNU autotools ",
"homepage": "https://coin-or-tools.github.io/BuildTools/",
"license": "EPL-2.0"

4
ports/crashpad/portfile.cmake
View File

@ -59,7 +59,7 @@ function(replace_gn_dependency INPUT_FILE OUTPUT_FILE LIBRARY_NAMES)
NO_DEFAULT_PATH)
if(_LIBRARY_REL MATCHES "-NOTFOUND")
message(FATAL_ERROR "Could not find library with names: ${LIBRARY_NAMES}")
message(FATAL_ERROR "Could not find release library with names: ${LIBRARY_NAMES}")
endif()
if(VCPKG_BUILD_TYPE STREQUAL "release")
@ -75,7 +75,7 @@ endfunction()
replace_gn_dependency(
"${CMAKE_CURRENT_LIST_DIR}/zlib.gn"
"${SOURCE_PATH}/third_party/zlib/BUILD.gn"
"z;zlib;zlibd"
"z;zs;zlib;zd;zsd;zlibd"
)
set(OPTIONS "target_cpu=\"${VCPKG_TARGET_ARCHITECTURE}\"")

2
ports/crashpad/vcpkg.json
View File

@ -1,7 +1,7 @@
{
"name": "crashpad",
"version-date": "2024-04-11",
"port-version": 10,
"port-version": 11,
"description": [
"Crashpad is a crash-reporting system.",
"Crashpad is a library for capturing, storing and transmitting postmortem crash reports from a client to an upstream collection server. Crashpad aims to make it possible for clients to capture process state at the time of crash with the best possible fidelity and coverage, with the minimum of fuss."

3
ports/dlib/portfile.cmake
View File

@ -9,7 +9,6 @@ vcpkg_from_github(
PATCHES
fix-dependencies.patch
)
file(REMOVE_RECURSE "${SOURCE_PATH}/dlib/external")
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
@ -35,8 +34,10 @@ vcpkg_cmake_configure(
${COMMON_OPTIONS}
-DDLIB_PNG_SUPPORT=ON
-DCMAKE_REQUIRE_FIND_PACKAGE_PNG=ON
-Dtest_for_libpng_worked=TRUE # try_compile ignores vcpkg setup
-DDLIB_JPEG_SUPPORT=ON
-DCMAKE_REQUIRE_FIND_PACKAGE_JPEG=ON
-Dtest_for_libjpeg_worked=TRUE # try_compile ignores vcpkg setup
-DDLIB_USE_BLAS=ON
-DDLIB_USE_LAPACK=ON
-DDLIB_GIF_SUPPORT=OFF

2
ports/dlib/vcpkg.json
View File

@ -1,7 +1,7 @@
{
"name": "dlib",
"version": "20.0.1",
"port-version": 1,
"port-version": 2,
"description": "Modern C++ toolkit containing machine learning algorithms and tools for creating complex software in C++",
"homepage": "https://github.com/davisking/dlib",
"license": "BSL-1.0",

28
ports/elfutils/crc32.diff Normal file
View File

@ -0,0 +1,28 @@
diff --git a/lib/crc32.c b/lib/crc32.c
index eae6582..3064c65 100644
--- a/lib/crc32.c
+++ b/lib/crc32.c
@@ -90,6 +90,10 @@ static const uint32_t crc32_table[256] =
0x2d02ef8d
};
+/* crc32 is owned by zlib. */
+#ifndef crc32
+#define crc32 eu_crc32
+#endif
uint32_t
crc32 (uint32_t crc, unsigned char *buf, size_t len)
{
diff --git a/lib/libeu.h b/lib/libeu.h
index e849a79..522fc74 100644
--- a/lib/libeu.h
+++ b/lib/libeu.h
@@ -42,6 +42,8 @@ extern char *xstrndup (const char *, size_t) __attribute__ ((__malloc__));
extern char *xasprintf(const char *fmt, ...)
__attribute__ ((format (printf, 1, 2))) __attribute__ ((__malloc__));
+/* crc32 is owned by zlib. */
+#define crc32 eu_crc32
extern uint32_t crc32 (uint32_t crc, unsigned char *buf, size_t len);
extern int crc32_file (int fd, uint32_t *resp);

1
ports/elfutils/portfile.cmake
View File

@ -8,6 +8,7 @@ vcpkg_download_distfile(ARCHIVE
vcpkg_extract_source_archive(SOURCE_PATH
ARCHIVE "${ARCHIVE}"
PATCHES
crc32.diff
disable-werror.diff
link-libs.diff
rpath-link.diff

1
ports/elfutils/vcpkg.json
View File

@ -1,6 +1,7 @@
{
"name": "elfutils",
"version": "0.195",
"port-version": 1,
"description": "elfutils is a collection of utilities and libraries to read, create and modify ELF binary files, find and handle DWARF debug data, symbols, thread state and stacktraces for processes and core files on GNU/Linux.",
"homepage": "https://sourceware.org/elfutils/",
"license": null,

6
ports/ffmpeg/0004-dependencies.patch
View File

@ -4,9 +4,11 @@ index 1759694..fcbae49 100644
+++ b/configure
@@ -7184,7 +7184,7 @@ fi
enabled zlib && { check_pkg_config zlib zlib "zlib.h" zlibVersion ||
check_lib zlib zlib.h zlibVersion -lz; }
-enabled zlib && { check_pkg_config zlib zlib "zlib.h" zlibVersion ||
- check_lib zlib zlib.h zlibVersion -lz; }
-enabled bzlib && check_lib bzlib bzlib.h BZ2_bzlibVersion -lbz2
+
+enabled zlib && require_pkg_config zlib zlib zlib.h zlibVersion
+enabled bzlib && require_pkg_config bzlib bzip2 bzlib.h BZ2_bzlibVersion
enabled lzma && check_lib lzma lzma.h lzma_version_number -llzma

4
ports/ffmpeg/0007-fix-lib-naming.patch
View File

@ -2,9 +2,9 @@ diff --git a/configure b/configure
index d6c4388..75b96c3 100644
--- a/configure
+++ b/configure
@@ -4781,6 +4781,7 @@ msvc_common_flags(){
@@ -4781,6 +4781,6 @@ msvc_common_flags(){
-mfp16-format=*) ;;
-lz) echo zlib.lib ;;
- -lz) echo zlib.lib ;;
-lx264) echo libx264.lib ;;
+ -lmp3lame) echo libmp3lame.lib ;;
-lstdc++) ;;

2
ports/ffmpeg/vcpkg.json
View File

@ -1,7 +1,7 @@
{
"name": "ffmpeg",
"version": "8.1",
"port-version": 2,
"port-version": 3,
"description": [
"A library to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created.",
"FFmpeg is the leading multimedia framework, able to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created. It supports the most obscure ancient formats up to the cutting edge. No matter if they were designed by some standards committee, the community or a corporation. It is also highly portable: FFmpeg compiles, runs, and passes our testing infrastructure FATE across Linux, Mac OS X, Microsoft Windows, the BSDs, Solaris, etc. under a wide variety of build environments, machine architectures, and configurations."

2
ports/libmagic/0002-Change-zlib-lib-name-to-match-CMake-output.patch
View File

@ -16,7 +16,7 @@ index b05c334..dd4063c 100644
dnl Checks for libraries
if test "$enable_zlib" != "no"; then
- AC_CHECK_LIB(z, gzopen)
+ AC_SEARCH_LIBS(gzopen, [z zlib zlibd], have_zlib="yes", have_zlib="no")
+ AC_SEARCH_LIBS(gzopen, [z zs zlib zd zsd zlibd], have_zlib="yes", have_zlib="no")
fi
if test "$enable_bzlib" != "no"; then
AC_CHECK_LIB(bz2, BZ2_bzCompressInit)

2
ports/libmagic/0017-Change-bzlib-name-to-match-CMake-output.patch
View File

@ -3,7 +3,7 @@ index 8b54efda..d043fb06 100644
--- a/configure.ac
+++ b/configure.ac
@@ -191,7 +191,7 @@ if test "$enable_zlib" != "no"; then
AC_SEARCH_LIBS(gzopen, [z zlib zlibd], have_zlib="yes", have_zlib="no")
AC_SEARCH_LIBS(gzopen, [z zs zlib zd zsd zlibd], have_zlib="yes", have_zlib="no")
fi
if test "$enable_bzlib" != "no"; then
- AC_CHECK_LIB(bz2, BZ2_bzCompressInit)

10
ports/libmagic/portfile.cmake
View File

@ -1,7 +1,7 @@
set(extra_patches "")
if(VCPKG_TARGET_IS_WINDOWS)
set(PATCHES
list(APPEND extra_patches
"0001-Use-libtre.patch"
"0002-Change-zlib-lib-name-to-match-CMake-output.patch"
"0003-Fix-WIN32-macro-checks.patch"
"0004-Typedef-POSIX-types-on-Windows.patch"
"0005-Include-dirent.h-for-S_ISREG-and-S_ISDIR.patch"
@ -14,7 +14,6 @@ if(VCPKG_TARGET_IS_WINDOWS)
"0013-Check-for-backslash-in-argv-0-on-Windows.patch"
"0015-MSYS2-Remove-ioctl-call.patch"
"0016-Fix-file_famagic-function.patch"
"0017-Change-bzlib-name-to-match-CMake-output.patch"
)
endif()
@ -24,7 +23,10 @@ vcpkg_from_github(
REF FILE5_46
SHA512 fb8157ee8065feaf57412ccdeee57cd8fc853b54ac49b0ddc818eeb1ca3555a7cfd25dea08996503f7c565dcba8c57fd7e4dc5fe3452872c617f5612a94a8f0e
HEAD_REF master
PATCHES ${PATCHES}
PATCHES
0002-Change-zlib-lib-name-to-match-CMake-output.patch
0017-Change-bzlib-name-to-match-CMake-output.patch
${extra_patches}
)
if(VCPKG_TARGET_IS_WINDOWS)

4
ports/libmagic/vcpkg.json
View File

@ -1,7 +1,7 @@
{
"name": "libmagic",
"version": "5.46",
"port-version": 2,
"port-version": 3,
"description": "This library can be used to classify files according to magic number tests.",
"homepage": "https://github.com/file/file",
"license": "BSD-2-Clause",
@ -11,7 +11,7 @@
"platform": "windows"
},
{
"name": "getopt",
"name": "getopt-win32",
"platform": "windows"
},
{

2
ports/libwandio/configure.lib.patch
View File

@ -36,7 +36,7 @@ index 428e66a..21e39db 100644
AS_IF([test "x$with_zlib" != "xno"],
[
- AC_CHECK_LIB(z, deflate, have_zlib=yes, have_zlib=no)
+ AC_SEARCH_LIBS(deflate, [z zlib zlibd zd], have_zlib=yes, have_zlib=no)
+ AC_SEARCH_LIBS(deflate, [z zs zlib zd zsd zlibd], have_zlib=yes, have_zlib=no)
], [have_zlib=no])
AS_IF([test "x$have_zlib" = "xyes"], [

2
ports/libwandio/vcpkg.json
View File

@ -1,7 +1,7 @@
{
"name": "libwandio",
"version": "4.2.6-1",
"port-version": 1,
"port-version": 2,
"description": "C library for simple and efficient file IO.",
"homepage": "https://github.com/wanduow/wandio",
"license": "LGPL-3.0-only",

2
ports/libxfont/configure.patch
View File

@ -7,7 +7,7 @@ index f507c285a..a821e7311 100644
X_GZIP_FONT_COMPRESSION=1
AC_SUBST(X_GZIP_FONT_COMPRESSION)
-AC_CHECK_LIB(z, gzopen, [Z_LIBS=-lz], AC_MSG_ERROR([*** zlib is required]))
+AC_SEARCH_LIBS(gzopen, [z zlib zlibd] , [Z_LIBS="$ac_cv_search_gzopen"], AC_MSG_ERROR([*** zlib is required]))
+AC_SEARCH_LIBS(gzopen, [z zs zlib zd zsd zlibd] , [Z_LIBS="$ac_cv_search_gzopen"], AC_MSG_ERROR([*** zlib is required]))
AC_ARG_WITH(bzip2,
AS_HELP_STRING([--with-bzip2],

2
ports/libxfont/vcpkg.json
View File

@ -1,7 +1,7 @@
{
"name": "libxfont",
"version": "2.0.5",
"port-version": 2,
"port-version": 3,
"description": "X font handling library for server & utilities",
"homepage": "https://gitlab.freedesktop.org/xorg/lib/libxfont",
"license": null,

2
ports/omniorb/add_win_into_autotools.patch
View File

@ -83,7 +83,7 @@ index cef87f8bd..cf61556bd 100644
AC_DEFUN([OMNI_ENABLE_ZIOP],
-[AC_CHECK_LIB(z,compressBound,omni_cv_enable_ziop_zlib=yes,omni_cv_enable_ziop_zlib=no)
-AC_CHECK_LIB(zstd,ZSTD_compress,omni_cv_enable_ziop_zstd=yes,omni_cv_enable_ziop_zstd=no)
+[AC_SEARCH_LIBS(compressBound,[z zlib zlibd],omni_cv_enable_ziop_zlib=yes,omni_cv_enable_ziop_zlib=no)
+[AC_SEARCH_LIBS(compressBound,[z zs zlib zd zsd zlibd],omni_cv_enable_ziop_zlib=yes,omni_cv_enable_ziop_zlib=no)
+AC_SEARCH_LIBS(ZSTD_compress,[zstd zstdd],omni_cv_enable_ziop_zstd=yes,omni_cv_enable_ziop_zstd=no)
omni_cv_enable_ziop="no"
if test "$omni_cv_enable_ziop_zlib" = "yes"; then

5
ports/omniorb/portfile.cmake
View File

@ -1,5 +1,5 @@
vcpkg_download_distfile(ARCHIVE
URLS "https://netcologne.dl.sourceforge.net/project/omniorb/omniORB/omniORB-${VERSION}/omniORB-${VERSION}.tar.bz2"
URLS "https://sourceforge.net/projects/omniorb/files/omniORB/omniORB-4.3.0/omniORB-4.3.0.tar.bz2/download"
FILENAME "omniORB-${VERSION}.tar.bz2"
SHA512 b081c1acbea3c7bee619a288fec209a0705b7d436f8e5fd4743675046356ef271a8c75882334fcbde4ff77d15f54d2da55f6cfcd117b01e42919d04fd29bfe2f
)
@ -94,11 +94,10 @@ vcpkg_configure_make(
)
if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
vcpkg_replace_string("${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel//mk/platforms/vcpkg.mk" "replace-with-per-config-text" "NoDebugBuild=1")
vcpkg_replace_string("${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/mk/platforms/vcpkg.mk" "replace-with-per-config-text" "NoDebugBuild=1")
if(NOT VCPKG_BUILD_TYPE)
vcpkg_replace_string("${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/mk/platforms/vcpkg.mk" "replace-with-per-config-text" "NoReleaseBuild=1\nBuildDebugBinary=1")
vcpkg_replace_string("${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/src/tool/omniidl/cxx/dir.mk" "python$(subst .,,$(PYVERSION)).lib" "python$(subst .,,$(PYVERSION))_d.lib")
vcpkg_replace_string("${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/src/tool/omniidl/cxx/dir.mk" "zlib.lib" "zlibd.lib")
endif()
endif()

2
ports/omniorb/python-fixes.patch
View File

@ -45,7 +45,7 @@ index 84f10ac03..3b5a60b87 100644
CXXLINKOPTIONS += $(patsubst %,-L%,$(PYLIBDIR))
else
-PYLIB := python$(subst .,,$(PYVERSION)).lib
+PYLIB = python$(subst .,,$(PYVERSION)).lib zlib.lib Advapi32.lib
+PYLIB := python$(subst .,,$(PYVERSION)).lib advapi32.lib
CXXLINKOPTIONS += $(patsubst %,-libpath:%,$(PYLIBDIR))
endif

2
ports/omniorb/vcpkg.json
View File

@ -1,7 +1,7 @@
{
"name": "omniorb",
"version": "4.3.0",
"port-version": 4,
"port-version": 5,
"description": "omniORB is a robust high performance CORBA ORB for C++",
"homepage": "https://omniorb.sourceforge.io/",
"license": "LGPL-2.1-or-later",

4
ports/python3/portfile.cmake
View File

@ -111,8 +111,8 @@ if(VCPKG_TARGET_IS_WINDOWS)
else()
message(STATUS "WARNING: Extensions have been disabled. No C extension modules will be available.")
endif()
find_library(ZLIB_RELEASE NAMES zlib PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH)
find_library(ZLIB_DEBUG NAMES zlib zlibd PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH)
find_library(ZLIB_RELEASE NAMES z zs zlib PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH)
find_library(ZLIB_DEBUG NAMES zd zsd zlibd PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH)
list(APPEND add_libs_rel "${ZLIB_RELEASE}")
list(APPEND add_libs_dbg "${ZLIB_DEBUG}")

1
ports/python3/vcpkg.json
View File

@ -1,6 +1,7 @@
{
"name": "python3",
"version": "3.12.13",
"port-version": 1,
"description": "The Python programming language",
"homepage": "https://github.com/python/cpython",
"license": "Python-2.0",

4
ports/qpdf/portfile.cmake
View File

@ -17,6 +17,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
)
vcpkg_find_acquire_program(PKGCONFIG)
set(ENV{PKG_CONFIG} "${PKGCONFIG}")
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
@ -28,9 +29,8 @@ vcpkg_cmake_configure(
)
vcpkg_cmake_install()
vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/qpdf)
vcpkg_copy_pdbs()
vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/qpdf)
vcpkg_fixup_pkgconfig()
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")

1
ports/qpdf/vcpkg.json
View File

@ -1,6 +1,7 @@
{
"name": "qpdf",
"version": "12.3.2",
"port-version": 1,
"description": "A content-preserving PDF document transformer",
"homepage": "https://qpdf.sourceforge.io/",
"license": "Apache-2.0 AND MIT",

19
ports/qt5-base/portfile.cmake
View File

@ -164,8 +164,7 @@ else()
list(APPEND CORE_OPTIONS --vulkan=no)
endif()
find_library(ZLIB_RELEASE NAMES z zlib PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH)
find_library(ZLIB_DEBUG NAMES z zlib zd zlibd PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH)
x_vcpkg_pkgconfig_get_modules(PREFIX zlib MODULES zlib LIBS)
find_library(JPEG_RELEASE NAMES jpeg jpeg-static PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH)
find_library(JPEG_DEBUG NAMES jpeg jpeg-static jpegd jpeg-staticd PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH)
find_library(LIBPNG_RELEASE NAMES png16 libpng16 PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) #Depends on zlib
@ -208,17 +207,17 @@ find_library(EAY_DEBUG libeay32 crypto libcrypto libeay32d cryptod libcryptod PA
set(RELEASE_OPTIONS
"LIBJPEG_LIBS=${JPEG_RELEASE}"
"ZLIB_LIBS=${ZLIB_RELEASE}"
"LIBPNG_LIBS=${LIBPNG_RELEASE} ${ZLIB_RELEASE}"
"ZLIB_LIBS=${zlib_LIBS_RELEASE}"
"LIBPNG_LIBS=${LIBPNG_RELEASE} ${zlib_LIBS_RELEASE}"
"PCRE2_LIBS=${PCRE2_RELEASE}"
"QMAKE_LIBS_PRIVATE+=${LIBPNG_RELEASE} ${ZLIB_RELEASE}"
"QMAKE_LIBS_PRIVATE+=${LIBPNG_RELEASE} ${zlib_LIBS_RELEASE}"
)
set(DEBUG_OPTIONS
"LIBJPEG_LIBS=${JPEG_DEBUG}"
"ZLIB_LIBS=${ZLIB_DEBUG}"
"LIBPNG_LIBS=${LIBPNG_DEBUG} ${ZLIB_DEBUG}"
"ZLIB_LIBS=${zlib_LIBS_DEBUG}"
"LIBPNG_LIBS=${LIBPNG_DEBUG} ${zlib_LIBS_DEBUG}"
"PCRE2_LIBS=${PCRE2_DEBUG}"
"QMAKE_LIBS_PRIVATE+=${LIBPNG_DEBUG} ${ZLIB_DEBUG}"
"QMAKE_LIBS_PRIVATE+=${LIBPNG_DEBUG} ${zlib_LIBS_DEBUG}"
)
x_vcpkg_pkgconfig_get_modules(PREFIX freetype MODULES freetype2 LIBS)
@ -386,8 +385,8 @@ elseif(VCPKG_TARGET_IS_OSX)
endif()
if (WITH_MYSQL_PLUGIN)
list(APPEND RELEASE_OPTIONS "MYSQL_LIBS=${MYSQL_RELEASE} ${SSL_RELEASE} ${EAY_RELEASE} ${ZLIB_RELEASE} ${ADDITIONAL_WINDOWS_LIBS}")
list(APPEND DEBUG_OPTIONS "MYSQL_LIBS=${MYSQL_DEBUG} ${SSL_DEBUG} ${EAY_DEBUG} ${ZLIB_DEBUG} ${ADDITIONAL_WINDOWS_LIBS}")
list(APPEND RELEASE_OPTIONS "MYSQL_LIBS=${MYSQL_RELEASE} ${SSL_RELEASE} ${EAY_RELEASE} ${zlib_LIBS_RELEASE} ${ADDITIONAL_WINDOWS_LIBS}")
list(APPEND DEBUG_OPTIONS "MYSQL_LIBS=${MYSQL_DEBUG} ${SSL_DEBUG} ${EAY_DEBUG} ${zlib_LIBS_DEBUG} ${ADDITIONAL_WINDOWS_LIBS}")
endif(WITH_MYSQL_PLUGIN)
## Do not build tests or examples

2
ports/qt5-base/vcpkg.json
View File

@ -1,7 +1,7 @@
{
"name": "qt5-base",
"version": "5.15.18",
"port-version": 2,
"port-version": 3,
"description": "Qt Base provides the basic non-GUI functionality required by all Qt applications.",
"homepage": "https://www.qt.io/",
"license": null,

1
ports/sdl3-image/portfile.cmake
View File

@ -26,6 +26,7 @@ vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS
${FEATURE_OPTIONS}
-DCMAKE_FIND_PACKAGE_PREFER_CONFIG=OFF
-DSDLIMAGE_BACKEND_IMAGEIO=OFF
-DSDLIMAGE_BACKEND_STB=OFF
-DSDLIMAGE_DEPS_SHARED=OFF

1
ports/sdl3-image/vcpkg.json
View File

@ -1,6 +1,7 @@
{
"name": "sdl3-image",
"version": "3.4.2",
"port-version": 1,
"description": "SDL_image is an image file loading library. It loads images as SDL surfaces and textures, and supports the following formats: BMP, GIF, JPEG, LBM, PCX, PNG, PNM, TGA, TIFF, WEBP, XCF, XPM, XV",
"homepage": "https://github.com/libsdl-org/SDL_image",
"license": "Zlib",

67
ports/serf/dependencies.diff Normal file
View File

@ -0,0 +1,67 @@
diff --git a/SConstruct b/SConstruct
index a96a94d..8b53af6 100644
--- a/SConstruct
+++ b/SConstruct
@@ -324,13 +324,21 @@ if sys.platform == 'win32':
if aprstatic:
apr_libs='apr-1.lib'
apu_libs='aprutil-1.lib'
- env.Append(LIBS=['shell32.lib', 'xml.lib'])
+ env.Append(LIBS=['shell32.lib'])
+ if debug:
+ env.Append(LIBS=['libexpatdMD.lib'])
+ else:
+ env.Append(LIBS=['libexpatMD.lib'])
else:
apr_libs='libapr-1.lib'
apu_libs='libaprutil-1.lib'
env.Append(LIBS=[apr_libs, apu_libs])
if not env.get('SOURCE_LAYOUT', None):
+ if debug:
+ env.Append(LIBPATH=['$APR/lib', '$APU/lib'],
+ CPPPATH=['$APR/../include/apr-1', '$APU/../include/apr-1'])
+ else:
env.Append(LIBPATH=['$APR/lib', '$APU/lib'],
CPPPATH=['$APR/include/apr-1', '$APU/include/apr-1'])
elif aprstatic:
@@ -341,8 +349,15 @@ if sys.platform == 'win32':
CPPPATH=['$APR/include', '$APU/include'])
# zlib
- env.Append(LIBS=['zlib.lib'])
+ if debug:
+ env.Append(LIBS=[os.environ.get('ZLIB_BASENAME','zlib')+'d.lib'])
+ else:
+ env.Append(LIBS=[os.environ.get('ZLIB_BASENAME','zlib')+'.lib'])
if not env.get('SOURCE_LAYOUT', None):
+ if debug:
+ env.Append(CPPPATH=['$ZLIB/../include'],
+ LIBPATH=['$ZLIB/lib'])
+ else:
env.Append(CPPPATH=['$ZLIB/include'],
LIBPATH=['$ZLIB/lib'])
else:
@@ -351,6 +366,10 @@ if sys.platform == 'win32':
# openssl
if not env.get('SOURCE_LAYOUT', None):
+ if debug:
+ env.Append(CPPPATH=['$OPENSSL/../include/openssl'],
+ LIBPATH=['$OPENSSL/debug/lib'])
+ else:
env.Append(CPPPATH=['$OPENSSL/include/openssl'],
LIBPATH=['$OPENSSL/lib'])
elif 0: # opensslstatic:
@@ -392,7 +411,10 @@ else:
apr_libs = ''
apu_libs = ''
- env.Append(CPPPATH=['$OPENSSL/include'])
+ if debug:
+ env.Append(CPPPATH=['$OPENSSL/../include/openssl'])
+ else:
+ env.Append(CPPPATH=['$OPENSSL/include/openssl'])
env.Append(LIBPATH=['$OPENSSL/lib'])

15
ports/serf/portfile.cmake
View File

@ -8,8 +8,7 @@ vcpkg_extract_source_archive(
SOURCE_PATH
ARCHIVE "${ARCHIVE}"
PATCHES
serf-fix-expat.patch
serf-use-debug-libs.patch
dependencies.diff
)
# Note: custom architecture is not supported on Unix.
@ -37,6 +36,11 @@ if(VCPKG_TARGET_IS_WINDOWS)
"APU=${CURRENT_INSTALLED_DIR}"
"APR_STATIC=${APR_STATIC}"
)
if(EXISTS "${CURRENT_INSTALLED_DIR}/lib/zs.lib")
set(ENV{ZLIB_BASENAME} "zs")
elseif(EXISTS "${CURRENT_INSTALLED_DIR}/lib/z.lib")
set(ENV{ZLIB_BASENAME} "z")
endif()
else()
SET(apr_opts
"APR=${CURRENT_INSTALLED_DIR}/tools/apr/bin/apr-1-config"
@ -102,8 +106,8 @@ if(NOT VCPKG_BUILD_TYPE)
"SOURCE_LAYOUT=no"
"PREFIX=${CURRENT_PACKAGES_DIR}/debug"
"LIBDIR=${CURRENT_PACKAGES_DIR}/debug/lib"
"OPENSSL=${CURRENT_INSTALLED_DIR}"
"ZLIB=${CURRENT_INSTALLED_DIR}"
"OPENSSL=${CURRENT_INSTALLED_DIR}/debug"
"ZLIB=${CURRENT_INSTALLED_DIR}/debug"
${apr_opts}
"${SCONS_ARCH}"
"DEBUG=yes"
@ -135,5 +139,6 @@ if(NOT VCPKG_BUILD_TYPE)
endif()
endif()
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
vcpkg_fixup_pkgconfig()
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")

17
ports/serf/serf-fix-expat.patch
View File

@ -1,17 +0,0 @@
Index: SConstruct
===================================================================
--- SConstruct (revision 1920717)
+++ SConstruct (working copy)
@@ -324,7 +324,11 @@
if aprstatic:
apr_libs='apr-1.lib'
apu_libs='aprutil-1.lib'
- env.Append(LIBS=['shell32.lib', 'xml.lib'])
+ env.Append(LIBS=['shell32.lib'])
+ if debug:
+ env.Append(LIBS=['libexpatdMD.lib'])
+ else:
+ env.Append(LIBS=['libexpatMD.lib'])
else:
apr_libs='libapr-1.lib'
apu_libs='libaprutil-1.lib'

68
ports/serf/serf-use-debug-libs.patch
View File

@ -1,68 +0,0 @@
Index: SConstruct
===================================================================
--- SConstruct (revision 1920717)
+++ SConstruct (working copy)
@@ -331,8 +331,12 @@
env.Append(LIBS=[apr_libs, apu_libs])
if not env.get('SOURCE_LAYOUT', None):
- env.Append(LIBPATH=['$APR/lib', '$APU/lib'],
- CPPPATH=['$APR/include/apr-1', '$APU/include/apr-1'])
+ if debug:
+ env.Append(LIBPATH=['$APR/debug/lib', '$APU/lib'],
+ CPPPATH=['$APR/include/apr-1', '$APU/include/apr-1'])
+ else:
+ env.Append(LIBPATH=['$APR/lib', '$APU/debug/lib'],
+ CPPPATH=['$APR/include/apr-1', '$APU/include/apr-1'])
elif aprstatic:
env.Append(LIBPATH=['$APR/LibR','$APU/LibR'],
CPPPATH=['$APR/include', '$APU/include'])
@@ -341,10 +345,15 @@
CPPPATH=['$APR/include', '$APU/include'])
# zlib
- env.Append(LIBS=['zlib.lib'])
if not env.get('SOURCE_LAYOUT', None):
- env.Append(CPPPATH=['$ZLIB/include'],
- LIBPATH=['$ZLIB/lib'])
+ if debug:
+ env.Append(CPPPATH=['$ZLIB/include'],
+ LIBPATH=['$ZLIB/debug/lib'])
+ env.Append(LIBS=['zlibd.lib'])
+ else:
+ env.Append(CPPPATH=['$ZLIB/include'],
+ LIBPATH=['$ZLIB/lib'])
+ env.Append(LIBS=['zlib.lib'])
else:
env.Append(CPPPATH=['$ZLIB'],
LIBPATH=['$ZLIB'])
@@ -351,8 +360,12 @@
# openssl
if not env.get('SOURCE_LAYOUT', None):
- env.Append(CPPPATH=['$OPENSSL/include/openssl'],
- LIBPATH=['$OPENSSL/lib'])
+ if debug:
+ env.Append(CPPPATH=['$OPENSSL/include/openssl'],
+ LIBPATH=['$OPENSSL/debug/lib'])
+ else:
+ env.Append(CPPPATH=['$OPENSSL/include/openssl'],
+ LIBPATH=['$OPENSSL/lib'])
elif 0: # opensslstatic:
env.Append(CPPPATH=['$OPENSSL/inc32'],
LIBPATH=['$OPENSSL/out32'])
@@ -392,8 +405,12 @@
apr_libs = ''
apu_libs = ''
- env.Append(CPPPATH=['$OPENSSL/include'])
- env.Append(LIBPATH=['$OPENSSL/lib'])
+ if debug:
+ env.Append(CPPPATH=['$OPENSSL/include/openssl'],
+ LIBPATH=['$OPENSSL/debug/lib'])
+ else:
+ env.Append(CPPPATH=['$OPENSSL/include/openssl'],
+ LIBPATH=['$OPENSSL/debug'])
# If build with gssapi, get its information and define SERF_HAVE_GSSAPI

1
ports/serf/vcpkg.json
View File

@ -1,6 +1,7 @@
{
"name": "serf",
"version": "1.3.10",
"port-version": 1,
"description": "The serf library is a high performance C-based HTTP client library built upon the Apache Portable Runtime (APR) library. It is permissively licensed under the Apache License, v2.",
"homepage": "https://serf.apache.org/",
"license": "Apache-2.0",

13
ports/shiftmedia-libgnutls/portfile.cmake
View File

@ -120,10 +120,21 @@ vcpkg_replace_string(
"nettled"
"nettle"
)
set(zlib_basename "zlib")
if(EXISTS "${CURRENT_INSTALLED_DIR}/lib/zs.lib")
set(zlib_basename "zs")
elseif(EXISTS "${CURRENT_INSTALLED_DIR}/lib/z.lib")
set(zlib_basename "z")
endif()
vcpkg_replace_string(
"${VCXPROJ}"
"libzlib"
"${zlib_basename}"
)
vcpkg_replace_string(
"${VCXPROJ}"
"zlib"
"${zlib_basename}"
)
vcpkg_replace_string(
"${VCXPROJ}"
@ -152,7 +163,7 @@ if(VCPKG_TARGET_IS_UWP)
endif()
file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/${SOURCE_PATH_SUFFIX}/msvc/${WINRT_SUBFOLDER}/include" DESTINATION "${CURRENT_PACKAGES_DIR}")
set(GNUTLS_REQUIRES_PRIVATE "Requires.private: gmp, nettle, hogweed, libtasn1")
set(GNUTLS_REQUIRES_PRIVATE "Requires.private: gmp, nettle, hogweed, libtasn1, zlib")
set(GNUTLS_LIBS_PRIVATE "-lcrypt32 -lws2_32 -lkernel32 -lncrypt")
set(prefix "${CURRENT_INSTALLED_DIR}")

3
ports/shiftmedia-libgnutls/vcpkg.json
View File

@ -1,13 +1,12 @@
{
"name": "shiftmedia-libgnutls",
"version": "3.8.7",
"port-version": 2,
"port-version": 3,
"description": "Unofficial GnuTLS fork with added custom native Visual Studio project build tools. ",
"homepage": "https://github.com/ShiftMediaProject/gnutls",
"license": "LGPL-2.1-only",
"supports": "windows & !arm & !mingw & !xbox",
"dependencies": [
"gettext",
"gmp",
"libtasn1",
"nettle",

53
ports/zlib/0001-Prevent-invalid-inclusions-when-HAVE_-is-set-to-0.patch
View File

@ -1,53 +0,0 @@
diff --git a/zconf.h.cmakein b/zconf.h.cmakein
index a7f24cc..a1b359b 100644
--- a/zconf.h.cmakein
+++ b/zconf.h.cmakein
@@ -434,11 +434,19 @@ typedef uLong FAR uLongf;
#endif
#ifdef HAVE_UNISTD_H /* may be set to #if 1 by ./configure */
-# define Z_HAVE_UNISTD_H
+# if ~(~HAVE_UNISTD_H + 0) == 0 && ~(~HAVE_UNISTD_H + 1) == 1
+# define Z_HAVE_UNISTD_H
+# elif HAVE_UNISTD_H != 0
+# define Z_HAVE_UNISTD_H
+# endif
#endif
#ifdef HAVE_STDARG_H /* may be set to #if 1 by ./configure */
-# define Z_HAVE_STDARG_H
+# if ~(~HAVE_STDARG_H + 0) == 0 && ~(~HAVE_STDARG_H + 1) == 1
+# define Z_HAVE_STDARG_H
+# elif HAVE_STDARG_H != 0
+# define Z_HAVE_STDARG_H
+# endif
#endif
#ifdef STDC
diff --git a/zconf.h.in b/zconf.h.in
index 5e1d68a..32f53c8 100644
--- a/zconf.h.in
+++ b/zconf.h.in
@@ -432,11 +432,19 @@ typedef uLong FAR uLongf;
#endif
#ifdef HAVE_UNISTD_H /* may be set to #if 1 by ./configure */
-# define Z_HAVE_UNISTD_H
+# if ~(~HAVE_UNISTD_H + 0) == 0 && ~(~HAVE_UNISTD_H + 1) == 1
+# define Z_HAVE_UNISTD_H
+# elif HAVE_UNISTD_H != 0
+# define Z_HAVE_UNISTD_H
+# endif
#endif
#ifdef HAVE_STDARG_H /* may be set to #if 1 by ./configure */
-# define Z_HAVE_STDARG_H
+# if ~(~HAVE_STDARG_H + 0) == 0 && ~(~HAVE_STDARG_H + 1) == 1
+# define Z_HAVE_STDARG_H
+# elif HAVE_STDARG_H != 0
+# define Z_HAVE_STDARG_H
+# endif
#endif
#ifdef STDC

54
ports/zlib/0002-build-static-or-shared-not-both.patch
View File

@ -1,54 +0,0 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -123,9 +123,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
@@ -146,15 +148,17 @@ 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(zlib ${ZLIB_SRCS} ${ZLIB_ASMS} ${ZLIB_DLL_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
target_include_directories(zlib PUBLIC ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
-add_library(zlibstatic STATIC ${ZLIB_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
-target_include_directories(zlibstatic PUBLIC ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
+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
@@ -169,7 +173,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 AND NOT(CMAKE_SYSTEM_NAME STREQUAL AIX))
set_target_properties(zlib PROPERTIES LINK_FLAGS "-Wl,--version-script,\"${CMAKE_CURRENT_SOURCE_DIR}/zlib.map\"")
endif()
@@ -179,7 +183,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}" )

30
ports/zlib/0003-android-and-mingw-fixes.patch
View File

@ -1,30 +0,0 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -58,7 +58,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)
@@ -135,7 +135,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})
-if(MINGW)
+if(MINGW AND NOT ANDROID)
# This gets us DLL resource information when compiling on MinGW.
if(NOT CMAKE_RC_COMPILER)
set(CMAKE_RC_COMPILER windres.exe)
@@ -151,7 +151,7 @@ if(MINGW)
if(BUILD_SHARED_LIBS)
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})
target_include_directories(zlib PUBLIC ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})

58
ports/zlib/portfile.cmake
View File

@ -3,51 +3,51 @@ 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")
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" ZLIB_BUILD_SHARED)
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" ZLIB_BUILD_STATIC)
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
-DZLIB_BUILD_SHARED=${ZLIB_BUILD_SHARED}
-DZLIB_BUILD_STATIC=${ZLIB_BUILD_STATIC}
)
vcpkg_cmake_install()
file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
# Install the pkgconfig file
if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
if(VCPKG_TARGET_IS_WINDOWS)
vcpkg_replace_string("${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/zlib.pc" "-lz" "-lzlib")
endif()
file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/zlib.pc" DESTINATION "${CURRENT_PACKAGES_DIR}/lib/pkgconfig")
endif()
if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
if(VCPKG_TARGET_IS_WINDOWS)
vcpkg_replace_string("${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/zlib.pc" "-lz" "-lzlibd")
endif()
file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/zlib.pc" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig")
endif()
vcpkg_fixup_pkgconfig()
vcpkg_copy_pdbs()
vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/zlib")
vcpkg_fixup_pkgconfig()
if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "static")
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/zlib.pc" " -lz" " -lzs")
endif()
if(NOT VCPKG_BUILD_TYPE)
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/zlib.pc" "/include" "/../include")
if(VCPKG_TARGET_IS_WINDOWS)
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/zlib.pc" " -lz" " -lzsd")
else()
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/zlib.pc" " -lz" " -lzd")
endif()
endif()
endif()
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/zconf.h" "ifdef ZLIB_DLL" "if 0")
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/zlib/ZLIBConfig.cmake" [[_ZLIB_supported_components "shared" "static"]] [[_ZLIB_supported_components "static"]])
else()
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/zconf.h" "ifdef ZLIB_DLL" "if 1")
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/zlib/ZLIBConfig.cmake" [[_ZLIB_supported_components "shared" "static"]] [[_ZLIB_supported_components "shared"]])
endif()
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
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)
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")

6
ports/zlib/usage
View File

@ -1,4 +1,4 @@
The package zlib is compatible with built-in CMake targets:
zlib is compatible with built-in CMake targets:
find_package(ZLIB REQUIRED)
target_link_libraries(main PRIVATE ZLIB::ZLIB)
find_package(ZLIB REQUIRED)
target_link_libraries(main PRIVATE ZLIB::ZLIB)

12
ports/zlib/vcpkg-cmake-wrapper.cmake
View File

@ -1,12 +1,4 @@
find_path(ZLIB_INCLUDE_DIR NAMES zlib.h PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include" NO_DEFAULT_PATH)
find_library(ZLIB_LIBRARY_RELEASE NAMES zlib z PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib" NO_DEFAULT_PATH)
find_library(ZLIB_LIBRARY_DEBUG NAMES zlibd z PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/lib" NO_DEFAULT_PATH)
if(NOT ZLIB_INCLUDE_DIR OR NOT (ZLIB_LIBRARY_RELEASE OR ZLIB_LIBRARY_DEBUG))
message(FATAL_ERROR "Broken installation of vcpkg port zlib")
endif()
if(CMAKE_VERSION VERSION_LESS 3.4)
include(SelectLibraryConfigurations)
select_library_configurations(ZLIB)
unset(ZLIB_FOUND)
endif()
find_library(ZLIB_LIBRARY_RELEASE NAMES z zs PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib" NO_DEFAULT_PATH)
find_library(ZLIB_LIBRARY_DEBUG NAMES z zd zsd PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/lib" NO_DEFAULT_PATH)
_find_package(${ARGS})

6
ports/zlib/vcpkg.json
View File

@ -1,6 +1,6 @@
{
"name": "zlib",
"version": "1.3.1",
"version": "1.3.2",
"description": "A compression library",
"homepage": "https://www.zlib.net/",
"license": "Zlib",
@ -8,6 +8,10 @@
{
"name": "vcpkg-cmake",
"host": true
},
{
"name": "vcpkg-cmake-config",
"host": true
}
]
}

7
scripts/ci.feature.baseline.txt
View File

@ -91,6 +91,7 @@ apr:arm64-android=fail
apr:arm64-linux=fail
apr:x64-android=fail
apr-util:arm64-linux=cascade
apsi:arm-neon-android=fail
aravis[introspection]:arm64-windows=skip # needs arm64 host
aravis[usb]:arm64-linux=cascade
armadillo:arm-neon-android=cascade
@ -293,12 +294,10 @@ ffmpeg[amf]:arm64-osx=cascade
ffmpeg[avisynthplus]:arm64-windows=cascade
ffmpeg[dav1d]:x86-windows=cascade
ffmpeg[fdk-aac](android)=cascade
ffmpeg[ffplay]:arm64-linux=cascade
ffmpeg[nvcodec,ffplay,opengl](android)=feature-fails
ffmpeg[opengl]:arm64-linux=feature-fails
ffmpeg[qsv](((!x86 & !x64) | (!android & !linux)) & (!windows | uwp))=cascade
ffmpeg[rubberband]:arm64-linux=cascade
ffmpeg[sdl2]:arm64-linux=cascade
ffmpeg[tensorflow](windows)=cascade
ffmpeg[vaapi]:arm64-linux=cascade
fftw3[openmp]:arm64-osx=feature-fails # waits for https://github.com/microsoft/vcpkg/pull/30833
@ -851,7 +850,10 @@ ogre-next[java]:arm64-osx=cascade
ogre-next[python]:arm64-osx=cascade
ogre-next(android)=fail
ois:x64-android=fail
omniorb:arm-neon-android=fail
omniorb:arm64-android=fail
omniorb:arm64-linux=fail
omniorb:x64-android=fail
omplapp:arm64-linux=cascade
omplapp[opengl](android)=feature-fails # Could NOT find OpenGL (missing: OPENGL_opengl_LIBRARY OPENGL_glx_LIBRARY OPENGL_INCLUDE_DIR)
onnx-optimizer[pybind11]:arm64-linux=cascade
@ -1141,6 +1143,7 @@ qt5-base[icu]:x64-windows-static-md=feature-fails
qt5-base[icu]:x64-windows-static=feature-fails
qt5-base[icu]:x64-windows=feature-fails
qt5-base[icu]:x86-windows=feature-fails
qt5-base[postgresqlplugin](windows & !static)=feature-fails # https://github.com/microsoft/vcpkg/issues/51102
qt5-base[vulkan]:arm64-osx=feature-fails # needs MolkenVK
qt5-base(android)=skip # port doesn't support cross builds
qt5-base(arm & windows)=fail # qt5-base: no cross builds

5
versions/a-/apsi.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "154dfb78740cc2acc90c4190af5f5598062c94c1",
"version-semver": "0.11.0",
"port-version": 1
},
{
"git-tree": "d846cf4ccf985e33eea10fa2ac4ff44da9086dad",
"version-semver": "0.11.0",

34
versions/baseline.json
View File

@ -210,7 +210,7 @@
},
"apsi": {
"baseline": "0.11.0",
"port-version": 0
"port-version": 1
},
"aravis": {
"baseline": "0.8.35",
@ -1886,7 +1886,7 @@
},
"coin-or-buildtools": {
"baseline": "2023-02-02",
"port-version": 1
"port-version": 2
},
"coin-or-cbc": {
"baseline": "2024-06-04",
@ -2186,7 +2186,7 @@
},
"crashpad": {
"baseline": "2024-04-11",
"port-version": 10
"port-version": 11
},
"crashrpt": {
"baseline": "1.4.3",
@ -2554,7 +2554,7 @@
},
"dlib": {
"baseline": "20.0.1",
"port-version": 1
"port-version": 2
},
"dlpack": {
"baseline": "1.3",
@ -2782,7 +2782,7 @@
},
"elfutils": {
"baseline": "0.195",
"port-version": 0
"port-version": 1
},
"eljonny-testcpp": {
"baseline": "0.3.0-beta.4",
@ -3002,7 +3002,7 @@
},
"ffmpeg": {
"baseline": "8.1",
"port-version": 2
"port-version": 3
},
"ffmpeg-bin2c": {
"baseline": "8.1",
@ -5214,7 +5214,7 @@
},
"libmagic": {
"baseline": "5.46",
"port-version": 2
"port-version": 3
},
"libmariadb": {
"baseline": "3.4.8",
@ -5834,7 +5834,7 @@
},
"libwandio": {
"baseline": "4.2.6-1",
"port-version": 1
"port-version": 2
},
"libwebm": {
"baseline": "1.0.0.32",
@ -5898,7 +5898,7 @@
},
"libxfont": {
"baseline": "2.0.5",
"port-version": 2
"port-version": 3
},
"libxft": {
"baseline": "2.3.9",
@ -7226,7 +7226,7 @@
},
"omniorb": {
"baseline": "4.3.0",
"port-version": 4
"port-version": 5
},
"ompl": {
"baseline": "1.7.0",
@ -8042,7 +8042,7 @@
},
"python3": {
"baseline": "3.12.13",
"port-version": 0
"port-version": 1
},
"qca": {
"baseline": "2.3.7",
@ -8102,7 +8102,7 @@
},
"qpdf": {
"baseline": "12.3.2",
"port-version": 0
"port-version": 1
},
"qpid-proton": {
"baseline": "0.40.0",
@ -8146,7 +8146,7 @@
},
"qt5-base": {
"baseline": "5.15.18",
"port-version": 2
"port-version": 3
},
"qt5-charts": {
"baseline": "5.15.18",
@ -9078,7 +9078,7 @@
},
"sdl3-image": {
"baseline": "3.4.2",
"port-version": 0
"port-version": 1
},
"sdl3-mixer": {
"baseline": "3.2.0",
@ -9146,7 +9146,7 @@
},
"serf": {
"baseline": "1.3.10",
"port-version": 0
"port-version": 1
},
"sese": {
"baseline": "2.3.0",
@ -9206,7 +9206,7 @@
},
"shiftmedia-libgnutls": {
"baseline": "3.8.7",
"port-version": 2
"port-version": 3
},
"shiftmedia-libgpg-error": {
"baseline": "1.45",
@ -11169,7 +11169,7 @@
"port-version": 5
},
"zlib": {
"baseline": "1.3.1",
"baseline": "1.3.2",
"port-version": 0
},
"zlib-ng": {

5
versions/c-/coin-or-buildtools.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "684ef6c482fdda760e688acfc1e9cc76ce41477a",
"version-date": "2023-02-02",
"port-version": 2
},
{
"git-tree": "9c512b1216f88b2c98a9944c43131fad4de9fdd5",
"version-date": "2023-02-02",

5
versions/c-/crashpad.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "72faa94ef243fcd582120dac62c2573e538234bc",
"version-date": "2024-04-11",
"port-version": 11
},
{
"git-tree": "45929b16dd46deb0333a00975263a3ee7fafbcf9",
"version-date": "2024-04-11",

5
versions/d-/dlib.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "e237a400bae75c688af53444f3626ddb873fb300",
"version": "20.0.1",
"port-version": 2
},
{
"git-tree": "c1a270ddbab3a834e181e2216c293138848d4622",
"version": "20.0.1",

5
versions/e-/elfutils.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "8e6a0b3de9b5932717234031687d5895c8ced9bf",
"version": "0.195",
"port-version": 1
},
{
"git-tree": "c6b8117ba15e892493e6381f9e05e51a4629289c",
"version": "0.195",

5
versions/f-/ffmpeg.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "6b761cfd6d236878bef9bc2684cde2bc21341c6d",
"version": "8.1",
"port-version": 3
},
{
"git-tree": "aeae74ea92c2de847098317487ff646c77c9f28f",
"version": "8.1",

5
versions/l-/libmagic.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "2e653e20565b1a620ad50e9555eee72d4455ec18",
"version": "5.46",
"port-version": 3
},
{
"git-tree": "41586f5bc835926bf3a4ba4bfc79be735ca581d3",
"version": "5.46",

5
versions/l-/libwandio.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "04bcbb0fc4d2640814fae356a29c2549bdfcfbe8",
"version": "4.2.6-1",
"port-version": 2
},
{
"git-tree": "55502b698857c954b39c145577100b0bf38bdb4d",
"version": "4.2.6-1",

5
versions/l-/libxfont.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "626b0f9af32ec7e9243a8367ae56289661eff54c",
"version": "2.0.5",
"port-version": 3
},
{
"git-tree": "b86bce7ad32a354a79147d29cf126eb7c87fa148",
"version": "2.0.5",

5
versions/o-/omniorb.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "2374ad7e8f7377e4342e232767e01d321f81f4d7",
"version": "4.3.0",
"port-version": 5
},
{
"git-tree": "6ca24d5ca5d2bcc61fb96f531a56da7b09990452",
"version": "4.3.0",

5
versions/p-/python3.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "36787c37e508b45bfa1b6739e68bebdefdbed21b",
"version": "3.12.13",
"port-version": 1
},
{
"git-tree": "17c48c7410a2ddd23344c2dfc6b659c51189f858",
"version": "3.12.13",

5
versions/q-/qpdf.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "9b5192826719e19f1b11e877b8024d2fc30a2abb",
"version": "12.3.2",
"port-version": 1
},
{
"git-tree": "73aa26b167a01911ed5b424e0954eb1ac9aa95c7",
"version": "12.3.2",

5
versions/q-/qt5-base.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "997295bf0dc2718ba909ddc293a37e1d795d4107",
"version": "5.15.18",
"port-version": 3
},
{
"git-tree": "ac9abc3027905d9a1f2558ba6f6a569cdfb03892",
"version": "5.15.18",

5
versions/s-/sdl3-image.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "2e97142e6b1a6f51cdf99b8ef743719515c56994",
"version": "3.4.2",
"port-version": 1
},
{
"git-tree": "2621596cc09e39b1ab98298f4f9e126c1764a6c4",
"version": "3.4.2",

5
versions/s-/serf.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "b6de178033cf4863ae254effe4d99276f66eb14e",
"version": "1.3.10",
"port-version": 1
},
{
"git-tree": "703faeed41a5142b4ee46dbd247823a14a05b31f",
"version": "1.3.10",

5
versions/s-/shiftmedia-libgnutls.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "55c21aee08576ed90588858b47134ddec3f1e559",
"version": "3.8.7",
"port-version": 3
},
{
"git-tree": "dcd9bcc539c9c95eb9c40a11f053bd2bad22e822",
"version": "3.8.7",

5
versions/z-/zlib.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "e2a9ce8cf8f5d07e489e14c256eefdd58cd535c1",
"version": "1.3.2",
"port-version": 0
},
{
"git-tree": "3f05e04b9aededb96786a911a16193cdb711f0c9",
"version": "1.3.1",