From 8316469cfcfb076d5a9772557b0de522f39616d2 Mon Sep 17 00:00:00 2001
From: RipleyTom <RipleyTom@users.noreply.github.com>
Date: Thu, 28 Apr 2022 19:18:12 +0200
Subject: [PATCH] Update libusb to v1.0.26

---
 3rdparty/libusb/CMakeLists.txt       | 2 +-
 3rdparty/libusb/config.h.cmake       | 2 ++
 3rdparty/libusb/libusb               | 2 +-
 3rdparty/libusb/os.cmake             | 1 +
 rpcs3/Emu/RSX/Common/surface_store.h | 2 +-
 rpcs3/Emu/RSX/Common/texture_cache.h | 2 +-
 6 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/3rdparty/libusb/CMakeLists.txt b/3rdparty/libusb/CMakeLists.txt
index 21f3e019ef..e0ccd72040 100644
--- a/3rdparty/libusb/CMakeLists.txt
+++ b/3rdparty/libusb/CMakeLists.txt
@@ -13,7 +13,7 @@ option(WITHOUT_PTHREADS "force pthreads to not be used.  if on, then they are us
 
 set(LIBUSB_MAJOR 1)
 set(LIBUSB_MINOR 0)
-set(LIBUSB_MICRO 23)
+set(LIBUSB_MICRO 26)
 
 macro(append_compiler_flags)
 	foreach(FLAG IN ITEMS ${ARGN})
diff --git a/3rdparty/libusb/config.h.cmake b/3rdparty/libusb/config.h.cmake
index dbf72bfa39..60db929d54 100644
--- a/3rdparty/libusb/config.h.cmake
+++ b/3rdparty/libusb/config.h.cmake
@@ -1,6 +1,8 @@
 #ifndef LIBUSB_CONFIG_H
 #define LIBUSB_CONFIG_H
 
+#define PRINTF_FORMAT(a, b) __attribute__ ((__format__ (__printf__, a, b)))
+
 #define DEFAULT_VISIBILITY @DEFAULT_VISIBILITY@
 
 #cmakedefine ENABLE_DEBUG_LOGGING
diff --git a/3rdparty/libusb/libusb b/3rdparty/libusb/libusb
index c33990a300..4239bc3a50 160000
--- a/3rdparty/libusb/libusb
+++ b/3rdparty/libusb/libusb
@@ -1 +1 @@
-Subproject commit c33990a300674e24f47ff0f172f7efb10b63b88a
+Subproject commit 4239bc3a50014b8e6a5a2a59df1fff3b7469543b
diff --git a/3rdparty/libusb/os.cmake b/3rdparty/libusb/os.cmake
index cde292bc0a..4f0200ce2b 100644
--- a/3rdparty/libusb/os.cmake
+++ b/3rdparty/libusb/os.cmake
@@ -49,6 +49,7 @@ elseif (APPLE)
 
 		find_package(IOKit REQUIRED)
 		list(APPEND LIBUSB_LIBRARIES ${IOKit_LIBRARIES})
+		list(APPEND LIBUSB_LIBRARIES "-framework Security")
 
 		# Currently only objc_registerThreadWithCollector requires linking against it
 		# which is only for MAC_OS_X_VERSION_MIN_REQUIRED >= 1060
diff --git a/rpcs3/Emu/RSX/Common/surface_store.h b/rpcs3/Emu/RSX/Common/surface_store.h
index 873f30da4f..b16528d471 100644
--- a/rpcs3/Emu/RSX/Common/surface_store.h
+++ b/rpcs3/Emu/RSX/Common/surface_store.h
@@ -1108,7 +1108,7 @@ namespace rsx
 			return result;
 		}
 
-		void check_for_duplicates(std::vector<surface_overlap_info>& sections, const rsx::address_range& range)
+		void check_for_duplicates(std::vector<surface_overlap_info>& sections)
 		{
 			utils::address_range test_range;
 			for (const auto& section : sections)
diff --git a/rpcs3/Emu/RSX/Common/texture_cache.h b/rpcs3/Emu/RSX/Common/texture_cache.h
index fd3d7bb731..c912b20595 100644
--- a/rpcs3/Emu/RSX/Common/texture_cache.h
+++ b/rpcs3/Emu/RSX/Common/texture_cache.h
@@ -1976,7 +1976,7 @@ namespace rsx
 								{
 									rsx_log.warning("[Performance warning] Texture gather routine encountered too many objects! Operation=%d, Mipmaps=%d, Depth=%d, Sections=%zu, Ratio=%llu%",
 										static_cast<int>(result.external_subresource_desc.op), attr.mipmaps, attr.depth, overlapping_fbos.size(), coverage_ratio);
-									m_rtts.check_for_duplicates(overlapping_fbos, memory_range);
+									m_rtts.check_for_duplicates(overlapping_fbos);
 								}
 							}