graphics/pcl-pointclouds: Fix VTK option and switch to VTK-9.1

2 files changed, 146 insertions, 5 deletions

diff --git a/graphics/pcl-pointclouds/Makefile b/graphics/pcl-pointclouds/Makefile
index 2c56b75b7ee6..6c4cbb72addf 100644
--- a/graphics/pcl-pointclouds/Makefile
+++ b/graphics/pcl-pointclouds/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	pcl
 DISTVERSION=	1.12.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics math
 MASTER_SITES=	https://github.com/PointCloudLibrary/${PORTNAME}/releases/download/${PORTNAME}-${DISTVERSION}/
 PKGNAMESUFFIX=	-pointclouds
@@ -69,12 +69,15 @@ QHULL_DESC=		Include convex-hull operations
 QHULL_CMAKE_BOOL=	WITH_QHULL
 QHULL_LIB_DEPENDS=	libqhull_r.so:math/qhull8
 
-QT5_CMAKE_BOOL=		WITH_QT
+QT5_CMAKE_ON=		-DWITH_QT=QT5
+QT5_CMAKE_OFF=		-DWITH_QT=NO
 QT5_BROKEN=		WITH_QT doesn't do anything, should be used by apps, but apps is also broken: see https://github.com/PointCloudLibrary/pcl/issues/2642
 
-VTK_DESC=		Build VTK-Visualizations
+VTK_DESC=		Build VTK visualizations
+VTK_USES=		gl qt:5
+VTK_USE=		GL=gl,glu QT=core,gui,opengl,widgets,buildtools_build,qmake_build
 VTK_CMAKE_BOOL=		WITH_VTK
-VTK_LIB_DEPENDS=	libvtkCommonCore-8.2.so:math/vtk8
-VTK_BROKEN=		VTK has missing ompxx symbols: https://gitlab.kitware.com/vtk/vtk/issues/17444
+VTK_CMAKE_ON=		-DVTK_DIR=${LOCALBASE}/lib/cmake/vtk-9.1
+VTK_LIB_DEPENDS=	libvtkCommonCore-9.1.so:math/vtk9
 
 .include <bsd.port.mk>
diff --git a/graphics/pcl-pointclouds/pkg-plist b/graphics/pcl-pointclouds/pkg-plist
index 8575863f3ee5..5bc7680acbe6 100644
--- a/graphics/pcl-pointclouds/pkg-plist
+++ b/graphics/pcl-pointclouds/pkg-plist
@@ -6,6 +6,7 @@ bin/pcl_compute_hausdorff
 %%QHULL%%bin/pcl_compute_hull
 bin/pcl_concatenate_points_pcd
 bin/pcl_convert_pcd_ascii_binary
+%%VTK%%bin/pcl_converter
 bin/pcl_crf_segmentation
 %%QHULL%%bin/pcl_crop_to_hull
 bin/pcl_demean_cloud
@@ -17,6 +18,7 @@ bin/pcl_generate
 bin/pcl_gp3_surface
 bin/pcl_grid_min
 bin/pcl_hdl_grabber
+%%VTK%%bin/pcl_hdl_viewer_simple
 bin/pcl_icp
 bin/pcl_icp2d
 bin/pcl_linemod_detection
@@ -24,17 +26,35 @@ bin/pcl_local_max
 bin/pcl_lum
 bin/pcl_marching_cubes_reconstruction
 bin/pcl_match_linemod_template
+%%VTK%%bin/pcl_mesh2pcd
+%%VTK%%bin/pcl_mesh_sampling
 bin/pcl_mls_smoothing
 bin/pcl_morph
 bin/pcl_ndt2d
 bin/pcl_ndt3d
 bin/pcl_normal_estimation
