From d512e637686fe65bc4a249b96db573e188db7123 Mon Sep 17 00:00:00 2001 From: Alexander Vieth Date: Tue, 17 Oct 2023 15:41:40 +0200 Subject: [PATCH 01/32] Update Eigen3 version --- ports/eigen3/portfile.cmake | 41 +++++++++++++++++++------------------ ports/eigen3/vcpkg.json | 3 +-- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/ports/eigen3/portfile.cmake b/ports/eigen3/portfile.cmake index 52f0a72f7e62fd..5ff40633641741 100644 --- a/ports/eigen3/portfile.cmake +++ b/ports/eigen3/portfile.cmake @@ -1,43 +1,44 @@ vcpkg_buildpath_length_warning(37) -block(SCOPE_FOR VARIABLES PROPAGATE SOURCE_PATH) -set(VCPKG_BUILD_TYPE release) # header-only - vcpkg_from_gitlab( GITLAB_URL https://gitlab.com OUT_SOURCE_PATH SOURCE_PATH REPO libeigen/eigen - REF "${VERSION}" - SHA512 ba75ecb760e32acf4ceaf27115468e65d4f77c44f8d519b5a13e7940af2c03a304ad433368cb6d55431f307c5c39e2666ab41d34442db3cf441638e51f5c3b6a + REF 4a2c4901ce1627c9511d2f23d3a33d903c42069f # 3.4.1 + SHA512 3711944483d5dedd685f9b280322803ce5f873156ee0e9aa8e6c8686fbc7e4afb780d2ca39a694db8be651f3e776f2e5a09e69b315520ed2eddd5b638813d0c6 HEAD_REF master - PATCHES - remove_configure_checks.patch # This removes unnecessary configure checks. Eigen3 just installs headers not anything more. - fix-vectorized-reductions-half.patch # Remove this patch in the next update - update-warning-suppression-to-latest.patch ) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_TESTING=OFF + -DEIGEN_BUILD_BLAS=OFF + -DEIGEN_BUILD_BTL=OFF + -DEIGEN_BUILD_CMAKE_PACKAGE=ON + -DEIGEN_BUILD_DEMOS=OFF -DEIGEN_BUILD_DOC=OFF + -DEIGEN_BUILD_LAPACK=OFF -DEIGEN_BUILD_PKGCONFIG=ON - "-DCMAKEPACKAGE_INSTALL_DIR=${CURRENT_PACKAGES_DIR}/share/eigen3" + -DEIGEN_BUILD_SPBENCH=ON + OPTIONS_RELEASE + "-DCMAKEPACKAGE_INSTALL_DIR=${CURRENT_PACKAGES_DIR}/share/${PORT}" "-DPKGCONFIG_INSTALL_DIR=${CURRENT_PACKAGES_DIR}/lib/pkgconfig" + OPTIONS_DEBUG + "-DCMAKEPACKAGE_INSTALL_DIR=${CURRENT_PACKAGES_DIR}/debug/share/${PORT}" + "-DPKGCONFIG_INSTALL_DIR=${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig" ) vcpkg_cmake_install() vcpkg_cmake_config_fixup() -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/eigen3/Eigen3Config.cmake" "if (NOT TARGET eigen)" "if (NOT TARGET Eigen3::Eigen)") -endblock() -if(NOT VCPKG_BUILD_TYPE) - file(INSTALL "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/eigen3.pc" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig") -endif() vcpkg_fixup_pkgconfig() -file(GLOB INCLUDES "${CURRENT_PACKAGES_DIR}/include/eigen3/*") -# Copy the eigen header files to conventional location for user-wide MSBuild integration -file(COPY ${INCLUDES} DESTINATION "${CURRENT_PACKAGES_DIR}/include") - -vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING.README") +vcpkg_install_copyright( + FILE_LIST + "${SOURCE_PATH}/COPYING.README" + "${SOURCE_PATH}/COPYING.APACHE" + "${SOURCE_PATH}/COPYING.BSD" + "${SOURCE_PATH}/COPYING.MINPACK" + "${SOURCE_PATH}/COPYING.MPL2" +) diff --git a/ports/eigen3/vcpkg.json b/ports/eigen3/vcpkg.json index 86fef988ab3e97..2ea164a4982dd3 100644 --- a/ports/eigen3/vcpkg.json +++ b/ports/eigen3/vcpkg.json @@ -1,7 +1,6 @@ { "name": "eigen3", - "version": "3.4.0", - "port-version": 5, + "version": "3.4.1", "description": "C++ template library for linear algebra: matrices, vectors, numerical solvers, and related algorithms.", "homepage": "http://eigen.tuxfamily.org", "license": "MPL-2.0", From 0dc6e61c3f0278e8c48373589339735e51aa02fb Mon Sep 17 00:00:00 2001 From: Alexander Vieth Date: Tue, 17 Oct 2023 15:56:38 +0200 Subject: [PATCH 02/32] Remove old patch --- .../fix-vectorized-reductions-half.patch | 26 ------------------- versions/baseline.json | 4 +-- 2 files changed, 2 insertions(+), 28 deletions(-) delete mode 100644 ports/eigen3/fix-vectorized-reductions-half.patch diff --git a/ports/eigen3/fix-vectorized-reductions-half.patch b/ports/eigen3/fix-vectorized-reductions-half.patch deleted file mode 100644 index 1c5e592db52fa5..00000000000000 --- a/ports/eigen3/fix-vectorized-reductions-half.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/Eigen/src/Core/PartialReduxEvaluator.h b/Eigen/src/Core/PartialReduxEvaluator.h -index 29abf35..4051fcf 100644 ---- a/Eigen/src/Core/PartialReduxEvaluator.h -+++ b/Eigen/src/Core/PartialReduxEvaluator.h -@@ -54,12 +54,19 @@ struct packetwise_redux_traits - /* Value to be returned when size==0 , by default let's return 0 */ - template - EIGEN_DEVICE_FUNC --PacketType packetwise_redux_empty_value(const Func& ) { return pset1(0); } -+PacketType packetwise_redux_empty_value(const Func& ) { -+ const typename unpacket_traits::type zero(0); -+ return pset1(zero); -+} -+ - - /* For products the default is 1 */ - template - EIGEN_DEVICE_FUNC --PacketType packetwise_redux_empty_value(const scalar_product_op& ) { return pset1(1); } -+PacketType packetwise_redux_empty_value(const scalar_product_op& ) { -+ return pset1(Scalar(1)); -+} -+ - - /* Perform the actual reduction */ - template Date: Tue, 12 Aug 2025 11:12:25 +0200 Subject: [PATCH 03/32] remove debug folders --- ports/eigen3/portfile.cmake | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ports/eigen3/portfile.cmake b/ports/eigen3/portfile.cmake index 5ff40633641741..21e2e7ca636ec2 100644 --- a/ports/eigen3/portfile.cmake +++ b/ports/eigen3/portfile.cmake @@ -34,6 +34,8 @@ vcpkg_cmake_config_fixup() vcpkg_fixup_pkgconfig() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") + vcpkg_install_copyright( FILE_LIST "${SOURCE_PATH}/COPYING.README" From 18e4ae4faf14caadf88fc94a3c0113a4db12a350 Mon Sep 17 00:00:00 2001 From: Alexander Vieth Date: Tue, 12 Aug 2025 11:13:13 +0200 Subject: [PATCH 04/32] Modify version --- versions/e-/eigen3.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/versions/e-/eigen3.json b/versions/e-/eigen3.json index dd584047f7a18c..14bd05cecaedb0 100644 --- a/versions/e-/eigen3.json +++ b/versions/e-/eigen3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bcabed2a4bf42361f82b6341cbd0d55cdda91a11", + "version": "3.4.1", + "port-version": 0 + }, { "git-tree": "d9b547a9e3dc5b847f5ecab763fdea9728107a16", "version": "3.4.0", From 867470deaa3240f0a5ce71a3d2a89bacf9af5b98 Mon Sep 17 00:00:00 2001 From: Alexander Vieth Date: Tue, 12 Aug 2025 11:15:07 +0200 Subject: [PATCH 05/32] Remove old patch files --- ports/eigen3/remove_configure_checks.patch | 48 ------ ...update-warning-suppression-to-latest.patch | 140 ------------------ 2 files changed, 188 deletions(-) delete mode 100644 ports/eigen3/remove_configure_checks.patch delete mode 100644 ports/eigen3/update-warning-suppression-to-latest.patch diff --git a/ports/eigen3/remove_configure_checks.patch b/ports/eigen3/remove_configure_checks.patch deleted file mode 100644 index c5e30c7e7597cc..00000000000000 --- a/ports/eigen3/remove_configure_checks.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index f3e69b8..f32ffee 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -59,6 +59,7 @@ include(CheckCXXCompilerFlag) - include(GNUInstallDirs) - include(CMakeDependentOption) - -+if(0) - set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake) - - -@@ -419,6 +420,7 @@ endif() - set(EIGEN_CUDA_COMPUTE_ARCH 30 CACHE STRING "The CUDA compute architecture level to target when compiling CUDA code") - - include_directories(${CMAKE_CURRENT_SOURCE_DIR}) -+endif() - - # Backward compatibility support for EIGEN_INCLUDE_INSTALL_DIR - if(EIGEN_INCLUDE_INSTALL_DIR) -@@ -495,6 +497,7 @@ if(BUILD_TESTING) - add_subdirectory(failtest) - endif() - -+if(0) - if(EIGEN_LEAVE_TEST_IN_ALL_TARGET) - add_subdirectory(blas) - add_subdirectory(lapack) -@@ -532,9 +535,11 @@ if(EIGEN_TEST_SYCL) - add_definitions(-DEIGEN_DONT_VECTORIZE_SYCL=1) - endif() - endif() -+endif() - - add_subdirectory(unsupported) - -+if(0) - add_subdirectory(demos EXCLUDE_FROM_ALL) - - # must be after test and unsupported, for configuring buildtests.in -@@ -554,6 +559,7 @@ configure_file(scripts/cdashtesting.cmake.in cdashtesting.cmake @ONLY) - if(BUILD_TESTING) - ei_testing_print_summary() - endif() -+endif() - - message(STATUS "") - message(STATUS "Configured Eigen ${EIGEN_VERSION_NUMBER}") diff --git a/ports/eigen3/update-warning-suppression-to-latest.patch b/ports/eigen3/update-warning-suppression-to-latest.patch deleted file mode 100644 index 8750e11cc37192..00000000000000 --- a/ports/eigen3/update-warning-suppression-to-latest.patch +++ /dev/null @@ -1,140 +0,0 @@ -From 193e24dca1338ad692a65c47c90eb3fb3f342a0c Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Antonio=20S=C3=A1nchez?= -Date: Mon, 21 Mar 2022 15:56:03 +0000 -Subject: [PATCH] Update warning suppression to latest. - ---- - Eigen/src/Core/util/DisableStupidWarnings.h | 91 ++++++++++++++------- - 1 file changed, 61 insertions(+), 30 deletions(-) - mode change 100755 => 100644 Eigen/src/Core/util/DisableStupidWarnings.h - -diff --git a/Eigen/src/Core/util/DisableStupidWarnings.h b/Eigen/src/Core/util/DisableStupidWarnings.h -old mode 100755 -new mode 100644 -index fe0cfec0b..75056592d ---- a/Eigen/src/Core/util/DisableStupidWarnings.h -+++ b/Eigen/src/Core/util/DisableStupidWarnings.h -@@ -1,7 +1,7 @@ - #ifndef EIGEN_WARNINGS_DISABLED - #define EIGEN_WARNINGS_DISABLED - --#ifdef _MSC_VER -+#if defined(_MSC_VER) - // 4100 - unreferenced formal parameter (occurred e.g. in aligned_allocator::destroy(pointer p)) - // 4101 - unreferenced local variable - // 4181 - qualifier applied to reference type ignored -@@ -35,25 +35,28 @@ - #pragma warning disable 2196 279 1684 2259 - - #elif defined __clang__ -- // -Wconstant-logical-operand - warning: use of logical && with constant operand; switch to bitwise & or remove constant -- // this is really a stupid warning as it warns on compile-time expressions involving enums - #ifndef EIGEN_PERMANENTLY_DISABLE_STUPID_WARNINGS - #pragma clang diagnostic push - #endif -- #pragma clang diagnostic ignored "-Wconstant-logical-operand" -- #if __clang_major__ >= 3 && __clang_minor__ >= 5 -- #pragma clang diagnostic ignored "-Wabsolute-value" -- #endif -- #if __clang_major__ >= 10 -- #pragma clang diagnostic ignored "-Wimplicit-int-float-conversion" -- #endif -- #if ( defined(__ALTIVEC__) || defined(__VSX__) ) && __cplusplus < 201103L -- // warning: generic selections are a C11-specific feature -- // ignoring warnings thrown at vec_ctf in Altivec/PacketMath.h -- #pragma clang diagnostic ignored "-Wc11-extensions" -+ #if defined(__has_warning) -+ // -Wconstant-logical-operand - warning: use of logical && with constant operand; switch to bitwise & or remove constant -+ // this is really a stupid warning as it warns on compile-time expressions involving enums -+ #if __has_warning("-Wconstant-logical-operand") -+ #pragma clang diagnostic ignored "-Wconstant-logical-operand" -+ #endif -+ #if __has_warning("-Wimplicit-int-float-conversion") -+ #pragma clang diagnostic ignored "-Wimplicit-int-float-conversion" -+ #endif -+ #if ( defined(__ALTIVEC__) || defined(__VSX__) ) && __cplusplus < 201103L -+ // warning: generic selections are a C11-specific feature -+ // ignoring warnings thrown at vec_ctf in Altivec/PacketMath.h -+ #if __has_warning("-Wc11-extensions") -+ #pragma clang diagnostic ignored "-Wc11-extensions" -+ #endif -+ #endif - #endif - --#elif defined __GNUC__ -+#elif defined __GNUC__ && !defined(__FUJITSU) - - #if (!defined(EIGEN_PERMANENTLY_DISABLE_STUPID_WARNINGS)) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) - #pragma GCC diagnostic push -@@ -74,25 +77,53 @@ - #endif - - #if defined __NVCC__ -- #pragma diag_suppress boolean_controlling_expr_is_constant -+ // MSVC 14.16 (required by CUDA 9.*) does not support the _Pragma keyword, so -+ // we instead use Microsoft's __pragma extension. -+ #if defined _MSC_VER -+ #define EIGEN_MAKE_PRAGMA(X) __pragma(#X) -+ #else -+ #define EIGEN_MAKE_PRAGMA(X) _Pragma(#X) -+ #endif -+ #if defined __NVCC_DIAG_PRAGMA_SUPPORT__ -+ #define EIGEN_NV_DIAG_SUPPRESS(X) EIGEN_MAKE_PRAGMA(nv_diag_suppress X) -+ #else -+ #define EIGEN_NV_DIAG_SUPPRESS(X) EIGEN_MAKE_PRAGMA(diag_suppress X) -+ #endif -+ -+ EIGEN_NV_DIAG_SUPPRESS(boolean_controlling_expr_is_constant) - // Disable the "statement is unreachable" message -- #pragma diag_suppress code_is_unreachable -+ EIGEN_NV_DIAG_SUPPRESS(code_is_unreachable) - // Disable the "dynamic initialization in unreachable code" message -- #pragma diag_suppress initialization_not_reachable -+ EIGEN_NV_DIAG_SUPPRESS(initialization_not_reachable) - // Disable the "invalid error number" message that we get with older versions of nvcc -- #pragma diag_suppress 1222 -+ EIGEN_NV_DIAG_SUPPRESS(1222) - // Disable the "calling a __host__ function from a __host__ __device__ function is not allowed" messages (yes, there are many of them and they seem to change with every version of the compiler) -- #pragma diag_suppress 2527 -- #pragma diag_suppress 2529 -- #pragma diag_suppress 2651 -- #pragma diag_suppress 2653 -- #pragma diag_suppress 2668 -- #pragma diag_suppress 2669 -- #pragma diag_suppress 2670 -- #pragma diag_suppress 2671 -- #pragma diag_suppress 2735 -- #pragma diag_suppress 2737 -- #pragma diag_suppress 2739 -+ EIGEN_NV_DIAG_SUPPRESS(2527) -+ EIGEN_NV_DIAG_SUPPRESS(2529) -+ EIGEN_NV_DIAG_SUPPRESS(2651) -+ EIGEN_NV_DIAG_SUPPRESS(2653) -+ EIGEN_NV_DIAG_SUPPRESS(2668) -+ EIGEN_NV_DIAG_SUPPRESS(2669) -+ EIGEN_NV_DIAG_SUPPRESS(2670) -+ EIGEN_NV_DIAG_SUPPRESS(2671) -+ EIGEN_NV_DIAG_SUPPRESS(2735) -+ EIGEN_NV_DIAG_SUPPRESS(2737) -+ EIGEN_NV_DIAG_SUPPRESS(2739) -+ EIGEN_NV_DIAG_SUPPRESS(2885) -+ EIGEN_NV_DIAG_SUPPRESS(2888) -+ EIGEN_NV_DIAG_SUPPRESS(2976) -+ EIGEN_NV_DIAG_SUPPRESS(2979) -+ EIGEN_NV_DIAG_SUPPRESS(20011) -+ EIGEN_NV_DIAG_SUPPRESS(20014) -+ // Disable the "// __device__ annotation is ignored on a function(...) that is -+ // explicitly defaulted on its first declaration" message. -+ // The __device__ annotation seems to actually be needed in some cases, -+ // otherwise resulting in kernel runtime errors. -+ EIGEN_NV_DIAG_SUPPRESS(2886) -+ EIGEN_NV_DIAG_SUPPRESS(2977) -+ EIGEN_NV_DIAG_SUPPRESS(20012) -+ #undef EIGEN_NV_DIAG_SUPPRESS -+ #undef EIGEN_MAKE_PRAGMA - #endif - - #else --- -2.37.0.windows.1 - From 5d58153bd00f2a6084d618124b4f1eb748ad2b08 Mon Sep 17 00:00:00 2001 From: Yury Bura Date: Fri, 23 May 2025 18:26:55 +0900 Subject: [PATCH 06/32] [orocos-kdl] fix build with new Eigen version --- ports/orocos-kdl/portfile.cmake | 2 ++ ports/orocos-kdl/vcpkg.json | 1 + 2 files changed, 3 insertions(+) diff --git a/ports/orocos-kdl/portfile.cmake b/ports/orocos-kdl/portfile.cmake index e7d041161728f8..2ebacf63475660 100644 --- a/ports/orocos-kdl/portfile.cmake +++ b/ports/orocos-kdl/portfile.cmake @@ -9,6 +9,8 @@ vcpkg_from_github( vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}/orocos_kdl" + OPTIONS + -DCMAKE_CXX_STANDARD=14 ) vcpkg_cmake_install() diff --git a/ports/orocos-kdl/vcpkg.json b/ports/orocos-kdl/vcpkg.json index 475a66f1c62c8c..8ea399d42b75bd 100644 --- a/ports/orocos-kdl/vcpkg.json +++ b/ports/orocos-kdl/vcpkg.json @@ -1,6 +1,7 @@ { "name": "orocos-kdl", "version": "1.5.1", + "port-version": 1, "description": "Kinematics and Dynamics Library.", "homepage": "https://github.com/orocos/orocos_kinematics_dynamics", "dependencies": [ From 29cdd6109e0f239fdbbfc1e60d12269d6e83bf1d Mon Sep 17 00:00:00 2001 From: Alexander Vieth Date: Tue, 12 Aug 2025 12:43:14 +0200 Subject: [PATCH 07/32] [rbdl] fix build after update Eigen3 --- ports/rbdl/portfile.cmake | 2 +- ports/rbdl/vcpkg.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/rbdl/portfile.cmake b/ports/rbdl/portfile.cmake index 425c88d970cd8f..fd9c2528dacb79 100644 --- a/ports/rbdl/portfile.cmake +++ b/ports/rbdl/portfile.cmake @@ -38,4 +38,4 @@ vcpkg_copy_pdbs() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/RBDL PACKAGE_NAME RBDL) vcpkg_fixup_pkgconfig() -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/rbdl/vcpkg.json b/ports/rbdl/vcpkg.json index f06685bc95b747..7ea3ba1813a0c4 100644 --- a/ports/rbdl/vcpkg.json +++ b/ports/rbdl/vcpkg.json @@ -1,7 +1,7 @@ { "name": "rbdl", "version": "3.3.0", - "port-version": 7, + "port-version": 8, "description": "Rigid Body Dynamics Library", "homepage": "https://github.com/rbdl/rbdl", "dependencies": [ From 7cba376d4a76af93aa8bbea9804ffed86f5e4969 Mon Sep 17 00:00:00 2001 From: Alexander Vieth Date: Tue, 12 Aug 2025 12:46:29 +0200 Subject: [PATCH 08/32] update baseline.json --- versions/baseline.json | 4 ++-- versions/o-/orocos-kdl.json | 5 +++++ versions/r-/rbdl.json | 5 +++++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/versions/baseline.json b/versions/baseline.json index 669f2198ec959d..1c305814c41476 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7158,7 +7158,7 @@ }, "orocos-kdl": { "baseline": "1.5.1", - "port-version": 0 + "port-version": 1 }, "oscpack": { "baseline": "1.1.0", @@ -8246,7 +8246,7 @@ }, "rbdl": { "baseline": "3.3.0", - "port-version": 7 + "port-version": 8 }, "rbdl-orb": { "baseline": "3.2.0", diff --git a/versions/o-/orocos-kdl.json b/versions/o-/orocos-kdl.json index 2ba686831c6ae6..05cfc100a14691 100644 --- a/versions/o-/orocos-kdl.json +++ b/versions/o-/orocos-kdl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "238e1ace2118ba4f62cbb4479530f1c779b54669", + "version": "1.5.1", + "port-version": 1 + }, { "git-tree": "e9fdf57afeb547c9e5fdad47dff693fe8f96f4b5", "version": "1.5.1", diff --git a/versions/r-/rbdl.json b/versions/r-/rbdl.json index 3394686a2f9c74..cb7f740440123d 100644 --- a/versions/r-/rbdl.json +++ b/versions/r-/rbdl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7ff17d3e8047b9c5f93cd384e1915be900613852", + "version": "3.3.0", + "port-version": 8 + }, { "git-tree": "1dc8279017fb2aa827bcaf37fcf9e6af6b8bb751", "version": "3.3.0", From 16c0d95c8889256328bba11951aa29d179ff8e3b Mon Sep 17 00:00:00 2001 From: Alexander Vieth Date: Tue, 12 Aug 2025 12:57:30 +0200 Subject: [PATCH 09/32] Revert changes to rbdl and orocos-kdl --- versions/baseline.json | 4 ++-- versions/o-/orocos-kdl.json | 5 ----- versions/r-/rbdl.json | 5 ----- 3 files changed, 2 insertions(+), 12 deletions(-) diff --git a/versions/baseline.json b/versions/baseline.json index 1c305814c41476..669f2198ec959d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7158,7 +7158,7 @@ }, "orocos-kdl": { "baseline": "1.5.1", - "port-version": 1 + "port-version": 0 }, "oscpack": { "baseline": "1.1.0", @@ -8246,7 +8246,7 @@ }, "rbdl": { "baseline": "3.3.0", - "port-version": 8 + "port-version": 7 }, "rbdl-orb": { "baseline": "3.2.0", diff --git a/versions/o-/orocos-kdl.json b/versions/o-/orocos-kdl.json index 05cfc100a14691..2ba686831c6ae6 100644 --- a/versions/o-/orocos-kdl.json +++ b/versions/o-/orocos-kdl.json @@ -1,10 +1,5 @@ { "versions": [ - { - "git-tree": "238e1ace2118ba4f62cbb4479530f1c779b54669", - "version": "1.5.1", - "port-version": 1 - }, { "git-tree": "e9fdf57afeb547c9e5fdad47dff693fe8f96f4b5", "version": "1.5.1", diff --git a/versions/r-/rbdl.json b/versions/r-/rbdl.json index cb7f740440123d..3394686a2f9c74 100644 --- a/versions/r-/rbdl.json +++ b/versions/r-/rbdl.json @@ -1,10 +1,5 @@ { "versions": [ - { - "git-tree": "7ff17d3e8047b9c5f93cd384e1915be900613852", - "version": "3.3.0", - "port-version": 8 - }, { "git-tree": "1dc8279017fb2aa827bcaf37fcf9e6af6b8bb751", "version": "3.3.0", From 8f27435fe6f2042a1b65f5df17b8dbf8875ad415 Mon Sep 17 00:00:00 2001 From: Alexander Vieth Date: Tue, 12 Aug 2025 12:58:02 +0200 Subject: [PATCH 10/32] Revert "[rbdl] fix build after update Eigen3" This reverts commit 29cdd6109e0f239fdbbfc1e60d12269d6e83bf1d. --- ports/rbdl/portfile.cmake | 2 +- ports/rbdl/vcpkg.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/rbdl/portfile.cmake b/ports/rbdl/portfile.cmake index fd9c2528dacb79..425c88d970cd8f 100644 --- a/ports/rbdl/portfile.cmake +++ b/ports/rbdl/portfile.cmake @@ -38,4 +38,4 @@ vcpkg_copy_pdbs() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/RBDL PACKAGE_NAME RBDL) vcpkg_fixup_pkgconfig() -vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/rbdl/vcpkg.json b/ports/rbdl/vcpkg.json index 7ea3ba1813a0c4..f06685bc95b747 100644 --- a/ports/rbdl/vcpkg.json +++ b/ports/rbdl/vcpkg.json @@ -1,7 +1,7 @@ { "name": "rbdl", "version": "3.3.0", - "port-version": 8, + "port-version": 7, "description": "Rigid Body Dynamics Library", "homepage": "https://github.com/rbdl/rbdl", "dependencies": [ From fa6c70f9187e603e9d51b49d784289791df65134 Mon Sep 17 00:00:00 2001 From: Alexander Vieth Date: Tue, 12 Aug 2025 12:58:07 +0200 Subject: [PATCH 11/32] Revert "[orocos-kdl] fix build with new Eigen version" This reverts commit 5d58153bd00f2a6084d618124b4f1eb748ad2b08. --- ports/orocos-kdl/portfile.cmake | 2 -- ports/orocos-kdl/vcpkg.json | 1 - 2 files changed, 3 deletions(-) diff --git a/ports/orocos-kdl/portfile.cmake b/ports/orocos-kdl/portfile.cmake index 2ebacf63475660..e7d041161728f8 100644 --- a/ports/orocos-kdl/portfile.cmake +++ b/ports/orocos-kdl/portfile.cmake @@ -9,8 +9,6 @@ vcpkg_from_github( vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}/orocos_kdl" - OPTIONS - -DCMAKE_CXX_STANDARD=14 ) vcpkg_cmake_install() diff --git a/ports/orocos-kdl/vcpkg.json b/ports/orocos-kdl/vcpkg.json index 8ea399d42b75bd..475a66f1c62c8c 100644 --- a/ports/orocos-kdl/vcpkg.json +++ b/ports/orocos-kdl/vcpkg.json @@ -1,7 +1,6 @@ { "name": "orocos-kdl", "version": "1.5.1", - "port-version": 1, "description": "Kinematics and Dynamics Library.", "homepage": "https://github.com/orocos/orocos_kinematics_dynamics", "dependencies": [ From 3192305104374eb754fd4f98a143e8cf9b887911 Mon Sep 17 00:00:00 2001 From: Alexander Vieth Date: Tue, 12 Aug 2025 14:30:01 +0200 Subject: [PATCH 12/32] [rbdl] fix build after update Eigen3 --- ports/rbdl/find-eigen3.patch | 19 +++++++++++++++++++ ports/rbdl/portfile.cmake | 2 ++ 2 files changed, 21 insertions(+) create mode 100644 ports/rbdl/find-eigen3.patch diff --git a/ports/rbdl/find-eigen3.patch b/ports/rbdl/find-eigen3.patch new file mode 100644 index 00000000000000..328ddf7a420c91 --- /dev/null +++ b/ports/rbdl/find-eigen3.patch @@ -0,0 +1,19 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d25936d..d778095 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -71,12 +71,13 @@ OPTION (RBDL_VCPKG_BUILD "Building RBDL in vcpkg environment" OFF) + + + # Find and use the system's Eigen3 library +-FIND_PACKAGE (Eigen3 3.0.0) ++FIND_PACKAGE (Eigen3 CONFIG REQUIRED) + + IF (NOT EIGEN3_FOUND) + MESSAGE (WARNING "Could not find Eigen3 on your system. Please install it!") + ENDIF (NOT EIGEN3_FOUND) + ++get_target_property(EIGEN3_INCLUDE_DIR Eigen3::Eigen INTERFACE_INCLUDE_DIRECTORIES) + INCLUDE_DIRECTORIES (${EIGEN3_INCLUDE_DIR}) + + # Addons diff --git a/ports/rbdl/portfile.cmake b/ports/rbdl/portfile.cmake index 425c88d970cd8f..330a4f3e0557d8 100644 --- a/ports/rbdl/portfile.cmake +++ b/ports/rbdl/portfile.cmake @@ -6,6 +6,8 @@ vcpkg_from_github( REF 619175a441ba769ab1be34a727644f4dd13bf841 SHA512 0c6cd78c4385e582f481a6f92d5c3a01f5d3bcd3a7cc3417a504209dae1856d788157db8d9f4173493619f103dea323bd57ddae0bc63162d72b03031dae9a822 HEAD_REF master + PATCHES + find-eigen3.patch ) vcpkg_from_github( From 695d9823a71f0087f6969422457c17e5ca94a6ff Mon Sep 17 00:00:00 2001 From: Alexander Vieth Date: Tue, 12 Aug 2025 14:30:41 +0200 Subject: [PATCH 13/32] [orocos-kdl] fix build after update Eigen3 --- ports/orocos-kdl/find-eigen3.patch | 21 +++++++++++++++++++++ ports/orocos-kdl/portfile.cmake | 4 +++- 2 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 ports/orocos-kdl/find-eigen3.patch diff --git a/ports/orocos-kdl/find-eigen3.patch b/ports/orocos-kdl/find-eigen3.patch new file mode 100644 index 00000000000000..1d792cd3328737 --- /dev/null +++ b/ports/orocos-kdl/find-eigen3.patch @@ -0,0 +1,21 @@ +diff --git a/orocos_kdl/CMakeLists.txt b/orocos_kdl/CMakeLists.txt +index a15bd15..0bf5bab 100644 +--- a/orocos_kdl/CMakeLists.txt ++++ b/orocos_kdl/CMakeLists.txt +@@ -53,12 +53,11 @@ ENDIF ( NOT CMAKE_BUILD_TYPE ) + + SET( KDL_CFLAGS "") + +-find_package(Eigen3 QUIET) +-if(NOT EIGEN3_FOUND) +- include(${PROJ_SOURCE_DIR}/cmake/FindEigen3.cmake) +-endif() ++find_package(Eigen3 CONFIG REQUIRED) ++get_target_property(EIGEN3_INCLUDE_DIR Eigen3::Eigen INTERFACE_INCLUDE_DIRECTORIES) ++message(STATUS "EIGEN3_INCLUDE_DIR: ${EIGEN3_INCLUDE_DIR}") + include_directories(${EIGEN3_INCLUDE_DIR}) +-SET(KDL_CFLAGS "${KDL_CFLAGS} -I${EIGEN3_INCLUDE_DIR}") ++SET(KDL_CFLAGS "${KDL_CFLAGS} -I\"${EIGEN3_INCLUDE_DIR}\"") + + # Check the platform STL containers capabilities + include(cmake/CheckSTLContainers.cmake) diff --git a/ports/orocos-kdl/portfile.cmake b/ports/orocos-kdl/portfile.cmake index e7d041161728f8..8875c028dcbcc5 100644 --- a/ports/orocos-kdl/portfile.cmake +++ b/ports/orocos-kdl/portfile.cmake @@ -4,7 +4,9 @@ vcpkg_from_github( REF "v${VERSION}" SHA512 9774b76b755ea81168390643813789783f60d0b1cdb46cd250e3e0d27f75a6cf2fd3bfd2081c04e30a14ff4fc70d0080c9b43b82ee181c2dda82f23f052b338d HEAD_REF master - PATCHES export-include-dir.patch + PATCHES + export-include-dir.patch + find-eigen3.patch ) vcpkg_cmake_configure( From 4955b5396d783f91611546eb2588e0a9569c766f Mon Sep 17 00:00:00 2001 From: Alexander Vieth Date: Tue, 12 Aug 2025 15:01:55 +0200 Subject: [PATCH 14/32] [g2o] fix build after update Eigen3 --- ports/g2o/portfile.cmake | 1 + ports/g2o/remove-FindEigen3.patch | 113 ++++++++++++++++++++++++++++++ 2 files changed, 114 insertions(+) create mode 100644 ports/g2o/remove-FindEigen3.patch diff --git a/ports/g2o/portfile.cmake b/ports/g2o/portfile.cmake index 0aefcfb9297f02..79d6146385fdcc 100644 --- a/ports/g2o/portfile.cmake +++ b/ports/g2o/portfile.cmake @@ -21,6 +21,7 @@ vcpkg_from_github( PATCHES dependencies.diff fix-absolute.patch + remove-FindEigen3.patch "${FIX_UPSTREAM_37d17a9}" "${FIX_UPSTREAM_100af05}" ) diff --git a/ports/g2o/remove-FindEigen3.patch b/ports/g2o/remove-FindEigen3.patch new file mode 100644 index 00000000000000..55994ea5a3af8c --- /dev/null +++ b/ports/g2o/remove-FindEigen3.patch @@ -0,0 +1,113 @@ +diff --git a/cmake_modules/FindEigen3.cmake b/cmake_modules/FindEigen3.cmake +deleted file mode 100644 +index 2dbed583..00000000 +--- a/cmake_modules/FindEigen3.cmake ++++ /dev/null +@@ -1,107 +0,0 @@ +-# - Try to find Eigen3 lib +-# +-# This module supports requiring a minimum version, e.g. you can do +-# find_package(Eigen3 3.1.2) +-# to require version 3.1.2 or newer of Eigen3. +-# +-# Once done this will define +-# +-# EIGEN3_FOUND - system has eigen lib with correct version +-# EIGEN3_INCLUDE_DIR - the eigen include directory +-# EIGEN3_VERSION - eigen version +-# +-# and the following imported target: +-# +-# Eigen3::Eigen - The header-only Eigen library +-# +-# This module reads hints about search locations from +-# the following environment variables: +-# +-# EIGEN3_ROOT +-# EIGEN3_ROOT_DIR +- +-# Copyright (c) 2006, 2007 Montel Laurent, +-# Copyright (c) 2008, 2009 Gael Guennebaud, +-# Copyright (c) 2009 Benoit Jacob +-# Redistribution and use is allowed according to the terms of the 2-clause BSD license. +- +-if(NOT Eigen3_FIND_VERSION) +- if(NOT Eigen3_FIND_VERSION_MAJOR) +- set(Eigen3_FIND_VERSION_MAJOR 2) +- endif() +- if(NOT Eigen3_FIND_VERSION_MINOR) +- set(Eigen3_FIND_VERSION_MINOR 91) +- endif() +- if(NOT Eigen3_FIND_VERSION_PATCH) +- set(Eigen3_FIND_VERSION_PATCH 0) +- endif() +- +- set(Eigen3_FIND_VERSION "${Eigen3_FIND_VERSION_MAJOR}.${Eigen3_FIND_VERSION_MINOR}.${Eigen3_FIND_VERSION_PATCH}") +-endif() +- +-macro(_eigen3_check_version) +- file(READ "${EIGEN3_INCLUDE_DIR}/Eigen/src/Core/util/Macros.h" _eigen3_version_header) +- +- string(REGEX MATCH "define[ \t]+EIGEN_WORLD_VERSION[ \t]+([0-9]+)" _eigen3_world_version_match "${_eigen3_version_header}") +- set(EIGEN3_WORLD_VERSION "${CMAKE_MATCH_1}") +- string(REGEX MATCH "define[ \t]+EIGEN_MAJOR_VERSION[ \t]+([0-9]+)" _eigen3_major_version_match "${_eigen3_version_header}") +- set(EIGEN3_MAJOR_VERSION "${CMAKE_MATCH_1}") +- string(REGEX MATCH "define[ \t]+EIGEN_MINOR_VERSION[ \t]+([0-9]+)" _eigen3_minor_version_match "${_eigen3_version_header}") +- set(EIGEN3_MINOR_VERSION "${CMAKE_MATCH_1}") +- +- set(EIGEN3_VERSION ${EIGEN3_WORLD_VERSION}.${EIGEN3_MAJOR_VERSION}.${EIGEN3_MINOR_VERSION}) +- if(${EIGEN3_VERSION} VERSION_LESS ${Eigen3_FIND_VERSION}) +- set(EIGEN3_VERSION_OK FALSE) +- else() +- set(EIGEN3_VERSION_OK TRUE) +- endif() +- +- if(NOT EIGEN3_VERSION_OK) +- +- message(STATUS "Eigen3 version ${EIGEN3_VERSION} found in ${EIGEN3_INCLUDE_DIR}, " +- "but at least version ${Eigen3_FIND_VERSION} is required") +- endif() +-endmacro() +- +-if (EIGEN3_INCLUDE_DIR) +- +- # in cache already +- _eigen3_check_version() +- set(EIGEN3_FOUND ${EIGEN3_VERSION_OK}) +- set(Eigen3_FOUND ${EIGEN3_VERSION_OK}) +- +-else () +- +- # search first if an Eigen3Config.cmake is available in the system, +- # if successful this would set EIGEN3_INCLUDE_DIR and the rest of +- # the script will work as usual +- find_package(Eigen3 ${Eigen3_FIND_VERSION} NO_MODULE QUIET) +- +- if(NOT EIGEN3_INCLUDE_DIR) +- find_path(EIGEN3_INCLUDE_DIR NAMES signature_of_eigen3_matrix_library +- HINTS +- ENV EIGEN3_ROOT +- ENV EIGEN3_ROOT_DIR +- PATHS +- ${CMAKE_INSTALL_PREFIX}/include +- ${KDE4_INCLUDE_DIR} +- PATH_SUFFIXES eigen3 eigen +- ) +- endif() +- +- if(EIGEN3_INCLUDE_DIR) +- _eigen3_check_version() +- endif() +- +- include(FindPackageHandleStandardArgs) +- find_package_handle_standard_args(Eigen3 DEFAULT_MSG EIGEN3_INCLUDE_DIR EIGEN3_VERSION_OK) +- +- mark_as_advanced(EIGEN3_INCLUDE_DIR) +- +-endif() +- +-if(EIGEN3_FOUND AND NOT TARGET Eigen3::Eigen) +- add_library(Eigen3::Eigen INTERFACE IMPORTED) +- set_target_properties(Eigen3::Eigen PROPERTIES +- INTERFACE_INCLUDE_DIRECTORIES "${EIGEN3_INCLUDE_DIR}") +-endif() From 4aec8c34bd247f3a4aada42a3a0cba2723bacefc Mon Sep 17 00:00:00 2001 From: Alexander Vieth Date: Tue, 12 Aug 2025 15:39:47 +0200 Subject: [PATCH 15/32] update port versions --- ports/g2o/vcpkg.json | 2 +- ports/orocos-kdl/vcpkg.json | 1 + ports/rbdl/vcpkg.json | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ports/g2o/vcpkg.json b/ports/g2o/vcpkg.json index e0831cbfc903a6..7f1f8c8a44228d 100644 --- a/ports/g2o/vcpkg.json +++ b/ports/g2o/vcpkg.json @@ -1,7 +1,7 @@ { "name": "g2o", "version-date": "2024-12-14", - "port-version": 5, + "port-version": 6, "description": "g2o: A General Framework for Graph Optimization", "homepage": "https://openslam.org/g2o.html", "license": null, diff --git a/ports/orocos-kdl/vcpkg.json b/ports/orocos-kdl/vcpkg.json index 475a66f1c62c8c..8ea399d42b75bd 100644 --- a/ports/orocos-kdl/vcpkg.json +++ b/ports/orocos-kdl/vcpkg.json @@ -1,6 +1,7 @@ { "name": "orocos-kdl", "version": "1.5.1", + "port-version": 1, "description": "Kinematics and Dynamics Library.", "homepage": "https://github.com/orocos/orocos_kinematics_dynamics", "dependencies": [ diff --git a/ports/rbdl/vcpkg.json b/ports/rbdl/vcpkg.json index f06685bc95b747..7ea3ba1813a0c4 100644 --- a/ports/rbdl/vcpkg.json +++ b/ports/rbdl/vcpkg.json @@ -1,7 +1,7 @@ { "name": "rbdl", "version": "3.3.0", - "port-version": 7, + "port-version": 8, "description": "Rigid Body Dynamics Library", "homepage": "https://github.com/rbdl/rbdl", "dependencies": [ From 9333516e498a80a08561040fe5725d609bbc40b1 Mon Sep 17 00:00:00 2001 From: Alexander Vieth Date: Tue, 12 Aug 2025 15:41:46 +0200 Subject: [PATCH 16/32] Update baseline versions --- versions/baseline.json | 6 +++--- versions/e-/eigen3.json | 2 +- versions/g-/g2o.json | 5 +++++ versions/o-/orocos-kdl.json | 5 +++++ versions/r-/rbdl.json | 5 +++++ 5 files changed, 19 insertions(+), 4 deletions(-) diff --git a/versions/baseline.json b/versions/baseline.json index 669f2198ec959d..3d7c1b266324c6 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3118,7 +3118,7 @@ }, "g2o": { "baseline": "2024-12-14", - "port-version": 5 + "port-version": 6 }, "g3log": { "baseline": "2.6", @@ -7158,7 +7158,7 @@ }, "orocos-kdl": { "baseline": "1.5.1", - "port-version": 0 + "port-version": 1 }, "oscpack": { "baseline": "1.1.0", @@ -8246,7 +8246,7 @@ }, "rbdl": { "baseline": "3.3.0", - "port-version": 7 + "port-version": 8 }, "rbdl-orb": { "baseline": "3.2.0", diff --git a/versions/e-/eigen3.json b/versions/e-/eigen3.json index 14bd05cecaedb0..54d482e980f76f 100644 --- a/versions/e-/eigen3.json +++ b/versions/e-/eigen3.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "bcabed2a4bf42361f82b6341cbd0d55cdda91a11", + "git-tree": "1be910e3793725f7c9ba9abb6a223517d7cc18df", "version": "3.4.1", "port-version": 0 }, diff --git a/versions/g-/g2o.json b/versions/g-/g2o.json index a66df341cffc2d..f87923d44c5bb0 100644 --- a/versions/g-/g2o.json +++ b/versions/g-/g2o.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3951452431e71def0ffd69aa9955a8a616d45727", + "version-date": "2024-12-14", + "port-version": 6 + }, { "git-tree": "bba68d23af872af24aeeaf3a14cb3e0265f4d151", "version-date": "2024-12-14", diff --git a/versions/o-/orocos-kdl.json b/versions/o-/orocos-kdl.json index 2ba686831c6ae6..73f59adcc56d51 100644 --- a/versions/o-/orocos-kdl.json +++ b/versions/o-/orocos-kdl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "629b176569b0b614ee774fde6d280c37f6259b53", + "version": "1.5.1", + "port-version": 1 + }, { "git-tree": "e9fdf57afeb547c9e5fdad47dff693fe8f96f4b5", "version": "1.5.1", diff --git a/versions/r-/rbdl.json b/versions/r-/rbdl.json index 3394686a2f9c74..5a393636632e64 100644 --- a/versions/r-/rbdl.json +++ b/versions/r-/rbdl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0a31a3ca95c06c5787ad63cb7f134438ce9acacc", + "version": "3.3.0", + "port-version": 8 + }, { "git-tree": "1dc8279017fb2aa827bcaf37fcf9e6af6b8bb751", "version": "3.3.0", From 5007ce496a1715ee70757f7d2932222646f2dd94 Mon Sep 17 00:00:00 2001 From: Alexander Vieth Date: Wed, 13 Aug 2025 09:14:20 +0200 Subject: [PATCH 17/32] [g2o] better fix --- ports/g2o/portfile.cmake | 2 +- ports/g2o/remove-FindEigen3.patch | 113 ------------------------------ 2 files changed, 1 insertion(+), 114 deletions(-) delete mode 100644 ports/g2o/remove-FindEigen3.patch diff --git a/ports/g2o/portfile.cmake b/ports/g2o/portfile.cmake index 79d6146385fdcc..9bb47204bd0005 100644 --- a/ports/g2o/portfile.cmake +++ b/ports/g2o/portfile.cmake @@ -21,13 +21,13 @@ vcpkg_from_github( PATCHES dependencies.diff fix-absolute.patch - remove-FindEigen3.patch "${FIX_UPSTREAM_37d17a9}" "${FIX_UPSTREAM_100af05}" ) file(REMOVE "${SOURCE_PATH}/cmake_modules/FindBLAS.cmake" "${SOURCE_PATH}/cmake_modules/FindCSparse.cmake" + "${SOURCE_PATH}/cmake_modules/FindEigen3.cmake" ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_LGPL_SHARED_LIBS) diff --git a/ports/g2o/remove-FindEigen3.patch b/ports/g2o/remove-FindEigen3.patch deleted file mode 100644 index 55994ea5a3af8c..00000000000000 --- a/ports/g2o/remove-FindEigen3.patch +++ /dev/null @@ -1,113 +0,0 @@ -diff --git a/cmake_modules/FindEigen3.cmake b/cmake_modules/FindEigen3.cmake -deleted file mode 100644 -index 2dbed583..00000000 ---- a/cmake_modules/FindEigen3.cmake -+++ /dev/null -@@ -1,107 +0,0 @@ --# - Try to find Eigen3 lib --# --# This module supports requiring a minimum version, e.g. you can do --# find_package(Eigen3 3.1.2) --# to require version 3.1.2 or newer of Eigen3. --# --# Once done this will define --# --# EIGEN3_FOUND - system has eigen lib with correct version --# EIGEN3_INCLUDE_DIR - the eigen include directory --# EIGEN3_VERSION - eigen version --# --# and the following imported target: --# --# Eigen3::Eigen - The header-only Eigen library --# --# This module reads hints about search locations from --# the following environment variables: --# --# EIGEN3_ROOT --# EIGEN3_ROOT_DIR -- --# Copyright (c) 2006, 2007 Montel Laurent, --# Copyright (c) 2008, 2009 Gael Guennebaud, --# Copyright (c) 2009 Benoit Jacob --# Redistribution and use is allowed according to the terms of the 2-clause BSD license. -- --if(NOT Eigen3_FIND_VERSION) -- if(NOT Eigen3_FIND_VERSION_MAJOR) -- set(Eigen3_FIND_VERSION_MAJOR 2) -- endif() -- if(NOT Eigen3_FIND_VERSION_MINOR) -- set(Eigen3_FIND_VERSION_MINOR 91) -- endif() -- if(NOT Eigen3_FIND_VERSION_PATCH) -- set(Eigen3_FIND_VERSION_PATCH 0) -- endif() -- -- set(Eigen3_FIND_VERSION "${Eigen3_FIND_VERSION_MAJOR}.${Eigen3_FIND_VERSION_MINOR}.${Eigen3_FIND_VERSION_PATCH}") --endif() -- --macro(_eigen3_check_version) -- file(READ "${EIGEN3_INCLUDE_DIR}/Eigen/src/Core/util/Macros.h" _eigen3_version_header) -- -- string(REGEX MATCH "define[ \t]+EIGEN_WORLD_VERSION[ \t]+([0-9]+)" _eigen3_world_version_match "${_eigen3_version_header}") -- set(EIGEN3_WORLD_VERSION "${CMAKE_MATCH_1}") -- string(REGEX MATCH "define[ \t]+EIGEN_MAJOR_VERSION[ \t]+([0-9]+)" _eigen3_major_version_match "${_eigen3_version_header}") -- set(EIGEN3_MAJOR_VERSION "${CMAKE_MATCH_1}") -- string(REGEX MATCH "define[ \t]+EIGEN_MINOR_VERSION[ \t]+([0-9]+)" _eigen3_minor_version_match "${_eigen3_version_header}") -- set(EIGEN3_MINOR_VERSION "${CMAKE_MATCH_1}") -- -- set(EIGEN3_VERSION ${EIGEN3_WORLD_VERSION}.${EIGEN3_MAJOR_VERSION}.${EIGEN3_MINOR_VERSION}) -- if(${EIGEN3_VERSION} VERSION_LESS ${Eigen3_FIND_VERSION}) -- set(EIGEN3_VERSION_OK FALSE) -- else() -- set(EIGEN3_VERSION_OK TRUE) -- endif() -- -- if(NOT EIGEN3_VERSION_OK) -- -- message(STATUS "Eigen3 version ${EIGEN3_VERSION} found in ${EIGEN3_INCLUDE_DIR}, " -- "but at least version ${Eigen3_FIND_VERSION} is required") -- endif() --endmacro() -- --if (EIGEN3_INCLUDE_DIR) -- -- # in cache already -- _eigen3_check_version() -- set(EIGEN3_FOUND ${EIGEN3_VERSION_OK}) -- set(Eigen3_FOUND ${EIGEN3_VERSION_OK}) -- --else () -- -- # search first if an Eigen3Config.cmake is available in the system, -- # if successful this would set EIGEN3_INCLUDE_DIR and the rest of -- # the script will work as usual -- find_package(Eigen3 ${Eigen3_FIND_VERSION} NO_MODULE QUIET) -- -- if(NOT EIGEN3_INCLUDE_DIR) -- find_path(EIGEN3_INCLUDE_DIR NAMES signature_of_eigen3_matrix_library -- HINTS -- ENV EIGEN3_ROOT -- ENV EIGEN3_ROOT_DIR -- PATHS -- ${CMAKE_INSTALL_PREFIX}/include -- ${KDE4_INCLUDE_DIR} -- PATH_SUFFIXES eigen3 eigen -- ) -- endif() -- -- if(EIGEN3_INCLUDE_DIR) -- _eigen3_check_version() -- endif() -- -- include(FindPackageHandleStandardArgs) -- find_package_handle_standard_args(Eigen3 DEFAULT_MSG EIGEN3_INCLUDE_DIR EIGEN3_VERSION_OK) -- -- mark_as_advanced(EIGEN3_INCLUDE_DIR) -- --endif() -- --if(EIGEN3_FOUND AND NOT TARGET Eigen3::Eigen) -- add_library(Eigen3::Eigen INTERFACE IMPORTED) -- set_target_properties(Eigen3::Eigen PROPERTIES -- INTERFACE_INCLUDE_DIRECTORIES "${EIGEN3_INCLUDE_DIR}") --endif() From e829e099d90d388c19a04ba3c24aed22f1f78093 Mon Sep 17 00:00:00 2001 From: Alexander Vieth Date: Wed, 13 Aug 2025 10:24:15 +0200 Subject: [PATCH 18/32] [chronoengine] fix build after eigen3 update --- .../chronoengine/find_package_required.patch | 22 ------------------- ports/chronoengine/fix_dependencies.patch | 16 ++++++++------ ports/chronoengine/portfile.cmake | 5 ++++- ports/chronoengine/vcpkg.json | 2 +- 4 files changed, 14 insertions(+), 31 deletions(-) diff --git a/ports/chronoengine/find_package_required.patch b/ports/chronoengine/find_package_required.patch index 60423ac66a9701..c6aa97f0f7902e 100644 --- a/ports/chronoengine/find_package_required.patch +++ b/ports/chronoengine/find_package_required.patch @@ -11,28 +11,6 @@ index 6a8f0f9e1..c44f92eb4 100644 else() find_package(Threads REQUIRED) endif() -diff --git a/cmake/FindEigen3.cmake b/cmake/FindEigen3.cmake -index 0d2b3cedd..02c2b50d2 100644 ---- a/cmake/FindEigen3.cmake -+++ b/cmake/FindEigen3.cmake -@@ -1,7 +1,7 @@ - # - Try to find Eigen3 lib - # - # This module supports requiring a minimum version, e.g. you can do --# find_package(Eigen3 3.1.2) -+# find_package(Eigen3 3.1.2 REQUIRED) - # to require version 3.1.2 or newer of Eigen3. - # - # Once done this will define -@@ -70,7 +70,7 @@ else (EIGEN3_INCLUDE_DIR) - # search first if an Eigen3Config.cmake is available in the system, - # if successful this would set EIGEN3_INCLUDE_DIR and the rest of - # the script will work as usual -- find_package(Eigen3 ${Eigen3_FIND_VERSION} NO_MODULE QUIET) -+ find_package(Eigen3 ${Eigen3_FIND_VERSION} NO_MODULE REQUIRED) - - if(NOT EIGEN3_INCLUDE_DIR) - find_path(EIGEN3_INCLUDE_DIR NAMES signature_of_eigen3_matrix_library diff --git a/cmake/FindMKL.cmake b/cmake/FindMKL.cmake index 6f8a2740f..acf43af4d 100644 --- a/cmake/FindMKL.cmake diff --git a/ports/chronoengine/fix_dependencies.patch b/ports/chronoengine/fix_dependencies.patch index 214857df3495c4..8eb1098a8991f6 100644 --- a/ports/chronoengine/fix_dependencies.patch +++ b/ports/chronoengine/fix_dependencies.patch @@ -1,5 +1,5 @@ diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index d75ce1055..a21acbd83 100644 +index d75ce1055..11505afe2 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -96,7 +96,7 @@ endif() @@ -32,16 +32,18 @@ index d75ce1055..a21acbd83 100644 # Set substitution variables for configuration file if(SIMD_SSE) -@@ -250,7 +251,7 @@ endif() +@@ -250,8 +251,9 @@ endif() #----------------------------------------------------------------------------- message(STATUS "Searching for Eigen3...") -find_package(Eigen3 3.3.0) +find_package(Eigen3 3.3.0 REQUIRED) if(EIGEN3_FOUND) ++ get_target_property(EIGEN3_INCLUDE_DIR Eigen3::Eigen INTERFACE_INCLUDE_DIRECTORIES) message(STATUS " Eigen3 version: ${EIGEN3_VERSION}") message(STATUS " Eigen3 include directory: ${EIGEN3_INCLUDE_DIR}") -@@ -293,7 +294,9 @@ endif() + else() +@@ -293,7 +295,9 @@ endif() #----------------------------------------------------------------------------- message(STATUS "Searching for MPI...") @@ -52,7 +54,7 @@ index d75ce1055..a21acbd83 100644 if(MPI_FOUND) message(STATUS " MPI compiler: ${MPI_CXX_COMPILER}") message(STATUS " MPI compile flags: ${MPI_CXX_COMPILE_FLAGS}") -@@ -312,9 +315,9 @@ endif() +@@ -312,9 +316,9 @@ endif() #----------------------------------------------------------------------------- message(STATUS "Searching for CUDA...") @@ -65,7 +67,7 @@ index d75ce1055..a21acbd83 100644 if(CUDA_FOUND) set(CUDA_BINARY_DIR "${CUDA_TOOLKIT_ROOT_DIR}/bin") -@@ -373,7 +376,7 @@ endif() +@@ -373,7 +377,7 @@ endif() #----------------------------------------------------------------------------- message(STATUS "Searching for Thrust...") @@ -74,7 +76,7 @@ index d75ce1055..a21acbd83 100644 if (${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD") find_path(THRUST_INCLUDE_DIR NAMES thrust/version.h PATHS "/usr/local" "/usr/local/include") if (THRUST_INCLUDE_DIR) -@@ -383,9 +386,9 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD") +@@ -383,9 +387,9 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD") set(${THRUST_FOUND} FALSE) endif() else() @@ -86,7 +88,7 @@ index d75ce1055..a21acbd83 100644 if(THRUST_FOUND) message(STATUS " Thrust version: ${THRUST_VERSION}") message(STATUS " Thrust include dir: ${THRUST_INCLUDE_DIR}") -@@ -500,14 +503,14 @@ if(ENABLE_HDF5) +@@ -500,14 +504,14 @@ if(ENABLE_HDF5) # HDF5_INCLUDE_DIRS # HDF5_C_LIBRARIES # HDF5_CXX_LIBRARIES diff --git a/ports/chronoengine/portfile.cmake b/ports/chronoengine/portfile.cmake index 51936eac454c7a..5081fc25ac5d32 100644 --- a/ports/chronoengine/portfile.cmake +++ b/ports/chronoengine/portfile.cmake @@ -8,7 +8,10 @@ vcpkg_from_github( find_package_required.patch ) -file(REMOVE "${SOURCE_PATH}/cmake/FindTBB.cmake") +file(REMOVE + "${SOURCE_PATH}/cmake/FindTBB.cmake" + "${SOURCE_PATH}/cmake/FindEigen3.cmake" +) vcpkg_check_features( OUT_FEATURE_OPTIONS diff --git a/ports/chronoengine/vcpkg.json b/ports/chronoengine/vcpkg.json index 42614aea7212eb..02290db91933a7 100644 --- a/ports/chronoengine/vcpkg.json +++ b/ports/chronoengine/vcpkg.json @@ -1,7 +1,7 @@ { "name": "chronoengine", "version": "8.0.0", - "port-version": 1, + "port-version": 2, "description": "Multi-physics Simulation Engine.", "homepage": "https://projectchrono.org/", "license": "BSD-3-Clause", From a488821412c4e14ccfe02796e77a2a05813824ce Mon Sep 17 00:00:00 2001 From: Alexander Vieth Date: Wed, 13 Aug 2025 10:24:34 +0200 Subject: [PATCH 19/32] Update baseline version --- versions/baseline.json | 2 +- versions/c-/chronoengine.json | 5 +++++ versions/g-/g2o.json | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/versions/baseline.json b/versions/baseline.json index 3d7c1b266324c6..2466b2975b696b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1706,7 +1706,7 @@ }, "chronoengine": { "baseline": "8.0.0", - "port-version": 1 + "port-version": 2 }, "cialloo-rcon": { "baseline": "1.0.0", diff --git a/versions/c-/chronoengine.json b/versions/c-/chronoengine.json index 40ab007e8efd1c..da365b2851761c 100644 --- a/versions/c-/chronoengine.json +++ b/versions/c-/chronoengine.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "55389d248b9067f308bcbf81a08d94af3a098976", + "version": "8.0.0", + "port-version": 2 + }, { "git-tree": "7db5f822e4f4debf9b0b9400a3050fff89dca5c7", "version": "8.0.0", diff --git a/versions/g-/g2o.json b/versions/g-/g2o.json index f87923d44c5bb0..8b654cceeff46f 100644 --- a/versions/g-/g2o.json +++ b/versions/g-/g2o.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "3951452431e71def0ffd69aa9955a8a616d45727", + "git-tree": "a66b6e04a733c5678691839e17fc62eeb59aa4cb", "version-date": "2024-12-14", "port-version": 6 }, From 9cc9746990b4af428b526d711f6588951d196e69 Mon Sep 17 00:00:00 2001 From: Alexander Vieth Date: Wed, 13 Aug 2025 11:36:03 +0200 Subject: [PATCH 20/32] [openmvg] fix build after eigen update --- ports/openmvg/build_fixes.patch | 23 +++++++++++++++++++---- ports/openmvg/vcpkg.json | 2 +- 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/ports/openmvg/build_fixes.patch b/ports/openmvg/build_fixes.patch index 1ec5ce6265af96..0ec28788607ed6 100644 --- a/ports/openmvg/build_fixes.patch +++ b/ports/openmvg/build_fixes.patch @@ -1,8 +1,23 @@ diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 6879c4c..aa4167a 100644 +index 6879c4c6..073190b3 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt -@@ -324,13 +324,18 @@ else() +@@ -281,12 +281,13 @@ endif() + # - external if EIGEN_INCLUDE_DIR_HINTS is defined + # - internal if Eigen not found + # ============================================================================== +-find_package(Eigen3 QUIET) ++find_package(Eigen3 CONFIG REQUIRED) + if (NOT Eigen3_FOUND) + set(EIGEN_INCLUDE_DIR_HINTS ${CMAKE_CURRENT_SOURCE_DIR}/third_party/eigen) + set(OpenMVG_USE_INTERNAL_EIGEN ON) + find_package(Eigen QUIET) + else() ++ get_target_property(EIGEN3_INCLUDE_DIR Eigen3::Eigen INTERFACE_INCLUDE_DIRECTORIES) + set(EIGEN_INCLUDE_DIRS ${EIGEN3_INCLUDE_DIR}) + endif() + add_definitions(-DEIGEN_MPL2_ONLY) +@@ -324,13 +325,18 @@ else() if (TARGET flann::flann) set(FLANN_LIBRARIES "flann::flann;flann::flann_cpp") else() @@ -22,7 +37,7 @@ index 6879c4c..aa4167a 100644 # ============================================================================== # CoinUtils # ============================================================================== -@@ -391,6 +396,7 @@ if (OpenMVG_USE_INTERNAL_OSI AND OpenMVG_USE_INTERNAL_CLP AND OpenMVG_USE_INTERN +@@ -391,6 +397,7 @@ if (OpenMVG_USE_INTERNAL_OSI AND OpenMVG_USE_INTERNAL_CLP AND OpenMVG_USE_INTERN set_property(TARGET lib_Osi PROPERTY FOLDER OpenMVG/3rdParty/lib_Osi) set_property(TARGET lib_OsiClpSolver PROPERTY FOLDER OpenMVG/3rdParty/lib_OsiClpSolver) endif() @@ -30,7 +45,7 @@ index 6879c4c..aa4167a 100644 # ============================================================================== # Lemon -@@ -402,7 +408,7 @@ if (NOT DEFINED LEMON_INCLUDE_DIR_HINTS) +@@ -402,7 +409,7 @@ if (NOT DEFINED LEMON_INCLUDE_DIR_HINTS) set(LEMON_INCLUDE_DIR_HINTS ${CMAKE_CURRENT_SOURCE_DIR}/third_party/lemon) set(OpenMVG_USE_INTERNAL_LEMON ON) endif() diff --git a/ports/openmvg/vcpkg.json b/ports/openmvg/vcpkg.json index d93c6433e914c2..eb67f016535264 100644 --- a/ports/openmvg/vcpkg.json +++ b/ports/openmvg/vcpkg.json @@ -1,7 +1,7 @@ { "name": "openmvg", "version": "2.1", - "port-version": 2, + "port-version": 3, "description": "open Multiple View Geometry library. Basis for 3D computer vision and Structure from Motion.", "license": null, "supports": "(x86 | x64 | arm64) & !xbox", From 446a2ff909ed7cc4a3be7a52b6ec9fc0c2991194 Mon Sep 17 00:00:00 2001 From: Alexander Vieth Date: Wed, 13 Aug 2025 11:36:35 +0200 Subject: [PATCH 21/32] update baeline version --- versions/baseline.json | 2 +- versions/o-/openmvg.json | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/versions/baseline.json b/versions/baseline.json index 2466b2975b696b..b3c48aeb2e9f9f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7066,7 +7066,7 @@ }, "openmvg": { "baseline": "2.1", - "port-version": 2 + "port-version": 3 }, "openmvs": { "baseline": "2.1.0", diff --git a/versions/o-/openmvg.json b/versions/o-/openmvg.json index 6d607ea27217fc..69056e32cba71e 100644 --- a/versions/o-/openmvg.json +++ b/versions/o-/openmvg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "34d65dec331136b85ba9e7ef673c3dedf578424b", + "version": "2.1", + "port-version": 3 + }, { "git-tree": "26f65270e3a45107e6e23f45dc8837143d77fb90", "version": "2.1", From 177fefc60eadc3b606bcf989b2b5a2911d8a74ac Mon Sep 17 00:00:00 2001 From: Alexander Vieth Date: Wed, 13 Aug 2025 15:55:26 +0200 Subject: [PATCH 22/32] Restore EIGEN_INCLUDE_DIR instead of patching multiple ports --- ports/chronoengine/fix_dependencies.patch | 16 +++++++--------- ports/eigen3/portfile.cmake | 4 +++- ports/eigen3/restore-include-dir.patch | 21 +++++++++++++++++++++ ports/openmvg/build_fixes.patch | 23 ++++------------------- ports/openmvg/vcpkg.json | 2 +- ports/orocos-kdl/find-eigen3.patch | 21 --------------------- ports/orocos-kdl/portfile.cmake | 4 +--- ports/orocos-kdl/vcpkg.json | 1 - ports/rbdl/find-eigen3.patch | 19 ------------------- ports/rbdl/portfile.cmake | 2 -- ports/rbdl/vcpkg.json | 2 +- versions/baseline.json | 6 +++--- versions/c-/chronoengine.json | 2 +- versions/e-/eigen3.json | 2 +- versions/o-/openmvg.json | 5 ----- versions/o-/orocos-kdl.json | 5 ----- versions/r-/rbdl.json | 5 ----- 17 files changed, 43 insertions(+), 97 deletions(-) create mode 100644 ports/eigen3/restore-include-dir.patch delete mode 100644 ports/orocos-kdl/find-eigen3.patch delete mode 100644 ports/rbdl/find-eigen3.patch diff --git a/ports/chronoengine/fix_dependencies.patch b/ports/chronoengine/fix_dependencies.patch index 8eb1098a8991f6..214857df3495c4 100644 --- a/ports/chronoengine/fix_dependencies.patch +++ b/ports/chronoengine/fix_dependencies.patch @@ -1,5 +1,5 @@ diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index d75ce1055..11505afe2 100644 +index d75ce1055..a21acbd83 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -96,7 +96,7 @@ endif() @@ -32,18 +32,16 @@ index d75ce1055..11505afe2 100644 # Set substitution variables for configuration file if(SIMD_SSE) -@@ -250,8 +251,9 @@ endif() +@@ -250,7 +251,7 @@ endif() #----------------------------------------------------------------------------- message(STATUS "Searching for Eigen3...") -find_package(Eigen3 3.3.0) +find_package(Eigen3 3.3.0 REQUIRED) if(EIGEN3_FOUND) -+ get_target_property(EIGEN3_INCLUDE_DIR Eigen3::Eigen INTERFACE_INCLUDE_DIRECTORIES) message(STATUS " Eigen3 version: ${EIGEN3_VERSION}") message(STATUS " Eigen3 include directory: ${EIGEN3_INCLUDE_DIR}") - else() -@@ -293,7 +295,9 @@ endif() +@@ -293,7 +294,9 @@ endif() #----------------------------------------------------------------------------- message(STATUS "Searching for MPI...") @@ -54,7 +52,7 @@ index d75ce1055..11505afe2 100644 if(MPI_FOUND) message(STATUS " MPI compiler: ${MPI_CXX_COMPILER}") message(STATUS " MPI compile flags: ${MPI_CXX_COMPILE_FLAGS}") -@@ -312,9 +316,9 @@ endif() +@@ -312,9 +315,9 @@ endif() #----------------------------------------------------------------------------- message(STATUS "Searching for CUDA...") @@ -67,7 +65,7 @@ index d75ce1055..11505afe2 100644 if(CUDA_FOUND) set(CUDA_BINARY_DIR "${CUDA_TOOLKIT_ROOT_DIR}/bin") -@@ -373,7 +377,7 @@ endif() +@@ -373,7 +376,7 @@ endif() #----------------------------------------------------------------------------- message(STATUS "Searching for Thrust...") @@ -76,7 +74,7 @@ index d75ce1055..11505afe2 100644 if (${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD") find_path(THRUST_INCLUDE_DIR NAMES thrust/version.h PATHS "/usr/local" "/usr/local/include") if (THRUST_INCLUDE_DIR) -@@ -383,9 +387,9 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD") +@@ -383,9 +386,9 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD") set(${THRUST_FOUND} FALSE) endif() else() @@ -88,7 +86,7 @@ index d75ce1055..11505afe2 100644 if(THRUST_FOUND) message(STATUS " Thrust version: ${THRUST_VERSION}") message(STATUS " Thrust include dir: ${THRUST_INCLUDE_DIR}") -@@ -500,14 +504,14 @@ if(ENABLE_HDF5) +@@ -500,14 +503,14 @@ if(ENABLE_HDF5) # HDF5_INCLUDE_DIRS # HDF5_C_LIBRARIES # HDF5_CXX_LIBRARIES diff --git a/ports/eigen3/portfile.cmake b/ports/eigen3/portfile.cmake index 21e2e7ca636ec2..4ce25b02b8eff3 100644 --- a/ports/eigen3/portfile.cmake +++ b/ports/eigen3/portfile.cmake @@ -4,9 +4,11 @@ vcpkg_from_gitlab( GITLAB_URL https://gitlab.com OUT_SOURCE_PATH SOURCE_PATH REPO libeigen/eigen - REF 4a2c4901ce1627c9511d2f23d3a33d903c42069f # 3.4.1 + REF 4a2c4901ce1627c9511d2f23d3a33d903c42069f # 3.4.1, from 3.4 branch on Jul 07, 2025 SHA512 3711944483d5dedd685f9b280322803ce5f873156ee0e9aa8e6c8686fbc7e4afb780d2ca39a694db8be651f3e776f2e5a09e69b315520ed2eddd5b638813d0c6 HEAD_REF master + PATCHES + restore-include-dir.patch # Restore EIGEN3_INCLUDE_DIR variable to match the 3.4.0 behavior ) vcpkg_cmake_configure( diff --git a/ports/eigen3/restore-include-dir.patch b/ports/eigen3/restore-include-dir.patch new file mode 100644 index 00000000000000..f64f205acc95a1 --- /dev/null +++ b/ports/eigen3/restore-include-dir.patch @@ -0,0 +1,21 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index ebfe8ec8f..29dac4742 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -175,6 +175,8 @@ set ( EIGEN_VERSION_STRING ${EIGEN_VERSION_NUMBER} ) + set ( EIGEN_VERSION_MAJOR ${EIGEN_WORLD_VERSION} ) + set ( EIGEN_VERSION_MINOR ${EIGEN_MAJOR_VERSION} ) + set ( EIGEN_VERSION_PATCH ${EIGEN_MINOR_VERSION} ) ++set ( EIGEN_INCLUDE_DIR "${CMAKE_INSTALL_PREFIX}/${INCLUDE_INSTALL_DIR}" ) ++set ( EIGEN_ROOT_DIR ${CMAKE_INSTALL_PREFIX} ) + + # Alias Eigen_*_DIR to Eigen3_*_DIR: + set(Eigen_SOURCE_DIR ${Eigen3_SOURCE_DIR}) +@@ -215,6 +217,7 @@ if(EIGEN_BUILD_CMAKE_PACKAGE) + configure_package_config_file ( + ${CMAKE_CURRENT_SOURCE_DIR}/cmake/Eigen3Config.cmake.in + ${CMAKE_CURRENT_BINARY_DIR}/Eigen3Config.cmake ++ PATH_VARS EIGEN_INCLUDE_DIR EIGEN_ROOT_DIR + INSTALL_DESTINATION ${CMAKEPACKAGE_INSTALL_DIR} + NO_SET_AND_CHECK_MACRO # Eigen does not provide legacy style defines + NO_CHECK_REQUIRED_COMPONENTS_MACRO # Eigen does not provide components diff --git a/ports/openmvg/build_fixes.patch b/ports/openmvg/build_fixes.patch index 0ec28788607ed6..1ec5ce6265af96 100644 --- a/ports/openmvg/build_fixes.patch +++ b/ports/openmvg/build_fixes.patch @@ -1,23 +1,8 @@ diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 6879c4c6..073190b3 100644 +index 6879c4c..aa4167a 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt -@@ -281,12 +281,13 @@ endif() - # - external if EIGEN_INCLUDE_DIR_HINTS is defined - # - internal if Eigen not found - # ============================================================================== --find_package(Eigen3 QUIET) -+find_package(Eigen3 CONFIG REQUIRED) - if (NOT Eigen3_FOUND) - set(EIGEN_INCLUDE_DIR_HINTS ${CMAKE_CURRENT_SOURCE_DIR}/third_party/eigen) - set(OpenMVG_USE_INTERNAL_EIGEN ON) - find_package(Eigen QUIET) - else() -+ get_target_property(EIGEN3_INCLUDE_DIR Eigen3::Eigen INTERFACE_INCLUDE_DIRECTORIES) - set(EIGEN_INCLUDE_DIRS ${EIGEN3_INCLUDE_DIR}) - endif() - add_definitions(-DEIGEN_MPL2_ONLY) -@@ -324,13 +325,18 @@ else() +@@ -324,13 +324,18 @@ else() if (TARGET flann::flann) set(FLANN_LIBRARIES "flann::flann;flann::flann_cpp") else() @@ -37,7 +22,7 @@ index 6879c4c6..073190b3 100644 # ============================================================================== # CoinUtils # ============================================================================== -@@ -391,6 +397,7 @@ if (OpenMVG_USE_INTERNAL_OSI AND OpenMVG_USE_INTERNAL_CLP AND OpenMVG_USE_INTERN +@@ -391,6 +396,7 @@ if (OpenMVG_USE_INTERNAL_OSI AND OpenMVG_USE_INTERNAL_CLP AND OpenMVG_USE_INTERN set_property(TARGET lib_Osi PROPERTY FOLDER OpenMVG/3rdParty/lib_Osi) set_property(TARGET lib_OsiClpSolver PROPERTY FOLDER OpenMVG/3rdParty/lib_OsiClpSolver) endif() @@ -45,7 +30,7 @@ index 6879c4c6..073190b3 100644 # ============================================================================== # Lemon -@@ -402,7 +409,7 @@ if (NOT DEFINED LEMON_INCLUDE_DIR_HINTS) +@@ -402,7 +408,7 @@ if (NOT DEFINED LEMON_INCLUDE_DIR_HINTS) set(LEMON_INCLUDE_DIR_HINTS ${CMAKE_CURRENT_SOURCE_DIR}/third_party/lemon) set(OpenMVG_USE_INTERNAL_LEMON ON) endif() diff --git a/ports/openmvg/vcpkg.json b/ports/openmvg/vcpkg.json index eb67f016535264..d93c6433e914c2 100644 --- a/ports/openmvg/vcpkg.json +++ b/ports/openmvg/vcpkg.json @@ -1,7 +1,7 @@ { "name": "openmvg", "version": "2.1", - "port-version": 3, + "port-version": 2, "description": "open Multiple View Geometry library. Basis for 3D computer vision and Structure from Motion.", "license": null, "supports": "(x86 | x64 | arm64) & !xbox", diff --git a/ports/orocos-kdl/find-eigen3.patch b/ports/orocos-kdl/find-eigen3.patch deleted file mode 100644 index 1d792cd3328737..00000000000000 --- a/ports/orocos-kdl/find-eigen3.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/orocos_kdl/CMakeLists.txt b/orocos_kdl/CMakeLists.txt -index a15bd15..0bf5bab 100644 ---- a/orocos_kdl/CMakeLists.txt -+++ b/orocos_kdl/CMakeLists.txt -@@ -53,12 +53,11 @@ ENDIF ( NOT CMAKE_BUILD_TYPE ) - - SET( KDL_CFLAGS "") - --find_package(Eigen3 QUIET) --if(NOT EIGEN3_FOUND) -- include(${PROJ_SOURCE_DIR}/cmake/FindEigen3.cmake) --endif() -+find_package(Eigen3 CONFIG REQUIRED) -+get_target_property(EIGEN3_INCLUDE_DIR Eigen3::Eigen INTERFACE_INCLUDE_DIRECTORIES) -+message(STATUS "EIGEN3_INCLUDE_DIR: ${EIGEN3_INCLUDE_DIR}") - include_directories(${EIGEN3_INCLUDE_DIR}) --SET(KDL_CFLAGS "${KDL_CFLAGS} -I${EIGEN3_INCLUDE_DIR}") -+SET(KDL_CFLAGS "${KDL_CFLAGS} -I\"${EIGEN3_INCLUDE_DIR}\"") - - # Check the platform STL containers capabilities - include(cmake/CheckSTLContainers.cmake) diff --git a/ports/orocos-kdl/portfile.cmake b/ports/orocos-kdl/portfile.cmake index 8875c028dcbcc5..e7d041161728f8 100644 --- a/ports/orocos-kdl/portfile.cmake +++ b/ports/orocos-kdl/portfile.cmake @@ -4,9 +4,7 @@ vcpkg_from_github( REF "v${VERSION}" SHA512 9774b76b755ea81168390643813789783f60d0b1cdb46cd250e3e0d27f75a6cf2fd3bfd2081c04e30a14ff4fc70d0080c9b43b82ee181c2dda82f23f052b338d HEAD_REF master - PATCHES - export-include-dir.patch - find-eigen3.patch + PATCHES export-include-dir.patch ) vcpkg_cmake_configure( diff --git a/ports/orocos-kdl/vcpkg.json b/ports/orocos-kdl/vcpkg.json index 8ea399d42b75bd..475a66f1c62c8c 100644 --- a/ports/orocos-kdl/vcpkg.json +++ b/ports/orocos-kdl/vcpkg.json @@ -1,7 +1,6 @@ { "name": "orocos-kdl", "version": "1.5.1", - "port-version": 1, "description": "Kinematics and Dynamics Library.", "homepage": "https://github.com/orocos/orocos_kinematics_dynamics", "dependencies": [ diff --git a/ports/rbdl/find-eigen3.patch b/ports/rbdl/find-eigen3.patch deleted file mode 100644 index 328ddf7a420c91..00000000000000 --- a/ports/rbdl/find-eigen3.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index d25936d..d778095 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -71,12 +71,13 @@ OPTION (RBDL_VCPKG_BUILD "Building RBDL in vcpkg environment" OFF) - - - # Find and use the system's Eigen3 library --FIND_PACKAGE (Eigen3 3.0.0) -+FIND_PACKAGE (Eigen3 CONFIG REQUIRED) - - IF (NOT EIGEN3_FOUND) - MESSAGE (WARNING "Could not find Eigen3 on your system. Please install it!") - ENDIF (NOT EIGEN3_FOUND) - -+get_target_property(EIGEN3_INCLUDE_DIR Eigen3::Eigen INTERFACE_INCLUDE_DIRECTORIES) - INCLUDE_DIRECTORIES (${EIGEN3_INCLUDE_DIR}) - - # Addons diff --git a/ports/rbdl/portfile.cmake b/ports/rbdl/portfile.cmake index 330a4f3e0557d8..425c88d970cd8f 100644 --- a/ports/rbdl/portfile.cmake +++ b/ports/rbdl/portfile.cmake @@ -6,8 +6,6 @@ vcpkg_from_github( REF 619175a441ba769ab1be34a727644f4dd13bf841 SHA512 0c6cd78c4385e582f481a6f92d5c3a01f5d3bcd3a7cc3417a504209dae1856d788157db8d9f4173493619f103dea323bd57ddae0bc63162d72b03031dae9a822 HEAD_REF master - PATCHES - find-eigen3.patch ) vcpkg_from_github( diff --git a/ports/rbdl/vcpkg.json b/ports/rbdl/vcpkg.json index 7ea3ba1813a0c4..f06685bc95b747 100644 --- a/ports/rbdl/vcpkg.json +++ b/ports/rbdl/vcpkg.json @@ -1,7 +1,7 @@ { "name": "rbdl", "version": "3.3.0", - "port-version": 8, + "port-version": 7, "description": "Rigid Body Dynamics Library", "homepage": "https://github.com/rbdl/rbdl", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index b3c48aeb2e9f9f..497432ecb0be59 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7066,7 +7066,7 @@ }, "openmvg": { "baseline": "2.1", - "port-version": 3 + "port-version": 2 }, "openmvs": { "baseline": "2.1.0", @@ -7158,7 +7158,7 @@ }, "orocos-kdl": { "baseline": "1.5.1", - "port-version": 1 + "port-version": 0 }, "oscpack": { "baseline": "1.1.0", @@ -8246,7 +8246,7 @@ }, "rbdl": { "baseline": "3.3.0", - "port-version": 8 + "port-version": 7 }, "rbdl-orb": { "baseline": "3.2.0", diff --git a/versions/c-/chronoengine.json b/versions/c-/chronoengine.json index da365b2851761c..24f4355bb1d3e7 100644 --- a/versions/c-/chronoengine.json +++ b/versions/c-/chronoengine.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "55389d248b9067f308bcbf81a08d94af3a098976", + "git-tree": "00ab22d697442be5c734a33687eef6f8c4190da0", "version": "8.0.0", "port-version": 2 }, diff --git a/versions/e-/eigen3.json b/versions/e-/eigen3.json index 54d482e980f76f..318fbe2fcfaf6b 100644 --- a/versions/e-/eigen3.json +++ b/versions/e-/eigen3.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "1be910e3793725f7c9ba9abb6a223517d7cc18df", + "git-tree": "26714a06083e3cc6502aa83172082e4aa53ac371", "version": "3.4.1", "port-version": 0 }, diff --git a/versions/o-/openmvg.json b/versions/o-/openmvg.json index 69056e32cba71e..6d607ea27217fc 100644 --- a/versions/o-/openmvg.json +++ b/versions/o-/openmvg.json @@ -1,10 +1,5 @@ { "versions": [ - { - "git-tree": "34d65dec331136b85ba9e7ef673c3dedf578424b", - "version": "2.1", - "port-version": 3 - }, { "git-tree": "26f65270e3a45107e6e23f45dc8837143d77fb90", "version": "2.1", diff --git a/versions/o-/orocos-kdl.json b/versions/o-/orocos-kdl.json index 73f59adcc56d51..2ba686831c6ae6 100644 --- a/versions/o-/orocos-kdl.json +++ b/versions/o-/orocos-kdl.json @@ -1,10 +1,5 @@ { "versions": [ - { - "git-tree": "629b176569b0b614ee774fde6d280c37f6259b53", - "version": "1.5.1", - "port-version": 1 - }, { "git-tree": "e9fdf57afeb547c9e5fdad47dff693fe8f96f4b5", "version": "1.5.1", diff --git a/versions/r-/rbdl.json b/versions/r-/rbdl.json index 5a393636632e64..3394686a2f9c74 100644 --- a/versions/r-/rbdl.json +++ b/versions/r-/rbdl.json @@ -1,10 +1,5 @@ { "versions": [ - { - "git-tree": "0a31a3ca95c06c5787ad63cb7f134438ce9acacc", - "version": "3.3.0", - "port-version": 8 - }, { "git-tree": "1dc8279017fb2aa827bcaf37fcf9e6af6b8bb751", "version": "3.3.0", From c68577f1d084d4421e4396353953303137bbb796 Mon Sep 17 00:00:00 2001 From: Alexander Vieth Date: Thu, 14 Aug 2025 09:22:43 +0200 Subject: [PATCH 23/32] Also keep installing UseEigen3 --- ports/eigen3/restore-include-dir.patch | 17 ++++++++++++++--- versions/e-/eigen3.json | 2 +- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/ports/eigen3/restore-include-dir.patch b/ports/eigen3/restore-include-dir.patch index f64f205acc95a1..98adc58736f777 100644 --- a/ports/eigen3/restore-include-dir.patch +++ b/ports/eigen3/restore-include-dir.patch @@ -1,17 +1,18 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index ebfe8ec8f..29dac4742 100644 +index ebfe8ec8f..b797d984f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -175,6 +175,8 @@ set ( EIGEN_VERSION_STRING ${EIGEN_VERSION_NUMBER} ) +@@ -175,6 +175,9 @@ set ( EIGEN_VERSION_STRING ${EIGEN_VERSION_NUMBER} ) set ( EIGEN_VERSION_MAJOR ${EIGEN_WORLD_VERSION} ) set ( EIGEN_VERSION_MINOR ${EIGEN_MAJOR_VERSION} ) set ( EIGEN_VERSION_PATCH ${EIGEN_MINOR_VERSION} ) ++set ( EIGEN_DEFINITIONS "") +set ( EIGEN_INCLUDE_DIR "${CMAKE_INSTALL_PREFIX}/${INCLUDE_INSTALL_DIR}" ) +set ( EIGEN_ROOT_DIR ${CMAKE_INSTALL_PREFIX} ) # Alias Eigen_*_DIR to Eigen3_*_DIR: set(Eigen_SOURCE_DIR ${Eigen3_SOURCE_DIR}) -@@ -215,6 +217,7 @@ if(EIGEN_BUILD_CMAKE_PACKAGE) +@@ -215,6 +218,7 @@ if(EIGEN_BUILD_CMAKE_PACKAGE) configure_package_config_file ( ${CMAKE_CURRENT_SOURCE_DIR}/cmake/Eigen3Config.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/Eigen3Config.cmake @@ -19,3 +20,13 @@ index ebfe8ec8f..29dac4742 100644 INSTALL_DESTINATION ${CMAKEPACKAGE_INSTALL_DIR} NO_SET_AND_CHECK_MACRO # Eigen does not provide legacy style defines NO_CHECK_REQUIRED_COMPONENTS_MACRO # Eigen does not provide components +@@ -249,7 +253,8 @@ if(EIGEN_BUILD_CMAKE_PACKAGE) + + install (EXPORT Eigen3Targets NAMESPACE Eigen3:: DESTINATION ${CMAKEPACKAGE_INSTALL_DIR}) + +- install (FILES ${CMAKE_CURRENT_BINARY_DIR}/Eigen3Config.cmake ++ install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/cmake/UseEigen3.cmake ++ ${CMAKE_CURRENT_BINARY_DIR}/Eigen3Config.cmake + ${CMAKE_CURRENT_BINARY_DIR}/Eigen3ConfigVersion.cmake + DESTINATION ${CMAKEPACKAGE_INSTALL_DIR}) + diff --git a/versions/e-/eigen3.json b/versions/e-/eigen3.json index 318fbe2fcfaf6b..0c6e7385eaf8f9 100644 --- a/versions/e-/eigen3.json +++ b/versions/e-/eigen3.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "26714a06083e3cc6502aa83172082e4aa53ac371", + "git-tree": "3d2120f350833443e60e19dc74928cbf922d52a5", "version": "3.4.1", "port-version": 0 }, From 7b318ab0c02eb470a161ec28655e9a828f8c0f08 Mon Sep 17 00:00:00 2001 From: Alexander Vieth Date: Thu, 14 Aug 2025 09:25:44 +0200 Subject: [PATCH 24/32] Remove chronoengine[irrlicht]:arm64-osx = cascade from baseline --- scripts/ci.feature.baseline.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/ci.feature.baseline.txt b/scripts/ci.feature.baseline.txt index 5b86a1b2684ce3..7878d0d1c12466 100644 --- a/scripts/ci.feature.baseline.txt +++ b/scripts/ci.feature.baseline.txt @@ -719,7 +719,6 @@ cgal[qt]:arm64-windows = cascade cgal[qt]:x64-windows = cascade cgal[qt]:x86-windows = cascade cgns[hdf5,mpi](uwp) = cascade -chronoengine[irrlicht]:arm64-osx = cascade clblas:x64-uwp = cascade clblast:arm64-uwp = cascade clblast:x64-uwp = cascade From 8265d3dbb50ba3b072b6cd28107a6a23c4b0c8f2 Mon Sep 17 00:00:00 2001 From: Alexander Vieth Date: Fri, 15 Aug 2025 10:05:45 +0200 Subject: [PATCH 25/32] [eigen] patch: fix compilation with clang and cxx03 on arm --- ports/eigen3/fix-arm-neon-cxx03.patch | 23 +++++++++++++++++++++++ ports/eigen3/portfile.cmake | 1 + versions/e-/eigen3.json | 2 +- 3 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 ports/eigen3/fix-arm-neon-cxx03.patch diff --git a/ports/eigen3/fix-arm-neon-cxx03.patch b/ports/eigen3/fix-arm-neon-cxx03.patch new file mode 100644 index 00000000000000..bde9667775d5c7 --- /dev/null +++ b/ports/eigen3/fix-arm-neon-cxx03.patch @@ -0,0 +1,23 @@ +diff --git a/Eigen/src/Core/arch/NEON/PacketMath.h b/Eigen/src/Core/arch/NEON/PacketMath.h +index f0fa74946..7c955d473 100644 +--- a/Eigen/src/Core/arch/NEON/PacketMath.h ++++ b/Eigen/src/Core/arch/NEON/PacketMath.h +@@ -88,8 +88,16 @@ typedef uint32x4_t Packet4ui; + typedef int64x2_t Packet2l; + typedef uint64x2_t Packet2ul; + +-EIGEN_ALWAYS_INLINE Packet4f make_packet4f(float a, float b, float c, float d) { return Packet4f{a, b, c, d}; } +-EIGEN_ALWAYS_INLINE Packet2f make_packet2f(float a, float b) { return Packet2f{a, b}; } ++EIGEN_ALWAYS_INLINE Packet4f make_packet4f(float a, float b, float c, float d) { ++ const Packet2f low = {a, b}; ++ const Packet2f high = {c, d}; ++ return vcombine_f32(low, high); ++} ++ ++EIGEN_ALWAYS_INLINE Packet2f make_packet2f(float a, float b) { ++ const Packet2f result = {a, b}; ++ return result; ++} + + #endif // EIGEN_COMP_MSVC_STRICT + diff --git a/ports/eigen3/portfile.cmake b/ports/eigen3/portfile.cmake index 4ce25b02b8eff3..57df8494ced97c 100644 --- a/ports/eigen3/portfile.cmake +++ b/ports/eigen3/portfile.cmake @@ -9,6 +9,7 @@ vcpkg_from_gitlab( HEAD_REF master PATCHES restore-include-dir.patch # Restore EIGEN3_INCLUDE_DIR variable to match the 3.4.0 behavior + fix-arm-neon-cxx03.patch # Fix compilation with c++03 and clang on arm ) vcpkg_cmake_configure( diff --git a/versions/e-/eigen3.json b/versions/e-/eigen3.json index 0c6e7385eaf8f9..2102f8e0eb4f93 100644 --- a/versions/e-/eigen3.json +++ b/versions/e-/eigen3.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "3d2120f350833443e60e19dc74928cbf922d52a5", + "git-tree": "117c444f2f8fa263b14381d55dbaad9d1001a037", "version": "3.4.1", "port-version": 0 }, From a3ac53f9ff3bd2fd96e604222cd8bba1f7ad239a Mon Sep 17 00:00:00 2001 From: Alexander Vieth Date: Sun, 17 Aug 2025 21:35:57 +0200 Subject: [PATCH 26/32] Revert changes to chronoengine --- .../chronoengine/find_package_required.patch | 22 +++++++++++++++++++ ports/chronoengine/portfile.cmake | 5 +---- ports/chronoengine/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/c-/chronoengine.json | 5 ----- 5 files changed, 25 insertions(+), 11 deletions(-) diff --git a/ports/chronoengine/find_package_required.patch b/ports/chronoengine/find_package_required.patch index c6aa97f0f7902e..60423ac66a9701 100644 --- a/ports/chronoengine/find_package_required.patch +++ b/ports/chronoengine/find_package_required.patch @@ -11,6 +11,28 @@ index 6a8f0f9e1..c44f92eb4 100644 else() find_package(Threads REQUIRED) endif() +diff --git a/cmake/FindEigen3.cmake b/cmake/FindEigen3.cmake +index 0d2b3cedd..02c2b50d2 100644 +--- a/cmake/FindEigen3.cmake ++++ b/cmake/FindEigen3.cmake +@@ -1,7 +1,7 @@ + # - Try to find Eigen3 lib + # + # This module supports requiring a minimum version, e.g. you can do +-# find_package(Eigen3 3.1.2) ++# find_package(Eigen3 3.1.2 REQUIRED) + # to require version 3.1.2 or newer of Eigen3. + # + # Once done this will define +@@ -70,7 +70,7 @@ else (EIGEN3_INCLUDE_DIR) + # search first if an Eigen3Config.cmake is available in the system, + # if successful this would set EIGEN3_INCLUDE_DIR and the rest of + # the script will work as usual +- find_package(Eigen3 ${Eigen3_FIND_VERSION} NO_MODULE QUIET) ++ find_package(Eigen3 ${Eigen3_FIND_VERSION} NO_MODULE REQUIRED) + + if(NOT EIGEN3_INCLUDE_DIR) + find_path(EIGEN3_INCLUDE_DIR NAMES signature_of_eigen3_matrix_library diff --git a/cmake/FindMKL.cmake b/cmake/FindMKL.cmake index 6f8a2740f..acf43af4d 100644 --- a/cmake/FindMKL.cmake diff --git a/ports/chronoengine/portfile.cmake b/ports/chronoengine/portfile.cmake index 5081fc25ac5d32..51936eac454c7a 100644 --- a/ports/chronoengine/portfile.cmake +++ b/ports/chronoengine/portfile.cmake @@ -8,10 +8,7 @@ vcpkg_from_github( find_package_required.patch ) -file(REMOVE - "${SOURCE_PATH}/cmake/FindTBB.cmake" - "${SOURCE_PATH}/cmake/FindEigen3.cmake" -) +file(REMOVE "${SOURCE_PATH}/cmake/FindTBB.cmake") vcpkg_check_features( OUT_FEATURE_OPTIONS diff --git a/ports/chronoengine/vcpkg.json b/ports/chronoengine/vcpkg.json index 02290db91933a7..42614aea7212eb 100644 --- a/ports/chronoengine/vcpkg.json +++ b/ports/chronoengine/vcpkg.json @@ -1,7 +1,7 @@ { "name": "chronoengine", "version": "8.0.0", - "port-version": 2, + "port-version": 1, "description": "Multi-physics Simulation Engine.", "homepage": "https://projectchrono.org/", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index 497432ecb0be59..8d36758a38f1c7 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1706,7 +1706,7 @@ }, "chronoengine": { "baseline": "8.0.0", - "port-version": 2 + "port-version": 1 }, "cialloo-rcon": { "baseline": "1.0.0", diff --git a/versions/c-/chronoengine.json b/versions/c-/chronoengine.json index 24f4355bb1d3e7..40ab007e8efd1c 100644 --- a/versions/c-/chronoengine.json +++ b/versions/c-/chronoengine.json @@ -1,10 +1,5 @@ { "versions": [ - { - "git-tree": "00ab22d697442be5c734a33687eef6f8c4190da0", - "version": "8.0.0", - "port-version": 2 - }, { "git-tree": "7db5f822e4f4debf9b0b9400a3050fff89dca5c7", "version": "8.0.0", From 4bdff69144e21fa3d236e7aa9a48515502da9eec Mon Sep 17 00:00:00 2001 From: Alexander Vieth Date: Sun, 17 Aug 2025 21:56:34 +0200 Subject: [PATCH 27/32] Revert changes to g2o --- ports/g2o/portfile.cmake | 1 - ports/g2o/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/g-/g2o.json | 5 ----- 4 files changed, 2 insertions(+), 8 deletions(-) diff --git a/ports/g2o/portfile.cmake b/ports/g2o/portfile.cmake index 9bb47204bd0005..0aefcfb9297f02 100644 --- a/ports/g2o/portfile.cmake +++ b/ports/g2o/portfile.cmake @@ -27,7 +27,6 @@ vcpkg_from_github( file(REMOVE "${SOURCE_PATH}/cmake_modules/FindBLAS.cmake" "${SOURCE_PATH}/cmake_modules/FindCSparse.cmake" - "${SOURCE_PATH}/cmake_modules/FindEigen3.cmake" ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_LGPL_SHARED_LIBS) diff --git a/ports/g2o/vcpkg.json b/ports/g2o/vcpkg.json index 7f1f8c8a44228d..e0831cbfc903a6 100644 --- a/ports/g2o/vcpkg.json +++ b/ports/g2o/vcpkg.json @@ -1,7 +1,7 @@ { "name": "g2o", "version-date": "2024-12-14", - "port-version": 6, + "port-version": 5, "description": "g2o: A General Framework for Graph Optimization", "homepage": "https://openslam.org/g2o.html", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index 8d36758a38f1c7..669f2198ec959d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3118,7 +3118,7 @@ }, "g2o": { "baseline": "2024-12-14", - "port-version": 6 + "port-version": 5 }, "g3log": { "baseline": "2.6", diff --git a/versions/g-/g2o.json b/versions/g-/g2o.json index 8b654cceeff46f..a66df341cffc2d 100644 --- a/versions/g-/g2o.json +++ b/versions/g-/g2o.json @@ -1,10 +1,5 @@ { "versions": [ - { - "git-tree": "a66b6e04a733c5678691839e17fc62eeb59aa4cb", - "version-date": "2024-12-14", - "port-version": 6 - }, { "git-tree": "bba68d23af872af24aeeaf3a14cb3e0265f4d151", "version-date": "2024-12-14", From 8f1ce3dec46c83c2c8700202324a56deb62c347e Mon Sep 17 00:00:00 2001 From: Alexander Vieth Date: Sun, 17 Aug 2025 22:05:32 +0200 Subject: [PATCH 28/32] [eigen3] fix-arm-neon-cxx03.patch is merged upstream --- ports/eigen3/fix-arm-neon-cxx03.patch | 23 ----------------------- ports/eigen3/portfile.cmake | 5 ++--- versions/e-/eigen3.json | 2 +- 3 files changed, 3 insertions(+), 27 deletions(-) delete mode 100644 ports/eigen3/fix-arm-neon-cxx03.patch diff --git a/ports/eigen3/fix-arm-neon-cxx03.patch b/ports/eigen3/fix-arm-neon-cxx03.patch deleted file mode 100644 index bde9667775d5c7..00000000000000 --- a/ports/eigen3/fix-arm-neon-cxx03.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/Eigen/src/Core/arch/NEON/PacketMath.h b/Eigen/src/Core/arch/NEON/PacketMath.h -index f0fa74946..7c955d473 100644 ---- a/Eigen/src/Core/arch/NEON/PacketMath.h -+++ b/Eigen/src/Core/arch/NEON/PacketMath.h -@@ -88,8 +88,16 @@ typedef uint32x4_t Packet4ui; - typedef int64x2_t Packet2l; - typedef uint64x2_t Packet2ul; - --EIGEN_ALWAYS_INLINE Packet4f make_packet4f(float a, float b, float c, float d) { return Packet4f{a, b, c, d}; } --EIGEN_ALWAYS_INLINE Packet2f make_packet2f(float a, float b) { return Packet2f{a, b}; } -+EIGEN_ALWAYS_INLINE Packet4f make_packet4f(float a, float b, float c, float d) { -+ const Packet2f low = {a, b}; -+ const Packet2f high = {c, d}; -+ return vcombine_f32(low, high); -+} -+ -+EIGEN_ALWAYS_INLINE Packet2f make_packet2f(float a, float b) { -+ const Packet2f result = {a, b}; -+ return result; -+} - - #endif // EIGEN_COMP_MSVC_STRICT - diff --git a/ports/eigen3/portfile.cmake b/ports/eigen3/portfile.cmake index 57df8494ced97c..ccd28987ad8c0b 100644 --- a/ports/eigen3/portfile.cmake +++ b/ports/eigen3/portfile.cmake @@ -4,12 +4,11 @@ vcpkg_from_gitlab( GITLAB_URL https://gitlab.com OUT_SOURCE_PATH SOURCE_PATH REPO libeigen/eigen - REF 4a2c4901ce1627c9511d2f23d3a33d903c42069f # 3.4.1, from 3.4 branch on Jul 07, 2025 - SHA512 3711944483d5dedd685f9b280322803ce5f873156ee0e9aa8e6c8686fbc7e4afb780d2ca39a694db8be651f3e776f2e5a09e69b315520ed2eddd5b638813d0c6 + REF eb57d4bdf1052f27bc575a8850dbc63eec6e9870 # from 3.4 branch on Aug 17, 2025 (3.4.1-250817) + SHA512 6c7d7b12492d24d3c25e39a04322d9182b1f6f78ed617a1bc4086cca14b1673cf5b9f8e67dd4bb7db5e0544cf24928e2afbe27af094761a65cc61bc6fd20fdab HEAD_REF master PATCHES restore-include-dir.patch # Restore EIGEN3_INCLUDE_DIR variable to match the 3.4.0 behavior - fix-arm-neon-cxx03.patch # Fix compilation with c++03 and clang on arm ) vcpkg_cmake_configure( diff --git a/versions/e-/eigen3.json b/versions/e-/eigen3.json index 2102f8e0eb4f93..386fec1f56a814 100644 --- a/versions/e-/eigen3.json +++ b/versions/e-/eigen3.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "117c444f2f8fa263b14381d55dbaad9d1001a037", + "git-tree": "89736f28f3b4c9035afb65e2e5e68a5bd105e416", "version": "3.4.1", "port-version": 0 }, From 7079e9edad2613f62fdfd3e83f6f70b415718ad0 Mon Sep 17 00:00:00 2001 From: Alexander Vieth Date: Mon, 18 Aug 2025 10:17:03 +0200 Subject: [PATCH 29/32] [eigen3] fix baseline version --- versions/e-/eigen3.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/e-/eigen3.json b/versions/e-/eigen3.json index 386fec1f56a814..64b6010e503029 100644 --- a/versions/e-/eigen3.json +++ b/versions/e-/eigen3.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "89736f28f3b4c9035afb65e2e5e68a5bd105e416", + "git-tree": "10b62600945ea2be85c23a87c8e3cf22aa136dbc", "version": "3.4.1", "port-version": 0 }, From 3d33a33c7e5837ef4df0685739fb54a571507598 Mon Sep 17 00:00:00 2001 From: Alexander Vieth Date: Tue, 19 Aug 2025 08:39:11 +0200 Subject: [PATCH 30/32] [eigen3] restore-include-dir.patch is merged upstream --- ports/eigen3/portfile.cmake | 6 ++--- ports/eigen3/restore-include-dir.patch | 32 -------------------------- 2 files changed, 2 insertions(+), 36 deletions(-) delete mode 100644 ports/eigen3/restore-include-dir.patch diff --git a/ports/eigen3/portfile.cmake b/ports/eigen3/portfile.cmake index ccd28987ad8c0b..aee8fb658f9f0d 100644 --- a/ports/eigen3/portfile.cmake +++ b/ports/eigen3/portfile.cmake @@ -4,11 +4,9 @@ vcpkg_from_gitlab( GITLAB_URL https://gitlab.com OUT_SOURCE_PATH SOURCE_PATH REPO libeigen/eigen - REF eb57d4bdf1052f27bc575a8850dbc63eec6e9870 # from 3.4 branch on Aug 17, 2025 (3.4.1-250817) - SHA512 6c7d7b12492d24d3c25e39a04322d9182b1f6f78ed617a1bc4086cca14b1673cf5b9f8e67dd4bb7db5e0544cf24928e2afbe27af094761a65cc61bc6fd20fdab + REF cd7263e7f626e75c9210b74d2d6043a8c0519f1c # from 3.4 branch on Aug 18, 2025 (3.4.1-250818) + SHA512 dd3992bdc79bd9a04c71d2e6c767cfaf3f20a27b4a72abf0e9157b9712b83101bc4ffe188f4f48d045a33617ad2c7a882d1ea1579b4ce997e5f377be38b8906e HEAD_REF master - PATCHES - restore-include-dir.patch # Restore EIGEN3_INCLUDE_DIR variable to match the 3.4.0 behavior ) vcpkg_cmake_configure( diff --git a/ports/eigen3/restore-include-dir.patch b/ports/eigen3/restore-include-dir.patch deleted file mode 100644 index 98adc58736f777..00000000000000 --- a/ports/eigen3/restore-include-dir.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index ebfe8ec8f..b797d984f 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -175,6 +175,9 @@ set ( EIGEN_VERSION_STRING ${EIGEN_VERSION_NUMBER} ) - set ( EIGEN_VERSION_MAJOR ${EIGEN_WORLD_VERSION} ) - set ( EIGEN_VERSION_MINOR ${EIGEN_MAJOR_VERSION} ) - set ( EIGEN_VERSION_PATCH ${EIGEN_MINOR_VERSION} ) -+set ( EIGEN_DEFINITIONS "") -+set ( EIGEN_INCLUDE_DIR "${CMAKE_INSTALL_PREFIX}/${INCLUDE_INSTALL_DIR}" ) -+set ( EIGEN_ROOT_DIR ${CMAKE_INSTALL_PREFIX} ) - - # Alias Eigen_*_DIR to Eigen3_*_DIR: - set(Eigen_SOURCE_DIR ${Eigen3_SOURCE_DIR}) -@@ -215,6 +218,7 @@ if(EIGEN_BUILD_CMAKE_PACKAGE) - configure_package_config_file ( - ${CMAKE_CURRENT_SOURCE_DIR}/cmake/Eigen3Config.cmake.in - ${CMAKE_CURRENT_BINARY_DIR}/Eigen3Config.cmake -+ PATH_VARS EIGEN_INCLUDE_DIR EIGEN_ROOT_DIR - INSTALL_DESTINATION ${CMAKEPACKAGE_INSTALL_DIR} - NO_SET_AND_CHECK_MACRO # Eigen does not provide legacy style defines - NO_CHECK_REQUIRED_COMPONENTS_MACRO # Eigen does not provide components -@@ -249,7 +253,8 @@ if(EIGEN_BUILD_CMAKE_PACKAGE) - - install (EXPORT Eigen3Targets NAMESPACE Eigen3:: DESTINATION ${CMAKEPACKAGE_INSTALL_DIR}) - -- install (FILES ${CMAKE_CURRENT_BINARY_DIR}/Eigen3Config.cmake -+ install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/cmake/UseEigen3.cmake -+ ${CMAKE_CURRENT_BINARY_DIR}/Eigen3Config.cmake - ${CMAKE_CURRENT_BINARY_DIR}/Eigen3ConfigVersion.cmake - DESTINATION ${CMAKEPACKAGE_INSTALL_DIR}) - From 99da60df7bc75daf39d650cb29f3fd76bbd29355 Mon Sep 17 00:00:00 2001 From: Alexander Vieth Date: Tue, 19 Aug 2025 08:41:47 +0200 Subject: [PATCH 31/32] [eigen3] add date to version --- ports/eigen3/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/e-/eigen3.json | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ports/eigen3/vcpkg.json b/ports/eigen3/vcpkg.json index 2ea164a4982dd3..8d1326de45976d 100644 --- a/ports/eigen3/vcpkg.json +++ b/ports/eigen3/vcpkg.json @@ -1,6 +1,6 @@ { "name": "eigen3", - "version": "3.4.1", + "version": "3.4.1-250818", "description": "C++ template library for linear algebra: matrices, vectors, numerical solvers, and related algorithms.", "homepage": "http://eigen.tuxfamily.org", "license": "MPL-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 669f2198ec959d..6c653e9e7921cc 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2653,7 +2653,7 @@ "port-version": 0 }, "eigen3": { - "baseline": "3.4.1", + "baseline": "3.4.1-250818", "port-version": 0 }, "eipscanner": { diff --git a/versions/e-/eigen3.json b/versions/e-/eigen3.json index 64b6010e503029..1762f1548045a3 100644 --- a/versions/e-/eigen3.json +++ b/versions/e-/eigen3.json @@ -1,8 +1,8 @@ { "versions": [ { - "git-tree": "10b62600945ea2be85c23a87c8e3cf22aa136dbc", - "version": "3.4.1", + "git-tree": "5fc06f2456fe7e3cd31b52e4a7050146b2c365d3", + "version": "3.4.1-250818", "port-version": 0 }, { From 01e805bfd99a828fedc9f1a7cb41c4f03dbf8bc5 Mon Sep 17 00:00:00 2001 From: Alexander Vieth Date: Wed, 20 Aug 2025 09:05:21 +0200 Subject: [PATCH 32/32] [eigen3] better turn EIGEN_BUILD_SPBENCH OFF --- ports/eigen3/portfile.cmake | 2 +- versions/e-/eigen3.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/eigen3/portfile.cmake b/ports/eigen3/portfile.cmake index aee8fb658f9f0d..5b47495fa21a25 100644 --- a/ports/eigen3/portfile.cmake +++ b/ports/eigen3/portfile.cmake @@ -20,7 +20,7 @@ vcpkg_cmake_configure( -DEIGEN_BUILD_DOC=OFF -DEIGEN_BUILD_LAPACK=OFF -DEIGEN_BUILD_PKGCONFIG=ON - -DEIGEN_BUILD_SPBENCH=ON + -DEIGEN_BUILD_SPBENCH=OFF OPTIONS_RELEASE "-DCMAKEPACKAGE_INSTALL_DIR=${CURRENT_PACKAGES_DIR}/share/${PORT}" "-DPKGCONFIG_INSTALL_DIR=${CURRENT_PACKAGES_DIR}/lib/pkgconfig" diff --git a/versions/e-/eigen3.json b/versions/e-/eigen3.json index 1762f1548045a3..1c437bc3bbaff8 100644 --- a/versions/e-/eigen3.json +++ b/versions/e-/eigen3.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "5fc06f2456fe7e3cd31b52e4a7050146b2c365d3", + "git-tree": "66092cc1695138f81da71b0a9055c216dcaef019", "version": "3.4.1-250818", "port-version": 0 },