Attachment 177392 Details for Bug 214830 – Update pdal to 1.3.0

[patch] Update pdal to 1.3.0

pdal_1.3.0.diff (text/plain), 13.79 KB, created by Loïc Bartoletti on 2016-11-25 19:50:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Loïc Bartoletti

Created: 2016-11-25 19:50:23 UTC

Size: 13.79 KB

patch

obsolete

>Index: math/pdal/Makefile
>===================================================================
>--- math/pdal/Makefile	(revision 427125)
>+++ math/pdal/Makefile	(working copy)
>@@ -1,12 +1,11 @@
>-# Created by: bart <coder@tuxfamily.org>
>+# Created by: lbartoletti <lbartoletti@tuxfamily.org>
> # $FreeBSD$
> 
> PORTNAME=	pdal
>-PORTVERSION=	1.1.0
>-PORTREVISION=	2
>+PORTVERSION=	1.3.0
> CATEGORIES=	math databases graphics
> 
>-MAINTAINER=	coder@tuxfamily.org
>+MAINTAINER=	lbartoletti@tuxfamily.org
> COMMENT=	Library for translating and manipulating point cloud data
> 
> LICENSE=	BSD3CLAUSE
>@@ -14,7 +13,8 @@
> 
> LIB_DEPENDS=	libgdal.so:graphics/gdal \
> 		libgeos.so:graphics/geos \
>-		libboost_thread.so:devel/boost-libs
>+		libboost_thread.so:devel/boost-libs \
>+		libcurl.so:ftp/curl
> 
> USES=		cmake:outsource compiler:c++11-lib pathfix pkgconfig
> USE_LDCONFIG=	yes
>@@ -27,7 +27,7 @@
> 
> OPTIONS_DEFINE=	GEOTIFF LIBXML2 LASZIP APPS BASH ATTRIBUTE \
> 		ICEBRIDGE PGPOINTCLOUD SQLITE \
>-		PYTHON TESTS
>+		PYTHONPL TESTS
> OPTIONS_DEFAULT=	GEOTIFF LIBXML2 LASZIP APPS
> #Plugins with lib not in port:
> #RivLib, Matlab, MrSID, CPD, GeoWave, GreyHound, HexBin
>@@ -43,12 +43,12 @@
> 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
>+PYTHONPL_DESC=	Enable Python plugin
>+PYTHONPL_CMAKE_ON=	-DBUILD_PLUGIN_PYTHON:BOOL=TRUE
>+PYTHONPL_USES=		${PYTHON_CMD}
>+PYTHONPL_BUILD_DEPENDS=	${PYNUMPY}
>+PYTHONPL_RUN_DEPENDS=	${PYNUMPY}
>+PYTHONPL_CMAKE_OFF=	-DBUILD_PLUGIN_PYTHON:BOOL=FALSE
> 
> TESTS_DESC=	Enable Tests
> TESTS_CMAKE_ON=	-DBUILD_PLUGIN_TESTS:BOOL=TRUE
>@@ -83,4 +83,15 @@
> LIBXML2_LIB_DEPENDS=	libxml2.so:textproc/libxml2
> LIBXML2_CMAKE_OFF=	-DWITH_LIBXML2:BOOL=FALSE
> 
>-.include <bsd.port.mk>
>+.include <bsd.port.pre.mk>
>+
>+.if ${CHOSEN_COMPILER_TYPE} == clang
>+. if ${COMPILER_VERSION} <= 34
>+BUILD_DEPENDS+=	${LOCALBASE}/bin/clang36:lang/clang36
>+CPP=	${LOCALBASE}/bin/clang-cpp36
>+CC=	${LOCALBASE}/bin/clang36
>+CXX=	${LOCALBASE}/bin/clang++36
>+. endif
>+.endif
>+
>+.include <bsd.port.post.mk>
>Index: math/pdal/distinfo
>===================================================================
>--- math/pdal/distinfo	(revision 427125)
>+++ math/pdal/distinfo	(working copy)
>@@ -1,2 +1,3 @@
>-SHA256 (PDAL-PDAL-1.1.0_GH0.tar.gz) = 70e0c84035b3fdc75c4eb72dde62a7a2138171d249f2a607170f79d5cafe589d
>-SIZE (PDAL-PDAL-1.1.0_GH0.tar.gz) = 37323319
>+TIMESTAMP = 1479848757
>+SHA256 (PDAL-PDAL-1.3.0_GH0.tar.gz) = 48d48b1fc2a2ce2cf6fba5b28f2455b94a1ccc33148ee0a3c79a4dc041641557
>+SIZE (PDAL-PDAL-1.3.0_GH0.tar.gz) = 64404536
>Index: math/pdal/files/patch-apps_CMakeLists.txt
>===================================================================
>--- math/pdal/files/patch-apps_CMakeLists.txt	(nonexistent)
>+++ math/pdal/files/patch-apps_CMakeLists.txt	(working copy)
>@@ -0,0 +1,11 @@
>+--- apps/CMakeLists.txt.orig	2016-11-22 21:46:27 UTC
>++++ apps/CMakeLists.txt
>+@@ -88,7 +88,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 "${PDAL_LIB_INSTALL_DIR}/pkgconfig/"
>++        DESTINATION "${CMAKE_INSTALL_PREFIX}/libdata/pkgconfig/"
>+         PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ)
>+ 
>+     # Autoconf compatibility variables to use the same script source.
>
>Property changes on: math/pdal/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: math/pdal/files/patch-git_080e614
>===================================================================
>--- math/pdal/files/patch-git_080e614	(revision 427125)
>+++ math/pdal/files/patch-git_080e614	(nonexistent)
>@@ -1,32 +0,0 @@
>-commit 080e614bd975aa3784a463a8a0b50885bc65c726
>-Author: Raphael Kubo da Costa <rakuco@FreeBSD.org>
>-Date:   Fri Mar 25 00:21:04 2016 +0100
>-
>-    Link against ${CMAKE_DL_LIBS} instead of libdl.
>-
>-    -dl only exists on Linux, so linking fails on other OSes like FreeBSD.
>-    Use the portable CMAKE_DL_LIBS variable instead.
>---- src/util/CMakeLists.txt.orig	2016-03-24 21:27:02 UTC
>-+++ src/util/CMakeLists.txt
>-@@ -33,20 +33,11 @@ set(PDAL_UTIL_SOURCES
>-     ${PDAL_UTIL_HPP})
>- 
>- PDAL_ADD_LIBRARY(${PDAL_UTIL_LIB_NAME} SHARED ${PDAL_UTIL_SOURCES})
>--target_link_libraries(${PDAL_UTIL_LIB_NAME} ${Boost_LIBRARIES})
>-+target_link_libraries(${PDAL_UTIL_LIB_NAME} ${Boost_LIBRARIES} ${CMAKE_DL_LIBS})
>- 
>- set_target_properties(${PDAL_UTIL_LIB_NAME} PROPERTIES
>-     VERSION "${PDAL_BUILD_VERSION}"
>-     SOVERSION "${PDAL_API_VERSION}"
>-     CLEAN_DIRECT_OUTPUT 1)
>- 
>--if (NOT WIN32)
>--    target_link_libraries(${PDAL_UTIL_LIB_NAME} dl)
>--endif (NOT WIN32)
>--
>--if (NOT WIN32)
>--    target_link_libraries(${PDAL_UTIL_LIB_NAME} dl)
>--endif (NOT WIN32)
>--
>- set_property(GLOBAL PROPERTY _UTIL_INCLUDED TRUE)
>--
>
>Property changes on: math/pdal/files/patch-git_080e614
>___________________________________________________________________
>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: math/pdal/files/patch-git_3c7e997
>===================================================================
>--- math/pdal/files/patch-git_3c7e997	(revision 427125)
>+++ math/pdal/files/patch-git_3c7e997	(nonexistent)
>@@ -1,38 +0,0 @@
>-commit 3c7e9979ea67a56e8d29f7404e1e8153dc93c6bb
>-Author: Raphael Kubo da Costa <rakuco@FreeBSD.org>
>-Date:   Mon Mar 28 14:55:29 2016 +0200
>-
>-    portable_endian: Remove wrong byte-order macro definitions for the BSDs.
>-
>-    Only OpenBSD has {b,l}etoh{16,32,64} in addition to {b,l}e{16,32,64}toh,
>-    so the macro definitions were breaking the build on all those OSes.
>-
>---- include/pdal/util/portable_endian.hpp.orig	2015-11-25 18:45:33 UTC
>-+++ include/pdal/util/portable_endian.hpp
>-@@ -41,23 +41,10 @@
>- #   define __PDP_ENDIAN    PDP_ENDIAN
>- **/
>-             
>--#elif defined(__OpenBSD__)
>--             
>--#   include <sys/endian.h>
>--              
>--#elif defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__)
>--               
>-+#elif defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__)
>-+
>- #   include <sys/endian.h>
>--                
>--#   define be16toh betoh16
>--#   define le16toh letoh16
>--                 
>--#   define be32toh betoh32
>--#   define le32toh letoh32
>--                  
>--#   define be64toh betoh64
>--#   define le64toh letoh64
>--                   
>-+
>- #elif defined(__WINDOWS__)
>-                     
>- #   include <winsock2.h>
>
>Property changes on: math/pdal/files/patch-git_3c7e997
>___________________________________________________________________
>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: math/pdal/files/patch-git_5a0b123
>===================================================================
>--- math/pdal/files/patch-git_5a0b123	(revision 427125)
>+++ math/pdal/files/patch-git_5a0b123	(nonexistent)
>@@ -1,20 +0,0 @@
>-commit 5a0b123bfd7a843b18318ec2e95ce725c5f1f386
>-Author: Raphael Kubo da Costa <rakuco@FreeBSD.org>
>-Date:   Mon Mar 28 15:07:22 2016 +0200
>-
>-    utils: Include sys/wait.h for the WIFEXITED and WEXITSTATUS macros.
>-
>-    These two macros are defined in sys/wait.h, which was being included
>-    indirectly by other headers. This did not work on systems such as
>-    FreeBSD, so explicitly include all headers that we actually need.
>-
>---- src/util/Utils.cpp.orig	2015-11-25 18:45:33 UTC
>-+++ src/util/Utils.cpp
>-@@ -43,6 +43,7 @@
>- #ifndef _WIN32
>- #include <cxxabi.h>
>- #include <sys/ioctl.h>
>-+#include <sys/wait.h>  // WIFEXITED, WEXITSTATUS
>- #endif
>- 
>- #ifdef PDAL_COMPILER_MSVC
>
>Property changes on: math/pdal/files/patch-git_5a0b123
>___________________________________________________________________
>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: math/pdal/files/patch-git_c8a1f88
>===================================================================
>--- math/pdal/files/patch-git_c8a1f88	(revision 427125)
>+++ math/pdal/files/patch-git_c8a1f88	(nonexistent)
>@@ -1,20 +0,0 @@
>-commit c8a1f887d7316f76853bd67ffe5a9bb556e54b57
>-Author: Raphael Kubo da Costa <rakuco@FreeBSD.org>
>-Date:   Fri Mar 25 17:48:33 2016 +0100
>-
>-    nanoflann: Include <cstdlib> for ::malloc().
>-
>-    malloc() is defined in stdlib.h, which was being included indirectly by
>-    other on Linux. On systems such as FreeBSD, the code was just failing to
>-    build because of the missing symbol.
>-
>---- vendor/nanoflann-1.1.8/nanoflann.hpp.orig	2015-11-25 18:45:33 UTC
>-+++ vendor/nanoflann-1.1.8/nanoflann.hpp
>-@@ -38,6 +38,7 @@
>- #include <algorithm>
>- #include <stdexcept>
>- #include <cstdio>  // for fwrite()
>-+#include <cstdlib> // for malloc()
>- #include <cmath>   // for fabs(),...
>- #include <limits>
>- 
>
>Property changes on: math/pdal/files/patch-git_c8a1f88
>___________________________________________________________________
>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: math/pdal/pkg-plist
>===================================================================
>--- math/pdal/pkg-plist	(revision 427125)
>+++ math/pdal/pkg-plist	(working copy)
>@@ -1,5 +1,7 @@
> bin/pdal
> bin/pdal-config
>+include/pdal/ApproximateCoplanarFilter.hpp
>+include/pdal/AttributeFilter.hpp
> include/pdal/BpfCompressor.hpp
> include/pdal/BpfHeader.hpp
> include/pdal/BpfReader.hpp
>@@ -16,7 +18,13 @@
> include/pdal/DerivativeWriter.hpp
> include/pdal/DiffKernel.hpp
> include/pdal/Dimension.hpp
>+include/pdal/DimDetail.hpp
>+include/pdal/DimType.hpp
>+include/pdal/DimUtil.hpp
> include/pdal/DividerFilter.hpp
>+include/pdal/Eigen.hpp
>+include/pdal/EigenvaluesFilter.hpp
>+include/pdal/EstimateRankFilter.hpp
> include/pdal/FauxReader.hpp
> include/pdal/FerryFilter.hpp
> include/pdal/Filter.hpp
>@@ -23,16 +31,16 @@
> include/pdal/FlexWriter.hpp
> include/pdal/GDALReader.hpp
> include/pdal/GDALUtils.hpp
>-include/pdal/Geometry.hpp
>+include/pdal/GEOSUtils.hpp
> include/pdal/GeotiffSupport.hpp
>-include/pdal/GlobalEnvironment.hpp
>+include/pdal/HAGFilter.hpp
> include/pdal/HeaderVal.hpp
>+include/pdal/Ilvis2MetadataReader.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
>@@ -42,24 +50,31 @@
> include/pdal/MergeFilter.hpp
> include/pdal/MergeKernel.hpp
> include/pdal/Metadata.hpp
>+include/pdal/MongusFilter.hpp
> include/pdal/MortonOrderFilter.hpp
>+include/pdal/NormalFilter.hpp
> include/pdal/NullWriter.hpp
> include/pdal/OptechCommon.hpp
> include/pdal/OptechReader.hpp
> include/pdal/OptechRotationMatrix.hpp
> include/pdal/Options.hpp
>+include/pdal/OutlierFilter.hpp
> include/pdal/PDALUtils.hpp
> include/pdal/PipelineKernel.hpp
> include/pdal/PipelineManager.hpp
>-include/pdal/PipelineReader.hpp
> include/pdal/PipelineWriter.hpp
> include/pdal/PluginManager.hpp
> include/pdal/PlyReader.hpp
> include/pdal/PlyWriter.hpp
>+include/pdal/PMFFilter.hpp
>+include/pdal/PointContainer.hpp
> include/pdal/PointLayout.hpp
> include/pdal/PointTable.hpp
> include/pdal/PointView.hpp
> include/pdal/PointViewIter.hpp
>+include/pdal/PointRef.hpp
>+include/pdal/Polygon.hpp
>+include/pdal/PtsReader.hpp
> include/pdal/QfitReader.hpp
> include/pdal/QuadIndex.hpp
> include/pdal/QuickInfo.hpp
>@@ -68,6 +83,9 @@
> include/pdal/RangeFilter.hpp
> include/pdal/Reader.hpp
> include/pdal/ReprojectionFilter.hpp
>+include/pdal/SMRFilter.hpp
>+include/pdal/SampleFilter.hpp
>+include/pdal/Scaling.hpp
> include/pdal/SbetCommon.hpp
> include/pdal/SbetReader.hpp
> include/pdal/SbetWriter.hpp
>@@ -80,14 +98,15 @@
> include/pdal/StageFactory.hpp
> include/pdal/StageWrapper.hpp
> include/pdal/StatsFilter.hpp
>+include/pdal/StreamCallbackFilter.hpp
> include/pdal/SummaryData.hpp
> include/pdal/TIndexKernel.hpp
> include/pdal/TIndexReader.hpp
> include/pdal/TerrasolidReader.hpp
>+include/pdal/TextReader.hpp
> include/pdal/TextWriter.hpp
> include/pdal/TransformationFilter.hpp
> include/pdal/TranslateKernel.hpp
>-include/pdal/UserCallback.hpp
> include/pdal/VariableLengthRecord.hpp
> include/pdal/Writer.hpp
> include/pdal/XMLSchema.hpp
>@@ -111,7 +130,6 @@
> 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
>@@ -118,14 +136,20 @@
> include/pdal/util/IStream.hpp
> include/pdal/util/Inserter.hpp
> include/pdal/util/OStream.hpp
>+include/pdal/util/ProgramArgs.hpp
> include/pdal/util/Utils.hpp
>+include/pdal/util/Uuid.hpp
>+include/pdal/util/pdal_util_export.hpp
> include/pdal/util/portable_endian.hpp
>+lib/libpdal_arbiter.a
> lib/libpdal_base.so
>-lib/libpdal_base.so.1
>-lib/libpdal_base.so.2.0.0
>+lib/libpdal_base.so.3
>+lib/libpdal_base.so.4.0.0
>+lib/libpdal_boost.a
>+lib/libpdal_jsoncpp.a
> lib/libpdal_util.so
>-lib/libpdal_util.so.1
>-lib/libpdal_util.so.2.0.0
>+lib/libpdal_util.so.3
>+lib/libpdal_util.so.4.0.0
> lib/libpdalcpp.so
> %%PYTHON%%lib/libpdal_plang.so
> %%PYTHON%%lib/libpdal_plang.so.1

Flags:

lbartoletti: maintainer-approval+

Actions: View | Diff

Attachments on bug 214830: 177392