diff --git a/math/octomap/Makefile b/math/octomap/Makefile index dbec3e54ec0b..223a55bcf127 100644 --- a/math/octomap/Makefile +++ b/math/octomap/Makefile @@ -1,28 +1,28 @@ PORTNAME= octomap DISTVERSIONPREFIX= v -DISTVERSION= 1.9.7 -PORTREVISION= 1 +DISTVERSION= 1.9.8 CATEGORIES= math MAINTAINER= yuri@FreeBSD.org COMMENT= Efficient probabilistic 3D mapping framework based on octrees LICENSE= BSD3CLAUSE GPLv2 LICENSE_COMB= dual LICENSE_FILE_BSD3CLAUSE= ${WRKSRC}/octomap/LICENSE.txt LICENSE_FILE_GPLv2= ${WRKSRC}/octovis/LICENSE.txt LIB_DEPENDS= libQGLViewer-qt5.so:graphics/libQGLViewer -USES= cmake compiler:c++11-lang localbase:ldflags gl qt:5 -USE_GITHUB= yes -GH_ACCOUNT= OctoMap +USES= cmake:testing compiler:c++11-lang localbase:ldflags gl qt:5 USE_QT= core gui opengl xml widgets buildtools_build qmake_build USE_GL= gl glu USE_LDCONFIG= yes +USE_GITHUB= yes +GH_ACCOUNT= OctoMap + # Viewer is broken: https://github.com/OctoMap/octomap/issues/224, and libQGLViewer detection is broken: https://github.com/OctoMap/octomap/issues/225 #CMAKE_ON= OCTOVIS_QT5 CMAKE_ARGS= -DQGLVIEWER_BASE_DIR:PATH=${LOCALBASE}/include/QGLViewer #-DQGLViewer_LIBRARY_DIR_OTHER:PATH=${LOCALBASE}/lib .include diff --git a/math/octomap/distinfo b/math/octomap/distinfo index 20e1d0b22471..7def9824dee2 100644 --- a/math/octomap/distinfo +++ b/math/octomap/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1620605016 -SHA256 (OctoMap-octomap-v1.9.7_GH0.tar.gz) = 3e9ac020686ceb4e17e161bffc5a0dafd9cccab33adeb9adee59a61c418ea1c1 -SIZE (OctoMap-octomap-v1.9.7_GH0.tar.gz) = 1684088 +TIMESTAMP = 1653983015 +SHA256 (OctoMap-octomap-v1.9.8_GH0.tar.gz) = 417af6da4e855e9a83b93458aa98b01a2c88f880088baad2b59d323ce162586e +SIZE (OctoMap-octomap-v1.9.8_GH0.tar.gz) = 1693311 diff --git a/math/octomap/files/patch-dynamicEDT3D_src_CMakeLists.txt b/math/octomap/files/patch-dynamicEDT3D_src_CMakeLists.txt index b1d079bf3ab1..000e1a04e2d1 100644 --- a/math/octomap/files/patch-dynamicEDT3D_src_CMakeLists.txt +++ b/math/octomap/files/patch-dynamicEDT3D_src_CMakeLists.txt @@ -1,37 +1,37 @@ ---- dynamicEDT3D/src/CMakeLists.txt.orig 2018-11-20 06:37:53 UTC +--- dynamicEDT3D/src/CMakeLists.txt.orig 2022-05-12 20:49:09 UTC +++ dynamicEDT3D/src/CMakeLists.txt -@@ -9,28 +9,28 @@ set_target_properties(dynamicedt3d PROPE +@@ -9,28 +9,28 @@ set_target_properties(dynamicedt3d PROPERTIES ) target_link_libraries(dynamicedt3d ${OCTOMAP_LIBRARIES}) -add_library(dynamicedt3d-static STATIC ${dynamicEDT3D_SRCS}) -target_link_libraries(dynamicedt3d-static ${OCTOMAP_LIBRARIES}) +#add_library(dynamicedt3d-static STATIC ${dynamicEDT3D_SRCS}) +#target_link_libraries(dynamicedt3d-static ${OCTOMAP_LIBRARIES}) -SET_TARGET_PROPERTIES(dynamicedt3d-static PROPERTIES OUTPUT_NAME "dynamicedt3d") +#SET_TARGET_PROPERTIES(dynamicedt3d-static PROPERTIES OUTPUT_NAME "dynamicedt3d") if(NOT EXISTS "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/cmake/dynamicEDT3D") file(MAKE_DIRECTORY "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/cmake/dynamicEDT3D") endif() -export(TARGETS dynamicedt3d dynamicedt3d-static +export(TARGETS dynamicedt3d FILE "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/cmake/dynamicEDT3D/dynamicEDT3DTargets.cmake") # directly depend on the octomap library target when building the # complete distribution, so it it recompiled as needed if (CMAKE_PROJECT_NAME STREQUAL "octomap-distribution") - ADD_DEPENDENCIES(dynamicedt3d-static octomap-static) + #ADD_DEPENDENCIES(dynamicedt3d-static octomap-static) ADD_DEPENDENCIES(dynamicedt3d octomap) endif() ADD_SUBDIRECTORY(examples) -install(TARGETS dynamicedt3d dynamicedt3d-static +install(TARGETS dynamicedt3d EXPORT dynamicEDT3DTargets - INCLUDES DESTINATION include + INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" ${INSTALL_TARGETS_DEFAULT_ARGS} diff --git a/math/octomap/files/patch-octomap_src_CMakeLists.txt b/math/octomap/files/patch-octomap_src_CMakeLists.txt index 0dab6634c922..285dc6b7c31c 100644 --- a/math/octomap/files/patch-octomap_src_CMakeLists.txt +++ b/math/octomap/files/patch-octomap_src_CMakeLists.txt @@ -1,33 +1,33 @@ ---- octomap/src/CMakeLists.txt.orig 2019-11-23 20:56:23 UTC +--- octomap/src/CMakeLists.txt.orig 2022-05-12 20:49:09 UTC +++ octomap/src/CMakeLists.txt @@ -16,9 +16,9 @@ set_target_properties( octomap PROPERTIES VERSION ${OCTOMAP_VERSION} SOVERSION ${OCTOMAP_SOVERSION} ) -ADD_LIBRARY( octomap-static STATIC ${octomap_SRCS}) -SET_TARGET_PROPERTIES(octomap-static PROPERTIES OUTPUT_NAME "octomap") -add_dependencies(octomap-static octomath-static) +#ADD_LIBRARY( octomap-static STATIC ${octomap_SRCS}) +#SET_TARGET_PROPERTIES(octomap-static PROPERTIES OUTPUT_NAME "octomap") +#add_dependencies(octomap-static octomath-static) TARGET_LINK_LIBRARIES(octomap octomath) @@ -26,7 +26,7 @@ if(NOT EXISTS "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/cmake file(MAKE_DIRECTORY "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/cmake/octomap") endif() -export(TARGETS octomap octomap-static +export(TARGETS octomap APPEND FILE "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/cmake/octomap/octomap-targets.cmake") ADD_SUBDIRECTORY( testing ) @@ -67,7 +67,7 @@ TARGET_LINK_LIBRARIES(intersection_example octomap) ADD_EXECUTABLE(octree2pointcloud octree2pointcloud.cpp) TARGET_LINK_LIBRARIES(octree2pointcloud octomap) -install(TARGETS octomap octomap-static +install(TARGETS octomap EXPORT octomap-targets - INCLUDES DESTINATION include + INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" ${INSTALL_TARGETS_DEFAULT_ARGS} diff --git a/math/octomap/files/patch-octomap_src_math_CMakeLists.txt b/math/octomap/files/patch-octomap_src_math_CMakeLists.txt index ef05b4b2c385..4f3613a33ea6 100644 --- a/math/octomap/files/patch-octomap_src_math_CMakeLists.txt +++ b/math/octomap/files/patch-octomap_src_math_CMakeLists.txt @@ -1,24 +1,24 @@ ---- octomap/src/math/CMakeLists.txt.orig 2018-11-20 06:36:08 UTC +--- octomap/src/math/CMakeLists.txt.orig 2022-05-12 20:49:09 UTC +++ octomap/src/math/CMakeLists.txt -@@ -14,17 +14,17 @@ SET_TARGET_PROPERTIES( octomath PROPERTI +@@ -12,17 +12,17 @@ SET_TARGET_PROPERTIES( octomath PROPERTIES + SOVERSION ${OCTOMAP_SOVERSION} ) - # INSTALL_NAME_DIR seems to be necessary for MacOS X -ADD_LIBRARY( octomath-static STATIC ${octomath_SRCS}) -SET_TARGET_PROPERTIES(octomath-static PROPERTIES OUTPUT_NAME "octomath") +#ADD_LIBRARY( octomath-static STATIC ${octomath_SRCS}) +#SET_TARGET_PROPERTIES(octomath-static PROPERTIES OUTPUT_NAME "octomath") if(NOT EXISTS "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/cmake/octomap") file(MAKE_DIRECTORY "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/cmake/octomap") endif() -export(TARGETS octomath octomath-static +export(TARGETS octomath APPEND FILE "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/cmake/octomap/octomap-targets.cmake") -install(TARGETS octomath octomath-static +install(TARGETS octomath EXPORT octomap-targets - INCLUDES DESTINATION include + INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" ${INSTALL_TARGETS_DEFAULT_ARGS} diff --git a/math/octomap/files/patch-octovis_CMakeLists__src.txt b/math/octomap/files/patch-octovis_CMakeLists__src.txt index 2f45d787664f..f3014c571154 100644 --- a/math/octomap/files/patch-octovis_CMakeLists__src.txt +++ b/math/octomap/files/patch-octovis_CMakeLists__src.txt @@ -1,37 +1,47 @@ ---- octovis/CMakeLists_src.txt.orig 2018-11-20 06:29:27 UTC +--- octovis/CMakeLists_src.txt.orig 2022-05-12 20:49:09 UTC +++ octovis/CMakeLists_src.txt -@@ -99,9 +99,9 @@ include_directories(${CMAKE_CURRENT_BINA +@@ -99,14 +99,14 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAK # Library target -add_library(octovis-static STATIC ${viewerlib_SRCS}) --target_link_libraries(octovis-static) +-target_link_libraries(octovis-static +- ${OPENGL_gl_LIBRARY} +- ${OPENGL_glu_LIBRARY} +- ${OCTOMAP_LIBRARIES} +- ${QGLViewer_LIBRARIES} +-) -set_target_properties(octovis-static PROPERTIES OUTPUT_NAME octovis) +#add_library(octovis-static STATIC ${viewerlib_SRCS}) -+#target_link_libraries(octovis-static) ++#target_link_libraries(octovis-static ++# ${OPENGL_gl_LIBRARY} ++# ${OPENGL_glu_LIBRARY} ++# ${OCTOMAP_LIBRARIES} ++# ${QGLViewer_LIBRARIES} ++#) +#set_target_properties(octovis-static PROPERTIES OUTPUT_NAME octovis) add_library(octovis-shared SHARED ${viewerlib_SRCS}) target_link_libraries(octovis-shared -@@ -119,7 +119,7 @@ set_target_properties(octovis-shared PRO +@@ -124,7 +124,7 @@ set_target_properties(octovis-shared PROPERTIES # directly depend on the octomap library target when building the # complete distribution, so it is recompiled as needed if (CMAKE_PROJECT_NAME STREQUAL "octomap-distribution") - ADD_DEPENDENCIES(octovis-static octomap-static) + #ADD_DEPENDENCIES(octovis-static octomap-static) ADD_DEPENDENCIES(octovis-shared octomap) endif() -@@ -146,10 +146,10 @@ if(NOT EXISTS "${CMAKE_LIBRARY_OUTPUT_DI +@@ -151,10 +151,10 @@ if(NOT EXISTS "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/cmake file(MAKE_DIRECTORY "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/cmake/octovis") endif() -export(TARGETS octovis octovis-static octovis-shared +export(TARGETS octovis octovis-shared FILE "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/cmake/octovis/octovis-targets.cmake") -install(TARGETS octovis octovis-static octovis-shared +install(TARGETS octovis octovis-shared EXPORT octovis-targets - INCLUDES DESTINATION include + INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" ${INSTALL_TARGETS_DEFAULT_ARGS} diff --git a/math/octomap/pkg-plist b/math/octomap/pkg-plist index 765af73a32ba..d505f617bf4c 100644 --- a/math/octomap/pkg-plist +++ b/math/octomap/pkg-plist @@ -1,86 +1,86 @@ bin/binvox2bt bin/bt2vrml bin/compare_octrees bin/convert_octree bin/edit_octree bin/eval_octree_accuracy bin/graph2tree bin/log2graph bin/octovis include/dynamicEDT3D/bucketedqueue.h include/dynamicEDT3D/bucketedqueue.hxx include/dynamicEDT3D/dynamicEDT3D.h include/dynamicEDT3D/dynamicEDTOctomap.h include/dynamicEDT3D/dynamicEDTOctomap.hxx include/dynamicEDT3D/point.h include/octomap/AbstractOcTree.h include/octomap/AbstractOccupancyOcTree.h include/octomap/ColorOcTree.h include/octomap/CountingOcTree.h include/octomap/MCTables.h include/octomap/MapCollection.h include/octomap/MapCollection.hxx include/octomap/MapNode.h include/octomap/MapNode.hxx include/octomap/OcTree.h include/octomap/OcTreeBase.h include/octomap/OcTreeBaseImpl.h include/octomap/OcTreeBaseImpl.hxx include/octomap/OcTreeDataNode.h include/octomap/OcTreeDataNode.hxx include/octomap/OcTreeIterator.hxx include/octomap/OcTreeKey.h include/octomap/OcTreeNode.h include/octomap/OcTreeStamped.h include/octomap/OccupancyOcTreeBase.h include/octomap/OccupancyOcTreeBase.hxx include/octomap/Pointcloud.h include/octomap/ScanGraph.h include/octomap/math/Pose6D.h include/octomap/math/Quaternion.h include/octomap/math/Utils.h include/octomap/math/Vector3.h include/octomap/octomap.h include/octomap/octomap_deprecated.h include/octomap/octomap_timing.h include/octomap/octomap_types.h include/octomap/octomap_utils.h include/octovis/ColorOcTreeDrawer.h include/octovis/OcTreeDrawer.h include/octovis/OcTreeRecord.h include/octovis/PointcloudDrawer.h include/octovis/SceneObject.h include/octovis/SelectionBox.h include/octovis/TrajectoryDrawer.h lib/libdynamicedt3d.so lib/libdynamicedt3d.so.1.9 -lib/libdynamicedt3d.so.1.9.7 +lib/libdynamicedt3d.so.1.9.8 lib/liboctomap.so lib/liboctomap.so.1.9 -lib/liboctomap.so.1.9.7 +lib/liboctomap.so.1.9.8 lib/liboctomath.so lib/liboctomath.so.1.9 -lib/liboctomath.so.1.9.7 +lib/liboctomath.so.1.9.8 lib/liboctovis.so lib/liboctovis.so.1.9 -lib/liboctovis.so.1.9.7 +lib/liboctovis.so.1.9.8 libdata/pkgconfig/dynamicEDT3D.pc libdata/pkgconfig/octomap.pc share/ament_index/resource_index/packages/dynamicEDT3D share/ament_index/resource_index/packages/octomap share/ament_index/resource_index/packages/octovis share/dynamicEDT3D/dynamicEDT3DConfig-version.cmake share/dynamicEDT3D/dynamicEDT3DConfig.cmake share/dynamicEDT3D/dynamicEDT3DTargets-%%CMAKE_BUILD_TYPE%%.cmake share/dynamicEDT3D/dynamicEDT3DTargets.cmake share/dynamic_edt_3d/package.xml %%DATADIR%%/octomap-config-version.cmake %%DATADIR%%/octomap-config.cmake %%DATADIR%%/octomap-targets-%%CMAKE_BUILD_TYPE%%.cmake %%DATADIR%%/octomap-targets.cmake %%DATADIR%%/package.xml share/octovis/octovis-config-version.cmake share/octovis/octovis-config.cmake share/octovis/octovis-targets-%%CMAKE_BUILD_TYPE%%.cmake share/octovis/octovis-targets.cmake share/octovis/package.xml