[pkgsrc/trunk]: pkgsrc/graphics/pcl graphics/pcl: Add Qt usage based on VTK Q...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/12641c96c834
branches:  trunk
changeset: 452329:12641c96c834
user:      thor <thor%pkgsrc.org@localhost>
date:      Sat May 08 22:03:14 2021 +0000

description:
graphics/pcl: Add Qt usage based on VTK Qt usage.

diffstat:

 graphics/pcl/Makefile                     |   4 ++--
 graphics/pcl/PLIST                        |  28 +++++++++++++++++++++++++++-
 graphics/pcl/buildlink3.mk                |  16 +++++++++-------
 graphics/pcl/options.mk                   |  14 +++++++++++---
 graphics/pcl/patches/patch-CMakeLists.txt |   4 ++--
 5 files changed, 51 insertions(+), 15 deletions(-)

diffs (140 lines):

diff -r 3b963c463d1e -r 12641c96c834 graphics/pcl/Makefile
--- a/graphics/pcl/Makefile     Sat May 08 20:04:34 2021 +0000
+++ b/graphics/pcl/Makefile     Sat May 08 22:03:14 2021 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2021/05/07 11:36:29 thor Exp $
+# $NetBSD: Makefile,v 1.5 2021/05/08 22:03:14 thor Exp $
 
 GITHUB_PROJECT=        pcl
 GITHUB_TAG=    pcl-${PKGVERSION}
-PKGREVISION=   2
+PKGREVISION=   3
 DISTNAME=      pcl-1.11.1
 CATEGORIES=    graphics
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=PointCloudLibrary/}
diff -r 3b963c463d1e -r 12641c96c834 graphics/pcl/PLIST
--- a/graphics/pcl/PLIST        Sat May 08 20:04:34 2021 +0000
+++ b/graphics/pcl/PLIST        Sat May 08 22:03:14 2021 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2021/05/07 11:36:29 thor Exp $
+@comment $NetBSD: PLIST,v 1.4 2021/05/08 22:03:14 thor Exp $
 bin/pcl_add_gaussian_noise
 bin/pcl_boundary_estimation
 bin/pcl_cluster_extraction
@@ -1122,3 +1122,29 @@
 ${PLIST.vtk}lib/pkgconfig/pcl_people-${PCL_BASE_VERSION}.pc
 ${PLIST.vtk}lib/pkgconfig/pcl_visualization-${PCL_BASE_VERSION}.pc
 ${PLIST.vtk}share/pcl-${PCL_BASE_VERSION}/Modules/FindGLEW.cmake
+${PLIST.qt}bin/pcl_convolve
+${PLIST.qt}bin/pcl_face_trainer
+${PLIST.qt}bin/pcl_feature_matching
+${PLIST.qt}bin/pcl_fs_face_detector
+${PLIST.qt}bin/pcl_grabcut_2d
+${PLIST.qt}bin/pcl_manual_registration
+${PLIST.qt}bin/pcl_multiscale_feature_persistence_example
+${PLIST.qt}bin/pcl_nn_classification_example
+${PLIST.qt}bin/pcl_pcd_organized_edge_detection
+${PLIST.qt}bin/pcl_pcd_organized_multi_plane_segmentation
+${PLIST.qt}bin/pcl_pcd_select_object_plane
+${PLIST.qt}bin/pcl_pcd_video_player
+${PLIST.qt}bin/pcl_ppf_object_recognition
+${PLIST.qt}bin/pcl_pyramid_surface_matching
+${PLIST.qt}bin/pcl_statistical_multiscale_interest_region_extraction_example
+${PLIST.qt}bin/pcl_stereo_ground_segmentation
+${PLIST.qt}bin/pcl_surfel_smoothing_test
+${PLIST.qt}bin/pcl_test_search_speed
+${PLIST.qt}include/pcl-1.11/pcl/apps/dominant_plane_segmentation.h
+${PLIST.qt}include/pcl-1.11/pcl/apps/impl/dominant_plane_segmentation.hpp
+${PLIST.qt}include/pcl-1.11/pcl/apps/render_views_tesselated_sphere.h
+${PLIST.qt}include/pcl-1.11/pcl/apps/timer.h
+${PLIST.qt}lib/libpcl_apps.so
+${PLIST.qt}lib/libpcl_apps.so.1.11
+${PLIST.qt}lib/libpcl_apps.so.1.11.1
+${PLIST.qt}lib/pkgconfig/pcl_apps-1.11.pc
diff -r 3b963c463d1e -r 12641c96c834 graphics/pcl/buildlink3.mk
--- a/graphics/pcl/buildlink3.mk        Sat May 08 20:04:34 2021 +0000
+++ b/graphics/pcl/buildlink3.mk        Sat May 08 22:03:14 2021 +0000
@@ -1,7 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2021/05/07 11:36:29 thor Exp $
-
-# TODO: PKG_BUILD_OPTIONS dance like devel/php-threads or
-# just always enable vtk as hard dependency.
+# $NetBSD: buildlink3.mk,v 1.5 2021/05/08 22:03:14 thor Exp $
 
 BUILDLINK_TREE+=       pcl
 
