git: 39950bb19025 - main - misc/dartsim: update 6.13.0 → 6.13.2

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Yuri Victorovich <yuri_at_FreeBSD.org>
Date: Thu, 04 Apr 2024 20:15:56 UTC
The branch main has been updated by yuri:

URL: https://cgit.FreeBSD.org/ports/commit/?id=39950bb19025ae54d0e21a7a2bef5004b223de58

commit 39950bb19025ae54d0e21a7a2bef5004b223de58
Author:     Yuri Victorovich <yuri@FreeBSD.org>
AuthorDate: 2024-04-04 20:15:45 +0000
Commit:     Yuri Victorovich <yuri@FreeBSD.org>
CommitDate: 2024-04-04 20:15:54 +0000

    misc/dartsim: update 6.13.0 → 6.13.2
    
    Reported by:    portscout
---
 misc/dartsim/Makefile                              | 15 ++++++++---
 misc/dartsim/distinfo                              |  6 ++---
 ...tch-unittests_gtest_cmake_internal__utils.cmake | 11 ++++++++
 misc/dartsim/pkg-plist                             | 29 +++++++++++-----------
 4 files changed, 40 insertions(+), 21 deletions(-)

diff --git a/misc/dartsim/Makefile b/misc/dartsim/Makefile
index 0a51e00baabc..acf44d358240 100644
--- a/misc/dartsim/Makefile
+++ b/misc/dartsim/Makefile
@@ -1,7 +1,6 @@
 PORTNAME=	dartsim
 DISTVERSIONPREFIX=	v
-DISTVERSION=	6.13.0
-PORTREVISION=	6
+DISTVERSION=	6.13.2
 CATEGORIES=	misc
 
 MAINTAINER=	yuri@FreeBSD.org
@@ -33,7 +32,7 @@ LIB_DEPENDS=	libassimp.so:multimedia/assimp \
 		libtinyxml2.so:textproc/tinyxml2 \
 		liburdfdom_world.so:devel/ros-urdfdom
 
-USES=		cmake compiler:c++17-lang eigen:3,build,run gl localbase:ldflags \
+USES=		cmake:testing compiler:c++17-lang eigen:3,build,run gl localbase:ldflags \
 		pkgconfig python xorg
 USE_GL=		gl glu glut
 USE_XORG=	xi xmu
@@ -46,11 +45,15 @@ GH_PROJECT=	dart
 CXXFLAGS+=	-I${LOCALBASE}/include/coin # because of pagmo2 headers include <IpReturnCodes.hpp>
 
 CMAKE_ON=	BUILD_SHARED_LIBS # DART_VERBOSE
-CMAKE_ARGS=	-DODE_DIR=${LOCALBASE}
+CMAKE_ARGS=	-DODE_DIR=${LOCALBASE} \
+		-DFREEBSD_PYTHON_VER=${PYTHON_VER}
+CMAKE_TESTING_TARGET=	tests # only builds test
 
 DATADIR=	share/dart
 DOCSDIR=	${PREFIX}/share/doc/dart
 
+BINARY_ALIAS=	python3=${PYTHON_CMD}
+
 OPTIONS_DEFINE=	DOCS
 
 PORTDOCS=	*
@@ -61,4 +64,8 @@ PORTDOCS=	*
 CFLAGS+=	-Wno-error=unused-but-set-variable
 .endif
 
