From 8164c96379a28998ec9d9c41c53a6321319c926d Mon Sep 17 00:00:00 2001
From: scribam <scribam@users.noreply.github.com>
Date: Fri, 26 Nov 2021 19:16:07 +0100
Subject: [PATCH] deps: update libchdr and remove patch

---
 CMakeLists.txt                  |  4 +--
 core/deps/libchdr               |  2 +-
 core/deps/patches/libchdr.patch | 49 ---------------------------------
 3 files changed, 2 insertions(+), 53 deletions(-)
 delete mode 100644 core/deps/patches/libchdr.patch

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b9ef5e33a..b4387c23d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -297,9 +297,7 @@ if(NOT LIBRETRO)
 	endif()
 endif()
 
-execute_process(COMMAND git apply -p1 ${CMAKE_CURRENT_SOURCE_DIR}/core/deps/patches/libchdr.patch
-		WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/core/deps/libchdr)
-add_subdirectory(core/deps/libchdr)
+add_subdirectory(core/deps/libchdr EXCLUDE_FROM_ALL)
 target_link_libraries(${PROJECT_NAME} PRIVATE chdr-static)
 target_include_directories(${PROJECT_NAME} PRIVATE core/deps/libchdr/include)
 
diff --git a/core/deps/libchdr b/core/deps/libchdr
index d3ffd20ca..7972daa6c 160000
--- a/core/deps/libchdr
+++ b/core/deps/libchdr
@@ -1 +1 @@
-Subproject commit d3ffd20ca71686877372dea7f9eed359dbf65ba2
+Subproject commit 7972daa6ca6bf631bf54d60c5ed09eb76472bb79
diff --git a/core/deps/patches/libchdr.patch b/core/deps/patches/libchdr.patch
deleted file mode 100644
index 0ab0762cd..000000000
--- a/core/deps/patches/libchdr.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 06bc77c..9ac12fc 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -12,8 +12,8 @@ option(INSTALL_STATIC_LIBS "Install static libraries" OFF)
- option(WITH_SYSTEM_ZLIB "Use system provided zlib library" OFF)
- 
- if(CMAKE_C_COMPILER_ID MATCHES "GNU")
--  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fvisibility=hidden -fPIC -O3 -flto")
--  set(CMAKE_INTERPROCEDURAL_OPTIMIZATION ON)
-+  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fvisibility=hidden -fPIC -O3")
-+  set(CMAKE_INTERPROCEDURAL_OPTIMIZATION OFF)
- elseif(CMAKE_C_COMPILER_ID MATCHES "Clang")
-   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O3")
-   set(CMAKE_INTERPROCEDURAL_OPTIMIZATION OFF)
-@@ -34,7 +34,11 @@ add_subdirectory(deps/lzma-19.00 EXCLUDE_FROM_ALL)
- 
- # zlib
- if (WITH_SYSTEM_ZLIB)
--  pkg_check_modules(ZLIB REQUIRED zlib)
-+  if (WINDOWS_STORE)
-+    find_package(ZLIB REQUIRED)
-+  else()
-+    pkg_check_modules(ZLIB REQUIRED zlib)
-+  endif()
-   list(APPEND PLATFORM_INCLUDES ${ZLIB_INCLUDE_DIRS})
-   list(APPEND PLATFORM_LIBS ${ZLIB_LIBRARIES})
- else()
-@@ -68,6 +72,10 @@ if (INSTALL_STATIC_LIBS)
-   )
- endif()
- 
-+if(MSVC)
-+    target_compile_definitions(chdr-static PRIVATE _CRT_SECURE_NO_WARNINGS)
-+endif()
-+
- if (BUILD_SHARED_LIBS)
-   set(CMAKE_CXX_VISIBILITY_PRESET hidden)
-   set(CMAKE_VISIBILITY_INLINES_HIDDEN 1)
-@@ -79,7 +87,7 @@ if (BUILD_SHARED_LIBS)
- 
-   if(MSVC)
-     target_compile_definitions(chdr PUBLIC "CHD_DLL")
--    target_compile_definitions(chdr PRIVATE "CHD_DLL_EXPORTS")
-+    target_compile_definitions(chdr PRIVATE "CHD_DLL_EXPORTS" _CRT_SECURE_NO_WARNINGS)
-   elseif(APPLE)
-     target_link_options(chdr PRIVATE -Wl,-dead_strip -Wl,-exported_symbol,_chd_*)
-   else()
-