diff options
| -rw-r--r-- | math/pdal/Makefile | 5 | ||||
| -rw-r--r-- | math/pdal/distinfo | 6 | ||||
| -rw-r--r-- | math/pdal/files/patch-apps_CMakeLists.txt | 4 | ||||
| -rw-r--r-- | math/pdal/files/patch-cmake_modules_FindLASzip.cmake | 11 | ||||
| -rw-r--r-- | math/pdal/files/patch-dimbuilder_CMakeLists.txt | 9 | ||||
| -rw-r--r-- | math/pdal/files/patch-pdal_util_CMakeLists.txt | 11 | ||||
| -rw-r--r-- | math/pdal/files/patch-vendor_kazhdan_MyTime.h | 10 | ||||
| -rw-r--r-- | math/pdal/pkg-plist | 60 |
8 files changed, 65 insertions, 51 deletions
diff --git a/math/pdal/Makefile b/math/pdal/Makefile index 8d01d05ba847..1233d7224678 100644 --- a/math/pdal/Makefile +++ b/math/pdal/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= pdal -DISTVERSION= 1.6 -PORTREVISION= 4 +DISTVERSION= 1.7.2 CATEGORIES= math databases graphics MAINTAINER= lbartoletti@tuxfamily.org @@ -30,7 +29,7 @@ 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 \ diff --git a/math/pdal/distinfo b/math/pdal/distinfo index e3879abb4936..e10fac2c3221 100644 --- a/math/pdal/distinfo +++ b/math/pdal/distinfo @@ -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 diff --git a/math/pdal/files/patch-apps_CMakeLists.txt b/math/pdal/files/patch-apps_CMakeLists.txt index 264ec5d31e74..89a1f701e5ef 100644 --- a/math/pdal/files/patch-apps_CMakeLists.txt +++ b/math/pdal/files/patch-apps_CMakeLists.txt @@ -1,6 +1,6 @@ ---- 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 diff --git a/math/pdal/files/patch-cmake_modules_FindLASzip.cmake b/math/pdal/files/patch-cmake_modules_FindLASzip.cmake new file mode 100644 index 000000000000..0a388385ae21 --- /dev/null +++ b/math/pdal/files/patch-cmake_modules_FindLASzip.cmake @@ -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) + diff --git a/math/pdal/files/patch-dimbuilder_CMakeLists.txt b/math/pdal/files/patch-dimbuilder_CMakeLists.txt deleted file mode 100644 index 5d73f3f2069c..000000000000 --- a/math/pdal/files/patch-dimbuilder_CMakeLists.txt +++ /dev/null @@ -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() diff --git a/math/pdal/files/patch-pdal_util_CMakeLists.txt b/math/pdal/files/patch-pdal_util_CMakeLists.txt deleted file mode 100644 index 5d714cba63e6..000000000000 --- a/math/pdal/files/patch-pdal_util_CMakeLists.txt +++ /dev/null @@ -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() - diff --git a/math/pdal/files/patch-vendor_kazhdan_MyTime.h b/math/pdal/files/patch-vendor_kazhdan_MyTime.h new file mode 100644 index 000000000000..e4db34f91b2a --- /dev/null +++ b/math/pdal/files/patch-vendor_kazhdan_MyTime.h @@ -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 <string.h> +-#include <sys/timeb.h> + #ifndef WIN32 + #include <sys/time.h> + #endif // WIN32 diff --git a/math/pdal/pkg-plist b/math/pdal/pkg-plist index fc546fd03570..661486a12c1e 100644 --- a/math/pdal/pkg-plist +++ b/math/pdal/pkg-plist @@ -1,6 +1,13 @@ 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 @@ -16,7 +23,6 @@ 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 @@ -36,6 +42,7 @@ 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 @@ -45,6 +52,7 @@ 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 @@ -115,10 +123,9 @@ 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 @@ -127,7 +134,9 @@ 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 @@ -136,7 +145,6 @@ 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 @@ -144,8 +152,10 @@ 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 @@ -165,35 +175,39 @@ 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 |