pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/graphics/vtk vtk: fix for Darwin + cleanup



details:   https://anonhg.NetBSD.org/pkgsrc/rev/709cebe0d01a
branches:  trunk
changeset: 376780:709cebe0d01a
user:      adam <adam%pkgsrc.org@localhost>
date:      Wed Apr 13 10:09:20 2022 +0000

description:
vtk: fix for Darwin + cleanup

diffstat:

 graphics/vtk/Makefile      |   34 ++--
 graphics/vtk/PLIST         |  312 ++++++++++++++++++++++----------------------
 graphics/vtk/buildlink3.mk |    4 +-
 3 files changed, 180 insertions(+), 170 deletions(-)

diffs (truncated from 678 to 300 lines):

diff -r 47e95de817b7 -r 709cebe0d01a graphics/vtk/Makefile
--- a/graphics/vtk/Makefile     Wed Apr 13 09:36:32 2022 +0000
+++ b/graphics/vtk/Makefile     Wed Apr 13 10:09:20 2022 +0000
@@ -1,32 +1,23 @@
-# $NetBSD: Makefile,v 1.18 2021/12/08 16:02:13 adam Exp $
+# $NetBSD: Makefile,v 1.19 2022/04/13 10:09:20 adam Exp $
 
 DISTNAME=      VTK-9.0.3
-PKGNAME=       ${DISTNAME:S/VTK/vtk/}
-PKGREVISION=   2
+PKGNAME=       ${DISTNAME:tl}
 CATEGORIES=    graphics
-MASTER_SITES=  https://www.vtk.org/files/release/9.0/
+MASTER_SITES=  https://www.vtk.org/files/release/${PKGVERSION_NOREV:R}/
 
 MAINTAINER=    prlw1%cam.ac.uk@localhost
 HOMEPAGE=      https://vtk.org/
 COMMENT=       Visualization toolkit
 LICENSE=       modified-bsd
 
+BUILD_DEPENDS= ninja-build-[0-9]*:../../devel/ninja-build
+
 USE_CMAKE=     yes
 USE_LANGUAGES= c c++11
 
 CONFIGURE_DIRS=        build
 CMAKE_ARG_PATH=        ..
 CMAKE_ARGS+=   -DCMAKE_BUILD_TYPE=Release
-
-
-MAKE_ENV+=     LD_LIBRARY_PATH=${WRKSRC}/build/lib
-#MAKE_ENV+=    CPPFLAGS=-I/usr/pkg/include
-
-post-extract:
-       mkdir ${WRKSRC}/build
-
-BUILD_DEPENDS= ninja-build-[0-9]*:../../devel/ninja-build
-
 CMAKE_ARGS+=   -DVTK_LEGACY_REMOVE=ON
 CMAKE_ARGS+=   -DVTK_USE_MPI=OFF
 CMAKE_ARGS+=   -DVTK_USE_CUDA=OFF
@@ -43,6 +34,21 @@
 # https://discourse.vtk.org/t/9-0-0-rc1-contextopengl2-not-built/2933
 CMAKE_ARGS+=   -DVTK_MODULE_ENABLE_VTK_RenderingContextOpenGL2=YES
 
+MAKE_ENV+=     LD_LIBRARY_PATH=${WRKSRC}/build/lib
+
+PLIST_VARS+=   cocoa opengl
+
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "Darwin"
+PLIST.cocoa=   yes
+.else
+PLIST.opengl=  yes
+.endif
+
+post-extract:
+       ${MKDIR} ${WRKSRC}/build
+
 .include "options.mk"
 
 .include "../../archivers/lz4/buildlink3.mk"
diff -r 47e95de817b7 -r 709cebe0d01a graphics/vtk/PLIST
--- a/graphics/vtk/PLIST        Wed Apr 13 09:36:32 2022 +0000
+++ b/graphics/vtk/PLIST        Wed Apr 13 10:09:20 2022 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2021/07/08 14:59:24 prlw1 Exp $
+@comment $NetBSD: PLIST,v 1.7 2022/04/13 10:09:20 adam Exp $
 bin/vtkProbeOpenGLVersion-9.0
 include/vtk-9.0/DICOMAppHelper.h
 include/vtk-9.0/DICOMCMakeConfig.h
