[pkgsrc/trunk]: pkgsrc/graphics/pcl graphics/pcl: duplicate deps as is custom...

[thor <thor%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/34e48525ed98
branches:  trunk
changeset: 451898:34e48525ed98
user:      thor <thor%pkgsrc.org@localhost>
date:      Mon May 03 17:29:58 2021 +0000

description:
graphics/pcl: duplicate deps as is customary, drop external metslib

The shared depends.mk is not the pkgsrc way. The metslib dependency
is not properly supported by upstream, so we switch to the internal
copy for now.

Also, the Makefile got a bit of further refinement.

diffstat:

 graphics/pcl/Makefile      |    20 +-
 graphics/pcl/PLIST         |  1775 ++++++++++++++++++++++---------------------
 graphics/pcl/buildlink3.mk |    16 +-
 3 files changed, 923 insertions(+), 888 deletions(-)

diffs (truncated from 1887 to 300 lines):

diff -r 79c2f07aeed0 -r 34e48525ed98 graphics/pcl/Makefile
--- a/graphics/pcl/Makefile     Mon May 03 17:20:24 2021 +0000
+++ b/graphics/pcl/Makefile     Mon May 03 17:29:58 2021 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2021/05/03 09:15:30 thor Exp $
+# $NetBSD: Makefile,v 1.3 2021/05/03 17:29:58 thor Exp $
 
 GITHUB_PROJECT=        pcl
 GITHUB_TAG=    pcl-${PKGVERSION}
+PKGREVISION=   1
 DISTNAME=      pcl-1.11.1
-PLIST_SUBST+=  PCL_V=1.11
 CATEGORIES=    graphics
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=PointCloudLibrary/}
 
@@ -22,6 +22,20 @@
 CMAKE_ARGS+=   -DWITH_CUDA=FALSE
 CMAKE_ARGS+=   -DWITH_QT=FALSE
 
-.include "../../graphics/pcl/depends.mk"
+PLIST_SUBST+=  PCL_BASE_VERSION=${PKGVERSION_NOREV:C/([0-9]+\.[0-9]+).*/\1/}
+
+.include "../../devel/boost-libs/buildlink3.mk"
+.include "../../devel/libusb1/buildlink3.mk"
+.include "../../math/flann-lib/buildlink3.mk"
+# waiting for VTK update, not usable yet
+#.include "../../graphics/vtk/buildlink3.mk"
+#.include "../../graphics/glew/buildlink3.mk"
+.include "../../math/eigen3/buildlink3.mk"
+.include "../../math/qhull/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
+.include "../../net/libpcap/buildlink3.mk"
+# Not used correctly right now, see
+# https://github.com/PointCloudLibrary/pcl/issues/4744
+#.include "../../devel/metslib/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff -r 79c2f07aeed0 -r 34e48525ed98 graphics/pcl/PLIST
--- a/graphics/pcl/PLIST        Mon May 03 17:20:24 2021 +0000
+++ b/graphics/pcl/PLIST        Mon May 03 17:29:58 2021 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2021/05/03 06:25:11 thor Exp $
+@comment $NetBSD: PLIST,v 1.2 2021/05/03 17:29:58 thor Exp $
 bin/pcl_add_gaussian_noise
 bin/pcl_boundary_estimation
 bin/pcl_cluster_extraction
@@ -58,919 +58,928 @@
 bin/pcl_vfh_estimation
 bin/pcl_voxel_grid
 bin/pcl_xyz2pcd
