From 2db1359711a30760cbfa819d4a6786b23a7bf5a8 Mon Sep 17 00:00:00 2001
From: kongfl888 <kongfl888@outlook.com>
Date: Mon, 3 Jun 2024 11:41:33 +0800
Subject: [PATCH] externals/fmt: update to HEAD fcd3e1e19. It will fix error.  
 integer_sequence<bool, (Is == Is)...>  [-Werror=tautological-compare] The
 updating is helpful and needed. Fmt has gone through two public versions
 since its last update and has fixed many bugs, including new compiler
 optimizations. But neither of these two public versions can fix the errors
 encountered above. We need to switch to a working version. It can be fixed
 after fmt/8e62172.There are still many optimizations, Such as this one:  
 Std. h c++23 build fix (# 3856) And these:   C++23 compatibility:
 basicstring_view cannot be constructed from nullptr (# 3846)   Fix warning
 C4702 emitted from format.h (MSVC) (#3866) Of course, there are other
 functional improvements as well. Very helpful. The selected version is the
 one that has been checked and works well.

And synchronously updating local code.
---
 externals/fmt                                     | 2 +-
 src/common/logging/formatter.h                    | 4 ++--
 src/core/hle/service/cfg/cfg.cpp                  | 2 +-
 src/core/hle/service/ir/extra_hid.cpp             | 2 +-
 src/core/hle/service/ir/ir_user.cpp               | 2 +-
 src/core/movie.cpp                                | 1 +
 src/core/savestate.cpp                            | 2 +-
 src/video_core/renderer_software/sw_clipper.cpp   | 1 +
 src/video_core/renderer_vulkan/vk_instance.cpp    | 2 +-
 src/video_core/renderer_vulkan/vk_shader_util.cpp | 1 +
 10 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/externals/fmt b/externals/fmt
index 2dd4fa874..fcd3e1e19 160000
--- a/externals/fmt
+++ b/externals/fmt
@@ -1 +1 @@
-Subproject commit 2dd4fa8742fdac36468f8d8ea3e06e78215551f8
+Subproject commit fcd3e1e19c8d2df94bb6cb40d7f1c97a9872cf2b
diff --git a/src/common/logging/formatter.h b/src/common/logging/formatter.h
index ad6adb143..1bfd534b5 100644
--- a/src/common/logging/formatter.h
+++ b/src/common/logging/formatter.h
@@ -12,9 +12,9 @@
 #if FMT_VERSION >= 80100
 template <typename T>
 struct fmt::formatter<T, std::enable_if_t<std::is_enum_v<T>, char>>
-    : formatter<std::underlying_type_t<T>> {
+    : fmt::formatter<std::underlying_type_t<T>> {
     template <typename FormatContext>
-    auto format(const T& value, FormatContext& ctx) -> decltype(ctx.out()) {
+    auto format(const T& value, FormatContext& ctx) const -> decltype(ctx.out()) {
         return fmt::formatter<std::underlying_type_t<T>>::format(
             static_cast<std::underlying_type_t<T>>(value), ctx);
     }
diff --git a/src/core/hle/service/cfg/cfg.cpp b/src/core/hle/service/cfg/cfg.cpp
index 864369215..1fa50e1df 100644
--- a/src/core/hle/service/cfg/cfg.cpp
+++ b/src/core/hle/service/cfg/cfg.cpp
@@ -9,7 +9,7 @@
 #include <boost/serialization/unique_ptr.hpp>
 #include <cryptopp/osrng.h>
 #include <cryptopp/sha.h>
-#include <fmt/format.h>
+#include <fmt/ranges.h>
 #include "common/archives.h"
 #include "common/file_util.h"
 #include "common/logging/log.h"
diff --git a/src/core/hle/service/ir/extra_hid.cpp b/src/core/hle/service/ir/extra_hid.cpp
index e159a70fe..2483a27f0 100644
--- a/src/core/hle/service/ir/extra_hid.cpp
+++ b/src/core/hle/service/ir/extra_hid.cpp
@@ -2,7 +2,7 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include <fmt/format.h>
+#include <fmt/ranges.h>
 #include "common/alignment.h"
 #include "common/settings.h"
 #include "core/core_timing.h"
diff --git a/src/core/hle/service/ir/ir_user.cpp b/src/core/hle/service/ir/ir_user.cpp
index add0eb3d0..597fdc4b6 100644
--- a/src/core/hle/service/ir/ir_user.cpp
+++ b/src/core/hle/service/ir/ir_user.cpp
@@ -8,7 +8,7 @@
 #include <boost/serialization/base_object.hpp>
 #include <boost/serialization/shared_ptr.hpp>
 #include <boost/serialization/unique_ptr.hpp>
-#include <fmt/format.h>
+#include <fmt/ranges.h>
 #include "common/archives.h"
 #include "common/swap.h"
 #include "core/core.h"
diff --git a/src/core/movie.cpp b/src/core/movie.cpp
index c7dd23c90..ee6bf3577 100644
--- a/src/core/movie.cpp
+++ b/src/core/movie.cpp
@@ -10,6 +10,7 @@
 #include <boost/optional.hpp>
 #include <cryptopp/hex.h>
 #include <cryptopp/osrng.h>
+#include <fmt/ranges.h>
 #include "common/archives.h"
 #include "common/bit_field.h"
 #include "common/file_util.h"
diff --git a/src/core/savestate.cpp b/src/core/savestate.cpp
index bb750d0c9..ad8e57ffb 100644
--- a/src/core/savestate.cpp
+++ b/src/core/savestate.cpp
@@ -5,7 +5,7 @@
 #include <chrono>
 #include <sstream>
 #include <cryptopp/hex.h>
-#include <fmt/format.h>
+#include <fmt/ranges.h>
 #include "common/archives.h"
 #include "common/file_util.h"
 #include "common/logging/log.h"
diff --git a/src/video_core/renderer_software/sw_clipper.cpp b/src/video_core/renderer_software/sw_clipper.cpp
index 03a287a37..531eb0175 100644
--- a/src/video_core/renderer_software/sw_clipper.cpp
+++ b/src/video_core/renderer_software/sw_clipper.cpp
@@ -4,6 +4,7 @@
 
 #include <array>
 #include <cstddef>
+#include <tuple>
 #include "video_core/pica/regs_texturing.h"
 #include "video_core/renderer_software/sw_clipper.h"
 
diff --git a/src/video_core/renderer_vulkan/vk_instance.cpp b/src/video_core/renderer_vulkan/vk_instance.cpp
index 8f77f25e0..2d91ff220 100644
--- a/src/video_core/renderer_vulkan/vk_instance.cpp
+++ b/src/video_core/renderer_vulkan/vk_instance.cpp
@@ -4,7 +4,7 @@
 
 #include <span>
 #include <boost/container/static_vector.hpp>
-#include <fmt/format.h>
+#include <fmt/ranges.h>
 
 #include "common/assert.h"
 #include "common/settings.h"
diff --git a/src/video_core/renderer_vulkan/vk_shader_util.cpp b/src/video_core/renderer_vulkan/vk_shader_util.cpp
index 09e3eb883..3d2f2f1d1 100644
--- a/src/video_core/renderer_vulkan/vk_shader_util.cpp
+++ b/src/video_core/renderer_vulkan/vk_shader_util.cpp
@@ -2,6 +2,7 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
+#include <memory>
 #include <SPIRV/GlslangToSpv.h>
 #include <glslang/Include/ResourceLimits.h>
 #include <glslang/Public/ShaderLang.h>