Attachment 167742 Details for Bug 207059 – Update pdal to 1.1.0

[patch] Update pdal to 1.1.0

pdal-1.1.0.diff (text/plain), 26.51 KB, created by Loïc Bartoletti on 2016-03-05 18:27:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Loïc Bartoletti

Created: 2016-03-05 18:27:33 UTC

Size: 26.51 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 410194)
>+++ Makefile	(working copy)
>@@ -1,8 +1,8 @@
>-# Created by: bart <bart@bureau>
>+# Created by: bart <coder@tuxfamily.org>
> # $FreeBSD$
> 
> PORTNAME=	pdal
>-PORTVERSION=	0.9.8
>+PORTVERSION=	1.1.0
> CATEGORIES=	math databases graphics
> 
> MAINTAINER=	coder@tuxfamily.org
>@@ -11,21 +11,66 @@
> LICENSE=	BSD3CLAUSE
> LICENSE_FILE=	${WRKSRC}/LICENSE.txt
> 
>-USES=		cmake compiler:c++11-lang
>+LIB_DEPENDS=	libgdal.so:${PORTSDIR}/graphics/gdal \
>+		libgeos.so:${PORTSDIR}/graphics/geos \
>+		libboost_thread.so:${PORTSDIR}/devel/boost-libs
>+
>+USES=		cmake compiler:c++11-lang pkgconfig
> USE_LDCONFIG=	yes
> USE_GITHUB=	yes
> GH_ACCOUNT=	${PORTNAME:tu}
> GH_PROJECT=	${GH_ACCOUNT}
> 
>-OPTIONS_DEFINE=	GDAL GEOTIFF LIBXML2 EMBED_BOOST
>-OPTIONS_DEFAULT=	GDAL GEOTIFF LIBXML2
>+OPTIONS_DEFINE=	GEOTIFF LIBXML2 LASZIP APPS BASH ATTRIBUTE \
>+		ICEBRIDGE PGPOINTCLOUD SQLITE \
>+		PYTHON TESTS
>+OPTIONS_DEFAULT=	GEOTIFF LIBXML2 LASZIP APPS
>+#Plugins with lib not in port:
>+#RivLib, Matlab, MrSID, CPD, GeoWave, GreyHound, HexBin
> OPTIONS_SUB=	yes
> 
>-GDAL_DESC=		Enable GDAL support
>-GDAL_CMAKE_ON=		-DWITH_GDAL:BOOL=TRUE
>-GDAL_LIB_DEPENDS=	libgdal.so:${PORTSDIR}/graphics/gdal
>-GDAL_CMAKE_OFF=		-DWITH_GDAL:BOOL=FALSE
>+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
>+
>+ATTRIBUTE_DESC=	Enable attribute plugin
>+ATTRIBUTE_CMAKE_ON=	-DBUILD_PLUGIN_ATTRIBUTE:BOOL=TRUE
>+ATTRIBUTE_CMAKE_OFF=	-DBUILD_PLUGIN_ATTRIBUTE:BOOL=FALSE
>+
>+ICEBRIDGE_DESC=	Enable Icebridge plugin
>+ICEBRIDGE_LIB_DEPENDS=	libhdf5.so:${PORTSDIR}/science/hdf5
>+ICEBRIDGE_CMAKE_ON=	-DBUILD_PLUGIN_ICEBRIDGE:BOOL=TRUE
>+ICEBRIDGE_CMAKE_OFF=	-DBUILD_PLUGIN_ICEBRIDGE:BOOL=FALSE
>+
>+APPS_DESC=	PDAL command line application
>+APPS_CMAKE_ON=	-DWITH_APPS:BOOL=TRUE
>+APPS_CMAKE_OFF=	-DWITH_APPS:BOOL=FALSE
>+
>+BASH_DESC=	BASH completion
>+BASH_CMAKE_ON=	-DWITH_BASH:BOOL=TRUE
>+BASH_RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
>+BASH_CMAKE_OFF=	-DWITH_BASH:BOOL=FALSE
>+
>+LASZIP_DESC=	Enable LASZip support (Recommended)
>+LASZIP_LIB_DEPENDS=	liblaszip.so:${PORTSDIR}/archivers/laszip
>+
> GEOTIFF_CMAKE_ON=	-DWITH_GEOTIFF:BOOL=TRUE
> GEOTIFF_LIB_DEPENDS=	libgeotiff.so:${PORTSDIR}/graphics/libgeotiff
> GEOTIFF_CMAKE_OFF=	-DWITH_GEOTIFF:BOOL=FALSE
>@@ -34,9 +79,4 @@
> LIBXML2_LIB_DEPENDS=	libxml2.so:${PORTSDIR}/textproc/libxml2
> LIBXML2_CMAKE_OFF=	-DWITH_LIBXML2:BOOL=FALSE
> 
>-EMBED_BOOST_DESC=	Use embedded rather than system boost
>-EMBED_BOOST_CMAKE_ON=	-DPDAL_EMBED_BOOST:BOOL=TRUE
>-EMBED_BOOST_CMAKE_OFF=	-DPDAL_EMBED_BOOST:BOOL=FALSE
>-EMBED_BOOST_LIB_DEPENDS_OFF=	libboost_thread.so:${PORTSDIR}/devel/boost-libs
>-
> .include <bsd.port.mk>
>Index: distinfo
>===================================================================
>--- distinfo	(revision 410194)
>+++ distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (PDAL-PDAL-0.9.8_GH0.tar.gz) = aef41ae7c8b87541eb9cc11c2e17f086ac26799f3e4da0f19f8e78e0538060ff
>-SIZE (PDAL-PDAL-0.9.8_GH0.tar.gz) = 11046030
>+SHA256 (PDAL-PDAL-1.1.0_GH0.tar.gz) = 70e0c84035b3fdc75c4eb72dde62a7a2138171d249f2a607170f79d5cafe589d
>+SIZE (PDAL-PDAL-1.1.0_GH0.tar.gz) = 37323319
>Index: files/patch-apps_CMakeLists.txt
>===================================================================
>--- files/patch-apps_CMakeLists.txt	(nonexistent)
>+++ files/patch-apps_CMakeLists.txt	(working copy)
>@@ -0,0 +1,11 @@
>+--- apps/CMakeLists.txt.orig	2016-02-26 21:07:55 UTC
>++++ apps/CMakeLists.txt
>+@@ -91,7 +91,7 @@ if(UNIX OR APPLE)
>+     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 "${CMAKE_INSTALL_PREFIX}/lib/pkgconfig/"
>++        DESTINATION "${CMAKE_INSTALL_PREFIX}/libdata/pkgconfig/"
>+         PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ)
>+ 
>+ 
>
>Property changes on: files/patch-apps_CMakeLists.txt
>___________________________________________________________________
>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: files/patch-include_pdal_util_Extractor.hpp
>===================================================================
>--- files/patch-include_pdal_util_Extractor.hpp	(nonexistent)
>+++ files/patch-include_pdal_util_Extractor.hpp	(working copy)
>@@ -0,0 +1,11 @@
>+--- include/pdal/util/Extractor.hpp.orig	2016-02-17 20:47:32 UTC
>++++ include/pdal/util/Extractor.hpp
>+@@ -37,7 +37,7 @@
>+ #include <pdal/Dimension.hpp>
>+ #include <pdal/pdal_macros.hpp>
>+ 
>+-#include "portable_endian.hpp"
>++//#include "portable_endian.hpp"
>+ 
>+ namespace pdal
>+ {
>
>Property changes on: files/patch-include_pdal_util_Extractor.hpp
>___________________________________________________________________
>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: files/patch-include_pdal_util_IStream.hpp
>===================================================================
>--- files/patch-include_pdal_util_IStream.hpp	(nonexistent)
>+++ files/patch-include_pdal_util_IStream.hpp	(working copy)
>@@ -0,0 +1,11 @@
>+--- include/pdal/util/IStream.hpp.orig	2016-02-17 20:11:50 UTC
>++++ include/pdal/util/IStream.hpp
>+@@ -45,7 +45,7 @@
>+ 
>+ #include <pdal/pdal_export.hpp>
>+ 
>+-#include "portable_endian.hpp"
>++//#include "portable_endian.hpp"
>+ 
>+ namespace pdal
>+ {
>
>Property changes on: files/patch-include_pdal_util_IStream.hpp
>___________________________________________________________________
>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: files/patch-include_pdal_util_Inserter.hpp
>===================================================================
>--- files/patch-include_pdal_util_Inserter.hpp	(nonexistent)
>+++ files/patch-include_pdal_util_Inserter.hpp	(working copy)
>@@ -0,0 +1,11 @@
>+--- include/pdal/util/Inserter.hpp.orig	2016-02-17 20:50:14 UTC
>++++ include/pdal/util/Inserter.hpp
>+@@ -33,7 +33,7 @@
>+ ****************************************************************************/
>+ #pragma once
>+ 
>+-#include "portable_endian.hpp"
>++//#include "portable_endian.hpp"
>+ 
>+ namespace pdal
>+ {
>
>Property changes on: files/patch-include_pdal_util_Inserter.hpp
>___________________________________________________________________
>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: files/patch-include_pdal_util_OStream.hpp
>===================================================================
>--- files/patch-include_pdal_util_OStream.hpp	(nonexistent)
>+++ files/patch-include_pdal_util_OStream.hpp	(working copy)
>@@ -0,0 +1,11 @@
>+--- include/pdal/util/OStream.hpp.orig	2016-02-17 20:12:30 UTC
>++++ include/pdal/util/OStream.hpp
>+@@ -42,7 +42,7 @@
>+ 
>+ #include <pdal/pdal_internal.hpp>
>+ 
>+-#include "portable_endian.hpp"
>++//#include "portable_endian.hpp"
>+ 
>+ namespace pdal
>+ {
>
>Property changes on: files/patch-include_pdal_util_OStream.hpp
>___________________________________________________________________
>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: files/patch-io_qfit_QfitReader.cpp
>===================================================================
>--- files/patch-io_qfit_QfitReader.cpp	(nonexistent)
>+++ files/patch-io_qfit_QfitReader.cpp	(working copy)
>@@ -0,0 +1,11 @@
>+--- io/qfit/QfitReader.cpp.orig	2016-02-17 20:55:22 UTC
>++++ io/qfit/QfitReader.cpp
>+@@ -168,7 +168,7 @@ Word #       Content
>+ 
>+ #include <pdal/PointView.hpp>
>+ #include <pdal/util/Extractor.hpp>
>+-#include <pdal/util/portable_endian.hpp>
>++//#include <pdal/util/portable_endian.hpp>
>+ 
>+ #include <algorithm>
>+ #include <map>
>
>Property changes on: files/patch-io_qfit_QfitReader.cpp
>___________________________________________________________________
>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: files/patch-src-Utils.cpp
>===================================================================
>--- files/patch-src-Utils.cpp	(revision 410194)
>+++ files/patch-src-Utils.cpp	(nonexistent)
>@@ -1,10 +0,0 @@
>---- src/Utils.cpp.orig	2014-07-27 19:02:59.456832475 +0200
>-+++ src/Utils.cpp	2014-07-27 19:03:23.513363445 +0200
>-@@ -37,6 +37,7 @@
>- #include <cassert>
>- #include <cstdlib>
>- #include <cctype>
>-+#include <sys/wait.h>
>- 
>- #ifdef PDAL_COMPILER_MSVC
>- #  pragma warning(disable: 4127)  // conditional expression is constant
>
>Property changes on: files/patch-src-Utils.cpp
>___________________________________________________________________
>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: files/patch-src_PluginManager.cpp
>===================================================================
>--- files/patch-src_PluginManager.cpp	(nonexistent)
>+++ files/patch-src_PluginManager.cpp	(working copy)
>@@ -0,0 +1,11 @@
>+--- src/PluginManager.cpp.orig	2016-02-17 21:17:16 UTC
>++++ src/PluginManager.cpp
>+@@ -58,7 +58,7 @@ namespace
>+ {
>+ #if defined(__APPLE__) && defined(__MACH__)
>+     const std::string dynamicLibraryExtension(".dylib");
>+-#elif defined __linux__
>++#elif defined __linux__ || __FreeBSD__
>+     const std::string dynamicLibraryExtension(".so");
>+ #elif defined _WIN32
>+     const std::string dynamicLibraryExtension(".dll");
>
>Property changes on: files/patch-src_PluginManager.cpp
>___________________________________________________________________
>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: files/patch-src_util_CMakeLists.txt
>===================================================================
>--- files/patch-src_util_CMakeLists.txt	(nonexistent)
>+++ files/patch-src_util_CMakeLists.txt	(working copy)
>@@ -0,0 +1,16 @@
>+--- src/util/CMakeLists.txt.orig	2016-02-17 20:37:44 UTC
>++++ src/util/CMakeLists.txt
>+@@ -41,11 +41,11 @@ set_target_properties(${PDAL_UTIL_LIB_NA
>+     CLEAN_DIRECT_OUTPUT 1)
>+ 
>+ if (NOT WIN32)
>+-    target_link_libraries(${PDAL_UTIL_LIB_NAME} dl)
>++    target_link_libraries(${PDAL_UTIL_LIB_NAME})
>+ endif (NOT WIN32)
>+ 
>+ if (NOT WIN32)
>+-    target_link_libraries(${PDAL_UTIL_LIB_NAME} dl)
>++    target_link_libraries(${PDAL_UTIL_LIB_NAME})
>+ endif (NOT WIN32)
>+ 
>+ set_property(GLOBAL PROPERTY _UTIL_INCLUDED TRUE)
>
>Property changes on: files/patch-src_util_CMakeLists.txt
>___________________________________________________________________
>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: files/patch-src_util_Utils.cpp
>===================================================================
>--- files/patch-src_util_Utils.cpp	(nonexistent)
>+++ files/patch-src_util_Utils.cpp	(working copy)
>@@ -0,0 +1,10 @@
>+--- src/util/Utils.cpp.orig	2016-02-17 20:01:52 UTC
>++++ src/util/Utils.cpp
>+@@ -41,6 +41,7 @@
>+ #include <cstdlib>
>+ #include <cctype>
>+ #include <random>
>++#include <sys/wait.h>
>+ 
>+ #ifndef _WIN32
>+ #include <cxxabi.h>
>
>Property changes on: files/patch-src_util_Utils.cpp
>___________________________________________________________________
>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: files/patch-test_unit_CMakeLists.txt
>===================================================================
>--- files/patch-test_unit_CMakeLists.txt	(nonexistent)
>+++ files/patch-test_unit_CMakeLists.txt	(working copy)
>@@ -0,0 +1,10 @@
>+--- test/unit/CMakeLists.txt.orig	2016-02-17 21:46:12 UTC
>++++ test/unit/CMakeLists.txt
>+@@ -17,6 +17,7 @@ include_directories(${CMAKE_CURRENT_BINA
>+ 
>+ include_directories(
>+     ${PROJECT_SOURCE_DIR}/include
>++    ${PROJECT_SOURCE_DIR}/vendor/gtest-1.7.0/include
>+     ${GDAL_INCLUDE_DIR}
>+     ${PROJECT_SOURCE_DIR}/io/bpf
>+     ${PROJECT_SOURCE_DIR}/io/buffer
>
>Property changes on: files/patch-test_unit_CMakeLists.txt
>___________________________________________________________________
>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: files/patch-test_unit_PointViewTest.cpp
>===================================================================
>--- files/patch-test_unit_PointViewTest.cpp	(nonexistent)
>+++ files/patch-test_unit_PointViewTest.cpp	(working copy)
>@@ -0,0 +1,22 @@
>+--- test/unit/PointViewTest.cpp.orig	2016-02-17 21:33:05 UTC
>++++ test/unit/PointViewTest.cpp
>+@@ -449,11 +449,11 @@ TEST(PointViewTest, order)
>+ 
>+ // Per discussions with @abellgithub (https://github.com/gadomski/PDAL/commit/c1d54e56e2de841d37f2a1b1c218ed723053f6a9#commitcomment-14415138)
>+ // we only do bounds checking on `PointView`s when in debug mode.
>+-#ifndef NDEBUG
>+-TEST(PointViewDeathTest, out_of_bounds)
>+-{
>+-    PointTable point_table;
>+-    auto point_view = makeTestView(point_table, 1);
>+-    EXPECT_DEATH(point_view->getFieldAs<uint8_t>(Dimension::Id::X, 1), "< m_size");
>+-}
>+-#endif
>++//#ifndef NDEBUG
>++//TEST(PointViewDeathTest, out_of_bounds)
>++//{
>++//    PointTable point_table;
>++//    auto point_view = makeTestView(point_table, 1);
>++//    EXPECT_DEATH(point_view->getFieldAs<uint8_t>(Dimension::Id::X, 1), "< m_size");
>++//}
>++//#endif
>
>Property changes on: files/patch-test_unit_PointViewTest.cpp
>___________________________________________________________________
>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: files/patch-vendor_nanoflann-1.1.8_nanoflann.hpp
>===================================================================
>--- files/patch-vendor_nanoflann-1.1.8_nanoflann.hpp	(nonexistent)
>+++ files/patch-vendor_nanoflann-1.1.8_nanoflann.hpp	(working copy)
>@@ -0,0 +1,46 @@
>+--- vendor/nanoflann-1.1.8/nanoflann.hpp.orig	2016-02-17 21:01:58 UTC
>++++ vendor/nanoflann-1.1.8/nanoflann.hpp
>+@@ -38,6 +38,7 @@
>+ #include <algorithm>
>+ #include <stdexcept>
>+ #include <cstdio>  // for fwrite()
>++#include <cstdlib>
>+ #include <cmath>   // for fabs(),...
>+ #include <limits>
>+ 
>+@@ -236,7 +237,7 @@ namespace nanoflann
>+ 	  * @{ */
>+ 
>+ 	template<typename T> inline T abs(T x) { return (x<0) ? -x : x; }
>+-	template<> inline int abs<int>(int x) { return ::abs(x); }
>++	template<> inline int abs<int>(int x) { return abs(x); }
>+ 	template<> inline float abs<float>(float x) { return fabsf(x); }
>+ 	template<> inline double abs<double>(double x) { return fabs(x); }
>+ 	template<> inline long double abs<long double>(long double x) { return fabsl(x); }
>+@@ -432,7 +433,7 @@ namespace nanoflann
>+ 	template <typename T>
>+ 	inline T* allocate(size_t count = 1)
>+ 	{
>+-		T* mem = (T*) ::malloc(sizeof(T)*count);
>++		T* mem = (T*) malloc(sizeof(T)*count);
>+ 		return mem;
>+ 	}
>+ 
>+@@ -499,7 +500,7 @@ namespace nanoflann
>+ 		{
>+ 			while (base != NULL) {
>+ 				void *prev = *((void**) base); /* Get pointer to prev block. */
>+-				::free(base);
>++				free(base);
>+ 				base = prev;
>+ 			}
>+ 			internal_init();
>+@@ -529,7 +530,7 @@ namespace nanoflann
>+ 							size + sizeof(void*) + (WORDSIZE-1) : blocksize;
>+ 
>+ 				// use the standard C malloc to allocate memory
>+-				void* m = ::malloc(bsize);
>++				void* m = malloc(bsize);
>+ 				if (!m) {
>+ 					fprintf(stderr,"Failed to allocate memory.\n");
>+ 					return NULL;
>
>Property changes on: files/patch-vendor_nanoflann-1.1.8_nanoflann.hpp
>___________________________________________________________________
>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: pkg-plist
>===================================================================
>--- pkg-plist	(revision 410194)
>+++ pkg-plist	(working copy)
>@@ -1,103 +1,188 @@
>-bin/pc2pc
>-bin/pcequal
>-bin/pcinfo
>-bin/pcpipeline
>-bin/pcquery
>+bin/pdal
> bin/pdal-config
>-include/pdal/Bounds.hpp
>+include/pdal/BpfCompressor.hpp
>+include/pdal/BpfHeader.hpp
>+include/pdal/BpfReader.hpp
>+include/pdal/BpfWriter.hpp
>+include/pdal/BufferReader.hpp
>+include/pdal/ChipperFilter.hpp
>+include/pdal/ColorizationFilter.hpp
>+include/pdal/Compression.hpp
>+include/pdal/CropFilter.hpp
>+include/pdal/DbReader.hpp
>+include/pdal/DbWriter.hpp
>+include/pdal/DecimationFilter.hpp
>+include/pdal/DeltaKernel.hpp
>+include/pdal/DerivativeWriter.hpp
>+include/pdal/DiffKernel.hpp
> include/pdal/Dimension.hpp
>-include/pdal/Endian.hpp
>-include/pdal/FileUtils.hpp
>+include/pdal/DividerFilter.hpp
>+include/pdal/FauxReader.hpp
>+include/pdal/FerryFilter.hpp
> include/pdal/Filter.hpp
>-include/pdal/FilterIterator.hpp
>+include/pdal/FlexWriter.hpp
>+include/pdal/GDALReader.hpp
> include/pdal/GDALUtils.hpp
>+include/pdal/Geometry.hpp
>+include/pdal/GeotiffSupport.hpp
> include/pdal/GlobalEnvironment.hpp
>+include/pdal/HeaderVal.hpp
>+include/pdal/Ilvis2Reader.hpp
>+include/pdal/InfoKernel.hpp
>+include/pdal/KDIndex.hpp
>+include/pdal/Kernel.hpp
>+include/pdal/KernelFactory.hpp
>+include/pdal/KernelSupport.hpp
>+include/pdal/LasError.hpp
>+include/pdal/LasHeader.hpp
>+include/pdal/LasReader.hpp
>+include/pdal/LasUtils.hpp
>+include/pdal/LasWriter.hpp
> include/pdal/Log.hpp
>+include/pdal/MergeFilter.hpp
>+include/pdal/MergeKernel.hpp
> include/pdal/Metadata.hpp
>-include/pdal/MultiFilter.hpp
>-include/pdal/MultiFilterIterator.hpp
>-include/pdal/Object.hpp
>+include/pdal/MortonOrderFilter.hpp
>+include/pdal/NullWriter.hpp
>+include/pdal/OptechCommon.hpp
>+include/pdal/OptechReader.hpp
>+include/pdal/OptechRotationMatrix.hpp
> include/pdal/Options.hpp
>+include/pdal/PDALUtils.hpp
>+include/pdal/PipelineKernel.hpp
> include/pdal/PipelineManager.hpp
> include/pdal/PipelineReader.hpp
> include/pdal/PipelineWriter.hpp
>-include/pdal/PointBuffer.hpp
>-include/pdal/Range.hpp
>+include/pdal/PluginManager.hpp
>+include/pdal/PlyReader.hpp
>+include/pdal/PlyWriter.hpp
>+include/pdal/PointLayout.hpp
>+include/pdal/PointTable.hpp
>+include/pdal/PointView.hpp
>+include/pdal/PointViewIter.hpp
>+include/pdal/QfitReader.hpp
>+include/pdal/QuadIndex.hpp
>+include/pdal/QuickInfo.hpp
>+include/pdal/RandomKernel.hpp
>+include/pdal/RandomizeFilter.hpp
>+include/pdal/RangeFilter.hpp
> include/pdal/Reader.hpp
>-include/pdal/ReaderIterator.hpp
>-include/pdal/Schema.hpp
>+include/pdal/ReprojectionFilter.hpp
>+include/pdal/SbetCommon.hpp
>+include/pdal/SbetReader.hpp
>+include/pdal/SbetWriter.hpp
>+include/pdal/SortFilter.hpp
>+include/pdal/SortKernel.hpp
> include/pdal/SpatialReference.hpp
>+include/pdal/SplitKernel.hpp
>+include/pdal/SplitterFilter.hpp
> include/pdal/Stage.hpp
>-include/pdal/StageBase.hpp
> include/pdal/StageFactory.hpp
>-include/pdal/StageIterator.hpp
>-include/pdal/StreamFactory.hpp
>-include/pdal/ThreadEnvironment.hpp
>+include/pdal/StageWrapper.hpp
>+include/pdal/StatsFilter.hpp
>+include/pdal/SummaryData.hpp
>+include/pdal/TIndexKernel.hpp
>+include/pdal/TIndexReader.hpp
>+include/pdal/TerrasolidReader.hpp
>+include/pdal/TextWriter.hpp
>+include/pdal/TransformationFilter.hpp
>+include/pdal/TranslateKernel.hpp
> include/pdal/UserCallback.hpp
>-include/pdal/Utils.hpp
>-include/pdal/Vector.hpp
>+include/pdal/VariableLengthRecord.hpp
> include/pdal/Writer.hpp
> include/pdal/XMLSchema.hpp
>-include/pdal/drivers/buffer/Reader.hpp
>-include/pdal/drivers/caris/CloudIterator.hpp
>-include/pdal/drivers/caris/CloudReader.hpp
>-include/pdal/drivers/faux/Reader.hpp
>-include/pdal/drivers/faux/Writer.hpp
>-include/pdal/drivers/las/Header.hpp
>-include/pdal/drivers/las/Reader.hpp
>-include/pdal/drivers/las/ReaderBase.hpp
>-include/pdal/drivers/las/SummaryData.hpp
>-include/pdal/drivers/las/Support.hpp
>-include/pdal/drivers/las/VariableLengthRecord.hpp
>-include/pdal/drivers/las/Writer.hpp
>-include/pdal/drivers/mrsid/Reader.hpp
>-include/pdal/drivers/nitf/Reader.hpp
>-include/pdal/drivers/nitf/Writer.hpp
>-include/pdal/drivers/oci/Reader.hpp
>-include/pdal/drivers/oci/Writer.hpp
>-include/pdal/drivers/oci/common.hpp
>-include/pdal/drivers/oci/oci_wrapper.h
>-include/pdal/drivers/p2g/Writer.hpp
>-include/pdal/drivers/pgpointcloud/Reader.hpp
>-include/pdal/drivers/pgpointcloud/Writer.hpp
>-include/pdal/drivers/pgpointcloud/common.hpp
>-include/pdal/drivers/pipeline/Reader.hpp
>-include/pdal/drivers/qfit/Reader.hpp
>-include/pdal/drivers/soci/Reader.hpp
>-include/pdal/drivers/soci/Writer.hpp
>-include/pdal/drivers/soci/common.hpp
>-include/pdal/drivers/terrasolid/Reader.hpp
>-include/pdal/drivers/text/Writer.hpp
>-include/pdal/filters/ByteSwap.hpp
>-include/pdal/filters/Cache.hpp
>-include/pdal/filters/Chipper.hpp
>-include/pdal/filters/Color.hpp
>-include/pdal/filters/Colorization.hpp
>-include/pdal/filters/Crop.hpp
>-include/pdal/filters/Decimation.hpp
>-include/pdal/filters/HexBin.hpp
>-include/pdal/filters/InPlaceReprojection.hpp
>-include/pdal/filters/Index.hpp
>-include/pdal/filters/Mosaic.hpp
>-include/pdal/filters/PointBufferCache.hpp
>-include/pdal/filters/Predicate.hpp
>-include/pdal/filters/Programmable.hpp
>-include/pdal/filters/Reprojection.hpp
>-include/pdal/filters/Scaling.hpp
>-include/pdal/filters/Selector.hpp
>-include/pdal/filters/Stats.hpp
>+include/pdal/ZipPoint.hpp
> include/pdal/gitsha.h
>+include/pdal/pdal.hpp
> include/pdal/pdal_config.hpp
> include/pdal/pdal_defines.h
>-include/pdal/pdal_error.hpp
> include/pdal/pdal_export.hpp
> include/pdal/pdal_internal.hpp
> include/pdal/pdal_macros.hpp
>+include/pdal/pdal_test_main.hpp
> include/pdal/pdal_types.hpp
>+include/pdal/plang/Array.hpp
> include/pdal/plang/BufferedInvocation.hpp
>+include/pdal/plang/Environment.hpp
> include/pdal/plang/Invocation.hpp
>-include/pdal/plang/PythonEnvironment.hpp
>+include/pdal/plang/Redirector.hpp
> include/pdal/plang/Script.hpp
>-include/pdal/third/nanoflann.hpp
>-lib/libpdal.so
>-lib/libpdal.so.0
>+include/pdal/plugin.hpp
>+include/pdal/util/Algorithm.hpp
>+include/pdal/util/Bounds.hpp
>+include/pdal/util/Charbuf.hpp
>+include/pdal/util/Endian.hpp
>+include/pdal/util/Extractor.hpp
>+include/pdal/util/FileUtils.hpp
>+include/pdal/util/Georeference.hpp
>+include/pdal/util/IStream.hpp
>+include/pdal/util/Inserter.hpp
>+include/pdal/util/OStream.hpp
>+include/pdal/util/Utils.hpp
>+include/pdal/util/portable_endian.hpp
>+lib/libpdal_base.so
>+lib/libpdal_base.so.1
>+lib/libpdal_base.so.2.0.0
>+lib/libpdal_util.so
>+lib/libpdal_util.so.1
>+lib/libpdal_util.so.2.0.0
>+lib/libpdalcpp.so
>+%%PYTHON%%lib/libpdal_plang.so
>+%%PYTHON%%lib/libpdal_plang.so.1
>+%%PYTHON%%lib/libpdal_plang.so.2.0.0
>+%%PYTHON%%lib/libpdal_plugin_filter_predicate.so
>+%%PYTHON%%lib/libpdal_plugin_filter_programmable.so
>+%%ATTRIBUTE%%lib/libpdal_plugin_filter_attribute.so
>+%%ICEBRIDGE%%lib/libpdal_plugin_reader_icebridge.so
>+%%SQLITE%%lib/libpdal_plugin_reader_sqlite.so
>+%%SQLITE%%lib/libpdal_plugin_writer_sqlite.so
>+%%PGPOINTCLOUD%%lib/libpdal_plugin_reader_pgpointcloud.so
>+%%PGPOINTCLOUD%%lib/libpdal_plugin_writer_pgpointcloud.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
>+@dir include/pdal/CMakeFiles/filter_chipper.dir
>+@dir include/pdal/CMakeFiles/filter_colorization.dir
>+@dir include/pdal/CMakeFiles/filter_crop.dir
>+@dir include/pdal/CMakeFiles/filter_decimation.dir
>+@dir include/pdal/CMakeFiles/filter_divider.dir
>+@dir include/pdal/CMakeFiles/filter_ferry.dir
>+@dir include/pdal/CMakeFiles/filter_merge.dir
>+@dir include/pdal/CMakeFiles/filter_mortonorder.dir
>+@dir include/pdal/CMakeFiles/filter_randomize.dir
>+@dir include/pdal/CMakeFiles/filter_range.dir
>+@dir include/pdal/CMakeFiles/filter_reprojection.dir
>+@dir include/pdal/CMakeFiles/filter_sort.dir
>+@dir include/pdal/CMakeFiles/filter_splitter.dir
>+@dir include/pdal/CMakeFiles/filter_stats.dir
>+@dir include/pdal/CMakeFiles/filter_transformation.dir
>+@dir include/pdal/CMakeFiles/kernel_delta.dir
>+@dir include/pdal/CMakeFiles/kernel_diff.dir
>+@dir include/pdal/CMakeFiles/kernel_info.dir
>+@dir include/pdal/CMakeFiles/kernel_merge.dir
>+@dir include/pdal/CMakeFiles/kernel_pipeline.dir
>+@dir include/pdal/CMakeFiles/kernel_random.dir
>+@dir include/pdal/CMakeFiles/kernel_sort.dir
>+@dir include/pdal/CMakeFiles/kernel_split.dir
>+@dir include/pdal/CMakeFiles/kernel_tindex.dir
>+@dir include/pdal/CMakeFiles/kernel_translate.dir
>+@dir include/pdal/CMakeFiles/lascommon.dir
>+@dir include/pdal/CMakeFiles/reader_bpf.dir
>+@dir include/pdal/CMakeFiles/reader_faux.dir
>+@dir include/pdal/CMakeFiles/reader_gdal.dir
>+@dir include/pdal/CMakeFiles/reader_ilvis2.dir
>+@dir include/pdal/CMakeFiles/reader_las.dir
>+@dir include/pdal/CMakeFiles/reader_optech.dir
>+@dir include/pdal/CMakeFiles/reader_ply.dir/__/__/vendor/rply-1.1.4
>+@dir include/pdal/CMakeFiles/reader_qfit.dir
>+@dir include/pdal/CMakeFiles/reader_sbet.dir
>+@dir include/pdal/CMakeFiles/reader_terrasolid.dir
>+@dir include/pdal/CMakeFiles/reader_tindex.dir
>+@dir include/pdal/CMakeFiles/sbetcommon.dir
>+@dir include/pdal/CMakeFiles/writer_derivative.dir
>+@dir include/pdal/CMakeFiles/writer_las.dir
>+@dir include/pdal/CMakeFiles/writer_null.dir
>+@dir include/pdal/CMakeFiles/writer_sbet.dir
>+@dir include/pdal/CMakeFiles/writer_text.dir

Flags:

lbartoletti: maintainer-approval+

Actions: View | Diff

Attachments on bug 207059: 167742 | 168587