CVS commit: pkgsrc/graphics/pcl

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Mon Feb 24 17:22:56 UTC 2025

Modified Files:
        pkgsrc/graphics/pcl: Makefile PLIST options.mk

Log Message:
pcl: fix openmp support with clang; fix PLIST for Darwin


To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 pkgsrc/graphics/pcl/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/graphics/pcl/PLIST
cvs rdiff -u -r1.4 -r1.5 pkgsrc/graphics/pcl/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/graphics/pcl/Makefile
diff -u pkgsrc/graphics/pcl/Makefile:1.43 pkgsrc/graphics/pcl/Makefile:1.44
--- pkgsrc/graphics/pcl/Makefile:1.43   Mon Feb 24 15:12:15 2025
+++ pkgsrc/graphics/pcl/Makefile        Mon Feb 24 17:22:56 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2025/02/24 15:12:15 gdt Exp $
+# $NetBSD: Makefile,v 1.44 2025/02/24 17:22:56 adam Exp $
 
 DISTNAME=      pcl-1.15.0
 CATEGORIES=    graphics
@@ -12,9 +12,8 @@ LICENSE=      modified-bsd
 
 WRKSRC=                ${WRKDIR}/pcl-${DISTNAME}
 
-USE_LANGUAGES=         c c++
 USE_CXX_FEATURES=      c++14
-
+USE_LANGUAGES=         c c++
 USE_TOOLS+=            pkg-config
 
 # Those could be enabled as options if desired.
@@ -22,7 +21,13 @@ CMAKE_CONFIGURE_ARGS+=               -DWITH_CUDA=FALS
 # test is missing
 CMAKE_CONFIGURE_ARGS.NetBSD+=  -DHAVE_POSIX_MEMALIGN=1
 
-.include "../../mk/bsd.prefs.mk"
+.include "../../mk/compiler.mk"
+
+# Clang needs openmp package for OpenMP support.
+.if !empty(PKGSRC_COMPILER:Mclang)
+.include "../../parallel/openmp/buildlink3.mk"
+.endif
+
 # See LIBATOMIC_NOT_NEEDED in CMakeLists.txt
 .if ${PKGSRC_COMPILER:Mgcc}
 .include "../../devel/libatomic/buildlink3.mk"

Index: pkgsrc/graphics/pcl/PLIST
diff -u pkgsrc/graphics/pcl/PLIST:1.7 pkgsrc/graphics/pcl/PLIST:1.8
--- pkgsrc/graphics/pcl/PLIST:1.7       Mon Feb 24 15:12:15 2025
+++ pkgsrc/graphics/pcl/PLIST   Mon Feb 24 17:22:56 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2025/02/24 15:12:15 gdt Exp $
+@comment $NetBSD: PLIST,v 1.8 2025/02/24 17:22:56 adam Exp $
 bin/pcl_add_gaussian_noise
 bin/pcl_bilateral_upsampling
 bin/pcl_boundary_estimation
@@ -1005,7 +1005,7 @@ ${PLIST.vtk}include/pcl-${PCL_BASE_VERSI
 ${PLIST.vtk}include/pcl-${PCL_BASE_VERSION}/pcl/visualization/vtk/pcl_context_item.h
 ${PLIST.vtk}include/pcl-${PCL_BASE_VERSION}/pcl/visualization/vtk/pcl_image_canvas_source_2d.h
 ${PLIST.vtk}include/pcl-${PCL_BASE_VERSION}/pcl/visualization/vtk/pcl_vtk_compatibility.h
-${PLIST.vtk}include/pcl-${PCL_BASE_VERSION}/pcl/visualization/vtk/vtkFixedXRenderWindowInteractor.h
+${PLIST.vtk}${PLIST.x11}include/pcl-${PCL_BASE_VERSION}/pcl/visualization/vtk/vtkFixedXRenderWindowInteractor.h
 ${PLIST.vtk}include/pcl-${PCL_BASE_VERSION}/pcl/visualization/vtk/vtkRenderWindowInteractorFix.h
 ${PLIST.vtk}include/pcl-${PCL_BASE_VERSION}/pcl/visualization/window.h
 ${PLIST.qt}lib/libpcl_apps.so

Index: pkgsrc/graphics/pcl/options.mk
diff -u pkgsrc/graphics/pcl/options.mk:1.4 pkgsrc/graphics/pcl/options.mk:1.5
--- pkgsrc/graphics/pcl/options.mk:1.4  Sun Aug 25 06:18:53 2024
+++ pkgsrc/graphics/pcl/options.mk      Mon Feb 24 17:22:56 2025
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.4 2024/08/25 06:18:53 wiz Exp $
+# $NetBSD: options.mk,v 1.5 2025/02/24 17:22:56 adam Exp $
 PKG_OPTIONS_VAR=       PKG_OPTIONS.pcl
 
 # Qt could be an option, but relies on vtk's qt support, too.
@@ -9,20 +9,26 @@ PKG_SUGGESTED_OPTIONS=        vtk
 
 .include "../../mk/bsd.options.mk"
 
-PLIST_VARS+=   vtk qt
-.if !empty(PKG_OPTIONS:Mvtk)
+PLIST_VARS+=   qt vtk x11
 
+.if !empty(PKG_OPTIONS:Mvtk)
 CMAKE_CONFIGURE_ARGS+= -DWITH_VTK=TRUE
 PLIST.vtk=     yes
 .include "../../graphics/glew/buildlink3.mk"
 .include "../../graphics/vtk/buildlink3.mk"
-.  if ${PKG_BUILD_OPTIONS.vtk:Mqt}
+.  if ${PKG_BUILD_OPTIONS.vtk:Mqt5}
 CMAKE_CONFIGURE_ARGS+= -DWITH_QT=QT5
 CMAKE_CONFIGURE_ARGS+= -DBUILD_apps=ON
 PLIST.qt=      yes
-.include "../../x11/qt5-qtbase/buildlink3.mk"
+.  elif ${PKG_BUILD_OPTIONS.vtk:Mqt6}
+CMAKE_CONFIGURE_ARGS+= -DWITH_QT=QT6
+CMAKE_CONFIGURE_ARGS+= -DBUILD_apps=ON
+PLIST.qt=      yes
+.  endif
+.  if ${OPSYS} != "Darwin"
+PLIST.x11=     yes
 .  endif
 .else
+CMAKE_CONFIGURE_ARGS+= -DWITH_QT=NO
 CMAKE_CONFIGURE_ARGS+= -DWITH_VTK=FALSE
-CMAKE_CONFIGURE_ARGS+=    -DWITH_QT=NO
 .endif