+post-test: # run tests: 8 tests fail, see https://github.com/dartsim/dart/issues/1797
+	@cd ${BUILD_WRKSRC} && \
+		${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test
+
 .include <bsd.port.mk>
diff --git a/misc/dartsim/distinfo b/misc/dartsim/distinfo
index 94ca0720c284..4f8ce268a260 100644
--- a/misc/dartsim/distinfo
+++ b/misc/dartsim/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1674019885
-SHA256 (dartsim-dart-v6.13.0_GH0.tar.gz) = 4da3ff8cee056252a558b05625a5ff29b21e71f2995e6d7f789abbf6261895f7
-SIZE (dartsim-dart-v6.13.0_GH0.tar.gz) = 16035103
+TIMESTAMP = 1712255491
+SHA256 (dartsim-dart-v6.13.2_GH0.tar.gz) = 02699a8f807276231c80ffc5dbc3f66dc1c3612364340c91bcad63a837c01576
+SIZE (dartsim-dart-v6.13.2_GH0.tar.gz) = 16041569
diff --git a/misc/dartsim/files/patch-unittests_gtest_cmake_internal__utils.cmake b/misc/dartsim/files/patch-unittests_gtest_cmake_internal__utils.cmake
new file mode 100644
index 000000000000..4e13714d65d3
--- /dev/null
+++ b/misc/dartsim/files/patch-unittests_gtest_cmake_internal__utils.cmake
@@ -0,0 +1,11 @@
+--- unittests/gtest/cmake/internal_utils.cmake.orig	2024-04-04 16:25:44 UTC
++++ unittests/gtest/cmake/internal_utils.cmake
+@@ -236,7 +236,7 @@ endfunction()
+ endfunction()
+ 
+ # Sets PYTHONINTERP_FOUND and PYTHON_EXECUTABLE.
+-find_package(PythonInterp)
++find_package(PythonInterp ${FREEBSD_PYTHON_VER} EXACT)
+ 
+ # cxx_test_with_flags(name cxx_flags libs srcs...)
+ #
diff --git a/misc/dartsim/pkg-plist b/misc/dartsim/pkg-plist
index 2a0668ea4b23..03ecd6b31ba8 100644
--- a/misc/dartsim/pkg-plist
+++ b/misc/dartsim/pkg-plist
@@ -257,6 +257,7 @@ include/dart/dynamics/detail/TranslationalJoint2DAspect.hpp
 include/dart/dynamics/detail/UniversalJointAspect.hpp
 include/dart/dynamics/dynamics.hpp
 include/dart/external/convhull_3d/convhull_3d.h
+include/dart/external/convhull_3d/safe_convhull_3d.h
 include/dart/external/ikfast/ikfast.h
 include/dart/external/imgui/imconfig.h
 include/dart/external/imgui/imgui.h
@@ -399,49 +400,50 @@ include/dart/utils/sdf/SdfParser.hpp
 include/dart/utils/sdf/sdf.hpp
 include/dart/utils/urdf/BackwardCompatibility.hpp
 include/dart/utils/urdf/DartLoader.hpp
+include/dart/utils/urdf/IncludeUrdf.hpp
 include/dart/utils/urdf/URDFTypes.hpp
 include/dart/utils/urdf/urdf.hpp
 include/dart/utils/urdf/urdf_world_parser.hpp
 include/dart/utils/utils.hpp
 lib/libdart-collision-bullet.so
 lib/libdart-collision-bullet.so.6.13
-lib/libdart-collision-bullet.so.6.13.0
+lib/libdart-collision-bullet.so.6.13.2
 lib/libdart-collision-ode.so
 lib/libdart-collision-ode.so.6.13
-lib/libdart-collision-ode.so.6.13.0
+lib/libdart-collision-ode.so.6.13.2
 lib/libdart-external-imgui.so
 lib/libdart-external-imgui.so.6.13
-lib/libdart-external-imgui.so.6.13.0
+lib/libdart-external-imgui.so.6.13.2
 lib/libdart-external-lodepng.so
 lib/libdart-external-lodepng.so.6.13
-lib/libdart-external-lodepng.so.6.13.0
+lib/libdart-external-lodepng.so.6.13.2
 lib/libdart-external-odelcpsolver.so
 lib/libdart-external-odelcpsolver.so.6.13
-lib/libdart-external-odelcpsolver.so.6.13.0
+lib/libdart-external-odelcpsolver.so.6.13.2
 lib/libdart-gui-osg.so
 lib/libdart-gui-osg.so.6.13
-lib/libdart-gui-osg.so.6.13.0
+lib/libdart-gui-osg.so.6.13.2
 lib/libdart-gui.so
 lib/libdart-gui.so.6.13
-lib/libdart-gui.so.6.13.0
+lib/libdart-gui.so.6.13.2
 lib/libdart-optimizer-ipopt.so
 lib/libdart-optimizer-ipopt.so.6.13
-lib/libdart-optimizer-ipopt.so.6.13.0
+lib/libdart-optimizer-ipopt.so.6.13.2
 lib/libdart-optimizer-nlopt.so
 lib/libdart-optimizer-nlopt.so.6.13
-lib/libdart-optimizer-nlopt.so.6.13.0
+lib/libdart-optimizer-nlopt.so.6.13.2
 lib/libdart-planning.so
 lib/libdart-planning.so.6.13
-lib/libdart-planning.so.6.13.0
+lib/libdart-planning.so.6.13.2
 lib/libdart-utils-urdf.so
 lib/libdart-utils-urdf.so.6.13
-lib/libdart-utils-urdf.so.6.13.0
+lib/libdart-utils-urdf.so.6.13.2
 lib/libdart-utils.so
 lib/libdart-utils.so.6.13
-lib/libdart-utils.so.6.13.0
+lib/libdart-utils.so.6.13.2
 lib/libdart.so
 lib/libdart.so.6.13
-lib/libdart.so.6.13.0
+lib/libdart.so.6.13.2
 %%PYTHON_SITELIBDIR%%/dartpy%%PYTHON_EXT_SUFFIX%%.so
 libdata/pkgconfig/dart.pc
 %%DATADIR%%/cmake/DARTConfig.cmake
@@ -461,7 +463,6 @@ libdata/pkgconfig/dart.pc
 %%DATADIR%%/cmake/DARTFindfmt.cmake
 %%DATADIR%%/cmake/DARTFindlz4.cmake
 %%DATADIR%%/cmake/DARTFindoctomap.cmake
-%%DATADIR%%/cmake/DARTFindspdlog.cmake
 %%DATADIR%%/cmake/DARTFindtinyxml2.cmake
 %%DATADIR%%/cmake/DARTFindurdfdom.cmake
 %%DATADIR%%/cmake/FindIPOPT.cmake