@@ -10,6 +10,16 @@
 include/vtk-9.0/DICOMTypes.h
 include/vtk-9.0/LSDynaFamily.h
 include/vtk-9.0/LSDynaMetaData.h
+${PLIST.qt}include/vtk-9.0/QFilterTreeProxyModel.h
+${PLIST.qt}include/vtk-9.0/QVTKApplication.h
+${PLIST.qt}include/vtk-9.0/QVTKInteractor.h
+${PLIST.qt}include/vtk-9.0/QVTKInteractorAdapter.h
+${PLIST.qt}include/vtk-9.0/QVTKOpenGLNativeWidget.h
+${PLIST.qt}include/vtk-9.0/QVTKOpenGLStereoWidget.h
+${PLIST.qt}include/vtk-9.0/QVTKOpenGLWindow.h
+${PLIST.qt}include/vtk-9.0/QVTKRenderWidget.h
+${PLIST.qt}include/vtk-9.0/QVTKRenderWindowAdapter.h
+${PLIST.qt}include/vtk-9.0/QVTKWin32Header.h
 include/vtk-9.0/octree/octree
 include/vtk-9.0/octree/octree.h
 include/vtk-9.0/octree/octree.txx
@@ -338,6 +348,10 @@
 include/vtk-9.0/vtkClosestNPointsStrategy.h
 include/vtk-9.0/vtkClosestPointStrategy.h
 include/vtk-9.0/vtkClustering2DLayoutStrategy.h
+${PLIST.cocoa}include/vtk-9.0/vtkCocoaGLView.h
+${PLIST.cocoa}include/vtk-9.0/vtkCocoaMacOSXSDKCompatibility.h
+${PLIST.cocoa}include/vtk-9.0/vtkCocoaRenderWindow.h
+${PLIST.cocoa}include/vtk-9.0/vtkCocoaRenderWindowInteractor.h
 include/vtk-9.0/vtkCoincidentPoints.h
 include/vtk-9.0/vtkCollapseGraph.h
 include/vtk-9.0/vtkCollapseVerticesByArray.h
@@ -610,6 +624,7 @@
 include/vtk-9.0/vtkEvent.h
 include/vtk-9.0/vtkEventData.h
 include/vtk-9.0/vtkEventForwarderCommand.h
+${PLIST.qt}include/vtk-9.0/vtkEventQtSlotConnect.h
 include/vtk-9.0/vtkExecutionTimer.h
 include/vtk-9.0/vtkExecutive.h
 include/vtk-9.0/vtkExodusIICache.h
@@ -757,6 +772,7 @@
 include/vtk-9.0/vtkGPUInfoList.h
 include/vtk-9.0/vtkGPUInfoListArray.h
 include/vtk-9.0/vtkGPUVolumeRayCastMapper.h
+${PLIST.qt}include/vtk-9.0/vtkGUISupportQtModule.h
 include/vtk-9.0/vtkGarbageCollector.h
 include/vtk-9.0/vtkGarbageCollectorManager.h
 include/vtk-9.0/vtkGaussianBlurPass.h
@@ -1799,6 +1815,28 @@
 include/vtk-9.0/vtkPruneTreeFilter.h
 include/vtk-9.0/vtkPyramid.h
 include/vtk-9.0/vtkPythagoreanQuadruples.h
