From 952a785bf0185bca639588ace9ae6988e83d4b53 Mon Sep 17 00:00:00 2001
From: scribam <scribam@users.noreply.github.com>
Date: Thu, 15 Feb 2024 18:03:03 +0100
Subject: [PATCH] deps: update libchdr

---
 .gitmodules       | 3 ++-
 CMakeLists.txt    | 6 +++---
 core/deps/libchdr | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index f29ba3db2..c4747d15b 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -3,7 +3,8 @@
 	url = https://github.com/libsdl-org/SDL.git
 [submodule "core/deps/libchdr"]
 	path = core/deps/libchdr
-	url = https://github.com/flyinghead/libchdr.git
+	url = https://github.com/rtissera/libchdr.git
+	ignore = dirty
 [submodule "core/deps/luabridge"]
 	path = core/deps/luabridge
 	url = https://github.com/vinniefalco/LuaBridge.git
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 95c175250..a32240fd9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -453,15 +453,15 @@ target_link_libraries(${PROJECT_NAME} PRIVATE chdr-static)
 target_include_directories(${PROJECT_NAME} PRIVATE core/deps/libchdr/include)
 
 if(NOT WITH_SYSTEM_ZLIB)
-	set(ZLIB_RELATIVE_PATH "core/deps/libchdr/deps/zlib-1.2.12")
+	set(ZLIB_RELATIVE_PATH "core/deps/libchdr/deps/zlib-1.3.1")
 	target_include_directories(${PROJECT_NAME} PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/${ZLIB_RELATIVE_PATH}" "${CMAKE_CURRENT_BINARY_DIR}/${ZLIB_RELATIVE_PATH}")
 	# help libzip find the package
 	set(ZLIB_FOUND TRUE)
 	set(ZLIB_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/${ZLIB_RELATIVE_PATH}" "${CMAKE_CURRENT_BINARY_DIR}/${ZLIB_RELATIVE_PATH}")
 	
 	cmake_policy(SET CMP0026 OLD)
-	get_target_property(ZLIB_LIBRARY_RELEASE zlib LOCATION)
-	get_target_property(ZLIB_LIBRARY_DEBUG zlib LOCATION_Debug)
+	get_target_property(ZLIB_LIBRARY_RELEASE zlibstatic LOCATION)
+	get_target_property(ZLIB_LIBRARY_DEBUG zlibstatic LOCATION_Debug)
 endif()
 
 find_package(PkgConfig)
diff --git a/core/deps/libchdr b/core/deps/libchdr
index 925400c4c..2a1119c68 160000
--- a/core/deps/libchdr
+++ b/core/deps/libchdr
@@ -1 +1 @@
-Subproject commit 925400c4c4b67bafdff8dfad9a1474b22d980777
+Subproject commit 2a1119c686eb07033d02f8c6d12406f8fd373775