mirror of
https://github.com/microsoft/vcpkg.git
synced 2025-01-19 05:50:58 +08:00
[zlib-ng] Update to 2.1.5 (#35363)
* update zlib-ng to 2.1.5 * update baseline
This commit is contained in:
parent
71283c8cd4
commit
58ac85fb2f
@ -1,24 +0,0 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index a645ad6e..fbc2bdba 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -1159,6 +1159,9 @@ else()
|
||||
endif()
|
||||
|
||||
set(ZLIB_PC ${CMAKE_CURRENT_BINARY_DIR}/zlib${SUFFIX}.pc)
|
||||
+if(WITH_GZFILEOP)
|
||||
+ set(PKG_CONFIG_CFLAGS "-DWITH_GZFILEOP")
|
||||
+endif()
|
||||
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/zlib.pc.cmakein
|
||||
${ZLIB_PC} @ONLY)
|
||||
configure_file(${CMAKE_CURRENT_BINARY_DIR}/zconf${SUFFIX}.h.cmakein
|
||||
diff --git a/zlib.pc.cmakein b/zlib.pc.cmakein
|
||||
index 3d440ce6..df8bf9f0 100644
|
||||
--- a/zlib.pc.cmakein
|
||||
+++ b/zlib.pc.cmakein
|
||||
@@ -11,4 +11,4 @@ Version: @ZLIB_FULL_VERSION@
|
||||
|
||||
Requires:
|
||||
Libs: -L${libdir} -L${sharedlibdir} -lz@SUFFIX@
|
||||
-Cflags: -I${includedir}
|
||||
+Cflags: -I${includedir} @PKG_CONFIG_CFLAGS@
|
@ -2,10 +2,8 @@ vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO zlib-ng/zlib-ng
|
||||
REF "${VERSION}"
|
||||
SHA512 5afda5ea4be84f7d7b016416a6eed18e2aab6c698f006cdfbc8f8b43ce3dc73c7994ab9d1ca090c1b93cb1aadc8747bfd8216afb22b44633d49127f01b77cfa2
|
||||
SHA512 9212d87c63a2da4e5355a7a1c75380aeba40fbd0ea3d71d3784cb3eac94237f9bea2a1b7993a08f39d4197725c4c133087d3a9d213d3944aa48a7559de2be920
|
||||
HEAD_REF develop
|
||||
PATCHES
|
||||
fix-cflags.patch
|
||||
)
|
||||
|
||||
vcpkg_cmake_configure(
|
||||
|
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "zlib-ng",
|
||||
"version": "2.1.4",
|
||||
"version": "2.1.5",
|
||||
"description": "zlib replacement with optimizations for 'next generation' systems",
|
||||
"homepage": "https://github.com/zlib-ng/zlib-ng",
|
||||
"license": "Zlib",
|
||||
|
@ -9341,7 +9341,7 @@
|
||||
"port-version": 0
|
||||
},
|
||||
"zlib-ng": {
|
||||
"baseline": "2.1.4",
|
||||
"baseline": "2.1.5",
|
||||
"port-version": 0
|
||||
},
|
||||
"zlmediakit": {
|
||||
|
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "e612211a2cf602a9a95796202f9cba452c6f5ebc",
|
||||
"version": "2.1.5",
|
||||
"port-version": 0
|
||||
},
|
||||
{
|
||||
"git-tree": "f05a7ce2c95cfcf4720d911a72dc3b60b46eb1c9",
|
||||
"version": "2.1.4",
|
||||
|
Loading…
Reference in New Issue
Block a user