Skip to content

Commit bc6dd40

Browse files
deps: update zlib to 1.4-ec453dc
PR-URL: #67475 Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Filip Skokan <panva.ip@gmail.com>
1 parent 750db58 commit bc6dd40

37 files changed

Lines changed: 887 additions & 546 deletions

‎deps/zlib/CMakeLists.txt‎

Lines changed: 150 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
cmake_minimum_required(VERSION 3.12...3.31)
1+
cmake_minimum_required(VERSION 3.15...3.31)
22

33
project(
44
zlib
55
LANGUAGES C
6-
VERSION 1.3.2.1
6+
VERSION 1.4
77
HOMEPAGE_URL "https://zlib.net/"
88
DESCRIPTION "a general-purpose lossless data-compression library")
99

@@ -23,8 +23,8 @@ option(ZLIB_BUILD_TESTING "Enable Zlib Examples as tests" ON)
2323
option(ZLIB_BUILD_SHARED "Enable building zlib shared library" ON)
2424
option(ZLIB_BUILD_STATIC "Enable building zlib static library" ON)
2525
option(ZLIB_INSTALL "Enable installation of zlib" ON)
26-
option(ZLIB_PREFIX "prefix for all types and library functions, see zconf.h.in"
27-
OFF)
26+
set(ZLIB_PREFIX "" CACHE STRING
27+
"prefix for all types and library functions, see zconf.h.in")
2828
mark_as_advanced(ZLIB_PREFIX)
2929

