ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Externals: Update minizip-ng to 4.0.5 

Also update unzLocateFile to the minizip-ng 4.0.4+ signature and document new unused files.
This commit is contained in:
mitaclaw 2024-04-22 00:14:34 -07:00
parent a1eaed2531
commit ba462578ac
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -675,7 +675,7 @@ dolphin_find_optional_system_library_pkgconfig(ZSTD libzstd>=1.4.0 zstd::zstd Ex
dolphin_find_optional_system_library_pkgconfig(ZLIB zlib-ng ZLIB::ZLIB Externals/zlib-ng) dolphin_find_optional_system_library_pkgconfig(ZLIB zlib-ng ZLIB::ZLIB Externals/zlib-ng)
# TODO: Some distributions might call this package "minizip" without the "-ng" suffix. # TODO: Some distributions might call this package "minizip" without the "-ng" suffix.
dolphin_find_optional_system_library_pkgconfig(MINIZIP minizip-ng>=3.0.0 minizip::minizip Externals/minizip-ng) dolphin_find_optional_system_library_pkgconfig(MINIZIP minizip-ng>=4.0.4 minizip::minizip Externals/minizip-ng)
dolphin_find_optional_system_library(LZO Externals/LZO) dolphin_find_optional_system_library(LZO Externals/LZO)

5
Externals/minizip-ng/CMakeLists.txt vendored
View File

@ -53,9 +53,12 @@ if (WIN32)
endif() endif()
# Unused files # Unused files
# minizip-ng/minigzip.c
# minizip-ng/minizip.c
# minizip-ng/mz_crypt_apple.c # minizip-ng/mz_crypt_apple.c
# minizip-ng/mz_crypt_openssl.c # minizip-ng/mz_crypt_openssl.c
# minizip-ng/mz_crypt_win32.c # minizip-ng/mz_crypt_winvista.c
# minizip-ng/mz_crypt_winxp.c
target_include_directories(minizip PUBLIC minizip-ng) target_include_directories(minizip PUBLIC minizip-ng)

4
Source/Core/UICommon/ResourcePack/ResourcePack.cpp
View File

@ -36,7 +36,7 @@ ResourcePack::ResourcePack(const std::string& path) : m_path(path)
return; return;
} }
if (unzLocateFile(file, "manifest.json", nullptr) == UNZ_END_OF_LIST_OF_FILE) if (unzLocateFile(file, "manifest.json", 0) == UNZ_END_OF_LIST_OF_FILE)
{ {
m_valid = false; m_valid = false;
m_error = "Resource pack is missing a manifest."; m_error = "Resource pack is missing a manifest.";
@ -63,7 +63,7 @@ ResourcePack::ResourcePack(const std::string& path) : m_path(path)
return; return;
} }
if (unzLocateFile(file, "logo.png", nullptr) != UNZ_END_OF_LIST_OF_FILE) if (unzLocateFile(file, "logo.png", 0) != UNZ_END_OF_LIST_OF_FILE)
{ {
unz_file_info64 logo_info{}; unz_file_info64 logo_info{};
unzGetCurrentFileInfo64(file, &logo_info, nullptr, 0, nullptr, 0, nullptr, 0); unzGetCurrentFileInfo64(file, &logo_info, nullptr, 0, nullptr, 0, nullptr, 0);