From 7010463f5530332ff16501eba41f5277b103ca96 Mon Sep 17 00:00:00 2001
From: jim wang <122244446+jimwang118@users.noreply.github.com>
Date: Wed, 26 Feb 2025 22:48:10 +0800
Subject: [PATCH] [wpilib] Fix format call error under fmt (#44011)

---
 ports/wpilib/fix-fmt.patch  | 32 ++++++++++++++++++++++++++++++++
 ports/wpilib/portfile.cmake |  1 +
 ports/wpilib/vcpkg.json     |  2 +-
 versions/baseline.json      |  2 +-
 versions/w-/wpilib.json     |  5 +++++
 5 files changed, 40 insertions(+), 2 deletions(-)
 create mode 100644 ports/wpilib/fix-fmt.patch

diff --git a/ports/wpilib/fix-fmt.patch b/ports/wpilib/fix-fmt.patch
new file mode 100644
index 0000000000..d2b36c24e3
--- /dev/null
+++ b/ports/wpilib/fix-fmt.patch
@@ -0,0 +1,32 @@
+diff --git a/wpimath/src/main/native/include/units/base.h b/wpimath/src/main/native/include/units/base.h
+index 3c939f3..09c56e5 100644
+--- a/wpimath/src/main/native/include/units/base.h
++++ b/wpimath/src/main/native/include/units/base.h
+@@ -183,9 +183,10 @@ namespace units
+ 	struct fmt::formatter<units::namespaceName::nameSingular ## _t> \
+ 		: fmt::formatter<double> \
+ 	{\
+-		template <typename FormatContext>\
+-		auto format(const units::namespaceName::nameSingular ## _t& obj,\
+-								FormatContext& ctx) -> decltype(ctx.out()) \
++		template <typename FmtContext>\
++		auto format(\
++				const units::namespaceName::nameSingular ## _t& obj,\
++				FmtContext& ctx) const\
+ 		{\
+ 			auto out = ctx.out();\
+ 			out = fmt::formatter<double>::format(obj(), ctx);\
+@@ -2890,9 +2891,10 @@ namespace units
+ template <>
+ struct fmt::formatter<units::dimensionless::dB_t> : fmt::formatter<double>
+ {
+-	template <typename FormatContext>
+-	auto format(const units::dimensionless::dB_t& obj,
+-							FormatContext& ctx) -> decltype(ctx.out())
++	template <typename FmtContext>
++	auto format(
++			const units::dimensionless::dB_t& obj,
++			FmtContext& ctx) const
+ 	{
+ 		auto out = ctx.out();
+ 		out = fmt::formatter<double>::format(obj(), ctx);
diff --git a/ports/wpilib/portfile.cmake b/ports/wpilib/portfile.cmake
index fed6884be7..d9e0220f95 100644
--- a/ports/wpilib/portfile.cmake
+++ b/ports/wpilib/portfile.cmake
@@ -9,6 +9,7 @@ vcpkg_from_github(
         missing-find_dependency.patch
         fix-usage.patch
         fix-build-error-with-fmt11.patch
+        fix-fmt.patch #https://github.com/wpilibsuite/allwpilib/pull/6796
 )
 
 if("allwpilib" IN_LIST FEATURES)
diff --git a/ports/wpilib/vcpkg.json b/ports/wpilib/vcpkg.json
index 9d54f08ff0..01edab8578 100644
--- a/ports/wpilib/vcpkg.json
+++ b/ports/wpilib/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "wpilib",
   "version-date": "2023-08-24",
-  "port-version": 1,
+  "port-version": 2,
   "description": "WPILib is the software library package for the FIRST Robotics Competition. The core install includes wpiutil, a common utilies library, and ntcore, the base NetworkTables library.",
   "homepage": "https://github.com/wpilibsuite/allwpilib",
   "license": null,
diff --git a/versions/baseline.json b/versions/baseline.json
index 5439e57fc4..e6de380551 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -9838,7 +9838,7 @@
     },
     "wpilib": {
       "baseline": "2023-08-24",
-      "port-version": 1
+      "port-version": 2
     },
     "wren": {
       "baseline": "0.4.0",
diff --git a/versions/w-/wpilib.json b/versions/w-/wpilib.json
index ebaaa23134..7fe2200eaf 100644
--- a/versions/w-/wpilib.json
+++ b/versions/w-/wpilib.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "d40fba76fe504d60de31286b322d5d4f0e5d65db",
+      "version-date": "2023-08-24",
+      "port-version": 2
+    },
     {
       "git-tree": "2fcd17f46e3a3690ef340ba7da121efac75e28cc",
       "version-date": "2023-08-24",