From 4e7255693961e36ee5a82f8dc0418ef2c22240a7 Mon Sep 17 00:00:00 2001 From: Sergey Fedorov Date: Sun, 5 Feb 2023 02:15:29 +0700 Subject: [PATCH 1/3] Sophus: update to 22.10 Signed-off-by: Sergey Fedorov --- math/Sophus/Portfile | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/math/Sophus/Portfile b/math/Sophus/Portfile index 4cedef4cec452..5b7e6b6fa5416 100644 --- a/math/Sophus/Portfile +++ b/math/Sophus/Portfile @@ -4,7 +4,7 @@ PortSystem 1.0 PortGroup github 1.0 PortGroup cmake 1.1 -github.setup strasdat Sophus 1.0.0 v +github.setup strasdat Sophus 22.10 v categories math platforms any license MIT @@ -18,10 +18,19 @@ long_description This is a c++ implementation of Lie groups commonly used for to present rotations in 2d and 3d as well as the special Euclidean group SE(2) \ and SE(3) to represent rigid body transformations (i.e. rotations and translations) in 2d and 3d. -depends_lib-append port:eigen3 +set port_libfmt libfmt9 +cmake.module_path-append \ + ${prefix}/lib/${port_libfmt}/cmake + +depends_lib-append path:include/eigen3:eigen3 \ + port:${port_libfmt} -checksums rmd160 6e1bda06cd4aac020843d05b97dd3d0db9032ced \ - sha256 edab6a5c60ded38b4304103cd9d384d2d7591b9949bde3b95859f7bb1b5355a5 +checksums rmd160 66b15cea7f3cc4b16214b684a00b5a1ac289c9e8 \ + sha256 28d7c81af2ae4c4717497b1de1f7a635662a528dfb83eab625b872b1a27bcd68 \ + size 104183 + +compiler.cxx_standard 2014 configure.args-append \ - -DBUILD_TESTS=OFF + -DBUILD_SOPHUS_EXAMPLES=OFF \ + -DBUILD_SOPHUS_TESTS=OFF From d2e77cba3f7bcf3e486620cc32d8b8bb3331adbb Mon Sep 17 00:00:00 2001 From: Sergey Fedorov Date: Sun, 5 Feb 2023 02:17:04 +0700 Subject: [PATCH 2/3] Sophus: add tests variant Signed-off-by: Sergey Fedorov --- math/Sophus/Portfile | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/math/Sophus/Portfile b/math/Sophus/Portfile index 5b7e6b6fa5416..c9397f9f1da3d 100644 --- a/math/Sophus/Portfile +++ b/math/Sophus/Portfile @@ -34,3 +34,10 @@ compiler.cxx_standard 2014 configure.args-append \ -DBUILD_SOPHUS_EXAMPLES=OFF \ -DBUILD_SOPHUS_TESTS=OFF + +variant tests description "Build and run tests" { + # Notice that there are a few failures on PPC: https://github.com/strasdat/Sophus/issues/448 + configure.args-replace \ + -DBUILD_SOPHUS_TESTS=OFF -DBUILD_SOPHUS_TESTS=ON + test.run yes +} From 9ffe2c2ba900fc9854bde29809d69caa5b33ef70 Mon Sep 17 00:00:00 2001 From: Sergey Fedorov Date: Tue, 7 Feb 2023 21:27:40 +0700 Subject: [PATCH 3/3] Sophus: change versioning scheme following upstream. See: https://github.com/strasdat/Sophus/commit/d9610ad5536bd601d42df0d33a3abdff9456679c --- math/Sophus/Portfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/math/Sophus/Portfile b/math/Sophus/Portfile index c9397f9f1da3d..0282b636c8b74 100644 --- a/math/Sophus/Portfile +++ b/math/Sophus/Portfile @@ -4,7 +4,7 @@ PortSystem 1.0 PortGroup github 1.0 PortGroup cmake 1.1 -github.setup strasdat Sophus 22.10 v +github.setup strasdat Sophus 1.22.10 categories math platforms any license MIT @@ -25,9 +25,9 @@ cmake.module_path-append \ depends_lib-append path:include/eigen3:eigen3 \ port:${port_libfmt} -checksums rmd160 66b15cea7f3cc4b16214b684a00b5a1ac289c9e8 \ - sha256 28d7c81af2ae4c4717497b1de1f7a635662a528dfb83eab625b872b1a27bcd68 \ - size 104183 +checksums rmd160 25ed84a989a16df4abf424dfdf7e4e0e32f28deb \ + sha256 ca5d3f8955f7da6ec3c24b641d5a1a20f6f4cd9f031023e0eeaa4bb6bd9edf11 \ + size 104186 compiler.cxx_standard 2014