+%%VTK%%bin/pcl_obj2pcd
+%%VTK%%bin/pcl_obj2ply
+%%VTK%%bin/pcl_obj2vtk
+%%VTK%%bin/pcl_obj_rec_ransac_accepted_hypotheses
+%%VTK%%bin/pcl_obj_rec_ransac_hash_table
+%%VTK%%bin/pcl_obj_rec_ransac_model_opps
+%%VTK%%bin/pcl_obj_rec_ransac_orr_octree
+%%VTK%%bin/pcl_obj_rec_ransac_orr_octree_zprojection
+%%VTK%%bin/pcl_obj_rec_ransac_result
+%%VTK%%bin/pcl_obj_rec_ransac_scene_opps
+%%VTK%%bin/pcl_octree_viewer
 bin/pcl_outlier_removal
+%%VTK%%bin/pcl_outofcore_print
+%%VTK%%bin/pcl_outofcore_process
+%%VTK%%bin/pcl_outofcore_viewer
 bin/pcl_passthrough_filter
 bin/pcl_pcd2ply
+%%VTK%%bin/pcl_pcd2png
 bin/pcl_pcd2vtk
 bin/pcl_pcd_change_viewpoint
 bin/pcl_pcd_convert_NaN_nan
+%%VTK%%bin/pcl_pcd_image_viewer
 bin/pcl_pcd_introduce_nan
 bin/pcl_pclzf2pcd
 bin/pcl_plane_projection
@@ -42,12 +62,17 @@ bin/pcl_ply2obj
 bin/pcl_ply2pcd
 bin/pcl_ply2ply
 bin/pcl_ply2raw
+%%VTK%%bin/pcl_ply2vtk
 bin/pcl_plyheader
+%%VTK%%bin/pcl_png2pcd
 bin/pcl_poisson_reconstruction
 bin/pcl_progressive_morphological_filter
 bin/pcl_radius_filter
+%%VTK%%bin/pcl_registration_visualizer
 bin/pcl_sac_segmentation_plane
 bin/pcl_spin_estimation
+%%VTK%%bin/pcl_tiff2pcd
+%%VTK%%bin/pcl_timed_trigger_test
 bin/pcl_train_linemod_template
 bin/pcl_train_unary_classifier
 bin/pcl_transform_from_viewpoint
@@ -55,7 +80,14 @@ bin/pcl_transform_point_cloud
 bin/pcl_unary_classifier_segment
 bin/pcl_uniform_sampling
 bin/pcl_vfh_estimation
+%%VTK%%bin/pcl_viewer
+%%VTK%%bin/pcl_virtual_scanner
+%%VTK%%bin/pcl_vlp_viewer
 bin/pcl_voxel_grid
+%%VTK%%bin/pcl_voxel_grid_occlusion_estimation
+%%VTK%%bin/pcl_vtk2obj
+%%VTK%%bin/pcl_vtk2pcd
+%%VTK%%bin/pcl_vtk2ply
 bin/pcl_xyz2pcd
 include/pcl-%%SHL2%%/pcl/2d/convolution.h
 include/pcl-%%SHL2%%/pcl/2d/edge.h
@@ -363,6 +395,7 @@ include/pcl-%%SHL2%%/pcl/io/impl/octree_pointcloud_compression.hpp
 include/pcl-%%SHL2%%/pcl/io/impl/pcd_io.hpp
 include/pcl-%%SHL2%%/pcl/io/impl/point_cloud_image_extractors.hpp
 include/pcl-%%SHL2%%/pcl/io/impl/synchronized_queue.hpp
+%%VTK%%include/pcl-%%SHL2%%/pcl/io/impl/vtk_lib_io.hpp
 include/pcl-%%SHL2%%/pcl/io/io.h
 include/pcl-%%SHL2%%/pcl/io/io_exception.h
 include/pcl-%%SHL2%%/pcl/io/low_level_io.h
@@ -376,12 +409,14 @@ include/pcl-%%SHL2%%/pcl/io/ply/io_operators.h
 include/pcl-%%SHL2%%/pcl/io/ply/ply.h
 include/pcl-%%SHL2%%/pcl/io/ply/ply_parser.h
 include/pcl-%%SHL2%%/pcl/io/ply_io.h