3030
get_property(IS_MULTI GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
@@ -35,7 +35,7 @@ if(NOT DEFINED CMAKE_BUILD_TYPE AND NOT IS_MULTI)
3535
endif(NOT DEFINED CMAKE_BUILD_TYPE AND NOT IS_MULTI)
3636

3737
include(CheckCSourceCompiles)
38-
include(CheckFunctionExists)
38+
include(CheckSymbolExists)
3939
include(CheckIncludeFile)
4040
include(CMakePackageConfigHelpers)
4141
include(CheckTypeSize)
@@ -44,12 +44,16 @@ include(GNUInstallDirs)
4444

4545
set(CPACK_INCLUDED TRUE)
4646

47+
set(Z_PREFIX "${ZLIB_PREFIX}")
48+
49+
#
50+
# Create zconf.h.cmakein
51+
#
4752
if(NOT ZLIB_CONF_WRITTEN)
48-
set(Z_PREFIX ${ZLIB_PREFIX})
4953
set(CONF_OUT_FILE ${zlib_BINARY_DIR}/zconf.h.cmakein)
5054
file(READ ${zlib_SOURCE_DIR}/zconf.h ZCONF_CONTENT LIMIT 245)
5155
file(WRITE ${CONF_OUT_FILE} ${ZCONF_CONTENT})
52-
file(APPEND ${CONF_OUT_FILE} "#cmakedefine Z_PREFIX 1\n")
56+
file(APPEND ${CONF_OUT_FILE} "#cmakedefine Z_PREFIX @Z_PREFIX@\n")
5357
file(APPEND ${CONF_OUT_FILE} "#cmakedefine HAVE_STDARG_H 1\n")
5458
file(APPEND ${CONF_OUT_FILE} "#cmakedefine HAVE_UNISTD_H 1\n")
5559
file(READ ${zlib_SOURCE_DIR}/zconf.h ZCONF_CONTENT OFFSET 244)
@@ -149,6 +153,73 @@ if (ENABLE_SIMD_OPTIMIZATIONS)
149153
endif()
150154
endif()
151155

156+
#
157+
# Create zlib.def.cmakein
158+
#
159+
if(NOT ZLIB_DEF_WRITTEN)
160+
file(STRINGS "${zlib_SOURCE_DIR}/win32/zlib.def" ZLIB_DEF_LINES)
161+
162+
set(ZLIB_DEF_OUT "")
163+
164+
foreach(line IN LISTS ZLIB_DEF_LINES)
165+
if(line MATCHES "^;")
166+
string(APPEND ZLIB_DEF_OUT "${line}\n")
167+
elseif(line MATCHES "^(LIBRARY|EXPORTS|DESCRIPTION)")
168+
string(APPEND ZLIB_DEF_OUT "${line}\n")
169+
elseif(line MATCHES "^ *$")
170+
string(APPEND ZLIB_DEF_OUT "\n")
171+
elseif(line MATCHES "^ *[A-Za-z_][A-Za-z0-9_]*")
172+
string(REGEX REPLACE "^ +" "" sym "${line}")
173+
string(APPEND ZLIB_DEF_OUT
174+
" @ZLIB_PREFIX@${sym}\n")
175+
else()
176+
string(APPEND ZLIB_DEF_OUT "${line}\n")
177+
endif()
178+
endforeach()
179+
180+
file(WRITE
181+
"${CMAKE_CURRENT_BINARY_DIR}/zlib.def.cmakein"
182+
"${ZLIB_DEF_OUT}"
183+
)
184+
185+
set(ZLIB_DEF_WRITTEN
186+
TRUE
187+
CACHE BOOL "zlib.def.cmakein was created")
188+
mark_as_advanced(ZLIB_DEF_WRITTEN)
189+
endif(NOT ZLIB_DEF_WRITTEN)
190+
191+
#
192+
#Create zlib.map
193+
#
194+
if(NOT ZLIB_MAP_WRITTEN)
195+
file(STRINGS "${zlib_SOURCE_DIR}/zlib.map" ZLIB_MAP_CONTENT)
196+
set(ZLIB_MAP_OUT "")
197+
198+
foreach(line IN LISTS ZLIB_MAP_CONTENT)
199+
if(line MATCHES "^ *[A-Za-z_][A-Za-z0-9_]* *; *$")
200+
if(line MATCHES "^ *\\* *; *$")
201+
string(APPEND ZLIB_MAP_OUT "${line}\n")
202+
else()
203+
string(REGEX REPLACE "^ +" "" sym "${line}")
204+
string(APPEND ZLIB_MAP_OUT
205+
" @ZLIB_PREFIX@${sym}\n")
206+
endif()
207+
else()
208+
string(APPEND ZLIB_MAP_OUT "${line}\n")
209+
endif()
210+
endforeach()
211+
212+
file(WRITE
213+
"${zlib_BINARY_DIR}/zlib.map.cmakein"
214+
"${ZLIB_MAP_OUT}"
215+
)
216+
217+
set(ZLIB_MAP_WRITTEN
218+
TRUE
219+
CACHE BOOL "zlib.map.cmakein was created")
220+
mark_as_advanced(ZLIB_MAP_WRITTEN)
221+
endif(NOT ZLIB_MAP_WRITTEN)
222+
152223
#
153224
# Check to see if we have large file support
154225
#
@@ -159,7 +230,7 @@ unset(CMAKE_REQUIRED_DEFINITIONS) # clear variable
159230
#
160231
# Check for fseeko
161232
#
162-
check_function_exists(fseeko HAVE_FSEEKO)
233+
check_symbol_exists(fseeko stdio.h HAVE_FSEEKO)
163234

164235
#
165236
# Check for stdarg.h
@@ -190,8 +261,21 @@ check_c_source_compiles(
190261

191262
unset(CMAKE_COMPILE_FLAGS)
192263
set(ZLIB_PC ${zlib_BINARY_DIR}/zlib.pc)
264+
if(IS_ABSOLUTE "${CMAKE_INSTALL_INCLUDEDIR}")
265+
set(pc_includedir "${CMAKE_INSTALL_INCLUDEDIR}")
266+
else()
267+
set(pc_includedir "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}")
268+
endif()
269+
if(IS_ABSOLUTE "${CMAKE_INSTALL_LIBDIR}")
270+
set(pc_libdir "${CMAKE_INSTALL_LIBDIR}")
271+
else()
272+
set(pc_libdir "\${exec_prefix}/${CMAKE_INSTALL_LIBDIR}")
273+
endif()
274+
193275
configure_file(${zlib_SOURCE_DIR}/zlib.pc.cmakein ${ZLIB_PC} @ONLY)
194276
configure_file(${zlib_BINARY_DIR}/zconf.h.cmakein ${zlib_BINARY_DIR}/zconf.h)
277+
configure_file(${zlib_BINARY_DIR}/zlib.def.cmakein ${zlib_BINARY_DIR}/zlib.def)
278+
configure_file(${zlib_BINARY_DIR}/zlib.map.cmakein ${zlib_BINARY_DIR}/zlib.map)
195279

196280
# ============================================================================
197281
# zlib
@@ -293,9 +377,12 @@ endif()
293377

294378
if(ZLIB_BUILD_SHARED)
295379
add_library(
296-
zlib SHARED ${ZLIB_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS}
297-
$<$<OR:$<BOOL:${WIN32}>,$<BOOL:${CYGWIN}>>:win32/zlib1.rc>)
380+
zlib SHARED ${ZLIB_SRCS} ${ZLIB_PUBLIC_HDRS}
381+
${ZLIB_PRIVATE_HDRS}
382+
$<$<OR:$<BOOL:${WIN32}>,$<BOOL:${CYGWIN}>>:win32/zlib-cmake.rc>
383+
$<$<BOOL:${MSVC}>:${zlib_BINARY_DIR}/zlib.def>)
298384
add_library(ZLIB::ZLIB ALIAS zlib)
385+
299386
target_include_directories(
300387
zlib
301388
PUBLIC $<BUILD_INTERFACE:${zlib_BINARY_DIR}>
@@ -304,37 +391,48 @@ if(ZLIB_BUILD_SHARED)
304391
target_compile_definitions(
305392
zlib
306393
PRIVATE ZLIB_BUILD
307-
$<$<BOOL:NOT:${HAVE_FSEEKO}>:NO_FSEEKO>
394+
$<$<NOT:$<BOOL:${HAVE_FSEEKO}>>:NO_FSEEKO>
308395
$<$<BOOL:${HAVE___ATTR__VIS_HIDDEN}>:HAVE_HIDDEN>
309396
$<$<BOOL:${MSVC}>:_CRT_SECURE_NO_DEPRECATE>
310397
$<$<BOOL:${MSVC}>:_CRT_NONSTDC_NO_DEPRECATE>
311-
PUBLIC $<$<BOOL:${HAVE_OFF64_T}>:_LARGEFILE64_SOURCE=1>)
398+
PUBLIC $<$<BOOL:${HAVE_OFF64_T}>:_LARGEFILE64_SOURCE=1>
399+
$<$<BOOL:${ZLIB_PREFIX}>:Z_PREFIX=${ZLIB_PREFIX}>)
400+
312401
set(INSTALL_VERSION ${zlib_VERSION})
313402

314-
if(NOT CYGWIN)
403+
if(CYGWIN)
404+
set_target_properties(zlib PROPERTIES PREFIX "lib")
405+
else(CYGWIN)
315406
set_target_properties(zlib PROPERTIES SOVERSION ${zlib_VERSION_MAJOR}
316407
VERSION ${INSTALL_VERSION})
317-
endif(NOT CYGWIN)
408+
endif(CYGWIN)
409+
410+
set_target_properties(zlib
411+
PROPERTIES
412+
DEFINE_SYMBOL ZLIB_DLL
413+
EXPORT_NAME ZLIB
414+
PUBLIC_HEADER "${ZLIB_PUBLIC_HDRS}")
415+
416+
if(MSVC)
417+
set_target_properties(zlib PROPERTIES OUTPUT_NAME libz)
418+
else(MSVC)
419+
set_target_properties(zlib PROPERTIES OUTPUT_NAME z)
420+
endif(MSVC)
318421

319-
set_target_properties(
320-
zlib
321-
PROPERTIES DEFINE_SYMBOL ZLIB_DLL
322-
EXPORT_NAME ZLIB
323-
OUTPUT_NAME z)
324422
if(UNIX
325423
AND NOT APPLE
326-
AND NOT (CMAKE_SYSTEM_NAME STREQUAL AIX)
327-
AND NOT (CMAKE_SYSTEM_NAME STREQUAL SunOS))
424+
AND NOT (CMAKE_SYSTEM_NAME STREQUAL "AIX")
425+
AND NOT (CMAKE_SYSTEM_NAME STREQUAL "SunOS"))
328426
# On unix-like platforms the library is almost always called libz
329427
set_target_properties(
330428
zlib
331429
PROPERTIES LINK_FLAGS
332-
"-Wl,--version-script,\"${zlib_SOURCE_DIR}/zlib.map\"")
430+
"-Wl,--version-script,\"${zlib_BINARY_DIR}/zlib.map\"")
333431
endif(
334432
UNIX
335433
AND NOT APPLE
336-
AND NOT (CMAKE_SYSTEM_NAME STREQUAL AIX)
337-
AND NOT (CMAKE_SYSTEM_NAME STREQUAL SunOS))
434+
AND NOT (CMAKE_SYSTEM_NAME STREQUAL "AIX")
435+
AND NOT (CMAKE_SYSTEM_NAME STREQUAL "SunOS"))
338436
endif(ZLIB_BUILD_SHARED)
339437

