Index: head/math/pdal/Makefile =================================================================== --- head/math/pdal/Makefile (revision 470655) +++ head/math/pdal/Makefile (revision 470656) @@ -1,86 +1,85 @@ # Created by: bart # $FreeBSD$ PORTNAME= pdal -DISTVERSION= 1.6 -PORTREVISION= 4 +DISTVERSION= 1.7.2 CATEGORIES= math databases graphics MAINTAINER= lbartoletti@tuxfamily.org COMMENT= Library for translating and manipulating point cloud data LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.txt LIB_DEPENDS= libgdal.so:graphics/gdal \ libgeos.so:graphics/geos \ libboost_thread.so:devel/boost-libs \ libcurl.so:ftp/curl \ libgeotiff.so:graphics/libgeotiff \ libxml2.so:textproc/libxml2 \ liblaszip.so:archivers/laszip \ libjsoncpp.so:devel/jsoncpp USES= cmake:outsource compiler:c++11-lib pathfix pkgconfig USE_LDCONFIG= yes USE_GITHUB= yes GH_ACCOUNT= ${PORTNAME:tu} GH_PROJECT= ${GH_ACCOUNT} # Unhide std::to_string() to fix build with GCC (see ports/193528 for details). CXXFLAGS+= -D_GLIBCXX_USE_C99 -CMAKE_ARGS+= -DWITH_LASZIP:BOOL=TRUE #Doesn't build without laszip. LASZIP is recommended +CMAKE_ON= WITH_LASZIP #LASZIP is recommended OPTIONS_DEFINE= BASH \ ICEBRIDGE PGPOINTCLOUD SQLITE MBIO \ PYTHON TESTS OPTIONS_DEFAULT= PYTHON PGPOINTCLOUD SQLITE #Option without port #lazperf #Plugins with lib not in port: #RivLib, Matlab, MrSID, CPD, GeoWave, GreyHound, HexBin, NITF (nitro) OPTIONS_SUB= yes PGPOINTCLOUD_DESC= Enable Coherent PostgreSQL Point Cloud plugin PGPOINTCLOUD_CMAKE_ON= -DBUILD_PLUGIN_PGPOINTCLOUD:BOOL=TRUE PGPOINTCLOUD_USES= pgsql PGPOINTCLOUD_CMAKE_OFF= -DBUILD_PLUGIN_PGPOINTCLOUD:BOOL=FALSE SQLITE_DESC= Enable SQLite plugin SQLITE_CMAKE_ON= -DBUILD_PLUGIN_SQLITE:BOOL=TRUE SQLITE_USES= sqlite SQLITE_CMAKE_OFF= -DBUILD_PLUGIN_SQLITE:BOOL=FALSE PYTHON_DESC= Enable Python plugin PYTHON_CMAKE_ON= -DBUILD_PLUGIN_PYTHON:BOOL=TRUE PYTHON_USES= python PYTHON_BUILD_DEPENDS= ${PYNUMPY} PYTHON_RUN_DEPENDS= ${PYNUMPY} PYTHON_CMAKE_OFF= -DBUILD_PLUGIN_PYTHON:BOOL=FALSE TESTS_DESC= Enable Tests TESTS_CMAKE_ON= -DBUILD_PLUGIN_TESTS:BOOL=TRUE TESTS_CMAKE_OFF= DBUILD_PLUGIN_TESTS:BOOL=FALSE ICEBRIDGE_DESC= Enable Icebridge plugin ICEBRIDGE_LIB_DEPENDS= libhdf5.so:science/hdf5 \ libsz.so:science/szip ICEBRIDGE_CMAKE_ON= -DBUILD_PLUGIN_ICEBRIDGE:BOOL=TRUE ICEBRIDGE_CMAKE_OFF= -DBUILD_PLUGIN_ICEBRIDGE:BOOL=FALSE MBIO_DESC= Enable MBIO plugin MBIO_CMAKE_ON= -DBUILD_PLUGIN_MBIO:BOOL=TRUE MBIO_CMAKE_OFF= -DBUILD_PLUGIN_MBIO:BOOL=FALSE BASH_DESC= BASH completion BASH_CMAKE_ON= -DWITH_COMPLETION:BOOL=TRUE BASH_RUN_DEPENDS= bash:shells/bash BASH_CMAKE_OFF= -DWITH_COMPLETION:BOOL=FALSE post-install-BASH-on: ${MKDIR} ${STAGEDIR}${PREFIX}/share/bash-completion/completions ${INSTALL_DATA} ${WRKSRC}/scripts/bash-completion/pdal \ ${STAGEDIR}${PREFIX}/share/bash-completion/completions .include Index: head/math/pdal/distinfo =================================================================== --- head/math/pdal/distinfo (revision 470655) +++ head/math/pdal/distinfo (revision 470656) @@ -1,3 +1,3 @@ -TIMESTAMP = 1509397016 -SHA256 (PDAL-PDAL-1.6_GH0.tar.gz) = 66baf8510225b34ee24021731758251cd70657dd578c210ae86c78d158f283eb -SIZE (PDAL-PDAL-1.6_GH0.tar.gz) = 70682980 +TIMESTAMP = 1526229886 +SHA256 (PDAL-PDAL-1.7.2_GH0.tar.gz) = cedfefbe54ca61cbb33d100d619c53873d84f480ff53deec2cf6dd91580f6a61 +SIZE (PDAL-PDAL-1.7.2_GH0.tar.gz) = 71830648 Index: head/math/pdal/files/patch-pdal_util_CMakeLists.txt =================================================================== --- head/math/pdal/files/patch-pdal_util_CMakeLists.txt (revision 470655) +++ head/math/pdal/files/patch-pdal_util_CMakeLists.txt (nonexistent) @@ -1,11 +0,0 @@ ---- pdal/util/CMakeLists.txt.orig 2017-01-06 20:52:21 UTC -+++ pdal/util/CMakeLists.txt -@@ -25,7 +25,7 @@ target_include_directories(${PDAL_UTIL_L - if (UNIX AND NOT APPLE) - target_link_libraries(${PDAL_UTIL_LIB_NAME} - PRIVATE -- dl -+ ${CMAKE_DL_LIBS} execinfo - ) - endif() - Property changes on: head/math/pdal/files/patch-pdal_util_CMakeLists.txt ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/math/pdal/files/patch-dimbuilder_CMakeLists.txt =================================================================== --- head/math/pdal/files/patch-dimbuilder_CMakeLists.txt (revision 470655) +++ head/math/pdal/files/patch-dimbuilder_CMakeLists.txt (nonexistent) @@ -1,9 +0,0 @@ ---- dimbuilder/CMakeLists.txt.orig 2017-01-06 20:52:21 UTC -+++ dimbuilder/CMakeLists.txt -@@ -30,5 +30,5 @@ if (PDAL_HAVE_JSONCPP) - target_link_libraries(dimbuilder PRIVATE ${PDAL_JSONCPP_LIB_NAME}) - endif() - if (UNIX AND NOT APPLE) -- target_link_libraries(dimbuilder PRIVATE dl) -+ target_link_libraries(dimbuilder PRIVATE ${CMAKE_DL_LIBS} execinfo) - endif() Property changes on: head/math/pdal/files/patch-dimbuilder_CMakeLists.txt ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/math/pdal/files/patch-apps_CMakeLists.txt =================================================================== --- head/math/pdal/files/patch-apps_CMakeLists.txt (revision 470655) +++ head/math/pdal/files/patch-apps_CMakeLists.txt (revision 470656) @@ -1,11 +1,11 @@ ---- apps/CMakeLists.txt.orig 2017-01-06 20:53:26 UTC +--- apps/CMakeLists.txt.orig 2018-05-22 16:03:21 UTC +++ apps/CMakeLists.txt -@@ -60,7 +60,7 @@ file(MAKE_DIRECTORY "${PDAL_OUTPUT_LIB_D +@@ -67,7 +67,7 @@ file(MAKE_DIRECTORY "${PDAL_OUTPUT_LIB_D configure_file(${CMAKE_CURRENT_SOURCE_DIR}/pdal.pc.in ${CMAKE_CURRENT_BINARY_DIR}/pdal.pc @ONLY) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/pdal.pc - DESTINATION "${PDAL_LIB_INSTALL_DIR}/pkgconfig/" + DESTINATION "${CMAKE_INSTALL_PREFIX}/libdata/pkgconfig/" PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ) if(UNIX OR APPLE) Index: head/math/pdal/files/patch-cmake_modules_FindLASzip.cmake =================================================================== --- head/math/pdal/files/patch-cmake_modules_FindLASzip.cmake (nonexistent) +++ head/math/pdal/files/patch-cmake_modules_FindLASzip.cmake (revision 470656) @@ -0,0 +1,11 @@ +--- cmake/modules/FindLASzip.cmake.orig 2018-05-22 16:04:04 UTC ++++ cmake/modules/FindLASzip.cmake +@@ -53,7 +53,7 @@ FIND_LIBRARY(LASZIP_LIBRARY + ${OSGEO4W_ROOT_DIR}/lib) + + # Comment out laszip.hpp version info +-SET(LASZIP_VERSION_H "${LASZIP_INCLUDE_DIR}/laszip/laszip_api_version.h") ++SET(LASZIP_VERSION_H "${LASZIP_INCLUDE_DIR}/laszip_api_version.h") + IF(LASZIP_INCLUDE_DIR AND EXISTS ${LASZIP_VERSION_H}) + SET(LASZIP_VERSION 0) + Property changes on: head/math/pdal/files/patch-cmake_modules_FindLASzip.cmake ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/math/pdal/files/patch-vendor_kazhdan_MyTime.h =================================================================== --- head/math/pdal/files/patch-vendor_kazhdan_MyTime.h (nonexistent) +++ head/math/pdal/files/patch-vendor_kazhdan_MyTime.h (revision 470656) @@ -0,0 +1,10 @@ +--- vendor/kazhdan/MyTime.h.orig 2018-04-06 19:43:22 UTC ++++ vendor/kazhdan/MyTime.h +@@ -30,7 +30,6 @@ DAMAGE. + #define MY_TIME_INCLUDED + + #include +-#include + #ifndef WIN32 + #include + #endif // WIN32 Property changes on: head/math/pdal/files/patch-vendor_kazhdan_MyTime.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/math/pdal/pkg-plist =================================================================== --- head/math/pdal/pkg-plist (revision 470655) +++ head/math/pdal/pkg-plist (revision 470656) @@ -1,199 +1,213 @@ bin/pdal bin/pdal-config -include/pdal/Compression.hpp +include/pdal/Artifact.hpp +include/pdal/ArtifactManager.hpp +include/pdal/compression/Compression.hpp +include/pdal/compression/DeflateCompression.hpp +include/pdal/compression/LazPerfCompression.hpp +include/pdal/compression/LazPerfVlrCompression.hpp +include/pdal/compression/LzmaCompression.hpp +include/pdal/compression/ZstdCompression.hpp include/pdal/DbReader.hpp include/pdal/DbWriter.hpp include/pdal/DimDetail.hpp include/pdal/Dimension.hpp include/pdal/DimType.hpp include/pdal/DimUtil.hpp include/pdal/EigenUtils.hpp include/pdal/Filter.hpp include/pdal/filters/ApproximateCoplanarFilter.hpp include/pdal/filters/AssignFilter.hpp include/pdal/filters/ChipperFilter.hpp include/pdal/filters/ClusterFilter.hpp include/pdal/filters/ColorinterpFilter.hpp include/pdal/filters/ColorInterpRamps.hpp include/pdal/filters/ColorizationFilter.hpp -include/pdal/filters/ComputeRangeFilter.hpp include/pdal/filters/CropFilter.hpp include/pdal/filters/DecimationFilter.hpp include/pdal/filters/DividerFilter.hpp include/pdal/filters/EigenvaluesFilter.hpp include/pdal/filters/ELMFilter.hpp include/pdal/filters/EstimateRankFilter.hpp include/pdal/filters/FerryFilter.hpp include/pdal/filters/GreedyProjection.hpp include/pdal/filters/GroupByFilter.hpp include/pdal/filters/HAGFilter.hpp include/pdal/filters/HeadFilter.hpp include/pdal/filters/IQRFilter.hpp include/pdal/filters/KDistanceFilter.hpp include/pdal/filters/LocateFilter.hpp include/pdal/filters/LOFFilter.hpp include/pdal/filters/MADFilter.hpp include/pdal/filters/MergeFilter.hpp include/pdal/filters/MongusFilter.hpp include/pdal/filters/MortonOrderFilter.hpp +include/pdal/filters/NeighborClassifierFilter.hpp include/pdal/filters/NormalFilter.hpp include/pdal/filters/OutlierFilter.hpp include/pdal/filters/OverlayFilter.hpp include/pdal/filters/PMFFilter.hpp include/pdal/filters/PoissonFilter.hpp include/pdal/filters/RadialDensityFilter.hpp include/pdal/filters/RandomizeFilter.hpp include/pdal/filters/RangeFilter.hpp include/pdal/filters/ReprojectionFilter.hpp +include/pdal/filters/ReturnsFilter.hpp include/pdal/filters/SampleFilter.hpp include/pdal/filters/SMRFilter.hpp include/pdal/filters/SortFilter.hpp include/pdal/filters/SplitterFilter.hpp include/pdal/filters/StatsFilter.hpp include/pdal/filters/StreamCallbackFilter.hpp include/pdal/filters/TailFilter.hpp include/pdal/filters/TransformationFilter.hpp include/pdal/filters/VoxelCenterNearestNeighborFilter.hpp include/pdal/filters/VoxelCentroidNearestNeighborFilter.hpp include/pdal/FlexWriter.hpp include/pdal/GDALUtils.hpp include/pdal/Geometry.hpp include/pdal/GEOSUtils.hpp include/pdal/gitsha.h include/pdal/io/BpfCompressor.hpp include/pdal/io/BpfHeader.hpp include/pdal/io/BpfReader.hpp include/pdal/io/BpfWriter.hpp include/pdal/io/BufferReader.hpp include/pdal/io/FauxReader.hpp include/pdal/io/GDALGrid.hpp include/pdal/io/GDALReader.hpp include/pdal/io/GDALWriter.hpp include/pdal/io/GeotiffSupport.hpp include/pdal/io/HeaderVal.hpp include/pdal/io/Ilvis2MetadataReader.hpp include/pdal/io/Ilvis2Reader.hpp include/pdal/io/LasError.hpp include/pdal/io/LasHeader.hpp include/pdal/io/LasReader.hpp include/pdal/io/LasSummaryData.hpp include/pdal/io/LasUtils.hpp include/pdal/io/LasVLR.hpp include/pdal/io/LasWriter.hpp include/pdal/io/NullWriter.hpp include/pdal/io/OGRWriter.hpp include/pdal/io/OptechCommon.hpp include/pdal/io/OptechReader.hpp include/pdal/io/OptechRotationMatrix.hpp include/pdal/io/PlyReader.hpp include/pdal/io/PlyWriter.hpp include/pdal/io/PtsReader.hpp include/pdal/io/QfitReader.hpp include/pdal/io/SbetCommon.hpp include/pdal/io/SbetReader.hpp include/pdal/io/SbetWriter.hpp include/pdal/io/TerrasolidReader.hpp include/pdal/io/TextReader.hpp include/pdal/io/TextWriter.hpp include/pdal/io/TIndexReader.hpp include/pdal/KDIndex.hpp include/pdal/Kernel.hpp include/pdal/kernels/DeltaKernel.hpp include/pdal/kernels/DiffKernel.hpp include/pdal/kernels/GroundKernel.hpp include/pdal/kernels/HausdorffKernel.hpp include/pdal/kernels/InfoKernel.hpp include/pdal/kernels/MergeKernel.hpp include/pdal/kernels/PipelineKernel.hpp include/pdal/kernels/RandomKernel.hpp include/pdal/kernels/SortKernel.hpp include/pdal/kernels/SplitKernel.hpp include/pdal/kernels/TIndexKernel.hpp include/pdal/kernels/TranslateKernel.hpp include/pdal/Log.hpp include/pdal/Mesh.hpp include/pdal/Metadata.hpp include/pdal/Options.hpp include/pdal/pdal_config.hpp -include/pdal/pdal_defines.h include/pdal/pdal_export.hpp +include/pdal/pdal_features.hpp include/pdal/pdal_internal.hpp -include/pdal/pdal_macros.hpp include/pdal/pdal_test_main.hpp include/pdal/pdal_types.hpp include/pdal/pdal.hpp include/pdal/PDALUtils.hpp include/pdal/PipelineExecutor.hpp include/pdal/PipelineManager.hpp include/pdal/PipelineReaderJSON.hpp include/pdal/PipelineWriter.hpp -include/pdal/plugin.hpp +include/pdal/PluginDirectory.hpp +include/pdal/PluginHelper.hpp +include/pdal/PluginInfo.hpp include/pdal/PluginManager.hpp include/pdal/PointContainer.hpp include/pdal/PointLayout.hpp include/pdal/PointRef.hpp include/pdal/PointTable.hpp include/pdal/PointView.hpp include/pdal/PointViewIter.hpp include/pdal/Polygon.hpp -include/pdal/PyArray.hpp include/pdal/QuadIndex.hpp include/pdal/QuickInfo.hpp include/pdal/Reader.hpp include/pdal/Scaling.hpp include/pdal/Segmentation.hpp include/pdal/SpatialReference.hpp include/pdal/Stage.hpp +include/pdal/StageExtensions.hpp include/pdal/StageFactory.hpp include/pdal/StageWrapper.hpp +include/pdal/Streamable.hpp include/pdal/util/Algorithm.hpp include/pdal/util/Bounds.hpp include/pdal/util/Charbuf.hpp include/pdal/util/Extractor.hpp include/pdal/util/FileUtils.hpp include/pdal/util/Georeference.hpp include/pdal/util/Inserter.hpp include/pdal/util/IStream.hpp include/pdal/util/NullOStream.hpp include/pdal/util/OStream.hpp include/pdal/util/pdal_util_export.hpp include/pdal/util/portable_endian.hpp include/pdal/util/ProgramArgs.hpp include/pdal/util/Utils.hpp include/pdal/util/Uuid.hpp include/pdal/Writer.hpp include/pdal/XMLSchema.hpp lib/libpdal_arbiter.a lib/libpdal_base.so -lib/libpdal_base.so.5 -lib/libpdal_base.so.6.1.0 +lib/libpdal_base.so.6 +lib/libpdal_base.so.7.0.2 lib/libpdal_boost.a lib/libpdal_kazhdan.a lib/libpdal_util.so -lib/libpdal_util.so.5 -lib/libpdal_util.so.6.1.0 +lib/libpdal_util.so.6 +lib/libpdal_util.so.7.0.2 lib/libpdalcpp.so lib/pdal/cmake/PDALConfig.cmake lib/pdal/cmake/PDALConfigVersion.cmake lib/pdal/cmake/PDALTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/pdal/cmake/PDALTargets.cmake libdata/pkgconfig/pdal.pc +%%BASH%%share/bash-completion/completions/pdal %%ICEBRIDGE%%lib/libpdal_plugin_reader_icebridge.so -%%ICEBRIDGE%%lib/libpdal_plugin_reader_icebridge.so.5 -%%ICEBRIDGE%%lib/libpdal_plugin_reader_icebridge.so.6.1.0 +%%ICEBRIDGE%%lib/libpdal_plugin_reader_icebridge.so.6 +%%ICEBRIDGE%%lib/libpdal_plugin_reader_icebridge.so.7.0.2 %%PGPOINTCLOUD%%lib/libpdal_plugin_reader_pgpointcloud.so -%%PGPOINTCLOUD%%lib/libpdal_plugin_reader_pgpointcloud.so.5 -%%PGPOINTCLOUD%%lib/libpdal_plugin_reader_pgpointcloud.so.6.1.0 +%%PGPOINTCLOUD%%lib/libpdal_plugin_reader_pgpointcloud.so.6 +%%PGPOINTCLOUD%%lib/libpdal_plugin_reader_pgpointcloud.so.7.0.2 %%PGPOINTCLOUD%%lib/libpdal_plugin_writer_pgpointcloud.so -%%PGPOINTCLOUD%%lib/libpdal_plugin_writer_pgpointcloud.so.5 -%%PGPOINTCLOUD%%lib/libpdal_plugin_writer_pgpointcloud.so.6.1.0 +%%PGPOINTCLOUD%%lib/libpdal_plugin_writer_pgpointcloud.so.6 +%%PGPOINTCLOUD%%lib/libpdal_plugin_writer_pgpointcloud.so.7.0.2 +%%PYTHON%%include/pdal/io/NumpyReader.hpp %%PYTHON%%lib/libpdal_plugin_filter_python.so -%%PYTHON%%lib/libpdal_plugin_filter_python.so.5 -%%PYTHON%%lib/libpdal_plugin_filter_python.so.6.1.0 +%%PYTHON%%lib/libpdal_plugin_filter_python.so.6 +%%PYTHON%%lib/libpdal_plugin_filter_python.so.7.0.2 +%%PYTHON%%lib/libpdal_plugin_reader_numpy.so +%%PYTHON%%lib/libpdal_plugin_reader_numpy.so.6 +%%PYTHON%%lib/libpdal_plugin_reader_numpy.so.7.0.2 %%SQLITE%%lib/libpdal_plugin_reader_sqlite.so -%%SQLITE%%lib/libpdal_plugin_reader_sqlite.so.5 -%%SQLITE%%lib/libpdal_plugin_reader_sqlite.so.6.1.0 +%%SQLITE%%lib/libpdal_plugin_reader_sqlite.so.6 +%%SQLITE%%lib/libpdal_plugin_reader_sqlite.so.7.0.2 %%SQLITE%%lib/libpdal_plugin_writer_sqlite.so -%%SQLITE%%lib/libpdal_plugin_writer_sqlite.so.5 -%%SQLITE%%lib/libpdal_plugin_writer_sqlite.so.6.1.0 -%%BASH%%share/bash-completion/completions/pdal +%%SQLITE%%lib/libpdal_plugin_writer_sqlite.so.6 +%%SQLITE%%lib/libpdal_plugin_writer_sqlite.so.7.0.2