+%%VTK%%include/pcl-%%SHL2%%/pcl/io/png_io.h
 include/pcl-%%SHL2%%/pcl/io/point_cloud_image_extractors.h
 include/pcl-%%SHL2%%/pcl/io/robot_eye_grabber.h
 include/pcl-%%SHL2%%/pcl/io/tar.h
 include/pcl-%%SHL2%%/pcl/io/tim_grabber.h
 include/pcl-%%SHL2%%/pcl/io/vlp_grabber.h
 include/pcl-%%SHL2%%/pcl/io/vtk_io.h
+%%VTK%%include/pcl-%%SHL2%%/pcl/io/vtk_lib_io.h
 include/pcl-%%SHL2%%/pcl/kdtree/impl/io.hpp
 include/pcl-%%SHL2%%/pcl/kdtree/impl/kdtree_flann.hpp
 include/pcl-%%SHL2%%/pcl/kdtree/io.h
@@ -474,11 +509,54 @@ include/pcl-%%SHL2%%/pcl/octree/octree_pointcloud_pointvector.h
 include/pcl-%%SHL2%%/pcl/octree/octree_pointcloud_singlepoint.h
 include/pcl-%%SHL2%%/pcl/octree/octree_pointcloud_voxelcentroid.h
 include/pcl-%%SHL2%%/pcl/octree/octree_search.h
+%%VTK%%include/pcl-%%SHL2%%/pcl/outofcore/boost.h
+%%VTK%%include/pcl-%%SHL2%%/pcl/outofcore/cJSON.h
+%%VTK%%include/pcl-%%SHL2%%/pcl/outofcore/impl/lru_cache.hpp
+%%VTK%%include/pcl-%%SHL2%%/pcl/outofcore/impl/monitor_queue.hpp
+%%VTK%%include/pcl-%%SHL2%%/pcl/outofcore/impl/octree_base.hpp
+%%VTK%%include/pcl-%%SHL2%%/pcl/outofcore/impl/octree_base_node.hpp
+%%VTK%%include/pcl-%%SHL2%%/pcl/outofcore/impl/octree_disk_container.hpp
+%%VTK%%include/pcl-%%SHL2%%/pcl/outofcore/impl/octree_ram_container.hpp
+%%VTK%%include/pcl-%%SHL2%%/pcl/outofcore/impl/outofcore_breadth_first_iterator.hpp
+%%VTK%%include/pcl-%%SHL2%%/pcl/outofcore/impl/outofcore_depth_first_iterator.hpp
+%%VTK%%include/pcl-%%SHL2%%/pcl/outofcore/metadata.h
+%%VTK%%include/pcl-%%SHL2%%/pcl/outofcore/octree_abstract_node_container.h
+%%VTK%%include/pcl-%%SHL2%%/pcl/outofcore/octree_base.h
+%%VTK%%include/pcl-%%SHL2%%/pcl/outofcore/octree_base_node.h
+%%VTK%%include/pcl-%%SHL2%%/pcl/outofcore/octree_disk_container.h
+%%VTK%%include/pcl-%%SHL2%%/pcl/outofcore/octree_ram_container.h
+%%VTK%%include/pcl-%%SHL2%%/pcl/outofcore/outofcore.h
+%%VTK%%include/pcl-%%SHL2%%/pcl/outofcore/outofcore_base_data.h
+%%VTK%%include/pcl-%%SHL2%%/pcl/outofcore/outofcore_breadth_first_iterator.h
+%%VTK%%include/pcl-%%SHL2%%/pcl/outofcore/outofcore_depth_first_iterator.h
+%%VTK%%include/pcl-%%SHL2%%/pcl/outofcore/outofcore_impl.h
+%%VTK%%include/pcl-%%SHL2%%/pcl/outofcore/outofcore_iterator_base.h
+%%VTK%%include/pcl-%%SHL2%%/pcl/outofcore/outofcore_node_data.h
+%%VTK%%include/pcl-%%SHL2%%/pcl/outofcore/visualization/axes.h
+%%VTK%%include/pcl-%%SHL2%%/pcl/outofcore/visualization/camera.h
+%%VTK%%include/pcl-%%SHL2%%/pcl/outofcore/visualization/common.h
+%%VTK%%include/pcl-%%SHL2%%/pcl/outofcore/visualization/geometry.h
+%%VTK%%include/pcl-%%SHL2%%/pcl/outofcore/visualization/grid.h
+%%VTK%%include/pcl-%%SHL2%%/pcl/outofcore/visualization/object.h
+%%VTK%%include/pcl-%%SHL2%%/pcl/outofcore/visualization/outofcore_cloud.h
+%%VTK%%include/pcl-%%SHL2%%/pcl/outofcore/visualization/scene.h
+%%VTK%%include/pcl-%%SHL2%%/pcl/outofcore/visualization/viewport.h
 include/pcl-%%SHL2%%/pcl/pcl_base.h
 include/pcl-%%SHL2%%/pcl/pcl_config.h
 include/pcl-%%SHL2%%/pcl/pcl_exports.h
 include/pcl-%%SHL2%%/pcl/pcl_macros.h
 include/pcl-%%SHL2%%/pcl/pcl_tests.h