@@ -15,9 +12,6 @@
 .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"
@@ -26,6 +20,14 @@
 # https://github.com/PointCloudLibrary/pcl/issues/4744
 #.include "../../devel/metslib/buildlink3.mk"
 
+pkgbase := pcl
+.include "../../mk/pkg-build-options.mk"
+
+.if ${PKG_BUILD_OPTIONS.pcl:Mvtk}
+.include "../../graphics/vtk/buildlink3.mk"
+.include "../../graphics/glew/buildlink3.mk"
+.endif
+
 .endif # PCL_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -pcl
diff -r 3b963c463d1e -r 12641c96c834 graphics/pcl/options.mk
--- a/graphics/pcl/options.mk   Sat May 08 20:04:34 2021 +0000
+++ b/graphics/pcl/options.mk   Sat May 08 22:03:14 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2021/05/07 11:36:29 thor Exp $
+# $NetBSD: options.mk,v 1.2 2021/05/08 22:03:14 thor Exp $
 PKG_OPTIONS_VAR=       PKG_OPTIONS.pcl
 
 # Qt could be an option, but relies on vtk's qt support, too.
@@ -9,12 +9,20 @@
 
 .include "../../mk/bsd.options.mk"
 
-PLIST_VARS+=   vtk
+PLIST_VARS+=   vtk qt
 .if !empty(PKG_OPTIONS:Mvtk)
+
 CMAKE_ARGS+=   -DWITH_VTK=TRUE
 PLIST.vtk=     yes
 .include "../../graphics/vtk/buildlink3.mk"
 .include "../../graphics/glew/buildlink3.mk"
+.  if ${PKG_BUILD_OPTIONS.vtk:Mqt}
+CMAKE_ARGS+=   -DWITH_QT=TRUE
+CMAKE_ARGS+=   -DBUILD_apps=TRUE
+PLIST.qt=      yes
+.include "../../x11/qt5-qtbase/buildlink3.mk"
+.  endif
 .else
-CMAKE_ARGS+=   -DWITH_VTK=FALSE        
+CMAKE_ARGS+=   -DWITH_VTK=FALSE
+CMAKE_ARGS+=    -DWITH_QT=FALSE
 .endif
diff -r 3b963c463d1e -r 12641c96c834 graphics/pcl/patches/patch-CMakeLists.txt
--- a/graphics/pcl/patches/patch-CMakeLists.txt Sat May 08 20:04:34 2021 +0000
+++ b/graphics/pcl/patches/patch-CMakeLists.txt Sat May 08 22:03:14 2021 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-CMakeLists.txt,v 1.1 2021/05/07 11:36:29 thor Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.2 2021/05/08 22:03:14 thor Exp $
 
 Support VTK 9, from PR 4262
 
@@ -9,7 +9,7 @@
  
  ### ---[ Find universal dependencies
 -set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules/" ${CMAKE_MODULE_PATH})
-+set (CMAKE_MODULE_PATH "/data/pkgwork/graphics/pcl/work/.buildlink/cmake-Modules" "${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules/" ${CMAKE_MODULE_PATH})
++set (CMAKE_MODULE_PATH "/data/pkgwork/graphics/pcl/work/.buildlink/cmake-Modules" "/data/pkgwork/graphics/pcl/work/.buildlink/cmake-Modules" "${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules/" 
${CMAKE_MODULE_PATH})
  
  # ---[ Include pkgconfig
  include(FindPkgConfig)