Firehawk52-backup/dolphin
28
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2026-01-15 08:23:17 -03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "Externals: Update zlib-ng to v2.3.2"

Browse Source 
This reverts commit 34b402b631.
This commit is contained in:
Jordan Woyak
2026-01-11 20:29:05 -06:00
parent dc8f2995ef
commit 5162608df9
6 changed files with 61 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Externals/zlib-ng/CMakeLists.txt vendored
View File

@@ -1,13 +1,15 @@
set(BUILD_TESTING OFF)
set(ZLIB_ENABLE_TESTS OFF)
set(ZLIB_COMPAT ON)
set(INSTALL_UTILS OFF)
set(BUILD_SHARED_LIBS OFF)
set(SKIP_INSTALL_ALL ON)
option(BUILD_SHARED_LIBS "Build shared library" OFF)
add_subdirectory(zlib-ng)
# Set ZLIB variables for find_package used by other projects
set(ZLIB_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR}/zlib-ng CACHE STRING "Path to zlib include directory")
set(ZLIB_INCLUDE_DIR ${CMAKE_BINARY_DIR}/zlib-ng CACHE STRING "Path to zlib include directory")
set(ZLIB_LIBRARY ZLIB::ZLIB CACHE STRING "Path to zlib library")
add_library(ZLIB::ZLIB ALIAS zlib-ng)
dolphin_disable_warnings(zlib-ng)
# Setup zlib alias project so FindZLIB doesn't recreate it
add_library(ZLIB::ZLIB ALIAS zlib)
dolphin_disable_warnings(zlib)

19
Externals/zlib-ng/zconf.h vendored
View File

@@ -1,5 +1,5 @@
/* zconf.h -- configuration of the zlib compression library
* Copyright (C) 1995-2024 Jean-loup Gailly, Mark Adler
* Copyright (C) 1995-2016 Jean-loup Gailly, Mark Adler
* For conditions of distribution and use, see copyright notice in zlib.h
*/
@@ -35,9 +35,6 @@
* created by gzip. (Files created by minigzip can still be extracted by
* gzip.)
*/
#ifndef MIN_WBITS
# define MIN_WBITS 8 /* 256 LZ77 window */
#endif
#ifndef MAX_WBITS
# define MAX_WBITS 15 /* 32K LZ77 window */
#endif
@@ -82,9 +79,6 @@
* Caution: the standard ZLIB1.DLL is NOT compiled using ZLIB_WINAPI.
*/
#if defined(ZLIB_WINAPI) && defined(_WIN32)
# ifndef WIN32_LEAN_AND_MEAN
# define WIN32_LEAN_AND_MEAN
# endif
# include <windows.h>
/* No need for _export, use ZLIB.DEF instead. */
/* For complete Windows compatibility, use WINAPI, not __stdcall. */
@@ -116,11 +110,8 @@
#ifndef ZEXPORTVA
# define ZEXPORTVA Z_EXPORTVA
#endif
#ifndef FAR
# define FAR
#endif
/* Legacy zlib typedefs for backwards compatibility. Don't assume stdint.h is defined. */
/* Fallback for something that includes us. */
typedef unsigned char Byte;
typedef Byte Bytef;
@@ -136,9 +127,9 @@ typedef void const *voidpc;
typedef void *voidpf;
typedef void *voidp;
typedef unsigned int z_crc_t;
typedef uint32_t z_crc_t;
#if 0 /* was set to #if 1 by configure/cmake/etc */
#if 0 /* was set to #if 0 by configure/cmake/etc */
# define Z_HAVE_UNISTD_H
#endif
@@ -201,6 +192,4 @@ typedef PTRDIFF_TYPE ptrdiff_t;
# endif
#endif
typedef size_t z_size_t;
#endif /* ZCONF_H */

2
Externals/zlib-ng/zlib-ng vendored

Submodule Externals/zlib-ng/zlib-ng updated: 6d9f3dc072...ce01b1e41d

57
Externals/zlib-ng/zlib-ng.vcxproj vendored
View File

