mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-18 00:10:04 +00:00
Code Issues Releases Activity

misc/dartsim: update 6.13.2 → 6.14.0

Browse Source 
Reported by:	portscout
This commit is contained in:
Yuri Victorovich 2024-06-26 09:08:04 -07:00
parent 7d7ee880f5
commit 8ca6f6eead
11 changed files with 80 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
misc/dartsim/Makefile
View File

@ -1,6 +1,6 @@
PORTNAME= dartsim
DISTVERSIONPREFIX= v
DISTVERSION= 6.13.2
DISTVERSION= 6.14.0
CATEGORIES= misc
MAINTAINER= yuri@FreeBSD.org
@ -14,6 +14,7 @@ BROKEN_i386= clang failure: https://bugs.llvm.org/show_bug.cgi?id=41757
BUILD_DEPENDS= pagmo2>0:science/pagmo2 \
pybind11>0:devel/pybind11
BUILD_DEPENDS+= googletest>0:devel/googletest
LIB_DEPENDS= libassimp.so:multimedia/assimp \
libBulletDynamics.so:devel/bullet \
libboost_system.so:devel/boost-libs \
@ -26,7 +27,7 @@ LIB_DEPENDS= libassimp.so:multimedia/assimp \
liblz4.so:archivers/liblz4 \
liboctomap.so:math/octomap \
libode.so:devel/ode \
libosg.so:graphics/osg34 \
libosg.so:graphics/osg \
libnlopt.so:math/nlopt \
libpagmo.so:science/pagmo2 \
libtinyxml2.so:textproc/tinyxml2 \
@ -65,7 +66,7 @@ PORTDOCS= *
CFLAGS+= -Wno-error=unused-but-set-variable
.endif
post-test: # run tests: 8 tests fail, see https://github.com/dartsim/dart/issues/1797
post-test: # run tests: 8 tests fail, see https://github.com/dartsim/dart/issues/1797#issuecomment-2191988407
@cd ${BUILD_WRKSRC} && \
${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test

6
misc/dartsim/distinfo
View File

@ -1,3 +1,3 @@
TIMESTAMP = 1712255491
SHA256 (dartsim-dart-v6.13.2_GH0.tar.gz) = 02699a8f807276231c80ffc5dbc3f66dc1c3612364340c91bcad63a837c01576
SIZE (dartsim-dart-v6.13.2_GH0.tar.gz) = 16041569
TIMESTAMP = 1719395150
SHA256 (dartsim-dart-v6.14.0_GH0.tar.gz) = f3fdccb2781d6a606c031f11d6b1fdf5278708c6787e3ab9a67385d9a19a60ea
SIZE (dartsim-dart-v6.14.0_GH0.tar.gz) = 15939177

12
misc/dartsim/files/patch-CMakeLists.txt
View File

@ -1,15 +1,15 @@
--- CMakeLists.txt.orig 2022-12-31 21:52:21 UTC
--- CMakeLists.txt.orig 2024-06-25 05:13:56 UTC
+++ CMakeLists.txt
@@ -242,7 +242,7 @@ elseif(CMAKE_COMPILER_IS_GNUCXX)
if(GCC_VERSION VERSION_LESS 7.3.0)
message(FATAL_ERROR "The installed g++ version is ${GCC_VERSION}. ${PROJECT_NAME} requires g++ 7.3.0 or greater.")
@@ -294,7 +294,7 @@ elseif(CMAKE_COMPILER_IS_GNUCXX)
# TODO: These warnings should be properly addressed and these compiler options removed
add_compile_options(-Wno-overloaded-virtual -Wno-alloc-size-larger-than -Wno-dangling-pointer)
endif()
- set(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG")
+ set(CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG")
set(CMAKE_CXX_FLAGS_DEBUG "-g -fno-omit-frame-pointer -fno-inline-functions -fno-inline-functions-called-once -fno-optimize-sibling-calls")
if(DART_FAST_DEBUG)
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -O1")
@@ -270,7 +270,7 @@ elseif("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
@@ -322,7 +322,7 @@ elseif("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
if("${CMAKE_SYSTEM_NAME}" MATCHES "Darwin")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
endif()
@ -18,7 +18,7 @@
set(CMAKE_CXX_FLAGS_DEBUG "-g -fno-omit-frame-pointer -fno-inline-functions -fno-optimize-sibling-calls")
if(DART_FAST_DEBUG)
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -O1")
@@ -338,20 +338,20 @@ if(TARGET dart)
@@ -390,20 +390,20 @@ if(TARGET dart)
if(MSVC)
add_subdirectory(examples)
else()

11
misc/dartsim/files/patch-cmake_DARTMacros.cmake Normal file
View File

@ -0,0 +1,11 @@
--- cmake/DARTMacros.cmake.orig 2024-06-26 09:54:39 UTC
+++ cmake/DARTMacros.cmake
@@ -370,6 +370,8 @@ function(dart_build_tests)
${target_name} PRIVATE ${_ARG_INCLUDE_DIRS}
)
+ find_package(GTest REQUIRED)
+
# Link libraries
target_link_libraries(${target_name} PRIVATE GTest::gtest GTest::gtest_main)
target_link_libraries(

8
misc/dartsim/files/patch-dart_common_SharedLibrary.cpp
View File

@ -1,4 +1,4 @@
--- dart/common/SharedLibrary.cpp.orig 2018-11-20 05:47:58 UTC
--- dart/common/SharedLibrary.cpp.orig 2024-06-25 05:13:56 UTC
+++ dart/common/SharedLibrary.cpp
@@ -35,7 +35,7 @@
#include "dart/common/Console.hpp"
@ -7,9 +7,9 @@
-#if DART_OS_LINUX || DART_OS_MACOS
+#if DART_OS_LINUX || DART_OS_FREEBSD || DART_OS_MACOS
#include <dlfcn.h>
#define DYNLIB_LOAD(a) dlopen(a, RTLD_LAZY | RTLD_GLOBAL)
@@ -123,7 +123,7 @@ void* SharedLibrary::getSymbol(const std
#include <dlfcn.h>
#define DYNLIB_LOAD(a) dlopen(a, RTLD_LAZY | RTLD_GLOBAL)
@@ -139,7 +139,7 @@ std::string SharedLibrary::getLastError() const
//==============================================================================
std::string SharedLibrary::getLastError() const
{

12
misc/dartsim/files/patch-dart_common_SharedLibrary.hpp
View File

@ -1,15 +1,15 @@
--- dart/common/SharedLibrary.hpp.orig 2021-11-04 20:43:53 UTC
--- dart/common/SharedLibrary.hpp.orig 2024-06-25 05:13:56 UTC
+++ dart/common/SharedLibrary.hpp
@@ -41,7 +41,7 @@
#include "dart/common/Deprecated.hpp"
#include "dart/common/Platform.hpp"
@@ -40,7 +40,7 @@
#include <memory>
#include <string>
-#if DART_OS_LINUX
+#if DART_OS_LINUX || DART_OS_FREEBSD
#define DYNLIB_HANDLE void*
@@ -65,6 +65,8 @@ using hInstance = HINSTANCE__*;
@@ -58,6 +58,8 @@ static constexpr const char* DART_SHARED_LIB_EXTENSION
#if DART_OS_LINUX
static constexpr const char* DART_SHARED_LIB_EXTENSION = "so";
@ -18,7 +18,7 @@
#elif DART_OS_MACOS
static constexpr const char* DART_SHARED_LIB_EXTENSION = "dylib";
#elif DART_OS_WINDOWS
@@ -74,6 +76,8 @@ static constexpr const char* DART_SHARED_LIB_EXTENSION
@@ -67,6 +69,8 @@ static constexpr const char* DART_SHARED_LIB_EXTENSION
#endif
#if DART_OS_LINUX

4
misc/dartsim/files/patch-dart_gui_LoadOpengl.hpp
View File

@ -1,6 +1,6 @@
--- dart/gui/LoadOpengl.hpp.orig 2021-11-04 20:43:53 UTC
--- dart/gui/LoadOpengl.hpp.orig 2024-06-25 05:13:56 UTC
+++ dart/gui/LoadOpengl.hpp
@@ -46,6 +46,9 @@
@@ -42,6 +42,9 @@
#elif defined(__linux__)
#include <GL/gl.h>
#include <GL/glu.h>

4
misc/dartsim/files/patch-dart_gui_glut_LoadGlut.hpp
View File

@ -1,7 +1,7 @@
--- dart/gui/glut/LoadGlut.hpp.orig 2021-11-04 20:43:53 UTC
--- dart/gui/glut/LoadGlut.hpp.orig 2024-06-25 05:13:56 UTC
+++ dart/gui/glut/LoadGlut.hpp
@@ -39,6 +39,8 @@
#include <GL/glut.h>
#include <cstdlib> // To disable glut::exit() function
#elif defined(__linux__)
#include <GL/glut.h>
+#elif defined(__FreeBSD__)

6
misc/dartsim/files/patch-examples_wam__ikfast_Helpers.cpp
View File

@ -1,11 +1,11 @@
--- examples/wam_ikfast/Helpers.cpp.orig 2021-07-15 08:12:45 UTC
--- examples/wam_ikfast/Helpers.cpp.orig 2024-06-25 05:13:56 UTC
+++ examples/wam_ikfast/Helpers.cpp
@@ -109,7 +109,7 @@ void setupEndEffectors(const dart::dynamics::SkeletonP
std::stringstream ss;
ss << DART_SHARED_LIB_PREFIX << "wamIk";
-#if (DART_OS_LINUX || DART_OS_MACOS) && !NDEBUG
+#if (DART_OS_LINUX || DART_OS_FREEBSD || DART_OS_MACOS) && !NDEBUG
-#if (DART_OS_LINUX || DART_OS_MACOS) && DART_BUILD_MODE_DEBUG
+#if (DART_OS_LINUX || DART_OS_FREEBSD || DART_OS_MACOS) && DART_BUILD_MODE_DEBUG
ss << "d";
#endif
ss << "." << DART_SHARED_LIB_EXTENSION;

11
misc/dartsim/files/patch-unittests_gtest_cmake_internal__utils.cmake
View File

@ -1,11 +0,0 @@
--- 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...)
#

84
misc/dartsim/pkg-plist
View File

@ -74,6 +74,7 @@ include/dart/common/Observer.hpp
include/dart/common/Optional.hpp
include/dart/common/Platform.hpp
include/dart/common/PoolAllocator.hpp
include/dart/common/Profile.hpp
include/dart/common/ProxyAspect.hpp
include/dart/common/RequiresAspect.hpp
include/dart/common/Resource.hpp
@ -93,7 +94,6 @@ include/dart/common/Uri.hpp
include/dart/common/VersionCounter.hpp
include/dart/common/Virtual.hpp
include/dart/common/common.hpp
include/dart/common/detail/AlignedAllocator.hpp
include/dart/common/detail/Aspect.hpp
include/dart/common/detail/AspectWithVersion.hpp
include/dart/common/detail/Castable-impl.hpp
@ -187,6 +187,7 @@ include/dart/dynamics/Linkage.hpp
include/dart/dynamics/Marker.hpp
include/dart/dynamics/MeshShape.hpp
include/dart/dynamics/MetaSkeleton.hpp
include/dart/dynamics/MimicDofProperties.hpp
include/dart/dynamics/MultiSphereConvexHullShape.hpp
include/dart/dynamics/MultiSphereShape.hpp
include/dart/dynamics/Node.hpp
@ -303,6 +304,7 @@ include/dart/gui/osg/GridVisual.hpp
include/dart/gui/osg/ImGuiHandler.hpp
include/dart/gui/osg/ImGuiViewer.hpp
include/dart/gui/osg/ImGuiWidget.hpp
include/dart/gui/osg/IncludeImGui.hpp
include/dart/gui/osg/InteractiveFrame.hpp
include/dart/gui/osg/MouseEventHandler.hpp
include/dart/gui/osg/RealTimeWorldNode.hpp
@ -371,13 +373,10 @@ include/dart/optimizer/ipopt/ipopt.hpp
include/dart/optimizer/nlopt/NloptSolver.hpp
include/dart/optimizer/nlopt/nlopt.hpp
include/dart/optimizer/optimizer.hpp
include/dart/planning/Path.hpp
include/dart/planning/PathFollowingTrajectory.hpp
include/dart/planning/PathPlanner.hpp
include/dart/planning/PathShortener.hpp
include/dart/planning/RRT.hpp
include/dart/planning/Trajectory.hpp
include/dart/planning/planning.hpp
include/dart/optimizer/pagmo/PagmoMultiObjectiveProblemAdaptor.hpp
include/dart/optimizer/pagmo/PagmoMultiObjectiveSolver.hpp
include/dart/optimizer/pagmo/PagmoUtils.hpp
include/dart/optimizer/pagmo/pagmo.hpp
include/dart/simulation/Recording.hpp
include/dart/simulation/SmartPointer.hpp
include/dart/simulation/World.hpp
@ -406,45 +405,44 @@ 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.2
lib/libdart-collision-bullet.so.6.14
lib/libdart-collision-bullet.so.6.14.0
lib/libdart-collision-ode.so
lib/libdart-collision-ode.so.6.13
lib/libdart-collision-ode.so.6.13.2
lib/libdart-collision-ode.so.6.14
lib/libdart-collision-ode.so.6.14.0
lib/libdart-external-imgui.so
lib/libdart-external-imgui.so.6.13
lib/libdart-external-imgui.so.6.13.2
lib/libdart-external-imgui.so.6.14
lib/libdart-external-imgui.so.6.14.0
lib/libdart-external-lodepng.so
lib/libdart-external-lodepng.so.6.13
lib/libdart-external-lodepng.so.6.13.2
lib/libdart-external-lodepng.so.6.14
lib/libdart-external-lodepng.so.6.14.0
lib/libdart-external-odelcpsolver.so
lib/libdart-external-odelcpsolver.so.6.13
lib/libdart-external-odelcpsolver.so.6.13.2
lib/libdart-external-odelcpsolver.so.6.14
lib/libdart-external-odelcpsolver.so.6.14.0
lib/libdart-gui-osg.so
lib/libdart-gui-osg.so.6.13
lib/libdart-gui-osg.so.6.13.2
lib/libdart-gui-osg.so.6.14
lib/libdart-gui-osg.so.6.14.0
lib/libdart-gui.so
lib/libdart-gui.so.6.13
lib/libdart-gui.so.6.13.2
lib/libdart-gui.so.6.14
lib/libdart-gui.so.6.14.0
lib/libdart-optimizer-ipopt.so
lib/libdart-optimizer-ipopt.so.6.13
lib/libdart-optimizer-ipopt.so.6.13.2
lib/libdart-optimizer-ipopt.so.6.14
lib/libdart-optimizer-ipopt.so.6.14.0
lib/libdart-optimizer-nlopt.so
lib/libdart-optimizer-nlopt.so.6.13
lib/libdart-optimizer-nlopt.so.6.13.2
lib/libdart-planning.so
lib/libdart-planning.so.6.13
lib/libdart-planning.so.6.13.2
lib/libdart-optimizer-nlopt.so.6.14
lib/libdart-optimizer-nlopt.so.6.14.0
lib/libdart-optimizer-pagmo.so
lib/libdart-optimizer-pagmo.so.6.14
lib/libdart-optimizer-pagmo.so.6.14.0
lib/libdart-utils-urdf.so
lib/libdart-utils-urdf.so.6.13
lib/libdart-utils-urdf.so.6.13.2
lib/libdart-utils-urdf.so.6.14
lib/libdart-utils-urdf.so.6.14.0
lib/libdart-utils.so
lib/libdart-utils.so.6.13
lib/libdart-utils.so.6.13.2
lib/libdart-utils.so.6.14
lib/libdart-utils.so.6.14.0
lib/libdart.so
lib/libdart.so.6.13
lib/libdart.so.6.13.2
%%PYTHON_SITELIBDIR%%/dartpy%%PYTHON_EXT_SUFFIX%%.so
lib/libdart.so.6.14
lib/libdart.so.6.14.0
libdata/pkgconfig/dart.pc
%%DATADIR%%/cmake/DARTConfig.cmake
%%DATADIR%%/cmake/DARTConfigVersion.cmake
@ -457,22 +455,18 @@ libdata/pkgconfig/dart.pc
%%DATADIR%%/cmake/DARTFindOpenGL.cmake
%%DATADIR%%/cmake/DARTFindOpenSceneGraph.cmake
%%DATADIR%%/cmake/DARTFindassimp.cmake
%%DATADIR%%/cmake/DARTFindccd.cmake
%%DATADIR%%/cmake/DARTFindfcl.cmake
%%DATADIR%%/cmake/DARTFindflann.cmake
%%DATADIR%%/cmake/DARTFindfmt.cmake
%%DATADIR%%/cmake/DARTFindlz4.cmake
%%DATADIR%%/cmake/DARTFindoctomap.cmake
%%DATADIR%%/cmake/DARTFindpagmo.cmake
%%DATADIR%%/cmake/DARTFindspdlog.cmake
%%DATADIR%%/cmake/DARTFindtinyxml2.cmake
%%DATADIR%%/cmake/DARTFindurdfdom.cmake
%%DATADIR%%/cmake/FindIPOPT.cmake
%%DATADIR%%/cmake/FindNLOPT.cmake
%%DATADIR%%/cmake/FindODE.cmake
%%DATADIR%%/cmake/Findassimp.cmake
%%DATADIR%%/cmake/Findccd.cmake
%%DATADIR%%/cmake/Findfcl.cmake
%%DATADIR%%/cmake/Findflann.cmake
%%DATADIR%%/cmake/Findlz4.cmake
%%DATADIR%%/cmake/Findtinyxml2.cmake
%%DATADIR%%/cmake/dart_collision-bulletComponent.cmake
%%DATADIR%%/cmake/dart_collision-bulletTargets-%%CMAKE_BUILD_TYPE%%.cmake
@ -504,9 +498,9 @@ libdata/pkgconfig/dart.pc
%%DATADIR%%/cmake/dart_optimizer-nloptComponent.cmake
%%DATADIR%%/cmake/dart_optimizer-nloptTargets-%%CMAKE_BUILD_TYPE%%.cmake
%%DATADIR%%/cmake/dart_optimizer-nloptTargets.cmake
%%DATADIR%%/cmake/dart_planningComponent.cmake
%%DATADIR%%/cmake/dart_planningTargets-%%CMAKE_BUILD_TYPE%%.cmake
%%DATADIR%%/cmake/dart_planningTargets.cmake
%%DATADIR%%/cmake/dart_optimizer-pagmoComponent.cmake
%%DATADIR%%/cmake/dart_optimizer-pagmoTargets-%%CMAKE_BUILD_TYPE%%.cmake
%%DATADIR%%/cmake/dart_optimizer-pagmoTargets.cmake
%%DATADIR%%/cmake/dart_utils-urdfComponent.cmake
%%DATADIR%%/cmake/dart_utils-urdfTargets-%%CMAKE_BUILD_TYPE%%.cmake
%%DATADIR%%/cmake/dart_utils-urdfTargets.cmake