diff --git a/math/fcl/Makefile b/math/fcl/Makefile index 2700c4ea996b..28e2d9d47414 100644 --- a/math/fcl/Makefile +++ b/math/fcl/Makefile @@ -1,38 +1,37 @@ PORTNAME= fcl -DISTVERSIONPREFIX= v -DISTVERSION= 0.6.1 -PORTREVISION= 1 +DISTVERSION= 0.7.0 CATEGORIES= math MAINTAINER= yuri@FreeBSD.org COMMENT= Flexible Collision Library LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libccd.so:math/libccd USES= cmake compiler:c++11-lang eigen:3 USE_GITHUB= yes GH_ACCOUNT= flexible-collision-library USE_LDCONFIG= yes +CMAKE_ON= FREEBSD_ENABLE_SSE CMAKE_OFF= FCL_BUILD_TESTS BUILD_TESTING # also see https://github.com/flexible-collision-library/fcl/issues/354 OPTIONS_DEFINE_amd64= SSE2 SSE3 SSSE3 SSE4 SSE41 SSE42 SSE4A OPTIONS_DEFAULT_amd64= SSE2 OPTIONS_DEFINE_i386= ${OPTIONS_DEFINE_amd64} OPTIONS_DEFAULT_i386= ${OPTIONS_DEFAULT_amd64} .for sse in ${OPTIONS_DEFINE_amd64} ${sse}_DESC= Support for ${sse} ${sse}_CMAKE_ON= -DFCL_USE_X64_SSE:BOOL=ON -DOPT_SSE_${sse}=-m${sse:tl:S/41/4.1/:S/42/4.2/} .endfor -do-test: +do-test: # tests fail to compile: https://github.com/flexible-collision-library/fcl/issues/549 @cd ${BUILD_WRKSRC} && \ ${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DBUILD_TESTING:BOOL=ON -DFCL_BUILD_TESTS:BOOL=ON ${CMAKE_SOURCE_PATH} && \ ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \ ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test .include diff --git a/math/fcl/distinfo b/math/fcl/distinfo index acf6f262658b..4a3fe83e9d70 100644 --- a/math/fcl/distinfo +++ b/math/fcl/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1583020872 -SHA256 (flexible-collision-library-fcl-v0.6.1_GH0.tar.gz) = c8a68de8d35a4a5cd563411e7577c0dc2c626aba1eef288cb1ca88561f8d8019 -SIZE (flexible-collision-library-fcl-v0.6.1_GH0.tar.gz) = 6208928 +TIMESTAMP = 1631693005 +SHA256 (flexible-collision-library-fcl-0.7.0_GH0.tar.gz) = 90409e940b24045987506a6b239424a4222e2daf648c86dd146cbcb692ebdcbc +SIZE (flexible-collision-library-fcl-0.7.0_GH0.tar.gz) = 6231480 diff --git a/math/fcl/files/patch-CMakeLists.txt b/math/fcl/files/patch-CMakeLists.txt index 9dcd05ad5d6e..70ba9dd92a0c 100644 --- a/math/fcl/files/patch-CMakeLists.txt +++ b/math/fcl/files/patch-CMakeLists.txt @@ -1,15 +1,20 @@ ---- CMakeLists.txt.orig 2018-11-17 21:20:10 UTC +--- CMakeLists.txt.orig 2021-09-09 15:34:30 UTC +++ CMakeLists.txt -@@ -55,10 +55,10 @@ endif() +@@ -81,7 +81,7 @@ endif() - # Whether to enable SSE set(SSE_FLAGS "") --option(FCL_USE_X64_SSE "Whether FCL should x64 SSE instructions" ON) -+option(FCL_USE_X64_SSE "Whether FCL should x64 SSE instructions" OFF) - if(FCL_USE_X64_SSE) - if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang") -- set(SSE_FLAGS -mfpmath=sse -msse -msse2 -msse3 -mssse3) -+ set(SSE_FLAGS -mfpmath=sse ${OPT_SSE_SSE2} ${OPT_SSE_SSE3} ${OPT_SSE_SSSE3} ${OPT_SSE_SSE4} ${OPT_SSE_SSE41} ${OPT_SSE_SSE42} ${OPT_SSE_SSE4A}) - elseif(MSVC) - # Win64 will add the flag automatically - if(CMAKE_VS_PLATFORM_NAME STREQUAL "Win32") + if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang") +- set(SSE_FLAGS -mfpmath=sse -msse -msse2 -msse3 -mssse3) ++ set(SSE_FLAGS -mfpmath=sse ${OPT_SSE_SSE2} ${OPT_SSE_SSE3} ${OPT_SSE_SSSE3} ${OPT_SSE_SSE4} ${OPT_SSE_SSE41} ${OPT_SSE_SSE42} ${OPT_SSE_SSE4A}) + elseif(MSVC) + # Win64 will add the flag automatically + if(CMAKE_VS_PLATFORM_NAME STREQUAL "Win32") +@@ -102,7 +102,7 @@ else() + check_cxx_compiler_flag("${SSE_FLAGS}" _compiler_supports_sse) + + if(_has_sse AND _has_sse2 AND _compiler_supports_sse) +- set(FCL_TARGET_SUPPORT_X64_SSE ON) ++ set(FCL_TARGET_SUPPORT_X64_SSE ${FREEBSD_ENABLE_SSE}) + else() + set(FCL_TARGET_SUPPORT_X64_SSE OFF) + endif() diff --git a/math/fcl/pkg-plist b/math/fcl/pkg-plist index b1a0708196bd..e57bc7f521b7 100644 --- a/math/fcl/pkg-plist +++ b/math/fcl/pkg-plist @@ -1,323 +1,323 @@ include/fcl/broadphase/broadphase_SSaP-inl.h include/fcl/broadphase/broadphase_SSaP.h include/fcl/broadphase/broadphase_SaP-inl.h include/fcl/broadphase/broadphase_SaP.h include/fcl/broadphase/broadphase_bruteforce-inl.h include/fcl/broadphase/broadphase_bruteforce.h include/fcl/broadphase/broadphase_collision_manager-inl.h include/fcl/broadphase/broadphase_collision_manager.h include/fcl/broadphase/broadphase_continuous_collision_manager-inl.h include/fcl/broadphase/broadphase_continuous_collision_manager.h include/fcl/broadphase/broadphase_dynamic_AABB_tree-inl.h include/fcl/broadphase/broadphase_dynamic_AABB_tree.h include/fcl/broadphase/broadphase_dynamic_AABB_tree_array-inl.h include/fcl/broadphase/broadphase_dynamic_AABB_tree_array.h include/fcl/broadphase/broadphase_interval_tree-inl.h include/fcl/broadphase/broadphase_interval_tree.h include/fcl/broadphase/broadphase_spatialhash-inl.h include/fcl/broadphase/broadphase_spatialhash.h include/fcl/broadphase/default_broadphase_callbacks.h include/fcl/broadphase/detail/hierarchy_tree-inl.h include/fcl/broadphase/detail/hierarchy_tree.h include/fcl/broadphase/detail/hierarchy_tree_array-inl.h include/fcl/broadphase/detail/hierarchy_tree_array.h include/fcl/broadphase/detail/interval_tree-inl.h include/fcl/broadphase/detail/interval_tree.h include/fcl/broadphase/detail/interval_tree_node-inl.h include/fcl/broadphase/detail/interval_tree_node.h include/fcl/broadphase/detail/morton-inl.h include/fcl/broadphase/detail/morton.h include/fcl/broadphase/detail/node_base-inl.h include/fcl/broadphase/detail/node_base.h include/fcl/broadphase/detail/node_base_array-inl.h include/fcl/broadphase/detail/node_base_array.h include/fcl/broadphase/detail/simple_hash_table-inl.h include/fcl/broadphase/detail/simple_hash_table.h include/fcl/broadphase/detail/simple_interval-inl.h include/fcl/broadphase/detail/simple_interval.h include/fcl/broadphase/detail/sparse_hash_table-inl.h include/fcl/broadphase/detail/sparse_hash_table.h include/fcl/broadphase/detail/spatial_hash-inl.h include/fcl/broadphase/detail/spatial_hash.h include/fcl/common/detail/profiler.h include/fcl/common/exception.h include/fcl/common/profiler.h include/fcl/common/time.h include/fcl/common/types.h include/fcl/common/unused.h include/fcl/common/warning.h include/fcl/config.h include/fcl/export.h include/fcl/fcl.h include/fcl/geometry/bvh/BVH_internal.h include/fcl/geometry/bvh/BVH_model-inl.h include/fcl/geometry/bvh/BVH_model.h include/fcl/geometry/bvh/BVH_utility-inl.h include/fcl/geometry/bvh/BVH_utility.h include/fcl/geometry/bvh/BV_node-inl.h include/fcl/geometry/bvh/BV_node.h include/fcl/geometry/bvh/BV_node_base.h include/fcl/geometry/bvh/detail/BVH_front.h include/fcl/geometry/bvh/detail/BV_fitter-inl.h include/fcl/geometry/bvh/detail/BV_fitter.h include/fcl/geometry/bvh/detail/BV_fitter_base.h include/fcl/geometry/bvh/detail/BV_splitter-inl.h include/fcl/geometry/bvh/detail/BV_splitter.h include/fcl/geometry/bvh/detail/BV_splitter_base.h include/fcl/geometry/collision_geometry-inl.h include/fcl/geometry/collision_geometry.h include/fcl/geometry/geometric_shape_to_BVH_model-inl.h include/fcl/geometry/geometric_shape_to_BVH_model.h include/fcl/geometry/octree/octree-inl.h include/fcl/geometry/octree/octree.h include/fcl/geometry/shape/box-inl.h include/fcl/geometry/shape/box.h include/fcl/geometry/shape/capsule-inl.h include/fcl/geometry/shape/capsule.h include/fcl/geometry/shape/cone-inl.h include/fcl/geometry/shape/cone.h include/fcl/geometry/shape/convex-inl.h include/fcl/geometry/shape/convex.h include/fcl/geometry/shape/cylinder-inl.h include/fcl/geometry/shape/cylinder.h include/fcl/geometry/shape/ellipsoid-inl.h include/fcl/geometry/shape/ellipsoid.h include/fcl/geometry/shape/halfspace-inl.h include/fcl/geometry/shape/halfspace.h include/fcl/geometry/shape/plane-inl.h include/fcl/geometry/shape/plane.h include/fcl/geometry/shape/shape_base-inl.h include/fcl/geometry/shape/shape_base.h include/fcl/geometry/shape/sphere-inl.h include/fcl/geometry/shape/sphere.h include/fcl/geometry/shape/triangle_p-inl.h include/fcl/geometry/shape/triangle_p.h include/fcl/geometry/shape/utility-inl.h include/fcl/geometry/shape/utility.h include/fcl/math/bv/AABB-inl.h include/fcl/math/bv/AABB.h include/fcl/math/bv/OBB-inl.h include/fcl/math/bv/OBB.h include/fcl/math/bv/OBBRSS-inl.h include/fcl/math/bv/OBBRSS.h include/fcl/math/bv/RSS-inl.h include/fcl/math/bv/RSS.h include/fcl/math/bv/kDOP-inl.h include/fcl/math/bv/kDOP.h include/fcl/math/bv/kIOS-inl.h include/fcl/math/bv/kIOS.h include/fcl/math/bv/utility-inl.h include/fcl/math/bv/utility.h include/fcl/math/constants.h include/fcl/math/detail/polysolver-inl.h include/fcl/math/detail/polysolver.h include/fcl/math/detail/project-inl.h include/fcl/math/detail/project.h include/fcl/math/detail/seed.h include/fcl/math/geometry-inl.h include/fcl/math/geometry.h include/fcl/math/motion/bv_motion_bound_visitor.h include/fcl/math/motion/interp_motion-inl.h include/fcl/math/motion/interp_motion.h include/fcl/math/motion/motion_base-inl.h include/fcl/math/motion/motion_base.h include/fcl/math/motion/screw_motion-inl.h include/fcl/math/motion/screw_motion.h include/fcl/math/motion/spline_motion-inl.h include/fcl/math/motion/spline_motion.h include/fcl/math/motion/taylor_model/interval-inl.h include/fcl/math/motion/taylor_model/interval.h include/fcl/math/motion/taylor_model/interval_matrix-inl.h include/fcl/math/motion/taylor_model/interval_matrix.h include/fcl/math/motion/taylor_model/interval_vector-inl.h include/fcl/math/motion/taylor_model/interval_vector.h include/fcl/math/motion/taylor_model/taylor_matrix-inl.h include/fcl/math/motion/taylor_model/taylor_matrix.h include/fcl/math/motion/taylor_model/taylor_model-inl.h include/fcl/math/motion/taylor_model/taylor_model.h include/fcl/math/motion/taylor_model/taylor_vector-inl.h include/fcl/math/motion/taylor_model/taylor_vector.h include/fcl/math/motion/taylor_model/time_interval-inl.h include/fcl/math/motion/taylor_model/time_interval.h include/fcl/math/motion/tbv_motion_bound_visitor-inl.h include/fcl/math/motion/tbv_motion_bound_visitor.h include/fcl/math/motion/translation_motion-inl.h include/fcl/math/motion/translation_motion.h include/fcl/math/motion/triangle_motion_bound_visitor-inl.h include/fcl/math/motion/triangle_motion_bound_visitor.h include/fcl/math/rng-inl.h include/fcl/math/rng.h include/fcl/math/sampler/sampler_base.h include/fcl/math/sampler/sampler_r-inl.h include/fcl/math/sampler/sampler_r.h include/fcl/math/sampler/sampler_se2-inl.h include/fcl/math/sampler/sampler_se2.h include/fcl/math/sampler/sampler_se2_disk-inl.h include/fcl/math/sampler/sampler_se2_disk.h include/fcl/math/sampler/sampler_se3_euler-inl.h include/fcl/math/sampler/sampler_se3_euler.h include/fcl/math/sampler/sampler_se3_euler_ball-inl.h include/fcl/math/sampler/sampler_se3_euler_ball.h include/fcl/math/sampler/sampler_se3_quat-inl.h include/fcl/math/sampler/sampler_se3_quat.h include/fcl/math/sampler/sampler_se3_quat_ball-inl.h include/fcl/math/sampler/sampler_se3_quat_ball.h include/fcl/math/triangle.h include/fcl/math/variance3-inl.h include/fcl/math/variance3.h include/fcl/narrowphase/collision-inl.h include/fcl/narrowphase/collision.h include/fcl/narrowphase/collision_object-inl.h include/fcl/narrowphase/collision_object.h include/fcl/narrowphase/collision_request-inl.h include/fcl/narrowphase/collision_request.h include/fcl/narrowphase/collision_result-inl.h include/fcl/narrowphase/collision_result.h include/fcl/narrowphase/contact-inl.h include/fcl/narrowphase/contact.h include/fcl/narrowphase/contact_point-inl.h include/fcl/narrowphase/contact_point.h include/fcl/narrowphase/continuous_collision-inl.h include/fcl/narrowphase/continuous_collision.h include/fcl/narrowphase/continuous_collision_object-inl.h include/fcl/narrowphase/continuous_collision_object.h include/fcl/narrowphase/continuous_collision_request-inl.h include/fcl/narrowphase/continuous_collision_request.h include/fcl/narrowphase/continuous_collision_result-inl.h include/fcl/narrowphase/continuous_collision_result.h include/fcl/narrowphase/cost_source-inl.h include/fcl/narrowphase/cost_source.h include/fcl/narrowphase/detail/collision_func_matrix-inl.h include/fcl/narrowphase/detail/collision_func_matrix.h include/fcl/narrowphase/detail/conservative_advancement_func_matrix-inl.h include/fcl/narrowphase/detail/conservative_advancement_func_matrix.h include/fcl/narrowphase/detail/convexity_based_algorithm/alloc.h include/fcl/narrowphase/detail/convexity_based_algorithm/epa-inl.h include/fcl/narrowphase/detail/convexity_based_algorithm/epa.h include/fcl/narrowphase/detail/convexity_based_algorithm/gjk-inl.h include/fcl/narrowphase/detail/convexity_based_algorithm/gjk.h include/fcl/narrowphase/detail/convexity_based_algorithm/gjk_libccd-inl.h include/fcl/narrowphase/detail/convexity_based_algorithm/gjk_libccd.h include/fcl/narrowphase/detail/convexity_based_algorithm/list.h include/fcl/narrowphase/detail/convexity_based_algorithm/minkowski_diff-inl.h include/fcl/narrowphase/detail/convexity_based_algorithm/minkowski_diff.h include/fcl/narrowphase/detail/convexity_based_algorithm/polytope.h include/fcl/narrowphase/detail/convexity_based_algorithm/simplex.h include/fcl/narrowphase/detail/convexity_based_algorithm/support.h include/fcl/narrowphase/detail/distance_func_matrix-inl.h include/fcl/narrowphase/detail/distance_func_matrix.h include/fcl/narrowphase/detail/failed_at_this_configuration.h include/fcl/narrowphase/detail/gjk_solver_indep-inl.h include/fcl/narrowphase/detail/gjk_solver_indep.h include/fcl/narrowphase/detail/gjk_solver_libccd-inl.h include/fcl/narrowphase/detail/gjk_solver_libccd.h include/fcl/narrowphase/detail/primitive_shape_algorithm/box_box-inl.h include/fcl/narrowphase/detail/primitive_shape_algorithm/box_box.h include/fcl/narrowphase/detail/primitive_shape_algorithm/capsule_capsule-inl.h include/fcl/narrowphase/detail/primitive_shape_algorithm/capsule_capsule.h include/fcl/narrowphase/detail/primitive_shape_algorithm/halfspace-inl.h include/fcl/narrowphase/detail/primitive_shape_algorithm/halfspace.h include/fcl/narrowphase/detail/primitive_shape_algorithm/plane-inl.h include/fcl/narrowphase/detail/primitive_shape_algorithm/plane.h include/fcl/narrowphase/detail/primitive_shape_algorithm/sphere_box-inl.h include/fcl/narrowphase/detail/primitive_shape_algorithm/sphere_box.h include/fcl/narrowphase/detail/primitive_shape_algorithm/sphere_capsule-inl.h include/fcl/narrowphase/detail/primitive_shape_algorithm/sphere_capsule.h include/fcl/narrowphase/detail/primitive_shape_algorithm/sphere_cylinder-inl.h include/fcl/narrowphase/detail/primitive_shape_algorithm/sphere_cylinder.h include/fcl/narrowphase/detail/primitive_shape_algorithm/sphere_sphere-inl.h include/fcl/narrowphase/detail/primitive_shape_algorithm/sphere_sphere.h include/fcl/narrowphase/detail/primitive_shape_algorithm/sphere_triangle-inl.h include/fcl/narrowphase/detail/primitive_shape_algorithm/sphere_triangle.h include/fcl/narrowphase/detail/primitive_shape_algorithm/triangle_distance-inl.h include/fcl/narrowphase/detail/primitive_shape_algorithm/triangle_distance.h include/fcl/narrowphase/detail/traversal/collision/bvh_collision_traversal_node-inl.h include/fcl/narrowphase/detail/traversal/collision/bvh_collision_traversal_node.h include/fcl/narrowphase/detail/traversal/collision/bvh_shape_collision_traversal_node-inl.h include/fcl/narrowphase/detail/traversal/collision/bvh_shape_collision_traversal_node.h include/fcl/narrowphase/detail/traversal/collision/collision_traversal_node_base-inl.h include/fcl/narrowphase/detail/traversal/collision/collision_traversal_node_base.h include/fcl/narrowphase/detail/traversal/collision/intersect-inl.h include/fcl/narrowphase/detail/traversal/collision/intersect.h include/fcl/narrowphase/detail/traversal/collision/mesh_collision_traversal_node-inl.h include/fcl/narrowphase/detail/traversal/collision/mesh_collision_traversal_node.h include/fcl/narrowphase/detail/traversal/collision/mesh_continuous_collision_traversal_node-inl.h include/fcl/narrowphase/detail/traversal/collision/mesh_continuous_collision_traversal_node.h include/fcl/narrowphase/detail/traversal/collision/mesh_shape_collision_traversal_node-inl.h include/fcl/narrowphase/detail/traversal/collision/mesh_shape_collision_traversal_node.h include/fcl/narrowphase/detail/traversal/collision/shape_bvh_collision_traversal_node-inl.h include/fcl/narrowphase/detail/traversal/collision/shape_bvh_collision_traversal_node.h include/fcl/narrowphase/detail/traversal/collision/shape_collision_traversal_node-inl.h include/fcl/narrowphase/detail/traversal/collision/shape_collision_traversal_node.h include/fcl/narrowphase/detail/traversal/collision/shape_mesh_collision_traversal_node-inl.h include/fcl/narrowphase/detail/traversal/collision/shape_mesh_collision_traversal_node.h include/fcl/narrowphase/detail/traversal/collision_node-inl.h include/fcl/narrowphase/detail/traversal/collision_node.h include/fcl/narrowphase/detail/traversal/distance/bvh_distance_traversal_node-inl.h include/fcl/narrowphase/detail/traversal/distance/bvh_distance_traversal_node.h include/fcl/narrowphase/detail/traversal/distance/bvh_shape_distance_traversal_node-inl.h include/fcl/narrowphase/detail/traversal/distance/bvh_shape_distance_traversal_node.h include/fcl/narrowphase/detail/traversal/distance/conservative_advancement_stack_data-inl.h include/fcl/narrowphase/detail/traversal/distance/conservative_advancement_stack_data.h include/fcl/narrowphase/detail/traversal/distance/distance_traversal_node_base-inl.h include/fcl/narrowphase/detail/traversal/distance/distance_traversal_node_base.h include/fcl/narrowphase/detail/traversal/distance/mesh_conservative_advancement_traversal_node-inl.h include/fcl/narrowphase/detail/traversal/distance/mesh_conservative_advancement_traversal_node.h include/fcl/narrowphase/detail/traversal/distance/mesh_distance_traversal_node-inl.h include/fcl/narrowphase/detail/traversal/distance/mesh_distance_traversal_node.h include/fcl/narrowphase/detail/traversal/distance/mesh_shape_conservative_advancement_traversal_node-inl.h include/fcl/narrowphase/detail/traversal/distance/mesh_shape_conservative_advancement_traversal_node.h include/fcl/narrowphase/detail/traversal/distance/mesh_shape_distance_traversal_node-inl.h include/fcl/narrowphase/detail/traversal/distance/mesh_shape_distance_traversal_node.h include/fcl/narrowphase/detail/traversal/distance/shape_bvh_distance_traversal_node-inl.h include/fcl/narrowphase/detail/traversal/distance/shape_bvh_distance_traversal_node.h include/fcl/narrowphase/detail/traversal/distance/shape_conservative_advancement_traversal_node-inl.h include/fcl/narrowphase/detail/traversal/distance/shape_conservative_advancement_traversal_node.h include/fcl/narrowphase/detail/traversal/distance/shape_distance_traversal_node-inl.h include/fcl/narrowphase/detail/traversal/distance/shape_distance_traversal_node.h include/fcl/narrowphase/detail/traversal/distance/shape_mesh_conservative_advancement_traversal_node-inl.h include/fcl/narrowphase/detail/traversal/distance/shape_mesh_conservative_advancement_traversal_node.h include/fcl/narrowphase/detail/traversal/distance/shape_mesh_distance_traversal_node-inl.h include/fcl/narrowphase/detail/traversal/distance/shape_mesh_distance_traversal_node.h include/fcl/narrowphase/detail/traversal/octree/collision/mesh_octree_collision_traversal_node-inl.h include/fcl/narrowphase/detail/traversal/octree/collision/mesh_octree_collision_traversal_node.h include/fcl/narrowphase/detail/traversal/octree/collision/octree_collision_traversal_node-inl.h include/fcl/narrowphase/detail/traversal/octree/collision/octree_collision_traversal_node.h include/fcl/narrowphase/detail/traversal/octree/collision/octree_mesh_collision_traversal_node-inl.h include/fcl/narrowphase/detail/traversal/octree/collision/octree_mesh_collision_traversal_node.h include/fcl/narrowphase/detail/traversal/octree/collision/octree_shape_collision_traversal_node-inl.h include/fcl/narrowphase/detail/traversal/octree/collision/octree_shape_collision_traversal_node.h include/fcl/narrowphase/detail/traversal/octree/collision/shape_octree_collision_traversal_node-inl.h include/fcl/narrowphase/detail/traversal/octree/collision/shape_octree_collision_traversal_node.h include/fcl/narrowphase/detail/traversal/octree/distance/mesh_octree_distance_traversal_node-inl.h include/fcl/narrowphase/detail/traversal/octree/distance/mesh_octree_distance_traversal_node.h include/fcl/narrowphase/detail/traversal/octree/distance/octree_distance_traversal_node-inl.h include/fcl/narrowphase/detail/traversal/octree/distance/octree_distance_traversal_node.h include/fcl/narrowphase/detail/traversal/octree/distance/octree_mesh_distance_traversal_node-inl.h include/fcl/narrowphase/detail/traversal/octree/distance/octree_mesh_distance_traversal_node.h include/fcl/narrowphase/detail/traversal/octree/distance/octree_shape_distance_traversal_node-inl.h include/fcl/narrowphase/detail/traversal/octree/distance/octree_shape_distance_traversal_node.h include/fcl/narrowphase/detail/traversal/octree/distance/shape_octree_distance_traversal_node-inl.h include/fcl/narrowphase/detail/traversal/octree/distance/shape_octree_distance_traversal_node.h include/fcl/narrowphase/detail/traversal/octree/octree_solver-inl.h include/fcl/narrowphase/detail/traversal/octree/octree_solver.h include/fcl/narrowphase/detail/traversal/traversal_node_base-inl.h include/fcl/narrowphase/detail/traversal/traversal_node_base.h include/fcl/narrowphase/detail/traversal/traversal_recurse-inl.h include/fcl/narrowphase/detail/traversal/traversal_recurse.h include/fcl/narrowphase/distance-inl.h include/fcl/narrowphase/distance.h include/fcl/narrowphase/distance_request-inl.h include/fcl/narrowphase/distance_request.h include/fcl/narrowphase/distance_result-inl.h include/fcl/narrowphase/distance_result.h include/fcl/narrowphase/gjk_solver_type.h lib/cmake/fcl/fcl-config-version.cmake lib/cmake/fcl/fcl-config.cmake lib/cmake/fcl/fcl-targets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/fcl/fcl-targets.cmake lib/libfcl.so -lib/libfcl.so.0.6 -lib/libfcl.so.0.6.1 +lib/libfcl.so.0.7 +lib/libfcl.so.0.7.0 libdata/pkgconfig/fcl.pc %%DATADIR%%/package.xml diff --git a/math/py-python-fcl/Makefile b/math/py-python-fcl/Makefile index 623814a9e1ab..ee05a3a8db70 100644 --- a/math/py-python-fcl/Makefile +++ b/math/py-python-fcl/Makefile @@ -1,28 +1,28 @@ PORTNAME= python-fcl PORTVERSION= 0.0.12 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= math python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= db@FreeBSD.org COMMENT= Python bindings for the Flexible Collision Library LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libfcl05.so:math/fcl05 \ liboctomap.so:math/octomap BUILD_DEPENDS= ${PYNUMPY} RUN_DEPENDS= ${PYNUMPY} USES= compiler:c++11-lang eigen:3 python:3.6+ USE_PYTHON= distutils autoplist concurrent cython PYDISTUTILS_BUILD_TARGET= build_ext post-install: ${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/fcl/fcl*.so .include diff --git a/misc/dartsim/Makefile b/misc/dartsim/Makefile index b30e1f2174d3..44dca0fa9a4c 100644 --- a/misc/dartsim/Makefile +++ b/misc/dartsim/Makefile @@ -1,55 +1,56 @@ PORTNAME= dartsim DISTVERSIONPREFIX= v DISTVERSION= 6.11.1 +PORTREVISION= 1 CATEGORIES= misc MAINTAINER= yuri@FreeBSD.org COMMENT= Dynamic Animation and Robotics Toolkit LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE BROKEN_i386= clang failure: https://bugs.llvm.org/show_bug.cgi?id=41757 BUILD_DEPENDS= pagmo2>0:science/pagmo2 LIB_DEPENDS= libassimp.so:multimedia/assimp \ libBulletDynamics.so:devel/bullet \ libboost_system.so:devel/boost-libs \ libccd.so:math/libccd \ libconsole_bridge.so:devel/ros-console_bridge \ libfcl.so:math/fcl \ libflann_cpp.so:math/flann \ libipopt.so:math/ipopt \ liblz4.so:archivers/liblz4 \ liboctomap.so:math/octomap \ libode.so:devel/ode \ libosg.so:graphics/osg34 \ libnlopt.so:math/nlopt \ libpagmo.so:science/pagmo2 \ libtbb.so:devel/tbb \ libtinyxml2.so:textproc/tinyxml2 \ liburdfdom_world.so:devel/ros-urdfdom USES= cmake compiler:c++17-lang eigen:3,build,run gl localbase:ldflags \ pkgconfig xorg USE_GL= gl glu glut USE_XORG= xi xmu USE_CXXSTD= c++17 # missing in the project, it uses std::void_t (through pagmo2) which is a c++17 feature USE_LDCONFIG= yes USE_GITHUB= yes GH_PROJECT= dart CXXFLAGS+= -I${LOCALBASE}/include/coin # because of pagmo2 headers include CMAKE_ON= BUILD_SHARED_LIBS # DART_VERBOSE CMAKE_ARGS= -DODE_DIR=${LOCALBASE} DATADIR= share/dart DOCSDIR= ${PREFIX}/share/doc/dart OPTIONS_DEFINE= DOCS PORTDOCS= * .include