@@ -31,17 +31,14 @@
<ClCompile Include="zlib-ng\arch\x86\adler32_avx512_vnni.c" />
<ClCompile Include="zlib-ng\arch\x86\adler32_sse42.c" />
<ClCompile Include="zlib-ng\arch\x86\adler32_ssse3.c" />
<ClCompile Include="zlib-ng\arch\x86\chorba_sse2.c" />
<ClCompile Include="zlib-ng\arch\x86\chorba_sse41.c" />
<ClCompile Include="zlib-ng\arch\x86\chunkset_avx2.c" />
<ClCompile Include="zlib-ng\arch\x86\chunkset_avx512.c" />
<ClCompile Include="zlib-ng\arch\x86\chunkset_avx.c" />
<ClCompile Include="zlib-ng\arch\x86\chunkset_sse2.c" />
<ClCompile Include="zlib-ng\arch\x86\chunkset_ssse3.c" />
<ClCompile Include="zlib-ng\arch\x86\chunkset_sse41.c" />
<ClCompile Include="zlib-ng\arch\x86\compare256_avx2.c" />
<ClCompile Include="zlib-ng\arch\x86\compare256_avx512.c" />
<ClCompile Include="zlib-ng\arch\x86\compare256_sse2.c" />
<ClCompile Include="zlib-ng\arch\x86\crc32_pclmulqdq.c" />
<ClCompile Include="zlib-ng\arch\x86\crc32_vpclmulqdq.c" />
<ClCompile Include="zlib-ng\arch\x86\crc32_fold_pclmulqdq.c" />
<ClCompile Include="zlib-ng\arch\x86\crc32_fold_vpclmulqdq.c" />
<ClCompile Include="zlib-ng\arch\x86\insert_string_sse42.c" />
<ClCompile Include="zlib-ng\arch\x86\slide_hash_avx2.c" />
<ClCompile Include="zlib-ng\arch\x86\slide_hash_sse2.c" />
<ClCompile Include="zlib-ng\arch\x86\x86_features.c" />
@@ -51,24 +48,20 @@
<ClCompile Include="zlib-ng\arch\arm\arm_features.c" />
<ClCompile Include="zlib-ng\arch\arm\chunkset_neon.c" />
<ClCompile Include="zlib-ng\arch\arm\compare256_neon.c" />
<ClCompile Include="zlib-ng\arch\arm\crc32_armv8.c" />
<ClCompile Include="zlib-ng\arch\arm\slide_hash_armv6.c" />
<ClCompile Include="zlib-ng\arch\arm\crc32_acle.c" />
<ClCompile Include="zlib-ng\arch\arm\insert_string_acle.c" />
<ClCompile Include="zlib-ng\arch\arm\slide_hash_neon.c" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="zlib-ng\arch\generic\adler32_c.c" />
<ClCompile Include="zlib-ng\arch\generic\adler32_fold_c.c" />
<ClCompile Include="zlib-ng\arch\generic\chunkset_c.c" />
<ClCompile Include="zlib-ng\arch\generic\compare256_c.c" />
<ClCompile Include="zlib-ng\arch\generic\crc32_braid_c.c" />
<ClCompile Include="zlib-ng\arch\generic\crc32_chorba_c.c" />
<ClCompile Include="zlib-ng\arch\generic\crc32_fold_c.c" />
<ClCompile Include="zlib-ng\arch\generic\slide_hash_c.c" />
<ClCompile Include="zlib-ng\adler32.c" />
<ClCompile Include="zlib-ng\adler32_fold.c" />
<ClCompile Include="zlib-ng\chunkset.c" />
<ClCompile Include="zlib-ng\compare256.c" />
<ClCompile Include="zlib-ng\compress.c" />
<ClCompile Include="zlib-ng\cpu_features.c" />
<ClCompile Include="zlib-ng\crc32_braid.c" />
<ClCompile Include="zlib-ng\crc32_braid_comb.c" />
<ClCompile Include="zlib-ng\crc32.c" />
<ClCompile Include="zlib-ng\crc32_fold.c" />
<ClCompile Include="zlib-ng\deflate.c" />
<ClCompile Include="zlib-ng\deflate_fast.c" />
<ClCompile Include="zlib-ng\deflate_huff.c" />
@@ -81,10 +74,12 @@
<ClCompile Include="zlib-ng\gzlib.c" />
<ClCompile Include="zlib-ng\gzwrite.c" />
<ClCompile Include="zlib-ng\infback.c" />
<ClCompile Include="zlib-ng\inffast.c" />
<ClCompile Include="zlib-ng\inflate.c" />
<ClCompile Include="zlib-ng\inftrees.c" />
<ClCompile Include="zlib-ng\insert_string.c" />
<ClCompile Include="zlib-ng\insert_string_roll.c" />
<ClCompile Include="zlib-ng\slide_hash.c" />
<ClCompile Include="zlib-ng\trees.c" />
<ClCompile Include="zlib-ng\uncompr.c" />
<ClCompile Include="zlib-ng\zutil.c" />
@@ -94,54 +89,44 @@
</ItemGroup>
<ItemGroup Condition="'$(Platform)'=='x64'">
<ClInclude Include="zlib-ng\arch\x86\adler32_avx2_p.h" />
<ClInclude Include="zlib-ng\arch\x86\adler32_avx2_tpl.h" />
<ClInclude Include="zlib-ng\arch\x86\adler32_avx512_p.h" />
<ClInclude Include="zlib-ng\arch\x86\adler32_avx512_tpl.h" />
<ClInclude Include="zlib-ng\arch\x86\adler32_ssse3_p.h" />
<ClInclude Include="zlib-ng\arch\x86\crc32_fold_pclmulqdq_tpl.h" />
<ClInclude Include="zlib-ng\arch\x86\crc32_fold_vpclmulqdq_tpl.h" />
<ClInclude Include="zlib-ng\arch\x86\crc32_pclmulqdq_tpl.h" />
<ClInclude Include="zlib-ng\arch\x86\x86_features.h" />
<ClInclude Include="zlib-ng\arch\x86\x86_functions.h" />
<ClInclude Include="zlib-ng\arch\x86\x86_intrins.h" />
</ItemGroup>
<ItemGroup Condition="'$(Platform)'=='ARM64'">
<ClInclude Include="zlib-ng\arch\arm\acle_intrins.h" />
<ClInclude Include="zlib-ng\arch\arm\arm_features.h" />
<ClInclude Include="zlib-ng\arch\arm\arm_functions.h" />
<ClInclude Include="zlib-ng\arch\arm\neon_intrins.h" />
<ClInclude Include="zlib-ng\arch\arm\ctzl.h" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="zlib-ng\arch\generic\chunk_128bit_perm_idx_lut.h" />
<ClInclude Include="zlib-ng\arch\generic\chunk_256bit_perm_idx_lut.h" />
<ClInclude Include="zlib-ng\arch\generic\chunk_permute_table.h" />
<ClInclude Include="zlib-ng\arch\generic\compare256_p.h" />
<ClInclude Include="zlib-ng\arch\generic\generic_functions.h" />
<ClInclude Include="zlib-ng\adler32_fold.h" />
<ClInclude Include="zlib-ng\adler32_p.h" />
<ClInclude Include="zlib-ng\arch_functions.h" />
<ClInclude Include="zlib-ng\chunkset_tpl.h" />
<ClInclude Include="zlib-ng\compare256_rle.h" />
<ClInclude Include="zlib-ng\cpu_features.h" />
<ClInclude Include="zlib-ng\crc32_braid_comb_p.h" />
<ClInclude Include="zlib-ng\crc32_braid_p.h" />
<ClInclude Include="zlib-ng\crc32_braid_tbl.h" />
<ClInclude Include="zlib-ng\crc32.h" />
<ClInclude Include="zlib-ng\crc32_fold.h" />
<ClInclude Include="zlib-ng\deflate.h" />
<ClInclude Include="zlib-ng\deflate_p.h" />
<ClInclude Include="zlib-ng\fallback_builtins.h" />
<ClInclude Include="zlib-ng\functable.h" />
<ClInclude Include="zlib-ng\gzguts.h" />
<ClInclude Include="zlib-ng\inffast_tpl.h" />
<ClInclude Include="zlib-ng\inffast.h" />
<ClInclude Include="zlib-ng\inffixed_tbl.h" />
<ClInclude Include="zlib-ng\inflate.h" />
<ClInclude Include="zlib-ng\inflate_p.h" />
<ClInclude Include="zlib-ng\inftrees.h" />
<ClInclude Include="zlib-ng\insert_string_tpl.h" />
<ClInclude Include="zlib-ng\match_tpl.h" />
<ClInclude Include="zlib-ng\trees_emit.h" />
<ClInclude Include="zlib-ng\trees.h" />
<ClInclude Include="zlib-ng\trees_emit.h" />
<ClInclude Include="zlib-ng\trees_tbl.h" />
<ClInclude Include="zlib-ng\zbuild.h" />
<ClInclude Include="zlib-ng\zendian.h" />
<ClInclude Include="zlib-ng\zmemory.h" />
<ClInclude Include="zlib-ng\zutil.h" />
<ClInclude Include="zlib-ng\zutil_p.h" />
<!--Added by Dolphin (copied from cmake output)-->

