summaryrefslogtreecommitdiff
path: root/emulators/dolphin-emu/files
diff options
context:
space:
mode:
Diffstat (limited to 'emulators/dolphin-emu/files')
-rw-r--r--emulators/dolphin-emu/files/patch-CMakeLists.txt16
-rw-r--r--emulators/dolphin-emu/files/patch-minizip-ng.txt38
2 files changed, 4 insertions, 50 deletions
diff --git a/emulators/dolphin-emu/files/patch-CMakeLists.txt b/emulators/dolphin-emu/files/patch-CMakeLists.txt
index 36fd5226dff5..926a7016786c 100644
--- a/emulators/dolphin-emu/files/patch-CMakeLists.txt
+++ b/emulators/dolphin-emu/files/patch-CMakeLists.txt
@@ -1,17 +1,9 @@
-Fix detection of several libraries
+Fix minizip detection
-1) Use system zlib instead of embedded zlib-ng
-
-2) Fix minizip detection
-
---- CMakeLists.txt.orig 2024-12-01 23:00:52 UTC
+--- CMakeLists.txt.orig 2025-06-05 08:15:10 UTC
+++ CMakeLists.txt
-@@ -672,10 +672,10 @@ dolphin_find_optional_system_library_pkgconfig(ZSTD li
-
- dolphin_find_optional_system_library_pkgconfig(ZSTD libzstd>=1.4.0 zstd::zstd Externals/zstd)
-
--add_subdirectory(Externals/zlib-ng)
-+dolphin_find_optional_system_library_pkgconfig(ZLIB zlib ZLIB::ZLIB Externals/zlib-ng)
+@@ -692,7 +692,7 @@ dolphin_find_optional_system_library_pkgconfig(MINIZIP
+ dolphin_find_optional_system_library_pkgconfig(ZLIB zlib>=1.3.1 ZLIB::ZLIB Externals/zlib-ng)
dolphin_find_optional_system_library_pkgconfig(MINIZIP
- "minizip>=4.0.4" minizip::minizip Externals/minizip-ng
diff --git a/emulators/dolphin-emu/files/patch-minizip-ng.txt b/emulators/dolphin-emu/files/patch-minizip-ng.txt
deleted file mode 100644
index f29aa06843b4..000000000000
--- a/emulators/dolphin-emu/files/patch-minizip-ng.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-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"