+%%VTK%%include/pcl-%%SHL2%%/pcl/people/ground_based_people_detection_app.h
+%%VTK%%include/pcl-%%SHL2%%/pcl/people/head_based_subcluster.h
+%%VTK%%include/pcl-%%SHL2%%/pcl/people/height_map_2d.h
+%%VTK%%include/pcl-%%SHL2%%/pcl/people/hog.h
+%%VTK%%include/pcl-%%SHL2%%/pcl/people/impl/ground_based_people_detection_app.hpp
+%%VTK%%include/pcl-%%SHL2%%/pcl/people/impl/head_based_subcluster.hpp
+%%VTK%%include/pcl-%%SHL2%%/pcl/people/impl/height_map_2d.hpp
+%%VTK%%include/pcl-%%SHL2%%/pcl/people/impl/person_classifier.hpp
+%%VTK%%include/pcl-%%SHL2%%/pcl/people/impl/person_cluster.hpp
+%%VTK%%include/pcl-%%SHL2%%/pcl/people/person_classifier.h
+%%VTK%%include/pcl-%%SHL2%%/pcl/people/person_cluster.h
 include/pcl-%%SHL2%%/pcl/point_cloud.h
 include/pcl-%%SHL2%%/pcl/point_representation.h
 include/pcl-%%SHL2%%/pcl/point_struct_traits.h
@@ -868,6 +946,12 @@ include/pcl-%%SHL2%%/pcl/surface/reconstruction.h
 include/pcl-%%SHL2%%/pcl/surface/simplification_remove_unused_vertices.h
 include/pcl-%%SHL2%%/pcl/surface/surfel_smoothing.h
 include/pcl-%%SHL2%%/pcl/surface/texture_mapping.h
+%%VTK%%include/pcl-%%SHL2%%/pcl/surface/vtk_smoothing/vtk.h
+%%VTK%%include/pcl-%%SHL2%%/pcl/surface/vtk_smoothing/vtk_mesh_quadric_decimation.h
+%%VTK%%include/pcl-%%SHL2%%/pcl/surface/vtk_smoothing/vtk_mesh_smoothing_laplacian.h
+%%VTK%%include/pcl-%%SHL2%%/pcl/surface/vtk_smoothing/vtk_mesh_smoothing_windowed_sinc.h
+%%VTK%%include/pcl-%%SHL2%%/pcl/surface/vtk_smoothing/vtk_mesh_subdivision.h
+%%VTK%%include/pcl-%%SHL2%%/pcl/surface/vtk_smoothing/vtk_utils.h
 include/pcl-%%SHL2%%/pcl/tracking/approx_nearest_pair_point_cloud_coherence.h
 include/pcl-%%SHL2%%/pcl/tracking/coherence.h
 include/pcl-%%SHL2%%/pcl/tracking/distance_coherence.h