58
Externals/zlib-ng/zlib.h vendored
View File

@@ -1,9 +1,9 @@
#ifndef ZLIB_H_
#define ZLIB_H_
/* zlib.h -- interface of the 'zlib-ng' compression library
Forked from and compatible with zlib 1.3.1
Forked from and compatible with zlib 1.2.12
Copyright (C) 1995-2024 Jean-loup Gailly and Mark Adler
Copyright (C) 1995-2022 Jean-loup Gailly and Mark Adler
This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
@@ -49,21 +49,20 @@
extern "C" {
#endif
#define ZLIBNG_VERSION "2.3.2"
#define ZLIBNG_VERNUM 0x020302F0L /* MMNNRRSM: major minor revision status modified */
#define ZLIBNG_VERSION "2.1.0.devel"
#define ZLIBNG_VERNUM 0x02010000L /* MMNNRRMS: major minor revision status modified */
#define ZLIBNG_VER_MAJOR 2
#define ZLIBNG_VER_MINOR 3
#define ZLIBNG_VER_REVISION 2
#define ZLIBNG_VER_STATUS F /* 0=devel, 1-E=beta, F=Release (DEPRECATED) */
#define ZLIBNG_VER_STATUSH 0xF /* Hex values: 0=devel, 1-9=beta, A-E=Release Candidate, F=Release */
#define ZLIBNG_VER_MINOR 1
#define ZLIBNG_VER_REVISION 0
#define ZLIBNG_VER_STATUS 0 /* 0=devel, 1-E=beta, F=Release */
#define ZLIBNG_VER_MODIFIED 0 /* non-zero if modified externally from zlib-ng */
#define ZLIB_VERSION "1.3.1.zlib-ng"
#define ZLIB_VERNUM 0x131f
#define ZLIB_VERSION "1.2.12.zlib-ng"
#define ZLIB_VERNUM 0x12cf
#define ZLIB_VER_MAJOR 1
#define ZLIB_VER_MINOR 3
#define ZLIB_VER_REVISION 1
#define ZLIB_VER_SUBREVISION 15 /* 15=fork (0xf) */
#define ZLIB_VER_MINOR 2
#define ZLIB_VER_REVISION 12
#define ZLIB_VER_SUBREVISION 0
/*
The 'zlib' compression library provides in-memory compression and
@@ -220,7 +219,7 @@ typedef gz_header *gz_headerp;
#define Z_DEFLATED 8
/* The deflate compression method (the only one supported in this version) */
#define Z_NULL 0 /* for compatibility with zlib, was for initializing zalloc, zfree, opaque */
#define Z_NULL NULL /* for compatibility with zlib, was for initializing zalloc, zfree, opaque */
#define zlib_version zlibVersion()
/* for compatibility with versions < 1.0.2 */
@@ -240,8 +239,8 @@ Z_EXTERN int Z_EXPORT deflateInit (z_stream *strm, int level);
Initializes the internal stream state for compression. The fields
zalloc, zfree and opaque must be initialized before by the caller. If
zalloc and zfree are set to Z_NULL, deflateInit updates them to use default
allocation functions. total_in, total_out, adler, and msg are initialized.
zalloc and zfree are set to NULL, deflateInit updates them to use default
allocation functions.
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
@@ -331,8 +330,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
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 is greater than six when the flush marker begins, in order to avoid
repeated flush markers upon calling deflate() again when avail_out == 0.
avail_out is greater than six to avoid repeated flush markers due to
avail_out == 0 on return.
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
@@ -393,9 +392,8 @@ Z_EXTERN int Z_EXPORT inflateInit (z_stream *strm);
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
the first call of inflate (if the decompression does not complete on the
first call). If zalloc and zfree are set to Z_NULL, inflateInit updates
them to use default allocation functions. total_in, total_out, adler, and
msg are initialized.
first call). If zalloc and zfree are set to NULL, inflateInit updates
them to use default allocation functions.
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
@@ -705,7 +703,7 @@ Z_EXTERN int Z_EXPORT deflateReset(z_stream *strm);
This function is equivalent to deflateEnd followed by deflateInit, but
does not free and reallocate the internal compression state. The stream
will leave the compression level and any other attributes that may have been
set unchanged. total_in, total_out, adler, and msg are initialized.
set unchanged.
deflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source
stream state was inconsistent (such as zalloc or state being NULL).
@@ -736,7 +734,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.
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
applied to the data compressed after deflateParams().
applied to the the data compressed after deflateParams().
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
@@ -818,9 +816,8 @@ Z_EXTERN int Z_EXPORT deflateSetHeader(z_stream *strm, gz_headerp head);
gzip file" and give up.
If deflateSetHeader is not used, the default gzip header has text false,
the time set to zero, and os set to the current operating system, with no
extra, name, or comment fields. The gzip header is returned to the default
state by deflateReset().
the time set to zero, and os set to 255, with no 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
stream state was inconsistent.
@@ -890,7 +887,7 @@ Z_EXTERN int Z_EXPORT inflateSetDictionary(z_stream *strm, const unsigned char *
deflateSetDictionary). For raw inflate, this function can be called at any
time to set the dictionary. If the provided dictionary is smaller than the
window and there is already data in the window, then the provided dictionary
will amend what's there. The application must ensure that the dictionary
will amend what's there. The application must insure that the dictionary
that was used for compression is provided.
inflateSetDictionary returns Z_OK if success, Z_STREAM_ERROR if a
@@ -927,7 +924,7 @@ Z_EXTERN int Z_EXPORT inflateSync(z_stream *strm);
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
has been found, or Z_STREAM_ERROR if the stream structure was inconsistent.
In the success case, the application may save the current value of
In the success case, the application may save the current current value of
total_in which indicates where valid compressed data was found. In the
error case, the application may repeatedly call inflateSync, providing more
input each time, until success or end of the input data.
@@ -953,7 +950,6 @@ Z_EXTERN int Z_EXPORT inflateReset(z_stream *strm);
This function is equivalent to inflateEnd followed by inflateInit,
but does not free and reallocate the internal decompression state. The
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
stream state was inconsistent (such as zalloc or state being NULL).
@@ -1732,14 +1728,14 @@ Z_EXTERN unsigned long Z_EXPORT crc32_combine(unsigned long crc1, unsigned long
seq1 and seq2 with lengths len1 and len2, CRC-32 check values were
calculated for each, crc1 and crc2. crc32_combine() returns the CRC-32
check value of seq1 and seq2 concatenated, requiring only crc1, crc2, and
len2. len2 must be non-negative.
len2.
*/
/*
Z_EXTERN unsigned long Z_EXPORT crc32_combine_gen(z_off_t len2);
Return the operator corresponding to length len2, to be used with
crc32_combine_op(). len2 must be non-negative.
crc32_combine_op().
*/
Z_EXTERN unsigned long Z_EXPORT crc32_combine_op(unsigned long crc1, unsigned long crc2,

1
Source/Core/Common/CMakeLists.txt
View File

@@ -191,7 +191,6 @@ PRIVATE
FatFs
spng::spng
watcher
ZLIB::ZLIB
${VTUNE_LIBRARIES}
)