340438
if(ZLIB_BUILD_STATIC)
@@ -349,14 +447,31 @@ if(ZLIB_BUILD_STATIC)
349447
target_compile_definitions(
350448
zlibstatic
351449
PRIVATE ZLIB_BUILD
352-
$<$<BOOL:NOT:${HAVE_FSEEKO}>:NO_FSEEKO>
450+
$<$<NOT:$<BOOL:${HAVE_FSEEKO}>>:NO_FSEEKO>
353451
$<$<BOOL:${HAVE___ATTR__VIS_HIDDEN}>:HAVE_HIDDEN>
354452
$<$<BOOL:${MSVC}>:_CRT_SECURE_NO_DEPRECATE>
355453
$<$<BOOL:${MSVC}>:_CRT_NONSTDC_NO_DEPRECATE>
356-
PUBLIC $<$<BOOL:${HAVE_OFF64_T}>:_LARGEFILE64_SOURCE=1>)
357-
set_target_properties(
358-
zlibstatic PROPERTIES EXPORT_NAME ZLIBSTATIC OUTPUT_NAME
359-
z${zlib_static_suffix})
454+
PUBLIC $<$<BOOL:${HAVE_OFF64_T}>:_LARGEFILE64_SOURCE=1>
455+
$<$<BOOL:${ZLIB_PREFIX}>:Z_PREFIX=${ZLIB_PREFIX}>)
456+
457+
if(CYGWIN)
458+
set_target_properties(zlibstatic PROPERTIES PREFIX "lib")
459+
endif(CYGWIN)
460+
461+
if(MSVC)
462+
set_target_properties(zlibstatic
463+
PROPERTIES
464+
ARCHIVE_OUTPUT_NAME libz${zlib_static_suffix})
465+
else(MSVC)
466+
set_target_properties(zlibstatic
467+
PROPERTIES
468+
ARCHIVE_OUTPUT_NAME z${zlib_static_suffix})
469+
endif(MSVC)
470+
471+
set_target_properties(zlibstatic
472+
PROPERTIES
473+
EXPORT_NAME ZLIBSTATIC
474+
PUBLIC_HEADER "${ZLIB_PUBLIC_HDRS}")
360475
endif(ZLIB_BUILD_STATIC)
361476