@@ -896,6 +980,48 @@ include/pcl-%%SHL2%%/pcl/tracking/tracker.h
 include/pcl-%%SHL2%%/pcl/tracking/tracking.h
 include/pcl-%%SHL2%%/pcl/type_traits.h
 include/pcl-%%SHL2%%/pcl/types.h
+%%VTK%%include/pcl-%%SHL2%%/pcl/visualization/area_picking_event.h
+%%VTK%%include/pcl-%%SHL2%%/pcl/visualization/boost.h
+%%VTK%%include/pcl-%%SHL2%%/pcl/visualization/cloud_viewer.h
+%%VTK%%include/pcl-%%SHL2%%/pcl/visualization/common/actor_map.h
+%%VTK%%include/pcl-%%SHL2%%/pcl/visualization/common/common.h
+%%VTK%%include/pcl-%%SHL2%%/pcl/visualization/common/float_image_utils.h
+%%VTK%%include/pcl-%%SHL2%%/pcl/visualization/common/impl/common.hpp
+%%VTK%%include/pcl-%%SHL2%%/pcl/visualization/common/impl/shapes.hpp
+%%VTK%%include/pcl-%%SHL2%%/pcl/visualization/common/io.h
+%%VTK%%include/pcl-%%SHL2%%/pcl/visualization/common/ren_win_interact_map.h
+%%VTK%%include/pcl-%%SHL2%%/pcl/visualization/common/shapes.h
+%%VTK%%include/pcl-%%SHL2%%/pcl/visualization/eigen.h
+%%VTK%%include/pcl-%%SHL2%%/pcl/visualization/histogram_visualizer.h
+%%VTK%%include/pcl-%%SHL2%%/pcl/visualization/image_viewer.h
+%%VTK%%include/pcl-%%SHL2%%/pcl/visualization/impl/histogram_visualizer.hpp
+%%VTK%%include/pcl-%%SHL2%%/pcl/visualization/impl/image_viewer.hpp
+%%VTK%%include/pcl-%%SHL2%%/pcl/visualization/impl/pcl_plotter.hpp
+%%VTK%%include/pcl-%%SHL2%%/pcl/visualization/impl/pcl_visualizer.hpp
+%%VTK%%include/pcl-%%SHL2%%/pcl/visualization/impl/point_cloud_color_handlers.hpp
+%%VTK%%include/pcl-%%SHL2%%/pcl/visualization/impl/point_cloud_geometry_handlers.hpp
+%%VTK%%include/pcl-%%SHL2%%/pcl/visualization/impl/point_cloud_handlers.hpp
+%%VTK%%include/pcl-%%SHL2%%/pcl/visualization/impl/registration_visualizer.hpp
+%%VTK%%include/pcl-%%SHL2%%/pcl/visualization/interactor_style.h
+%%VTK%%include/pcl-%%SHL2%%/pcl/visualization/keyboard_event.h
+%%VTK%%include/pcl-%%SHL2%%/pcl/visualization/mouse_event.h
+%%VTK%%include/pcl-%%SHL2%%/pcl/visualization/pcl_painter2D.h
+%%VTK%%include/pcl-%%SHL2%%/pcl/visualization/pcl_plotter.h
+%%VTK%%include/pcl-%%SHL2%%/pcl/visualization/pcl_visualizer.h
+%%VTK%%include/pcl-%%SHL2%%/pcl/visualization/point_cloud_color_handlers.h
+%%VTK%%include/pcl-%%SHL2%%/pcl/visualization/point_cloud_geometry_handlers.h
+%%VTK%%include/pcl-%%SHL2%%/pcl/visualization/point_cloud_handlers.h
+%%VTK%%include/pcl-%%SHL2%%/pcl/visualization/point_picking_event.h
+%%VTK%%include/pcl-%%SHL2%%/pcl/visualization/qvtk_compatibility.h
+%%VTK%%include/pcl-%%SHL2%%/pcl/visualization/range_image_visualizer.h
+%%VTK%%include/pcl-%%SHL2%%/pcl/visualization/registration_visualizer.h
+%%VTK%%include/pcl-%%SHL2%%/pcl/visualization/simple_buffer_visualizer.h
+%%VTK%%include/pcl-%%SHL2%%/pcl/visualization/vtk.h
+%%VTK%%include/pcl-%%SHL2%%/pcl/visualization/vtk/pcl_context_item.h
+%%VTK%%include/pcl-%%SHL2%%/pcl/visualization/vtk/pcl_image_canvas_source_2d.h
+%%VTK%%include/pcl-%%SHL2%%/pcl/visualization/vtk/pcl_vtk_compatibility.h
+%%VTK%%include/pcl-%%SHL2%%/pcl/visualization/vtk/vtkRenderWindowInteractorFix.h
+%%VTK%%include/pcl-%%SHL2%%/pcl/visualization/window.h
 lib/libpcl_common.so
 lib/libpcl_common.so.%%SHL2%%
 lib/libpcl_common.so.%%SHL3%%