+${PLIST.qt}include/vtk-9.0/vtkQImageToImageSource.h
+${PLIST.qt}include/vtk-9.0/vtkQWidgetRepresentation.h
+${PLIST.qt}include/vtk-9.0/vtkQWidgetTexture.h
+${PLIST.qt}include/vtk-9.0/vtkQWidgetWidget.h
+${PLIST.qt}include/vtk-9.0/vtkQtAbstractModelAdapter.h
+${PLIST.qt}include/vtk-9.0/vtkQtAnnotationLayersModelAdapter.h
+${PLIST.qt}include/vtk-9.0/vtkQtAnnotationView.h
+${PLIST.qt}include/vtk-9.0/vtkQtConnection.h
+${PLIST.qt}include/vtk-9.0/vtkQtDebugLeaksModel.h
+${PLIST.qt}include/vtk-9.0/vtkQtDebugLeaksView.h
+${PLIST.qt}include/vtk-9.0/vtkQtInitialization.h
+${PLIST.qt}include/vtk-9.0/vtkQtLabelRenderStrategy.h
+${PLIST.qt}include/vtk-9.0/vtkQtListView.h
+${PLIST.qt}include/vtk-9.0/vtkQtRecordView.h
+${PLIST.qt}include/vtk-9.0/vtkQtStringToImage.h
+${PLIST.qt}include/vtk-9.0/vtkQtTableModelAdapter.h
+${PLIST.qt}include/vtk-9.0/vtkQtTableRepresentation.h
+${PLIST.qt}include/vtk-9.0/vtkQtTableView.h
+${PLIST.qt}include/vtk-9.0/vtkQtTreeModelAdapter.h
+${PLIST.qt}include/vtk-9.0/vtkQtTreeRingLabelMapper.h
+${PLIST.qt}include/vtk-9.0/vtkQtTreeView.h
+${PLIST.qt}include/vtk-9.0/vtkQtView.h
 include/vtk-9.0/vtkQuad.h
 include/vtk-9.0/vtkQuadRotationalExtrusionFilter.h
 include/vtk-9.0/vtkQuadraticEdge.h
@@ -1910,6 +1948,7 @@
 include/vtk-9.0/vtkRenderingLabelModule.h
 include/vtk-9.0/vtkRenderingOpenGL2Module.h
 include/vtk-9.0/vtkRenderingOpenGLConfigure.h
+${PLIST.qt}include/vtk-9.0/vtkRenderingQtModule.h
 include/vtk-9.0/vtkRenderingSceneGraphModule.h
 include/vtk-9.0/vtkRenderingUIModule.h
 include/vtk-9.0/vtkRenderingVolumeModule.h
@@ -2389,6 +2428,7 @@
 include/vtk-9.0/vtkViewsContext2DModule.h
 include/vtk-9.0/vtkViewsCoreModule.h
 include/vtk-9.0/vtkViewsInfovisModule.h
+${PLIST.qt}include/vtk-9.0/vtkViewsQtModule.h
 include/vtk-9.0/vtkVisibilitySort.h
 include/vtk-9.0/vtkVoidArray.h
 include/vtk-9.0/vtkVolume.h
@@ -2523,8 +2563,8 @@
 include/vtk-9.0/vtkXMLUtilities.h
 include/vtk-9.0/vtkXMLWriter.h
 include/vtk-9.0/vtkXMLWriterC.h
-include/vtk-9.0/vtkXOpenGLRenderWindow.h
-include/vtk-9.0/vtkXRenderWindowInteractor.h
+${PLIST.opengl}include/vtk-9.0/vtkXOpenGLRenderWindow.h
+${PLIST.opengl}include/vtk-9.0/vtkXRenderWindowInteractor.h
 include/vtk-9.0/vtkXYPlotActor.h
 include/vtk-9.0/vtkXYPlotWidget.h
 include/vtk-9.0/vtkXYZMolReader.h
@@ -2770,323 +2810,332 @@
 lib/cmake/vtk-9.0/vtkTestingRenderingDriver.cmake
 lib/cmake/vtk-9.0/vtkTopologicalSort.cmake
 lib/libvtkChartsCore-9.0.so
+lib/libvtkChartsCore-9.0.so.${PKGVERSION}
 lib/libvtkChartsCore-9.0.so.1
-lib/libvtkChartsCore-9.0.so.${PKGVERSION}
 lib/libvtkCommonColor-9.0.so
+lib/libvtkCommonColor-9.0.so.${PKGVERSION}
 lib/libvtkCommonColor-9.0.so.1
-lib/libvtkCommonColor-9.0.so.${PKGVERSION}
 lib/libvtkCommonComputationalGeometry-9.0.so
