Date: Tue, 14 Jan 2025 15:28:56 GMT From: Ganael LAPLANCHE <martymac@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org Subject: git: 9277ca031e80 - 2025Q1 - emulators/dolphin-emu: Fix build with minizip-ng >= 4.0.8 Message-ID: <202501141528.50EFSurd091860@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch 2025Q1 has been updated by martymac: URL: https://cgit.FreeBSD.org/ports/commit/?id=9277ca031e80e14fc49fbaf876f728432fc1ec87 commit 9277ca031e80e14fc49fbaf876f728432fc1ec87 Author: Ganael LAPLANCHE <martymac@FreeBSD.org> AuthorDate: 2025-01-14 15:18:47 +0000 Commit: Ganael LAPLANCHE <martymac@FreeBSD.org> CommitDate: 2025-01-14 15:28:26 +0000 emulators/dolphin-emu: Fix build with minizip-ng >= 4.0.8 (cherry picked from commit 03bee968c1322b7feb691b87e0bee8aa462b7c40) --- emulators/dolphin-emu/files/patch-minizip-ng.txt | 38 ++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/emulators/dolphin-emu/files/patch-minizip-ng.txt b/emulators/dolphin-emu/files/patch-minizip-ng.txt new file mode 100644 index 000000000000..f29aa06843b4 --- /dev/null +++ b/emulators/dolphin-emu/files/patch-minizip-ng.txt @@ -0,0 +1,38 @@ +Fix build with minizip-ng >= 4.0.8 + +See: https://github.com/zlib-ng/minizip-ng/releases/tag/4.0.8 + +--- Source/Core/DiscIO/VolumeVerifier.cpp.orig 2025-01-14 10:58:28 UTC ++++ Source/Core/DiscIO/VolumeVerifier.cpp +@@ -13,7 +13,7 @@ + #include <unordered_set> + + #include <mbedtls/md5.h> +-#include <mz_compat.h> ++#include <unzip.h> + #include <pugixml.hpp> + + #include "Common/Align.h" +--- Source/Core/Common/MinizipUtil.h.orig 2025-01-14 11:17:08 UTC ++++ Source/Core/Common/MinizipUtil.h +@@ -5,7 +5,7 @@ + + #include <algorithm> + +-#include <mz_compat.h> ++#include <unzip.h> + + #include "Common/CommonTypes.h" + #include "Common/ScopeGuard.h" +--- Source/Core/UICommon/ResourcePack/ResourcePack.cpp.orig 2025-01-14 11:19:18 UTC ++++ Source/Core/UICommon/ResourcePack/ResourcePack.cpp +@@ -6,7 +6,8 @@ + #include <algorithm> + #include <memory> + +-#include <mz_compat.h> ++#include <unzip.h> ++#include <mz.h> + #include <mz_os.h> + + #include "Common/CommonPaths.h"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202501141528.50EFSurd091860>