362477
if(ZLIB_INSTALL)
@@ -367,7 +482,10 @@ if(ZLIB_INSTALL)
367482
EXPORT zlibSharedExport
368483
RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
369484
ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
370-
LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}")
485+
LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
486+
PUBLIC_HEADER
487+
DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
488+
COMPONENT Development)
371489
install(
372490
EXPORT zlibSharedExport
373491
FILE ZLIB-shared.cmake
@@ -391,7 +509,8 @@ if(ZLIB_INSTALL)
391509
EXPORT zlibStaticExport
392510
RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
393511
ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
394-
LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}")
512+
LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
513+
PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
395514
install(
396515
EXPORT zlibStaticExport
397516
FILE ZLIB-static.cmake
@@ -412,10 +531,6 @@ if(ZLIB_INSTALL)
412531
install(FILES ${zlib_BINARY_DIR}/ZLIBConfig.cmake
413532
${zlib_BINARY_DIR}/ZLIBConfigVersion.cmake
414533
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/zlib)
415-
install(
416-
FILES ${ZLIB_PUBLIC_HDRS}
417-
COMPONENT Development
418-
DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
419534
install(
420535
FILES zlib.3
421536
COMPONENT Docs

‎deps/zlib/README‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
ZLIB DATA COMPRESSION LIBRARY
22

3-
zlib 1.3.2.1 is a general purpose data compression library. All the code is
3+
zlib 1.4 is a general purpose data compression library. All the code is
44
thread safe (though see the FAQ for caveats). The data format used by the zlib
55
library is described by RFCs (Request for Comments) 1950 to 1952 at
66
https://datatracker.ietf.org/doc/html/rfc1950 (zlib format), rfc1951 (deflate
@@ -31,7 +31,7 @@ Mark Nelson <markn@ieee.org> wrote an article about zlib for the Jan. 1997
3131
issue of Dr. Dobb's Journal; a copy of the article is available at
3232
https://zlib.net/nelson/ .
3333

34-
The changes made in version 1.3.2.1 are documented in the file ChangeLog.
34+
The changes made in version 1.4 are documented in the file ChangeLog.
3535

3636
Unsupported third party contributions are provided in directory contrib/ .
3737

‎deps/zlib/README.chromium‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
Name: zlib
22
Short Name: zlib
33
URL: https://github.com/madler/zlib
4-
Version: 1.3.2
5-
Revision: 09a1572aa624e5ddb6c075dc013880de70b1b9b9
4+
Version: 1.4
5+
Revision: 99623ef7097352da7993ba614161fd6a311e046e
66
Update Mechanism: Manual (https://crbug.com/422348588)
7-
CPEPrefix: cpe:/a:zlib:zlib:1.3.2
7+
CPEPrefix: cpe:/a:zlib:zlib:1.4
88
Security Critical: yes
99
Shipped: yes
1010
License: Zlib
@@ -15,7 +15,7 @@ Description:
1515
"A massively spiffy yet delicately unobtrusive compression library."
1616

1717
zlib is a free, general-purpose, legally unencumbered lossless data-compression
18-
library. zlib implements the "deflate" compression algorithm described by RFC
18+
library. zlib implements the "deflate" compression algorithm described by RFC
1919
1951, which combines the LZ77 (Lempel-Ziv) algorithm with Huffman coding. zlib
2020
also implements the zlib (RFC 1950) and gzip (RFC 1952) wrapper formats.
2121

‎deps/zlib/compress.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ int ZEXPORT compress2_z(Bytef *dest, z_size_t *destLen, const Bytef *source,
2828
const uInt max = (uInt)-1;
2929
z_size_t left;
3030

31-
if ((sourceLen > 0 && source == NULL) ||
32-
destLen == NULL || (*destLen > 0 && dest == NULL))
31+
if ((sourceLen > 0 && source == Z_NULL) ||
32+
destLen == Z_NULL || (*destLen > 0 && dest == Z_NULL))
3333
return Z_STREAM_ERROR;
3434

3535
left = *destLen;

0 commit comments

Comments
 (0)