@@ -923,6 +1049,12 @@ lib/libpcl_ml.so.%%SHL3%%
 lib/libpcl_octree.so
 lib/libpcl_octree.so.%%SHL2%%
 lib/libpcl_octree.so.%%SHL3%%
+%%VTK%%lib/libpcl_outofcore.so
+%%VTK%%lib/libpcl_outofcore.so.%%SHL2%%
+%%VTK%%lib/libpcl_outofcore.so.%%SHL3%%
+%%VTK%%lib/libpcl_people.so
+%%VTK%%lib/libpcl_people.so.%%SHL2%%
+%%VTK%%lib/libpcl_people.so.%%SHL3%%
 lib/libpcl_recognition.so
 lib/libpcl_recognition.so.%%SHL2%%
 lib/libpcl_recognition.so.%%SHL3%%
@@ -947,6 +1079,9 @@ lib/libpcl_surface.so.%%SHL3%%
 lib/libpcl_tracking.so
 lib/libpcl_tracking.so.%%SHL2%%
 lib/libpcl_tracking.so.%%SHL3%%
+%%VTK%%lib/libpcl_visualization.so
+%%VTK%%lib/libpcl_visualization.so.%%SHL2%%
+%%VTK%%lib/libpcl_visualization.so.%%SHL3%%
 libdata/pkgconfig/pcl_2d-%%SHL2%%.pc
 libdata/pkgconfig/pcl_common-%%SHL2%%.pc
 libdata/pkgconfig/pcl_features-%%SHL2%%.pc
@@ -957,6 +1092,8 @@ libdata/pkgconfig/pcl_kdtree-%%SHL2%%.pc
 libdata/pkgconfig/pcl_keypoints-%%SHL2%%.pc
 libdata/pkgconfig/pcl_ml-%%SHL2%%.pc
 libdata/pkgconfig/pcl_octree-%%SHL2%%.pc
+%%VTK%%libdata/pkgconfig/pcl_outofcore-%%SHL2%%.pc
+%%VTK%%libdata/pkgconfig/pcl_people-%%SHL2%%.pc
 libdata/pkgconfig/pcl_recognition-%%SHL2%%.pc
 libdata/pkgconfig/pcl_registration-%%SHL2%%.pc
 libdata/pkgconfig/pcl_sample_consensus-%%SHL2%%.pc
@@ -965,6 +1102,7 @@ libdata/pkgconfig/pcl_segmentation-%%SHL2%%.pc
 libdata/pkgconfig/pcl_stereo-%%SHL2%%.pc
 libdata/pkgconfig/pcl_surface-%%SHL2%%.pc
 libdata/pkgconfig/pcl_tracking-%%SHL2%%.pc
+%%VTK%%libdata/pkgconfig/pcl_visualization-%%SHL2%%.pc
 %%DATADIR%%/Modules/FindClangFormat.cmake
 %%DATADIR%%/Modules/FindDSSDK.cmake
 %%DATADIR%%/Modules/FindEigen.cmake