+lib/libvtkCommonComputationalGeometry-9.0.so.${PKGVERSION}
 lib/libvtkCommonComputationalGeometry-9.0.so.1
-lib/libvtkCommonComputationalGeometry-9.0.so.${PKGVERSION}
 lib/libvtkCommonCore-9.0.so
+lib/libvtkCommonCore-9.0.so.${PKGVERSION}
 lib/libvtkCommonCore-9.0.so.1
-lib/libvtkCommonCore-9.0.so.${PKGVERSION}
 lib/libvtkCommonDataModel-9.0.so
-lib/libvtkCommonDataModel-9.0.so.1
 lib/libvtkCommonDataModel-9.0.so.${PKGVERSION}
+lib/libvtkCommonDataModel-9.0.so.1
 lib/libvtkCommonExecutionModel-9.0.so
+lib/libvtkCommonExecutionModel-9.0.so.${PKGVERSION}
 lib/libvtkCommonExecutionModel-9.0.so.1
-lib/libvtkCommonExecutionModel-9.0.so.${PKGVERSION}
 lib/libvtkCommonMath-9.0.so
+lib/libvtkCommonMath-9.0.so.${PKGVERSION}
 lib/libvtkCommonMath-9.0.so.1
-lib/libvtkCommonMath-9.0.so.${PKGVERSION}
 lib/libvtkCommonMisc-9.0.so
+lib/libvtkCommonMisc-9.0.so.${PKGVERSION}
 lib/libvtkCommonMisc-9.0.so.1
-lib/libvtkCommonMisc-9.0.so.${PKGVERSION}
 lib/libvtkCommonSystem-9.0.so
+lib/libvtkCommonSystem-9.0.so.${PKGVERSION}
 lib/libvtkCommonSystem-9.0.so.1
-lib/libvtkCommonSystem-9.0.so.${PKGVERSION}
 lib/libvtkCommonTransforms-9.0.so
-lib/libvtkCommonTransforms-9.0.so.1
 lib/libvtkCommonTransforms-9.0.so.${PKGVERSION}
+lib/libvtkCommonTransforms-9.0.so.1
 lib/libvtkDICOMParser-9.0.so
+lib/libvtkDICOMParser-9.0.so.${PKGVERSION}
 lib/libvtkDICOMParser-9.0.so.1
-lib/libvtkDICOMParser-9.0.so.${PKGVERSION}
 lib/libvtkDomainsChemistry-9.0.so
+lib/libvtkDomainsChemistry-9.0.so.${PKGVERSION}
 lib/libvtkDomainsChemistry-9.0.so.1
-lib/libvtkDomainsChemistry-9.0.so.${PKGVERSION}
 lib/libvtkDomainsChemistryOpenGL2-9.0.so
+lib/libvtkDomainsChemistryOpenGL2-9.0.so.${PKGVERSION}
 lib/libvtkDomainsChemistryOpenGL2-9.0.so.1
-lib/libvtkDomainsChemistryOpenGL2-9.0.so.${PKGVERSION}
 lib/libvtkFiltersAMR-9.0.so
+lib/libvtkFiltersAMR-9.0.so.${PKGVERSION}
 lib/libvtkFiltersAMR-9.0.so.1
-lib/libvtkFiltersAMR-9.0.so.${PKGVERSION}
 lib/libvtkFiltersCore-9.0.so
-lib/libvtkFiltersCore-9.0.so.1
 lib/libvtkFiltersCore-9.0.so.${PKGVERSION}
+lib/libvtkFiltersCore-9.0.so.1
 lib/libvtkFiltersExtraction-9.0.so
+lib/libvtkFiltersExtraction-9.0.so.${PKGVERSION}
 lib/libvtkFiltersExtraction-9.0.so.1
-lib/libvtkFiltersExtraction-9.0.so.${PKGVERSION}
 lib/libvtkFiltersFlowPaths-9.0.so
+lib/libvtkFiltersFlowPaths-9.0.so.${PKGVERSION}
 lib/libvtkFiltersFlowPaths-9.0.so.1
