diff --git a/ports/wpilib/portfile.cmake b/ports/wpilib/portfile.cmake index f6d56eb3413ca5..49a83ee1c95244 100644 --- a/ports/wpilib/portfile.cmake +++ b/ports/wpilib/portfile.cmake @@ -6,8 +6,6 @@ vcpkg_from_github( REPO wpilibsuite/allwpilib REF "v${formatted_date}" SHA512 729ab66a39725551e36bce26ffb6dd9f40f941f432322e9733f4652dae294dafe2544647c6f05c7f301955429b1aca8549f5b7f17bacd50524bfe1ad4ae1d2ee - PATCHES - remove_eigen_placeholders.patch ) if("allwpilib" IN_LIST FEATURES) @@ -41,7 +39,7 @@ vcpkg_cmake_configure( -DWITH_SIMULATION_MODULES=OFF -DUSE_SYSTEM_FMTLIB=ON -DUSE_SYSTEM_LIBUV=ON - -DUSE_SYSTEM_EIGEN=ON + -DUSE_SYSTEM_EIGEN=OFF "-DFETCHCONTENT_SOURCE_DIR_APRILTAGLIB=${SOURCE_PATH_APRILTAG}" MAYBE_UNUSED_VARIABLES FETCHCONTENT_SOURCE_DIR_APRILTAGLIB diff --git a/ports/wpilib/remove_eigen_placeholders.patch b/ports/wpilib/remove_eigen_placeholders.patch deleted file mode 100644 index 569c1f0cec0fb4..00000000000000 --- a/ports/wpilib/remove_eigen_placeholders.patch +++ /dev/null @@ -1,15 +0,0 @@ -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{ -- 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 index 25044e15d6fbfb..7bdfc1a7e7f421 100644 --- a/ports/wpilib/vcpkg.json +++ b/ports/wpilib/vcpkg.json @@ -5,7 +5,6 @@ "homepage": "https://github.com/wpilibsuite/allwpilib", "license": null, "dependencies": [ - "eigen3", "fmt", "libuv", "protobuf", diff --git a/versions/w-/wpilib.json b/versions/w-/wpilib.json index 5da2cdb30c9096..aa2bc0ad67092b 100644 --- a/versions/w-/wpilib.json +++ b/versions/w-/wpilib.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "93b144c016cd268c9388fc8e94a7ab8f38656956", + "git-tree": "b35228c0fbc378f5bd27792d2b67542b73ff7a98", "version-date": "2025-02-01", "port-version": 0 },