mirror of
https://github.com/ZDoom/zdoom-macos-deps.git
synced 2024-11-10 06:31:37 +00:00
deps: update zlib-ng to 2.1.4
This commit is contained in:
parent
43d9c7469e
commit
eeb26c5065
3 changed files with 24 additions and 20 deletions
42
deps/zlib-ng/include/zlib.h
vendored
42
deps/zlib-ng/include/zlib.h
vendored
|
@ -49,19 +49,20 @@
|
||||||
extern "C" {
|
extern "C" {
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define ZLIBNG_VERSION "2.1.3"
|
#define ZLIBNG_VERSION "2.1.4"
|
||||||
#define ZLIBNG_VERNUM 0x020103F0L /* MMNNRRSM: major minor revision status modified */
|
#define ZLIBNG_VERNUM 0x020104F0L /* MMNNRRSM: major minor revision status modified */
|
||||||
#define ZLIBNG_VER_MAJOR 2
|
#define ZLIBNG_VER_MAJOR 2
|
||||||
#define ZLIBNG_VER_MINOR 1
|
#define ZLIBNG_VER_MINOR 1
|
||||||
#define ZLIBNG_VER_REVISION 3
|
#define ZLIBNG_VER_REVISION 4
|
||||||
#define ZLIBNG_VER_STATUS F /* 0=devel, 1-E=beta, F=Release */
|
#define ZLIBNG_VER_STATUS F /* 0=devel, 1-E=beta, F=Release (DEPRECATED) */
|
||||||
|
#define ZLIBNG_VER_STATUSH 0xF /* Hex values: 0=devel, 1-E=beta, F=Release */
|
||||||
#define ZLIBNG_VER_MODIFIED 0 /* non-zero if modified externally from zlib-ng */
|
#define ZLIBNG_VER_MODIFIED 0 /* non-zero if modified externally from zlib-ng */
|
||||||
|
|
||||||
#define ZLIB_VERSION "1.2.13.zlib-ng"
|
#define ZLIB_VERSION "1.3.0.zlib-ng"
|
||||||
#define ZLIB_VERNUM 0x12df
|
#define ZLIB_VERNUM 0x130f
|
||||||
#define ZLIB_VER_MAJOR 1
|
#define ZLIB_VER_MAJOR 1
|
||||||
#define ZLIB_VER_MINOR 2
|
#define ZLIB_VER_MINOR 3
|
||||||
#define ZLIB_VER_REVISION 13
|
#define ZLIB_VER_REVISION 0
|
||||||
#define ZLIB_VER_SUBREVISION 15 /* 15=fork (0xf) */
|
#define ZLIB_VER_SUBREVISION 15 /* 15=fork (0xf) */
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -239,8 +240,8 @@ Z_EXTERN int Z_EXPORT deflateInit (z_stream *strm, int level);
|
||||||
|
|
||||||
Initializes the internal stream state for compression. The fields
|
Initializes the internal stream state for compression. The fields
|
||||||
zalloc, zfree and opaque must be initialized before by the caller. If
|
zalloc, zfree and opaque must be initialized before by the caller. If
|
||||||
zalloc and zfree are set to NULL, deflateInit updates them to use default
|
zalloc and zfree are set to Z_NULL, deflateInit updates them to use default
|
||||||
allocation functions.
|
allocation functions. total_in, total_out, adler, and msg are initialized.
|
||||||
|
|
||||||
The compression level must be Z_DEFAULT_COMPRESSION, or between 0 and 9:
|
The compression level must be Z_DEFAULT_COMPRESSION, or between 0 and 9:
|
||||||
1 gives best speed, 9 gives best compression, 0 gives no compression at all
|
1 gives best speed, 9 gives best compression, 0 gives no compression at all
|
||||||
|
@ -330,8 +331,8 @@ Z_EXTERN int Z_EXPORT deflate(z_stream *strm, int flush);
|
||||||
with the same value of the flush parameter and more output space (updated
|
with the same value of the flush parameter and more output space (updated
|
||||||
avail_out), until the flush is complete (deflate returns with non-zero
|
avail_out), until the flush is complete (deflate returns with non-zero
|
||||||
avail_out). In the case of a Z_FULL_FLUSH or Z_SYNC_FLUSH, make sure that
|
avail_out). In the case of a Z_FULL_FLUSH or Z_SYNC_FLUSH, make sure that
|
||||||
avail_out is greater than six to avoid repeated flush markers due to
|
avail_out is greater than six when the flush marker begins, in order to avoid
|
||||||
avail_out == 0 on return.
|
repeated flush markers upon calling deflate() again when avail_out == 0.
|
||||||
|
|
||||||
If the parameter flush is set to Z_FINISH, pending input is processed,
|
If the parameter flush is set to Z_FINISH, pending input is processed,
|
||||||
pending output is flushed and deflate returns with Z_STREAM_END if there was
|
pending output is flushed and deflate returns with Z_STREAM_END if there was
|
||||||
|
@ -392,8 +393,9 @@ Z_EXTERN int Z_EXPORT inflateInit (z_stream *strm);
|
||||||
the caller. In the current version of inflate, the provided input is not
|
the caller. In the current version of inflate, the provided input is not
|
||||||
read or consumed. The allocation of a sliding window will be deferred to
|
read or consumed. The allocation of a sliding window will be deferred to
|
||||||
the first call of inflate (if the decompression does not complete on the
|
the first call of inflate (if the decompression does not complete on the
|
||||||
first call). If zalloc and zfree are set to NULL, inflateInit updates
|
first call). If zalloc and zfree are set to Z_NULL, inflateInit updates
|
||||||
them to use default allocation functions.
|
them to use default allocation functions. total_in, total_out, adler, and
|
||||||
|
msg are initialized.
|
||||||
|
|
||||||
inflateInit returns Z_OK if success, Z_MEM_ERROR if there was not enough
|
inflateInit returns Z_OK if success, Z_MEM_ERROR if there was not enough
|
||||||
memory, Z_VERSION_ERROR if the zlib library version is incompatible with the
|
memory, Z_VERSION_ERROR if the zlib library version is incompatible with the
|
||||||
|
@ -703,7 +705,7 @@ Z_EXTERN int Z_EXPORT deflateReset(z_stream *strm);
|
||||||
This function is equivalent to deflateEnd followed by deflateInit, but
|
This function is equivalent to deflateEnd followed by deflateInit, but
|
||||||
does not free and reallocate the internal compression state. The stream
|
does not free and reallocate the internal compression state. The stream
|
||||||
will leave the compression level and any other attributes that may have been
|
will leave the compression level and any other attributes that may have been
|
||||||
set unchanged.
|
set unchanged. total_in, total_out, adler, and msg are initialized.
|
||||||
|
|
||||||
deflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source
|
deflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source
|
||||||
stream state was inconsistent (such as zalloc or state being NULL).
|
stream state was inconsistent (such as zalloc or state being NULL).
|
||||||
|
@ -734,7 +736,7 @@ Z_EXTERN int Z_EXPORT deflateParams(z_stream *strm, int level, int strategy);
|
||||||
Then no more input data should be provided before the deflateParams() call.
|
Then no more input data should be provided before the deflateParams() call.
|
||||||
If this is done, the old level and strategy will be applied to the data
|
If this is done, the old level and strategy will be applied to the data
|
||||||
compressed before deflateParams(), and the new level and strategy will be
|
compressed before deflateParams(), and the new level and strategy will be
|
||||||
applied to the the data compressed after deflateParams().
|
applied to the data compressed after deflateParams().
|
||||||
|
|
||||||
deflateParams returns Z_OK on success, Z_STREAM_ERROR if the source stream
|
deflateParams returns Z_OK on success, Z_STREAM_ERROR if the source stream
|
||||||
state was inconsistent or if a parameter was invalid, or Z_BUF_ERROR if
|
state was inconsistent or if a parameter was invalid, or Z_BUF_ERROR if
|
||||||
|
@ -816,8 +818,9 @@ Z_EXTERN int Z_EXPORT deflateSetHeader(z_stream *strm, gz_headerp head);
|
||||||
gzip file" and give up.
|
gzip file" and give up.
|
||||||
|
|
||||||
If deflateSetHeader is not used, the default gzip header has text false,
|
If deflateSetHeader is not used, the default gzip header has text false,
|
||||||
the time set to zero, and os set to 255, with no extra, name, or comment
|
the time set to zero, and os set to the current operating system, with no
|
||||||
fields. The gzip header is returned to the default state by deflateReset().
|
extra, name, or comment fields. The gzip header is returned to the default
|
||||||
|
state by deflateReset().
|
||||||
|
|
||||||
deflateSetHeader returns Z_OK if success, or Z_STREAM_ERROR if the source
|
deflateSetHeader returns Z_OK if success, or Z_STREAM_ERROR if the source
|
||||||
stream state was inconsistent.
|
stream state was inconsistent.
|
||||||
|
@ -924,7 +927,7 @@ Z_EXTERN int Z_EXPORT inflateSync(z_stream *strm);
|
||||||
inflateSync returns Z_OK if a possible full flush point has been found,
|
inflateSync returns Z_OK if a possible full flush point has been found,
|
||||||
Z_BUF_ERROR if no more input was provided, Z_DATA_ERROR if no flush point
|
Z_BUF_ERROR if no more input was provided, Z_DATA_ERROR if no flush point
|
||||||
has been found, or Z_STREAM_ERROR if the stream structure was inconsistent.
|
has been found, or Z_STREAM_ERROR if the stream structure was inconsistent.
|
||||||
In the success case, the application may save the current current value of
|
In the success case, the application may save the current value of
|
||||||
total_in which indicates where valid compressed data was found. In the
|
total_in which indicates where valid compressed data was found. In the
|
||||||
error case, the application may repeatedly call inflateSync, providing more
|
error case, the application may repeatedly call inflateSync, providing more
|
||||||
input each time, until success or end of the input data.
|
input each time, until success or end of the input data.
|
||||||
|
@ -950,6 +953,7 @@ Z_EXTERN int Z_EXPORT inflateReset(z_stream *strm);
|
||||||
This function is equivalent to inflateEnd followed by inflateInit,
|
This function is equivalent to inflateEnd followed by inflateInit,
|
||||||
but does not free and reallocate the internal decompression state. The
|
but does not free and reallocate the internal decompression state. The
|
||||||
stream will keep attributes that may have been set by inflateInit2.
|
stream will keep attributes that may have been set by inflateInit2.
|
||||||
|
total_in, total_out, adler, and msg are initialized.
|
||||||
|
|
||||||
inflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source
|
inflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source
|
||||||
stream state was inconsistent (such as zalloc or state being NULL).
|
stream state was inconsistent (such as zalloc or state being NULL).
|
||||||
|
|
BIN
deps/zlib-ng/lib/libz.a
vendored
BIN
deps/zlib-ng/lib/libz.a
vendored
Binary file not shown.
2
deps/zlib-ng/lib/pkgconfig/zlib.pc
vendored
2
deps/zlib-ng/lib/pkgconfig/zlib.pc
vendored
|
@ -7,7 +7,7 @@ includedir=${prefix}/include
|
||||||
|
|
||||||
Name: zlib
|
Name: zlib
|
||||||
Description: zlib-ng compression library
|
Description: zlib-ng compression library
|
||||||
Version: 1.2.13.zlib-ng
|
Version: 1.3.0.zlib-ng
|
||||||
|
|
||||||
Requires:
|
Requires:
|
||||||
Libs: -L${libdir} -L${sharedlibdir} -lz
|
Libs: -L${libdir} -L${sharedlibdir} -lz
|
||||||
|
|
Loading…
Reference in a new issue