git: 760aa6d3701a - 2022Q2 - misc/dartsim: Update 6.11.1 -> 6.12.1

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Yuri Victorovich <yuri_at_FreeBSD.org>
Date: Sun, 22 May 2022 06:31:05 UTC
The branch 2022Q2 has been updated by yuri:

URL: https://cgit.FreeBSD.org/ports/commit/?id=760aa6d3701aa541056b88070c46c37aea601e35

commit 760aa6d3701aa541056b88070c46c37aea601e35
Author:     Yuri Victorovich <yuri@FreeBSD.org>
AuthorDate: 2022-05-01 22:18:52 +0000
Commit:     Yuri Victorovich <yuri@FreeBSD.org>
CommitDate: 2022-05-22 06:31:02 +0000

    misc/dartsim: Update 6.11.1 -> 6.12.1
    
    Reported by:    portscout
    
    (cherry picked from commit 6f1f155d61345e5d5178a35e3f411e83bd7c3017)
---
 misc/dartsim/Makefile                              |  3 +-
 misc/dartsim/distinfo                              |  6 +-
 misc/dartsim/files/patch-dart_common_Platform.hpp  |  8 +--
 .../files/patch-dart_common_SharedLibrary.hpp      |  4 +-
 misc/dartsim/files/patch-dart_gui_LoadOpengl.hpp   | 14 ++--
 .../dartsim/files/patch-dart_gui_glut_LoadGlut.hpp | 12 ++--
 misc/dartsim/pkg-plist                             | 77 +++++++---------------
 7 files changed, 48 insertions(+), 76 deletions(-)

diff --git a/misc/dartsim/Makefile b/misc/dartsim/Makefile
index bcd42517e389..41c912517fa7 100644
--- a/misc/dartsim/Makefile
+++ b/misc/dartsim/Makefile
@@ -1,7 +1,6 @@
 PORTNAME=	dartsim
 DISTVERSIONPREFIX=	v
-DISTVERSION=	6.11.1
-PORTREVISION=	3
+DISTVERSION=	6.12.1
 CATEGORIES=	misc
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/misc/dartsim/distinfo b/misc/dartsim/distinfo
index d2ff113f612f..4bea7428e31c 100644
--- a/misc/dartsim/distinfo
+++ b/misc/dartsim/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1629995202
-SHA256 (dartsim-dart-v6.11.1_GH0.tar.gz) = 1a59b9d8f55433ad111089431826cd8abbec71f61c72a8558b655d92164f8de4
-SIZE (dartsim-dart-v6.11.1_GH0.tar.gz) = 15882972
+TIMESTAMP = 1651431535
+SHA256 (dartsim-dart-v6.12.1_GH0.tar.gz) = e0d47bbc191903b93474da00bbd1042cefdc85f5ead3e9a9282b5f4187d53304
+SIZE (dartsim-dart-v6.12.1_GH0.tar.gz) = 15990308
diff --git a/misc/dartsim/files/patch-dart_common_Platform.hpp b/misc/dartsim/files/patch-dart_common_Platform.hpp
index 09667ffbdf43..e530e71e05b3 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	2021-07-15 08:12:45 UTC
+--- dart/common/Platform.hpp.orig	2021-11-04 20:43:53 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,4 +15,4 @@
 +
  #elif defined(__APPLE__)
  
- #  define DART_OS_MACOS 1
+   #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 ca7116267090..d7e41b92c436 100644
--- a/misc/dartsim/files/patch-dart_common_SharedLibrary.hpp
+++ b/misc/dartsim/files/patch-dart_common_SharedLibrary.hpp
@@ -1,4 +1,4 @@
---- dart/common/SharedLibrary.hpp.orig	2021-07-15 08:12:45 UTC
+--- dart/common/SharedLibrary.hpp.orig	2021-11-04 20:43:53 UTC
 +++ dart/common/SharedLibrary.hpp
 @@ -41,7 +41,7 @@
  #include "dart/common/Deprecated.hpp"
@@ -7,7 +7,7 @@
 -#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__*;
  
diff --git a/misc/dartsim/files/patch-dart_gui_LoadOpengl.hpp b/misc/dartsim/files/patch-dart_gui_LoadOpengl.hpp
index 60097fdb7d0d..c5a02057d792 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	2021-07-15 08:12:45 UTC
+--- dart/gui/LoadOpengl.hpp.orig	2021-11-04 20:43:53 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 d9075b59c2dc..a5aadbcac370 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	2021-07-15 08:12:45 UTC
+--- dart/gui/glut/LoadGlut.hpp.orig	2021-11-04 20:43:53 UTC
 +++ dart/gui/glut/LoadGlut.hpp
-@@ -38,6 +38,8 @@
- #  include <GL/glut.h>
+@@ -39,6 +39,8 @@
+   #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/pkg-plist b/misc/dartsim/pkg-plist
index 498ce2a5890d..01d3c535ecd7 100644
--- a/misc/dartsim/pkg-plist
+++ b/misc/dartsim/pkg-plist
@@ -17,6 +17,7 @@ include/dart/collision/bullet/BulletCollisionDetector.hpp
 include/dart/collision/bullet/BulletCollisionGroup.hpp
 include/dart/collision/bullet/BulletCollisionObject.hpp
 include/dart/collision/bullet/BulletCollisionShape.hpp
+include/dart/collision/bullet/BulletInclude.hpp
 include/dart/collision/bullet/BulletTypes.hpp
 include/dart/collision/bullet/bullet.hpp
 include/dart/collision/collision.hpp
