Merge pull request #14694 from JoshuaVandaele/fmt12.2

fmt: Allow building with version >=12.2.0

Source/Core/Common/Crypto/AES.cpp

@@ -4,6 +4,7 @@
 #include "Common/Crypto/AES.h"
 
 #include <array>
+#include <cstring>
 #include <memory>
 
 #include <mbedtls/aes.h>

Source/Core/Common/Logging/Log.h

@@ -103,8 +103,9 @@ void GenericLogFmt(LogLevel level, LogType type, const char* file, int line, con
   static_assert(NumFields == sizeof...(args),
                 "Unexpected number of replacement fields in format string; did you pass too few or "
                 "too many arguments?");
-
-#if FMT_VERSION >= 110000
+#if FMT_VERSION >= 110000 && FMT_VERSION < 120200
+  // fmt 11 made fmt::string_view no longer directly constructible from compile-time strings.
+  // In fmt 12.2+, compile-time strings are plain string literals, so this is no longer needed.
   auto&& format_str = fmt::format_string<Args...>(format);
 #else
   auto&& format_str = format;

Source/Core/Common/MsgHandler.h

@@ -39,7 +39,10 @@ bool MsgAlertFmt(bool yes_no, MsgType style, Common::Log::LogType log_type, cons
   static_assert(NumFields == sizeof...(args),
                 "Unexpected number of replacement fields in format string; did you pass too few or "
                 "too many arguments?");
-#if FMT_VERSION >= 110000
+
+#if FMT_VERSION >= 120200
+  auto&& format_str = format;
+#elif FMT_VERSION >= 110000
   static_assert(std::is_base_of_v<fmt::detail::compile_string, S>);
   auto&& format_str = fmt::format_string<Args...>(format);
 #elif FMT_VERSION >= 90000
@@ -63,13 +66,14 @@ bool MsgAlertFmtT(bool yes_no, MsgType style, Common::Log::LogType log_type, con
   static_assert(NumFields == sizeof...(args),
                 "Unexpected number of replacement fields in format string; did you pass too few or "
                 "too many arguments?");
-#if FMT_VERSION >= 110000
-  static_assert(std::is_base_of_v<fmt::detail::compile_string, S>);
-#elif FMT_VERSION >= 90000
-  static_assert(fmt::detail::is_compile_string<S>::value);
-#else
+#if FMT_VERSION < 90000
   static_assert(fmt::is_compile_string<S>::value);
+#elif FMT_VERSION < 110000
+  static_assert(fmt::detail::is_compile_string<S>::value);
+#elif FMT_VERSION < 120200
+  static_assert(std::is_base_of_v<fmt::detail::compile_string, S>);
 #endif
+  // FMT 12.2+ guarantees this will be a compile-time string
   auto arg_list = fmt::make_format_args(args...);
   return MsgAlertFmtImpl(yes_no, style, log_type, file, line, translated_format, arg_list);
 }

Source/Core/Common/TimeUtil.cpp

@@ -2,11 +2,13 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include "Common/TimeUtil.h"
-#include "Common/Logging/Log.h"
 
+#include <cstring>
 #include <ctime>
 #include <optional>
 
+#include "Common/Logging/Log.h"
+
 namespace Common
 {
 std::optional<std::tm> LocalTime(std::time_t time)

Source/Core/VideoBackends/OGL/OGLBoundingBox.cpp

@@ -3,6 +3,8 @@
 
 #include "VideoBackends/OGL/OGLBoundingBox.h"
 
+#include <cstring>
+
 #include "VideoBackends/OGL/OGLGfx.h"
 #include "VideoCommon/DriverDetails.h"