[wpilib] update to 2025.02.01

microsoft · Feb 3, 2025 · 9102b51 · 9102b51
1 parent f864415
commit 9102b51
Show file tree

Hide file tree

Showing 10 changed files with 32 additions and 457 deletions.
diff --git a/ports/wpilib/fix-build-error-with-fmt11.patch b/ports/wpilib/fix-build-error-with-fmt11.patch
diff --git a/ports/wpilib/fix-usage.patch b/ports/wpilib/fix-usage.patch
diff --git a/ports/wpilib/missing-find_dependency.patch b/ports/wpilib/missing-find_dependency.patch
diff --git a/ports/wpilib/no-werror.patch b/ports/wpilib/no-werror.patch
diff --git a/ports/wpilib/portfile.cmake b/ports/wpilib/portfile.cmake
@@ -1,14 +1,13 @@
+string(REPLACE "-0" "." temp_date ${VERSION})
+string(REPLACE "-" "." formatted_date ${temp_date})
+
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO wpilibsuite/allwpilib
-    REF 165ebe4c79c437c7ba6c03af4a88a8c8680f742a
-    SHA512 f6ee07db0a119a7ac5876c4b0cf74abfb6af635d3d3ba913300138c450f62f6595ac4849bc499346f9f0179cc563f548a5e8a9a47122af593b425af453afd99f
+    REF "v${formatted_date}"
+    SHA512 729ab66a39725551e36bce26ffb6dd9f40f941f432322e9733f4652dae294dafe2544647c6f05c7f301955429b1aca8549f5b7f17bacd50524bfe1ad4ae1d2ee
     PATCHES
-        no-werror.patch
-        windows-install-location.patch
-        missing-find_dependency.patch
-        fix-usage.patch
-        fix-build-error-with-fmt11.patch
+        remove_eigen_placeholders.patch
 )
 
 if("allwpilib" IN_LIST FEATURES)
@@ -34,7 +33,8 @@ vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
         ${FEATURE_OPTIONS}
-        -DWITH_JAVA=OFF
+	-DCMAKE_CXX_STANDARD=23
+	-DWITH_JAVA=OFF
         -DWITH_EXAMPLES=OFF
         -DWITH_TESTS=OFF
         -DWITH_GUI=OFF

diff --git a/ports/wpilib/remove_eigen_placeholders.patch b/ports/wpilib/remove_eigen_placeholders.patch
@@ -0,0 +1,15 @@
+diff --git a/wpimath/src/main/native/include/frc/system/LinearSystem.h b/wpimath/src/main/native/include/frc/system/LinearSystem.h
+index d2b0213..382a0a1 100644
+--- a/wpimath/src/main/native/include/frc/system/LinearSystem.h
++++ b/wpimath/src/main/native/include/frc/system/LinearSystem.h
+@@ -229,8 +229,8 @@ class LinearSystem {
+     }
+
+     return LinearSystem<States, Inputs, sizeof...(OutputIndices)>{
+-        m_A, m_B, m_C(outputIndicesArray, Eigen::placeholders::all),
+-        m_D(outputIndicesArray, Eigen::placeholders::all)};
++        m_A, m_B, m_C(outputIndicesArray, Eigen::all),
++        m_D(outputIndicesArray, Eigen::all)};
+   }
+
+  private:
diff --git a/ports/wpilib/vcpkg.json b/ports/wpilib/vcpkg.json
@@ -1,14 +1,14 @@
 {
   "name": "wpilib",
-  "version-date": "2023-08-24",
-  "port-version": 1,
+  "version-date": "2025-02-01",
   "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,
   "dependencies": [
     "eigen3",
     "fmt",
     "libuv",
+    "protobuf",
     {
       "name": "vcpkg-cmake",
       "host": true