@@ -343,17 +344,6 @@ 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/optimizer/pagmo/PagmoMultiObjectiveProblemAdaptor.hpp
-include/dart/optimizer/pagmo/PagmoMultiObjectiveSolver.hpp
-include/dart/optimizer/pagmo/PagmoUtils.hpp
-include/dart/optimizer/pagmo/pagmo.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/simulation/Recording.hpp
 include/dart/simulation/SmartPointer.hpp
 include/dart/simulation/World.hpp
@@ -380,47 +370,41 @@ 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.11
-lib/libdart-collision-bullet.so.6.11.1
+lib/libdart-collision-bullet.so.6.12
+lib/libdart-collision-bullet.so.6.12.1
 lib/libdart-collision-ode.so
-lib/libdart-collision-ode.so.6.11
-lib/libdart-collision-ode.so.6.11.1
+lib/libdart-collision-ode.so.6.12
+lib/libdart-collision-ode.so.6.12.1
 lib/libdart-external-imgui.so
-lib/libdart-external-imgui.so.6.11
-lib/libdart-external-imgui.so.6.11.1
+lib/libdart-external-imgui.so.6.12
+lib/libdart-external-imgui.so.6.12.1
 lib/libdart-external-lodepng.so
-lib/libdart-external-lodepng.so.6.11
-lib/libdart-external-lodepng.so.6.11.1
+lib/libdart-external-lodepng.so.6.12
+lib/libdart-external-lodepng.so.6.12.1
 lib/libdart-external-odelcpsolver.so
-lib/libdart-external-odelcpsolver.so.6.11
-lib/libdart-external-odelcpsolver.so.6.11.1
+lib/libdart-external-odelcpsolver.so.6.12
+lib/libdart-external-odelcpsolver.so.6.12.1
 lib/libdart-gui-osg.so
-lib/libdart-gui-osg.so.6.11
-lib/libdart-gui-osg.so.6.11.1
+lib/libdart-gui-osg.so.6.12
+lib/libdart-gui-osg.so.6.12.1
 lib/libdart-gui.so
-lib/libdart-gui.so.6.11
-lib/libdart-gui.so.6.11.1
+lib/libdart-gui.so.6.12
+lib/libdart-gui.so.6.12.1
 lib/libdart-optimizer-ipopt.so
-lib/libdart-optimizer-ipopt.so.6.11
-lib/libdart-optimizer-ipopt.so.6.11.1
+lib/libdart-optimizer-ipopt.so.6.12
+lib/libdart-optimizer-ipopt.so.6.12.1
 lib/libdart-optimizer-nlopt.so
-lib/libdart-optimizer-nlopt.so.6.11
-lib/libdart-optimizer-nlopt.so.6.11.1
-lib/libdart-optimizer-pagmo.so
-lib/libdart-optimizer-pagmo.so.6.11
-lib/libdart-optimizer-pagmo.so.6.11.1
-lib/libdart-planning.so
-lib/libdart-planning.so.6.11
-lib/libdart-planning.so.6.11.1
+lib/libdart-optimizer-nlopt.so.6.12
+lib/libdart-optimizer-nlopt.so.6.12.1
 lib/libdart-utils-urdf.so
-lib/libdart-utils-urdf.so.6.11
-lib/libdart-utils-urdf.so.6.11.1
+lib/libdart-utils-urdf.so.6.12
+lib/libdart-utils-urdf.so.6.12.1
 lib/libdart-utils.so
-lib/libdart-utils.so.6.11
-lib/libdart-utils.so.6.11.1
+lib/libdart-utils.so.6.12
+lib/libdart-utils.so.6.12.1
 lib/libdart.so
-lib/libdart.so.6.11
-lib/libdart.so.6.11.1
+lib/libdart.so.6.12
+lib/libdart.so.6.12.1
 libdata/pkgconfig/dart.pc
 %%DATADIR%%/cmake/DARTConfig.cmake
 %%DATADIR%%/cmake/DARTConfigVersion.cmake
@@ -436,10 +420,7 @@ libdata/pkgconfig/dart.pc
 %%DATADIR%%/cmake/DARTFindassimp.cmake
 %%DATADIR%%/cmake/DARTFindccd.cmake
 %%DATADIR%%/cmake/DARTFindfcl.cmake
-%%DATADIR%%/cmake/DARTFindflann.cmake
-%%DATADIR%%/cmake/DARTFindlz4.cmake
 %%DATADIR%%/cmake/DARTFindoctomap.cmake
-%%DATADIR%%/cmake/DARTFindpagmo.cmake
 %%DATADIR%%/cmake/DARTFindtinyxml2.cmake
 %%DATADIR%%/cmake/DARTFindurdfdom.cmake
 %%DATADIR%%/cmake/FindIPOPT.cmake
@@ -448,8 +429,6 @@ libdata/pkgconfig/dart.pc
 %%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
@@ -481,12 +460,6 @@ 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_optimizer-pagmoComponent.cmake
-%%DATADIR%%/cmake/dart_optimizer-pagmoTargets-%%CMAKE_BUILD_TYPE%%.cmake
-%%DATADIR%%/cmake/dart_optimizer-pagmoTargets.cmake
-%%DATADIR%%/cmake/dart_planningComponent.cmake
-%%DATADIR%%/cmake/dart_planningTargets-%%CMAKE_BUILD_TYPE%%.cmake
-%%DATADIR%%/cmake/dart_planningTargets.cmake
 %%DATADIR%%/cmake/dart_utils-urdfComponent.cmake
 %%DATADIR%%/cmake/dart_utils-urdfTargets-%%CMAKE_BUILD_TYPE%%.cmake
 %%DATADIR%%/cmake/dart_utils-urdfTargets.cmake