Date: Mon, 19 Jul 2021 00:49:25 GMT From: Yuri Victorovich <yuri@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 2a36fc3e7669 - main - misc/dartsim: Update 6.9.5 -> 6.11.0 Message-ID: <202107190049.16J0nPuI087660@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=2a36fc3e7669a852c69d462ebf34daffe207860f commit 2a36fc3e7669a852c69d462ebf34daffe207860f Author: Yuri Victorovich <yuri@FreeBSD.org> AuthorDate: 2021-07-18 21:47:48 +0000 Commit: Yuri Victorovich <yuri@FreeBSD.org> CommitDate: 2021-07-19 00:49:19 +0000 misc/dartsim: Update 6.9.5 -> 6.11.0 Reported by: portscout --- misc/dartsim/Makefile | 3 +- misc/dartsim/distinfo | 6 +- misc/dartsim/files/patch-CMakeLists.txt | 12 ++-- misc/dartsim/files/patch-dart_common_Platform.hpp | 19 ++---- .../files/patch-dart_common_SharedLibrary.hpp | 26 ++++++-- misc/dartsim/files/patch-dart_gui_LoadOpengl.hpp | 14 ++--- .../dartsim/files/patch-dart_gui_glut_LoadGlut.hpp | 10 +-- .../files/patch-examples_wam__ikfast_Helpers.cpp | 16 ++--- .../files/patch-unittests_unit_test__IkFast.cpp | 16 ++--- misc/dartsim/pkg-plist | 72 +++++++++++++--------- 10 files changed, 104 insertions(+), 90 deletions(-) diff --git a/misc/dartsim/Makefile b/misc/dartsim/Makefile index 0219d1de271c..745df7cbd324 100644 --- a/misc/dartsim/Makefile +++ b/misc/dartsim/Makefile @@ -1,7 +1,6 @@ PORTNAME= dartsim DISTVERSIONPREFIX= v -DISTVERSION= 6.9.5 -PORTREVISION= 3 +DISTVERSION= 6.11.0 CATEGORIES= misc MAINTAINER= yuri@FreeBSD.org diff --git a/misc/dartsim/distinfo b/misc/dartsim/distinfo index 1ff9fc007c61..305a40eb69f1 100644 --- a/misc/dartsim/distinfo +++ b/misc/dartsim/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1604688838 -SHA256 (dartsim-dart-v6.9.5_GH0.tar.gz) = 624c00b65e3a753cba50de038620860c86e2ac47b1793ae51f9427a4bcb14c32 -SIZE (dartsim-dart-v6.9.5_GH0.tar.gz) = 14821495 +TIMESTAMP = 1626571083 +SHA256 (dartsim-dart-v6.11.0_GH0.tar.gz) = 41d783d7f99d7b5ad1874336646f1bdfa33e146e0652a6c32d12eaa21505bd51 +SIZE (dartsim-dart-v6.11.0_GH0.tar.gz) = 15881289 diff --git a/misc/dartsim/files/patch-CMakeLists.txt b/misc/dartsim/files/patch-CMakeLists.txt index cebb728aa15e..0804e7bf1bf4 100644 --- a/misc/dartsim/files/patch-CMakeLists.txt +++ b/misc/dartsim/files/patch-CMakeLists.txt @@ -1,15 +1,15 @@ ---- CMakeLists.txt.orig 2020-10-17 21:51:02 UTC +--- CMakeLists.txt.orig 2021-07-15 08:12:45 UTC +++ CMakeLists.txt -@@ -64,7 +64,7 @@ set(DART_MINOR_VERSION "9") - set(DART_PATCH_VERSION "5") +@@ -72,7 +72,7 @@ string(REGEX REPLACE "^<version>([0-9]+)\\.([0-9]+)\\. set(DART_VERSION "${DART_MAJOR_VERSION}.${DART_MINOR_VERSION}.${DART_PATCH_VERSION}") + set(DART_PKG_DESC "Dynamic Animation and Robotics Toolkit.") -set(DART_PKG_EXTERNAL_DEPS "eigen, ccd, fcl, assimp, boost") +set(DART_PKG_EXTERNAL_DEPS "eigen3, ccd, fcl, assimp") #=============================================================================== # Build options -@@ -202,7 +202,7 @@ elseif(CMAKE_COMPILER_IS_GNUCXX) +@@ -213,7 +213,7 @@ elseif(CMAKE_COMPILER_IS_GNUCXX) if(GCC_VERSION VERSION_LESS 5.3.1) message(FATAL_ERROR "The installed g++ version is ${GCC_VERSION}. ${PROJECT_NAME} requires g++ 5.3.1 or greater.") endif() @@ -18,7 +18,7 @@ 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") -@@ -228,7 +228,7 @@ elseif("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang") +@@ -243,7 +243,7 @@ elseif("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang") if("${CMAKE_SYSTEM_NAME}" MATCHES "Darwin") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++") endif() @@ -27,7 +27,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") -@@ -293,20 +293,20 @@ if(TARGET dart AND NOT DART_BUILD_DARTPY) +@@ -312,20 +312,20 @@ if(TARGET dart) if(MSVC) # add_subdirectory(examples) else() diff --git a/misc/dartsim/files/patch-dart_common_Platform.hpp b/misc/dartsim/files/patch-dart_common_Platform.hpp index 46d36ad5a1b6..09667ffbdf43 100644 --- a/misc/dartsim/files/patch-dart_common_Platform.hpp +++ b/misc/dartsim/files/patch-dart_common_Platform.hpp @@ -1,8 +1,8 @@ ---- dart/common/Platform.hpp.orig 2019-08-17 03:14:11 UTC +--- dart/common/Platform.hpp.orig 2021-07-15 08:12:45 UTC +++ dart/common/Platform.hpp @@ -43,6 +43,15 @@ - #define DART_ARCH_32BITS 1 - #endif + # define DART_ARCH_32BITS 1 + # endif +#elif defined(__FreeBSD__) + @@ -15,15 +15,4 @@ + #elif defined(__APPLE__) - #define DART_OS_MACOS 1 -@@ -75,6 +84,10 @@ - - #ifndef DART_OS_LINUX - #define DART_OS_LINUX 0 -+#endif -+ -+#ifndef DART_OS_FREEBSD -+ #define DART_OS_FREEBSD 0 - #endif - - #ifndef DART_OS_MACOS + # define DART_OS_MACOS 1 diff --git a/misc/dartsim/files/patch-dart_common_SharedLibrary.hpp b/misc/dartsim/files/patch-dart_common_SharedLibrary.hpp index cb2d64d14314..ca7116267090 100644 --- a/misc/dartsim/files/patch-dart_common_SharedLibrary.hpp +++ b/misc/dartsim/files/patch-dart_common_SharedLibrary.hpp @@ -1,11 +1,29 @@ ---- dart/common/SharedLibrary.hpp.orig 2018-11-20 05:50:43 UTC +--- dart/common/SharedLibrary.hpp.orig 2021-07-15 08:12:45 UTC +++ dart/common/SharedLibrary.hpp -@@ -38,7 +38,7 @@ - #include <boost/filesystem.hpp> +@@ -41,7 +41,7 @@ + #include "dart/common/Deprecated.hpp" #include "dart/common/Platform.hpp" -#if DART_OS_LINUX +#if DART_OS_LINUX || DART_OS_FREEBSD - #define DYNLIB_HANDLE void* + # define DYNLIB_HANDLE void* +@@ -65,6 +65,8 @@ using hInstance = HINSTANCE__*; + + #if DART_OS_LINUX + static constexpr const char* DART_SHARED_LIB_EXTENSION = "so"; ++#elif DART_OS_FREEBSD ++static constexpr const char* DART_SHARED_LIB_EXTENSION = "so"; + #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 + #endif + + #if DART_OS_LINUX ++static constexpr const char* DART_SHARED_LIB_PREFIX = "lib"; ++#elif DART_OS_FREEBSD + static constexpr const char* DART_SHARED_LIB_PREFIX = "lib"; + #elif DART_OS_MACOS + static constexpr const char* DART_SHARED_LIB_PREFIX = "lib"; diff --git a/misc/dartsim/files/patch-dart_gui_LoadOpengl.hpp b/misc/dartsim/files/patch-dart_gui_LoadOpengl.hpp index 03f4db95eb35..60097fdb7d0d 100644 --- a/misc/dartsim/files/patch-dart_gui_LoadOpengl.hpp +++ b/misc/dartsim/files/patch-dart_gui_LoadOpengl.hpp @@ -1,12 +1,12 @@ ---- dart/gui/LoadOpengl.hpp.orig 2019-02-18 02:38:26 UTC +--- dart/gui/LoadOpengl.hpp.orig 2021-07-15 08:12:45 UTC +++ dart/gui/LoadOpengl.hpp @@ -46,6 +46,9 @@ #elif defined(__linux__) - #include <GL/gl.h> - #include <GL/glu.h> + # include <GL/gl.h> + # include <GL/glu.h> +#elif defined(__FreeBSD__) -+ #include <GL/gl.h> -+ #include <GL/glu.h> ++# include <GL/gl.h> ++# include <GL/glu.h> #elif defined(__APPLE__) - #include <OpenGL/gl.h> - #include <OpenGL/glu.h> + # include <OpenGL/gl.h> + # include <OpenGL/glu.h> diff --git a/misc/dartsim/files/patch-dart_gui_glut_LoadGlut.hpp b/misc/dartsim/files/patch-dart_gui_glut_LoadGlut.hpp index 2112334a35bf..d9075b59c2dc 100644 --- a/misc/dartsim/files/patch-dart_gui_glut_LoadGlut.hpp +++ b/misc/dartsim/files/patch-dart_gui_glut_LoadGlut.hpp @@ -1,11 +1,11 @@ ---- dart/gui/glut/LoadGlut.hpp.orig 2019-02-18 02:40:12 UTC +--- dart/gui/glut/LoadGlut.hpp.orig 2021-07-15 08:12:45 UTC +++ dart/gui/glut/LoadGlut.hpp @@ -38,6 +38,8 @@ - #include <GL/glut.h> + # include <GL/glut.h> #elif defined(__linux__) - #include <GL/glut.h> + # include <GL/glut.h> +#elif defined(__FreeBSD__) -+ #include <GL/glut.h> ++# include <GL/glut.h> #elif defined(__APPLE__) - #include <GLUT/glut.h> + # include <GLUT/glut.h> #else diff --git a/misc/dartsim/files/patch-examples_wam__ikfast_Helpers.cpp b/misc/dartsim/files/patch-examples_wam__ikfast_Helpers.cpp index 30363efcac5b..d7c06d609dee 100644 --- a/misc/dartsim/files/patch-examples_wam__ikfast_Helpers.cpp +++ b/misc/dartsim/files/patch-examples_wam__ikfast_Helpers.cpp @@ -1,15 +1,11 @@ ---- examples/wam_ikfast/Helpers.cpp.orig 2019-08-17 03:14:11 UTC +--- examples/wam_ikfast/Helpers.cpp.orig 2021-07-15 08:12:45 UTC +++ examples/wam_ikfast/Helpers.cpp -@@ -106,10 +106,10 @@ void setupEndEffectors(const dart::dynamics::SkeletonP - ee->getIK(true)->setTarget(wam7_target); +@@ -109,7 +109,7 @@ void setupEndEffectors(const dart::dynamics::SkeletonP - std::string libName = "libwamIk"; + 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 - libName += "d"; + ss << "d"; #endif --#if DART_OS_LINUX -+#if DART_OS_LINUX || DART_OS_FREEBSD - libName += ".so"; - #elif DART_OS_MACOS - libName += ".dylib"; + ss << "." << DART_SHARED_LIB_EXTENSION; diff --git a/misc/dartsim/files/patch-unittests_unit_test__IkFast.cpp b/misc/dartsim/files/patch-unittests_unit_test__IkFast.cpp index 59c1318fb5c4..57947fa312cd 100644 --- a/misc/dartsim/files/patch-unittests_unit_test__IkFast.cpp +++ b/misc/dartsim/files/patch-unittests_unit_test__IkFast.cpp @@ -1,15 +1,11 @@ ---- unittests/unit/test_IkFast.cpp.orig 2018-11-20 05:49:54 UTC +--- unittests/unit/test_IkFast.cpp.orig 2021-07-15 08:12:45 UTC +++ unittests/unit/test_IkFast.cpp -@@ -74,10 +74,10 @@ TEST(IkFast, LoadWamArmIk) - ik->setTarget(targetFrame); +@@ -131,7 +131,7 @@ TEST(IkFast, LoadWamArmIk) ik->setHierarchyLevel(1); - std::string libName = "libGeneratedWamIkFast"; + std::stringstream ss; + ss << DART_SHARED_LIB_PREFIX << "GeneratedWamIkFast"; -#if (DART_OS_LINUX || DART_OS_MACOS) && !NDEBUG +#if (DART_OS_LINUX || DART_OS_FREEBSD || DART_OS_MACOS) && !NDEBUG - libName += "d"; + ss << "d"; #endif --#if DART_OS_LINUX -+#if DART_OS_LINUX || DART_OS_FREEBSD - libName += ".so"; - #elif DART_OS_MACOS - libName += ".dylib"; + ss << "." << DART_SHARED_LIB_EXTENSION; diff --git a/misc/dartsim/pkg-plist b/misc/dartsim/pkg-plist index 2c12d5d7bacf..0e43003b0679 100644 --- a/misc/dartsim/pkg-plist +++ b/misc/dartsim/pkg-plist @@ -44,6 +44,7 @@ include/dart/collision/ode/OdeTypes.hpp include/dart/collision/ode/ode.hpp include/dart/common/Aspect.hpp include/dart/common/AspectWithVersion.hpp +include/dart/common/ClassWithVirtualBase.hpp include/dart/common/Cloneable.hpp include/dart/common/Composite.hpp include/dart/common/CompositeJoiner.hpp @@ -58,6 +59,7 @@ include/dart/common/LockableReference.hpp include/dart/common/Memory.hpp include/dart/common/NameManager.hpp include/dart/common/Observer.hpp +include/dart/common/Optional.hpp include/dart/common/Platform.hpp include/dart/common/ProxyAspect.hpp include/dart/common/RequiresAspect.hpp @@ -109,6 +111,7 @@ include/dart/constraint/ConstraintSolver.hpp include/dart/constraint/ContactConstraint.hpp include/dart/constraint/DantzigBoxedLcpSolver.hpp include/dart/constraint/DantzigLCPSolver.hpp +include/dart/constraint/DynamicJointConstraint.hpp include/dart/constraint/JointConstraint.hpp include/dart/constraint/JointCoulombFrictionConstraint.hpp include/dart/constraint/JointLimitConstraint.hpp @@ -168,6 +171,7 @@ include/dart/dynamics/PlaneShape.hpp include/dart/dynamics/PointCloudShape.hpp include/dart/dynamics/PointMass.hpp include/dart/dynamics/PrismaticJoint.hpp +include/dart/dynamics/PyramidShape.hpp include/dart/dynamics/ReferentialSkeleton.hpp include/dart/dynamics/RevoluteJoint.hpp include/dart/dynamics/ScrewJoint.hpp @@ -227,6 +231,7 @@ include/dart/dynamics/detail/TemplatedJacobianNode.hpp 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/ikfast/ikfast.h include/dart/external/imgui/imconfig.h include/dart/external/imgui/imgui.h @@ -293,6 +298,7 @@ include/dart/gui/osg/render/MeshShapeNode.hpp include/dart/gui/osg/render/MultiSphereShapeNode.hpp include/dart/gui/osg/render/PlaneShapeNode.hpp include/dart/gui/osg/render/PointCloudShapeNode.hpp +include/dart/gui/osg/render/PyramidShapeNode.hpp include/dart/gui/osg/render/ShapeNode.hpp include/dart/gui/osg/render/SoftMeshShapeNode.hpp include/dart/gui/osg/render/SphereShapeNode.hpp @@ -311,10 +317,17 @@ include/dart/math/ConfigurationSpace.hpp include/dart/math/Constants.hpp include/dart/math/Geometry.hpp include/dart/math/Helpers.hpp +include/dart/math/Icosphere.hpp include/dart/math/MathTypes.hpp +include/dart/math/Mesh.hpp include/dart/math/Random.hpp +include/dart/math/TriMesh.hpp include/dart/math/detail/ConfigurationSpace.hpp +include/dart/math/detail/Geometry-impl.hpp +include/dart/math/detail/Icosphere-impl.hpp +include/dart/math/detail/Mesh-impl.hpp include/dart/math/detail/Random-impl.hpp +include/dart/math/detail/TriMesh-impl.hpp include/dart/math/math.hpp include/dart/optimizer/Function.hpp include/dart/optimizer/GenericMultiObjectiveProblem.hpp @@ -356,6 +369,8 @@ include/dart/utils/PackageResourceRetriever.hpp include/dart/utils/SkelParser.hpp include/dart/utils/VskParser.hpp include/dart/utils/XmlHelpers.hpp +include/dart/utils/mjcf/MjcfParser.hpp +include/dart/utils/mjcf/mjcf.hpp include/dart/utils/sdf/SdfParser.hpp include/dart/utils/sdf/sdf.hpp include/dart/utils/urdf/BackwardCompatibility.hpp @@ -365,47 +380,47 @@ 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.9 -lib/libdart-collision-bullet.so.6.9.5 +lib/libdart-collision-bullet.so.6.11 +lib/libdart-collision-bullet.so.6.11.0 lib/libdart-collision-ode.so -lib/libdart-collision-ode.so.6.9 -lib/libdart-collision-ode.so.6.9.5 +lib/libdart-collision-ode.so.6.11 +lib/libdart-collision-ode.so.6.11.0 lib/libdart-external-imgui.so -lib/libdart-external-imgui.so.6.9 -lib/libdart-external-imgui.so.6.9.5 +lib/libdart-external-imgui.so.6.11 +lib/libdart-external-imgui.so.6.11.0 lib/libdart-external-lodepng.so -lib/libdart-external-lodepng.so.6.9 -lib/libdart-external-lodepng.so.6.9.5 +lib/libdart-external-lodepng.so.6.11 +lib/libdart-external-lodepng.so.6.11.0 lib/libdart-external-odelcpsolver.so -lib/libdart-external-odelcpsolver.so.6.9 -lib/libdart-external-odelcpsolver.so.6.9.5 +lib/libdart-external-odelcpsolver.so.6.11 +lib/libdart-external-odelcpsolver.so.6.11.0 lib/libdart-gui-osg.so -lib/libdart-gui-osg.so.6.9 -lib/libdart-gui-osg.so.6.9.5 +lib/libdart-gui-osg.so.6.11 +lib/libdart-gui-osg.so.6.11.0 lib/libdart-gui.so -lib/libdart-gui.so.6.9 -lib/libdart-gui.so.6.9.5 +lib/libdart-gui.so.6.11 +lib/libdart-gui.so.6.11.0 lib/libdart-optimizer-ipopt.so -lib/libdart-optimizer-ipopt.so.6.9 -lib/libdart-optimizer-ipopt.so.6.9.5 +lib/libdart-optimizer-ipopt.so.6.11 +lib/libdart-optimizer-ipopt.so.6.11.0 lib/libdart-optimizer-nlopt.so -lib/libdart-optimizer-nlopt.so.6.9 -lib/libdart-optimizer-nlopt.so.6.9.5 +lib/libdart-optimizer-nlopt.so.6.11 +lib/libdart-optimizer-nlopt.so.6.11.0 lib/libdart-optimizer-pagmo.so -lib/libdart-optimizer-pagmo.so.6.9 -lib/libdart-optimizer-pagmo.so.6.9.5 +lib/libdart-optimizer-pagmo.so.6.11 +lib/libdart-optimizer-pagmo.so.6.11.0 lib/libdart-planning.so -lib/libdart-planning.so.6.9 -lib/libdart-planning.so.6.9.5 +lib/libdart-planning.so.6.11 +lib/libdart-planning.so.6.11.0 lib/libdart-utils-urdf.so -lib/libdart-utils-urdf.so.6.9 -lib/libdart-utils-urdf.so.6.9.5 +lib/libdart-utils-urdf.so.6.11 +lib/libdart-utils-urdf.so.6.11.0 lib/libdart-utils.so -lib/libdart-utils.so.6.9 -lib/libdart-utils.so.6.9.5 +lib/libdart-utils.so.6.11 +lib/libdart-utils.so.6.11.0 lib/libdart.so -lib/libdart.so.6.9 -lib/libdart.so.6.9.5 +lib/libdart.so.6.11 +lib/libdart.so.6.11.0 libdata/pkgconfig/dart.pc %%DATADIR%%/cmake/DARTConfig.cmake %%DATADIR%%/cmake/DARTConfigVersion.cmake @@ -417,6 +432,7 @@ libdata/pkgconfig/dart.pc %%DATADIR%%/cmake/DARTFindNLOPT.cmake %%DATADIR%%/cmake/DARTFindODE.cmake %%DATADIR%%/cmake/DARTFindOpenGL.cmake +%%DATADIR%%/cmake/DARTFindOpenSceneGraph.cmake %%DATADIR%%/cmake/DARTFindassimp.cmake %%DATADIR%%/cmake/DARTFindccd.cmake %%DATADIR%%/cmake/DARTFindfcl.cmake
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202107190049.16J0nPuI087660>