-include/pcl-${PCL_V}/pcl/2d/convolution.h
-include/pcl-${PCL_V}/pcl/2d/edge.h
-include/pcl-${PCL_V}/pcl/2d/impl/convolution.hpp
-include/pcl-${PCL_V}/pcl/2d/impl/edge.hpp
-include/pcl-${PCL_V}/pcl/2d/impl/kernel.hpp
-include/pcl-${PCL_V}/pcl/2d/impl/morphology.hpp
-include/pcl-${PCL_V}/pcl/2d/kernel.h
-include/pcl-${PCL_V}/pcl/2d/morphology.h
-include/pcl-${PCL_V}/pcl/ModelCoefficients.h
-include/pcl-${PCL_V}/pcl/PCLHeader.h
-include/pcl-${PCL_V}/pcl/PCLImage.h
-include/pcl-${PCL_V}/pcl/PCLPointCloud2.h
-include/pcl-${PCL_V}/pcl/PCLPointField.h
-include/pcl-${PCL_V}/pcl/PointIndices.h
-include/pcl-${PCL_V}/pcl/PolygonMesh.h
-include/pcl-${PCL_V}/pcl/TextureMesh.h
-include/pcl-${PCL_V}/pcl/Vertices.h
-include/pcl-${PCL_V}/pcl/cloud_iterator.h
-include/pcl-${PCL_V}/pcl/common/angles.h
-include/pcl-${PCL_V}/pcl/common/bivariate_polynomial.h
-include/pcl-${PCL_V}/pcl/common/boost.h
-include/pcl-${PCL_V}/pcl/common/centroid.h
-include/pcl-${PCL_V}/pcl/common/colors.h
-include/pcl-${PCL_V}/pcl/common/common.h
-include/pcl-${PCL_V}/pcl/common/common_headers.h
-include/pcl-${PCL_V}/pcl/common/concatenate.h
-include/pcl-${PCL_V}/pcl/common/copy_point.h
-include/pcl-${PCL_V}/pcl/common/distances.h
-include/pcl-${PCL_V}/pcl/common/eigen.h
-include/pcl-${PCL_V}/pcl/common/feature_histogram.h
-include/pcl-${PCL_V}/pcl/common/fft/_kiss_fft_guts.h
-include/pcl-${PCL_V}/pcl/common/fft/kiss_fft.h
-include/pcl-${PCL_V}/pcl/common/fft/kiss_fftr.h
-include/pcl-${PCL_V}/pcl/common/file_io.h
-include/pcl-${PCL_V}/pcl/common/gaussian.h
-include/pcl-${PCL_V}/pcl/common/generate.h
-include/pcl-${PCL_V}/pcl/common/geometry.h
-include/pcl-${PCL_V}/pcl/common/impl/accumulators.hpp
-include/pcl-${PCL_V}/pcl/common/impl/angles.hpp
-include/pcl-${PCL_V}/pcl/common/impl/bivariate_polynomial.hpp
-include/pcl-${PCL_V}/pcl/common/impl/centroid.hpp
-include/pcl-${PCL_V}/pcl/common/impl/common.hpp
-include/pcl-${PCL_V}/pcl/common/impl/copy_point.hpp
-include/pcl-${PCL_V}/pcl/common/impl/eigen.hpp
-include/pcl-${PCL_V}/pcl/common/impl/file_io.hpp
-include/pcl-${PCL_V}/pcl/common/impl/gaussian.hpp
-include/pcl-${PCL_V}/pcl/common/impl/generate.hpp
-include/pcl-${PCL_V}/pcl/common/impl/intensity.hpp
-include/pcl-${PCL_V}/pcl/common/impl/intersections.hpp
-include/pcl-${PCL_V}/pcl/common/impl/io.hpp
-include/pcl-${PCL_V}/pcl/common/impl/norms.hpp
-include/pcl-${PCL_V}/pcl/common/impl/pca.hpp
-include/pcl-${PCL_V}/pcl/common/impl/piecewise_linear_function.hpp
-include/pcl-${PCL_V}/pcl/common/impl/polynomial_calculations.hpp
-include/pcl-${PCL_V}/pcl/common/impl/projection_matrix.hpp
-include/pcl-${PCL_V}/pcl/common/impl/random.hpp
-include/pcl-${PCL_V}/pcl/common/impl/spring.hpp
-include/pcl-${PCL_V}/pcl/common/impl/transformation_from_correspondences.hpp
-include/pcl-${PCL_V}/pcl/common/impl/transforms.hpp
-include/pcl-${PCL_V}/pcl/common/impl/vector_average.hpp
-include/pcl-${PCL_V}/pcl/common/intensity.h
-include/pcl-${PCL_V}/pcl/common/intersections.h
-include/pcl-${PCL_V}/pcl/common/io.h
-include/pcl-${PCL_V}/pcl/common/norms.h
-include/pcl-${PCL_V}/pcl/common/pca.h
-include/pcl-${PCL_V}/pcl/common/piecewise_linear_function.h
-include/pcl-${PCL_V}/pcl/common/point_tests.h
-include/pcl-${PCL_V}/pcl/common/polynomial_calculations.h
-include/pcl-${PCL_V}/pcl/common/poses_from_matches.h
-include/pcl-${PCL_V}/pcl/common/projection_matrix.h
-include/pcl-${PCL_V}/pcl/common/random.h
-include/pcl-${PCL_V}/pcl/common/spring.h
-include/pcl-${PCL_V}/pcl/common/synchronizer.h
-include/pcl-${PCL_V}/pcl/common/time.h
-include/pcl-${PCL_V}/pcl/common/time_trigger.h
-include/pcl-${PCL_V}/pcl/common/transformation_from_correspondences.h
-include/pcl-${PCL_V}/pcl/common/transforms.h
-include/pcl-${PCL_V}/pcl/common/utils.h
-include/pcl-${PCL_V}/pcl/common/vector_average.h
-include/pcl-${PCL_V}/pcl/compression/color_coding.h
-include/pcl-${PCL_V}/pcl/compression/compression_profiles.h
-include/pcl-${PCL_V}/pcl/compression/entropy_range_coder.h
-include/pcl-${PCL_V}/pcl/compression/libpng_wrapper.h
-include/pcl-${PCL_V}/pcl/compression/octree_pointcloud_compression.h
-include/pcl-${PCL_V}/pcl/compression/organized_pointcloud_conversion.h
-include/pcl-${PCL_V}/pcl/compression/point_coding.h
-include/pcl-${PCL_V}/pcl/console/parse.h
-include/pcl-${PCL_V}/pcl/console/print.h
-include/pcl-${PCL_V}/pcl/console/time.h
-include/pcl-${PCL_V}/pcl/conversions.h
-include/pcl-${PCL_V}/pcl/correspondence.h
-include/pcl-${PCL_V}/pcl/exceptions.h
-include/pcl-${PCL_V}/pcl/features/3dsc.h
-include/pcl-${PCL_V}/pcl/features/board.h
-include/pcl-${PCL_V}/pcl/features/boost.h
-include/pcl-${PCL_V}/pcl/features/boundary.h
-include/pcl-${PCL_V}/pcl/features/brisk_2d.h
-include/pcl-${PCL_V}/pcl/features/cppf.h
-include/pcl-${PCL_V}/pcl/features/crh.h
-include/pcl-${PCL_V}/pcl/features/cvfh.h
-include/pcl-${PCL_V}/pcl/features/don.h
-include/pcl-${PCL_V}/pcl/features/eigen.h
-include/pcl-${PCL_V}/pcl/features/esf.h
-include/pcl-${PCL_V}/pcl/features/feature.h
-include/pcl-${PCL_V}/pcl/features/flare.h
-include/pcl-${PCL_V}/pcl/features/fpfh.h
-include/pcl-${PCL_V}/pcl/features/fpfh_omp.h
-include/pcl-${PCL_V}/pcl/features/from_meshes.h
-include/pcl-${PCL_V}/pcl/features/gasd.h
-include/pcl-${PCL_V}/pcl/features/gfpfh.h
-include/pcl-${PCL_V}/pcl/features/grsd.h
-include/pcl-${PCL_V}/pcl/features/impl/3dsc.hpp
-include/pcl-${PCL_V}/pcl/features/impl/board.hpp
-include/pcl-${PCL_V}/pcl/features/impl/boundary.hpp
-include/pcl-${PCL_V}/pcl/features/impl/brisk_2d.hpp
-include/pcl-${PCL_V}/pcl/features/impl/cppf.hpp
-include/pcl-${PCL_V}/pcl/features/impl/crh.hpp
-include/pcl-${PCL_V}/pcl/features/impl/cvfh.hpp
-include/pcl-${PCL_V}/pcl/features/impl/don.hpp
-include/pcl-${PCL_V}/pcl/features/impl/esf.hpp
-include/pcl-${PCL_V}/pcl/features/impl/feature.hpp
-include/pcl-${PCL_V}/pcl/features/impl/flare.hpp
-include/pcl-${PCL_V}/pcl/features/impl/fpfh.hpp
-include/pcl-${PCL_V}/pcl/features/impl/fpfh_omp.hpp
-include/pcl-${PCL_V}/pcl/features/impl/gasd.hpp
-include/pcl-${PCL_V}/pcl/features/impl/gfpfh.hpp
-include/pcl-${PCL_V}/pcl/features/impl/grsd.hpp
-include/pcl-${PCL_V}/pcl/features/impl/integral_image2D.hpp
-include/pcl-${PCL_V}/pcl/features/impl/integral_image_normal.hpp
-include/pcl-${PCL_V}/pcl/features/impl/intensity_gradient.hpp
-include/pcl-${PCL_V}/pcl/features/impl/intensity_spin.hpp
-include/pcl-${PCL_V}/pcl/features/impl/linear_least_squares_normal.hpp
-include/pcl-${PCL_V}/pcl/features/impl/moment_invariants.hpp
-include/pcl-${PCL_V}/pcl/features/impl/moment_of_inertia_estimation.hpp
-include/pcl-${PCL_V}/pcl/features/impl/multiscale_feature_persistence.hpp
-include/pcl-${PCL_V}/pcl/features/impl/narf.hpp
-include/pcl-${PCL_V}/pcl/features/impl/normal_3d.hpp
-include/pcl-${PCL_V}/pcl/features/impl/normal_3d_omp.hpp
-include/pcl-${PCL_V}/pcl/features/impl/normal_based_signature.hpp
-include/pcl-${PCL_V}/pcl/features/impl/organized_edge_detection.hpp
-include/pcl-${PCL_V}/pcl/features/impl/our_cvfh.hpp
-include/pcl-${PCL_V}/pcl/features/impl/pfh.hpp
-include/pcl-${PCL_V}/pcl/features/impl/pfhrgb.hpp
-include/pcl-${PCL_V}/pcl/features/impl/ppf.hpp
-include/pcl-${PCL_V}/pcl/features/impl/ppfrgb.hpp
-include/pcl-${PCL_V}/pcl/features/impl/principal_curvatures.hpp
-include/pcl-${PCL_V}/pcl/features/impl/range_image_border_extractor.hpp
-include/pcl-${PCL_V}/pcl/features/impl/rift.hpp
-include/pcl-${PCL_V}/pcl/features/impl/rops_estimation.hpp
-include/pcl-${PCL_V}/pcl/features/impl/rsd.hpp
-include/pcl-${PCL_V}/pcl/features/impl/shot.hpp
-include/pcl-${PCL_V}/pcl/features/impl/shot_lrf.hpp
-include/pcl-${PCL_V}/pcl/features/impl/shot_lrf_omp.hpp
-include/pcl-${PCL_V}/pcl/features/impl/shot_omp.hpp
-include/pcl-${PCL_V}/pcl/features/impl/spin_image.hpp
-include/pcl-${PCL_V}/pcl/features/impl/statistical_multiscale_interest_region_extraction.hpp
-include/pcl-${PCL_V}/pcl/features/impl/usc.hpp
-include/pcl-${PCL_V}/pcl/features/impl/vfh.hpp
-include/pcl-${PCL_V}/pcl/features/integral_image2D.h
-include/pcl-${PCL_V}/pcl/features/integral_image_normal.h
-include/pcl-${PCL_V}/pcl/features/intensity_gradient.h
-include/pcl-${PCL_V}/pcl/features/intensity_spin.h
-include/pcl-${PCL_V}/pcl/features/linear_least_squares_normal.h
-include/pcl-${PCL_V}/pcl/features/moment_invariants.h
-include/pcl-${PCL_V}/pcl/features/moment_of_inertia_estimation.h
-include/pcl-${PCL_V}/pcl/features/multiscale_feature_persistence.h
-include/pcl-${PCL_V}/pcl/features/narf.h
-include/pcl-${PCL_V}/pcl/features/narf_descriptor.h
-include/pcl-${PCL_V}/pcl/features/normal_3d.h
-include/pcl-${PCL_V}/pcl/features/normal_3d_omp.h
-include/pcl-${PCL_V}/pcl/features/normal_based_signature.h
-include/pcl-${PCL_V}/pcl/features/organized_edge_detection.h
-include/pcl-${PCL_V}/pcl/features/our_cvfh.h
-include/pcl-${PCL_V}/pcl/features/pfh.h
-include/pcl-${PCL_V}/pcl/features/pfh_tools.h
-include/pcl-${PCL_V}/pcl/features/pfhrgb.h
-include/pcl-${PCL_V}/pcl/features/ppf.h
-include/pcl-${PCL_V}/pcl/features/ppfrgb.h
-include/pcl-${PCL_V}/pcl/features/principal_curvatures.h
-include/pcl-${PCL_V}/pcl/features/range_image_border_extractor.h
-include/pcl-${PCL_V}/pcl/features/rift.h
-include/pcl-${PCL_V}/pcl/features/rops_estimation.h
-include/pcl-${PCL_V}/pcl/features/rsd.h
-include/pcl-${PCL_V}/pcl/features/shot.h
-include/pcl-${PCL_V}/pcl/features/shot_lrf.h
-include/pcl-${PCL_V}/pcl/features/shot_lrf_omp.h
-include/pcl-${PCL_V}/pcl/features/shot_omp.h
-include/pcl-${PCL_V}/pcl/features/spin_image.h
-include/pcl-${PCL_V}/pcl/features/statistical_multiscale_interest_region_extraction.h
-include/pcl-${PCL_V}/pcl/features/usc.h
-include/pcl-${PCL_V}/pcl/features/vfh.h
-include/pcl-${PCL_V}/pcl/filters/approximate_voxel_grid.h
-include/pcl-${PCL_V}/pcl/filters/bilateral.h
-include/pcl-${PCL_V}/pcl/filters/boost.h
-include/pcl-${PCL_V}/pcl/filters/box_clipper3D.h
-include/pcl-${PCL_V}/pcl/filters/clipper3D.h
-include/pcl-${PCL_V}/pcl/filters/conditional_removal.h
-include/pcl-${PCL_V}/pcl/filters/convolution.h
-include/pcl-${PCL_V}/pcl/filters/convolution_3d.h
-include/pcl-${PCL_V}/pcl/filters/covariance_sampling.h
-include/pcl-${PCL_V}/pcl/filters/crop_box.h
-include/pcl-${PCL_V}/pcl/filters/crop_hull.h
-include/pcl-${PCL_V}/pcl/filters/extract_indices.h
-include/pcl-${PCL_V}/pcl/filters/fast_bilateral.h
-include/pcl-${PCL_V}/pcl/filters/fast_bilateral_omp.h
-include/pcl-${PCL_V}/pcl/filters/filter.h
-include/pcl-${PCL_V}/pcl/filters/filter_indices.h
-include/pcl-${PCL_V}/pcl/filters/frustum_culling.h
-include/pcl-${PCL_V}/pcl/filters/grid_minimum.h
-include/pcl-${PCL_V}/pcl/filters/impl/approximate_voxel_grid.hpp
-include/pcl-${PCL_V}/pcl/filters/impl/bilateral.hpp
-include/pcl-${PCL_V}/pcl/filters/impl/box_clipper3D.hpp
-include/pcl-${PCL_V}/pcl/filters/impl/conditional_removal.hpp
-include/pcl-${PCL_V}/pcl/filters/impl/convolution.hpp
-include/pcl-${PCL_V}/pcl/filters/impl/convolution_3d.hpp
-include/pcl-${PCL_V}/pcl/filters/impl/covariance_sampling.hpp
-include/pcl-${PCL_V}/pcl/filters/impl/crop_box.hpp
-include/pcl-${PCL_V}/pcl/filters/impl/crop_hull.hpp
-include/pcl-${PCL_V}/pcl/filters/impl/extract_indices.hpp
-include/pcl-${PCL_V}/pcl/filters/impl/fast_bilateral.hpp
-include/pcl-${PCL_V}/pcl/filters/impl/fast_bilateral_omp.hpp
-include/pcl-${PCL_V}/pcl/filters/impl/filter.hpp
-include/pcl-${PCL_V}/pcl/filters/impl/filter_indices.hpp
-include/pcl-${PCL_V}/pcl/filters/impl/frustum_culling.hpp
-include/pcl-${PCL_V}/pcl/filters/impl/grid_minimum.hpp
-include/pcl-${PCL_V}/pcl/filters/impl/local_maximum.hpp
-include/pcl-${PCL_V}/pcl/filters/impl/median_filter.hpp
-include/pcl-${PCL_V}/pcl/filters/impl/model_outlier_removal.hpp
-include/pcl-${PCL_V}/pcl/filters/impl/morphological_filter.hpp
-include/pcl-${PCL_V}/pcl/filters/impl/normal_refinement.hpp
-include/pcl-${PCL_V}/pcl/filters/impl/normal_space.hpp
-include/pcl-${PCL_V}/pcl/filters/impl/passthrough.hpp
-include/pcl-${PCL_V}/pcl/filters/impl/plane_clipper3D.hpp
-include/pcl-${PCL_V}/pcl/filters/impl/project_inliers.hpp
-include/pcl-${PCL_V}/pcl/filters/impl/radius_outlier_removal.hpp
-include/pcl-${PCL_V}/pcl/filters/impl/random_sample.hpp
-include/pcl-${PCL_V}/pcl/filters/impl/sampling_surface_normal.hpp
-include/pcl-${PCL_V}/pcl/filters/impl/shadowpoints.hpp
-include/pcl-${PCL_V}/pcl/filters/impl/statistical_outlier_removal.hpp
-include/pcl-${PCL_V}/pcl/filters/impl/uniform_sampling.hpp
-include/pcl-${PCL_V}/pcl/filters/impl/voxel_grid.hpp
-include/pcl-${PCL_V}/pcl/filters/impl/voxel_grid_covariance.hpp
-include/pcl-${PCL_V}/pcl/filters/impl/voxel_grid_occlusion_estimation.hpp
-include/pcl-${PCL_V}/pcl/filters/local_maximum.h
-include/pcl-${PCL_V}/pcl/filters/median_filter.h
-include/pcl-${PCL_V}/pcl/filters/model_outlier_removal.h
-include/pcl-${PCL_V}/pcl/filters/morphological_filter.h
-include/pcl-${PCL_V}/pcl/filters/normal_refinement.h
-include/pcl-${PCL_V}/pcl/filters/normal_space.h
-include/pcl-${PCL_V}/pcl/filters/passthrough.h