-lib/libvtkFiltersFlowPaths-9.0.so.${PKGVERSION}
 lib/libvtkFiltersGeneral-9.0.so
+lib/libvtkFiltersGeneral-9.0.so.${PKGVERSION}
 lib/libvtkFiltersGeneral-9.0.so.1
-lib/libvtkFiltersGeneral-9.0.so.${PKGVERSION}
 lib/libvtkFiltersGeneric-9.0.so
+lib/libvtkFiltersGeneric-9.0.so.${PKGVERSION}
 lib/libvtkFiltersGeneric-9.0.so.1
-lib/libvtkFiltersGeneric-9.0.so.${PKGVERSION}
 lib/libvtkFiltersGeometry-9.0.so
-lib/libvtkFiltersGeometry-9.0.so.1
 lib/libvtkFiltersGeometry-9.0.so.${PKGVERSION}
+lib/libvtkFiltersGeometry-9.0.so.1
 lib/libvtkFiltersHybrid-9.0.so
+lib/libvtkFiltersHybrid-9.0.so.${PKGVERSION}
 lib/libvtkFiltersHybrid-9.0.so.1
-lib/libvtkFiltersHybrid-9.0.so.${PKGVERSION}
 lib/libvtkFiltersHyperTree-9.0.so
+lib/libvtkFiltersHyperTree-9.0.so.${PKGVERSION}
 lib/libvtkFiltersHyperTree-9.0.so.1
-lib/libvtkFiltersHyperTree-9.0.so.${PKGVERSION}
 lib/libvtkFiltersImaging-9.0.so
+lib/libvtkFiltersImaging-9.0.so.${PKGVERSION}
 lib/libvtkFiltersImaging-9.0.so.1
-lib/libvtkFiltersImaging-9.0.so.${PKGVERSION}
 lib/libvtkFiltersModeling-9.0.so
+lib/libvtkFiltersModeling-9.0.so.${PKGVERSION}
 lib/libvtkFiltersModeling-9.0.so.1
-lib/libvtkFiltersModeling-9.0.so.${PKGVERSION}
 lib/libvtkFiltersParallel-9.0.so
-lib/libvtkFiltersParallel-9.0.so.1
 lib/libvtkFiltersParallel-9.0.so.${PKGVERSION}
+lib/libvtkFiltersParallel-9.0.so.1
 lib/libvtkFiltersParallelImaging-9.0.so
+lib/libvtkFiltersParallelImaging-9.0.so.${PKGVERSION}
 lib/libvtkFiltersParallelImaging-9.0.so.1
-lib/libvtkFiltersParallelImaging-9.0.so.${PKGVERSION}
 lib/libvtkFiltersPoints-9.0.so
+lib/libvtkFiltersPoints-9.0.so.${PKGVERSION}
 lib/libvtkFiltersPoints-9.0.so.1
-lib/libvtkFiltersPoints-9.0.so.${PKGVERSION}
 lib/libvtkFiltersProgrammable-9.0.so
+lib/libvtkFiltersProgrammable-9.0.so.${PKGVERSION}
 lib/libvtkFiltersProgrammable-9.0.so.1
-lib/libvtkFiltersProgrammable-9.0.so.${PKGVERSION}
 lib/libvtkFiltersSMP-9.0.so
+lib/libvtkFiltersSMP-9.0.so.${PKGVERSION}
 lib/libvtkFiltersSMP-9.0.so.1
-lib/libvtkFiltersSMP-9.0.so.${PKGVERSION}
 lib/libvtkFiltersSelection-9.0.so
-lib/libvtkFiltersSelection-9.0.so.1
 lib/libvtkFiltersSelection-9.0.so.${PKGVERSION}
+lib/libvtkFiltersSelection-9.0.so.1
 lib/libvtkFiltersSources-9.0.so
+lib/libvtkFiltersSources-9.0.so.${PKGVERSION}
 lib/libvtkFiltersSources-9.0.so.1
-lib/libvtkFiltersSources-9.0.so.${PKGVERSION}
 lib/libvtkFiltersStatistics-9.0.so



Home | Main Index | Thread Index | Old Index