Attachment #177392 for bug #214830

View | Details | Raw Unified | Return to bug 214830
Collapse All | Expand All




# Created by: lbartoletti <lbartoletti@tuxfamily.org>
# $FreeBSD$

PORTNAME=	pdal
PORTVERSION=	1.3.0
PORTREVISION=	2
CATEGORIES=	math databases graphics

MAINTAINER=	lbartoletti@tuxfamily.org
COMMENT=	Library for translating and manipulating point cloud data

LICENSE=	BSD3CLAUSE


LIB_DEPENDS=	libgdal.so:graphics/gdal \
		libgeos.so:graphics/geos \
		libboost_thread.so:devel/boost-libs \
		libcurl.so:ftp/curl

USES=		cmake:outsource compiler:c++11-lib pathfix pkgconfig
USE_LDCONFIG=	yes


OPTIONS_DEFINE=	GEOTIFF LIBXML2 LASZIP APPS BASH ATTRIBUTE \
		ICEBRIDGE PGPOINTCLOUD SQLITE \
		PYTHONPL TESTS
OPTIONS_DEFAULT=	GEOTIFF LIBXML2 LASZIP APPS
#Plugins with lib not in port:
#RivLib, Matlab, MrSID, CPD, GeoWave, GreyHound, HexBin

SQLITE_USES=	sqlite
SQLITE_CMAKE_OFF=	-DBUILD_PLUGIN_SQLITE: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

LIBXML2_LIB_DEPENDS=	libxml2.so:textproc/libxml2
LIBXML2_CMAKE_OFF=	-DWITH_LIBXML2:BOOL=FALSE

.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>

Lines 1-2 Link Here

(-)math/pdal/distinfo (-2 / +3 lines)
1	SHA256 (PDAL-PDAL-1.1.0_GH0.tar.gz) = 70e0c84035b3fdc75c4eb72dde62a7a2138171d249f2a607170f79d5cafe589d	1	TIMESTAMP = 1479848757
2	SIZE (PDAL-PDAL-1.1.0_GH0.tar.gz) = 37323319	2	SHA256 (PDAL-PDAL-1.3.0_GH0.tar.gz) = 48d48b1fc2a2ce2cf6fba5b28f2455b94a1ccc33148ee0a3c79a4dc041641557
		3	SIZE (PDAL-PDAL-1.3.0_GH0.tar.gz) = 64404536

Line 0 Link Here

(-)math/pdal/files/patch-apps_CMakeLists.txt (+11 lines)
	1	--- apps/CMakeLists.txt.orig 2016-11-22 21:46:27 UTC
	2	+++ apps/CMakeLists.txt
	3	@@ -88,7 +88,7 @@ if(UNIX OR APPLE)
	4	configure_file(${CMAKE_CURRENT_SOURCE_DIR}/pdal.pc.in
	5	${CMAKE_CURRENT_BINARY_DIR}/pdal.pc @ONLY)
	6	install(FILES ${CMAKE_CURRENT_BINARY_DIR}/pdal.pc
	7	- DESTINATION "${PDAL_LIB_INSTALL_DIR}/pkgconfig/"
	8	+ DESTINATION "${CMAKE_INSTALL_PREFIX}/libdata/pkgconfig/"
	9	PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ)
	10
	11	# Autoconf compatibility variables to use the same script source.




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)
-




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>




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




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>
 

Lines 1-5 Link Here

(-)math/pdal/pkg-plist (-10 / +34 lines)
1	bin/pdal	1	bin/pdal
2	bin/pdal-config	2	bin/pdal-config
		3	include/pdal/ApproximateCoplanarFilter.hpp
		4	include/pdal/AttributeFilter.hpp
3	include/pdal/BpfCompressor.hpp	5	include/pdal/BpfCompressor.hpp
4	include/pdal/BpfHeader.hpp	6	include/pdal/BpfHeader.hpp
5	include/pdal/BpfReader.hpp	7	include/pdal/BpfReader.hpp
Lines 16-22 Link Here
16	include/pdal/DerivativeWriter.hpp	18	include/pdal/DerivativeWriter.hpp
17	include/pdal/DiffKernel.hpp	19	include/pdal/DiffKernel.hpp
18	include/pdal/Dimension.hpp	20	include/pdal/Dimension.hpp
		21	include/pdal/DimDetail.hpp
		22	include/pdal/DimType.hpp
		23	include/pdal/DimUtil.hpp
19	include/pdal/DividerFilter.hpp	24	include/pdal/DividerFilter.hpp
		25	include/pdal/Eigen.hpp
		26	include/pdal/EigenvaluesFilter.hpp
		27	include/pdal/EstimateRankFilter.hpp
20	include/pdal/FauxReader.hpp	28	include/pdal/FauxReader.hpp
21	include/pdal/FerryFilter.hpp	29	include/pdal/FerryFilter.hpp
22	include/pdal/Filter.hpp	30	include/pdal/Filter.hpp
Lines 23-38 Link Here
23	include/pdal/FlexWriter.hpp	31	include/pdal/FlexWriter.hpp
24	include/pdal/GDALReader.hpp	32	include/pdal/GDALReader.hpp
25	include/pdal/GDALUtils.hpp	33	include/pdal/GDALUtils.hpp
26	include/pdal/Geometry.hpp	34	include/pdal/GEOSUtils.hpp
27	include/pdal/GeotiffSupport.hpp	35	include/pdal/GeotiffSupport.hpp
28	include/pdal/GlobalEnvironment.hpp	36	include/pdal/HAGFilter.hpp
29	include/pdal/HeaderVal.hpp	37	include/pdal/HeaderVal.hpp
		38	include/pdal/Ilvis2MetadataReader.hpp
30	include/pdal/Ilvis2Reader.hpp	39	include/pdal/Ilvis2Reader.hpp
31	include/pdal/InfoKernel.hpp	40	include/pdal/InfoKernel.hpp
32	include/pdal/KDIndex.hpp	41	include/pdal/KDIndex.hpp
33	include/pdal/Kernel.hpp	42	include/pdal/Kernel.hpp
34	include/pdal/KernelFactory.hpp	43	include/pdal/KernelFactory.hpp
35	include/pdal/KernelSupport.hpp
36	include/pdal/LasError.hpp	44	include/pdal/LasError.hpp
37	include/pdal/LasHeader.hpp	45	include/pdal/LasHeader.hpp
38	include/pdal/LasReader.hpp	46	include/pdal/LasReader.hpp
Lines 42-65 Link Here
42	include/pdal/MergeFilter.hpp	50	include/pdal/MergeFilter.hpp
43	include/pdal/MergeKernel.hpp	51	include/pdal/MergeKernel.hpp
44	include/pdal/Metadata.hpp	52	include/pdal/Metadata.hpp
		53	include/pdal/MongusFilter.hpp
45	include/pdal/MortonOrderFilter.hpp	54	include/pdal/MortonOrderFilter.hpp
		55	include/pdal/NormalFilter.hpp
46	include/pdal/NullWriter.hpp	56	include/pdal/NullWriter.hpp
47	include/pdal/OptechCommon.hpp	57	include/pdal/OptechCommon.hpp
48	include/pdal/OptechReader.hpp	58	include/pdal/OptechReader.hpp
49	include/pdal/OptechRotationMatrix.hpp	59	include/pdal/OptechRotationMatrix.hpp
50	include/pdal/Options.hpp	60	include/pdal/Options.hpp
		61	include/pdal/OutlierFilter.hpp
51	include/pdal/PDALUtils.hpp	62	include/pdal/PDALUtils.hpp
52	include/pdal/PipelineKernel.hpp	63	include/pdal/PipelineKernel.hpp
53	include/pdal/PipelineManager.hpp	64	include/pdal/PipelineManager.hpp
54	include/pdal/PipelineReader.hpp
55	include/pdal/PipelineWriter.hpp	65	include/pdal/PipelineWriter.hpp
56	include/pdal/PluginManager.hpp	66	include/pdal/PluginManager.hpp
57	include/pdal/PlyReader.hpp	67	include/pdal/PlyReader.hpp
58	include/pdal/PlyWriter.hpp	68	include/pdal/PlyWriter.hpp
		69	include/pdal/PMFFilter.hpp
		70	include/pdal/PointContainer.hpp
59	include/pdal/PointLayout.hpp	71	include/pdal/PointLayout.hpp
60	include/pdal/PointTable.hpp	72	include/pdal/PointTable.hpp
61	include/pdal/PointView.hpp	73	include/pdal/PointView.hpp
62	include/pdal/PointViewIter.hpp	74	include/pdal/PointViewIter.hpp
		75	include/pdal/PointRef.hpp
		76	include/pdal/Polygon.hpp
		77	include/pdal/PtsReader.hpp
63	include/pdal/QfitReader.hpp	78	include/pdal/QfitReader.hpp
64	include/pdal/QuadIndex.hpp	79	include/pdal/QuadIndex.hpp
65	include/pdal/QuickInfo.hpp	80	include/pdal/QuickInfo.hpp
Lines 68-73 Link Here
68	include/pdal/RangeFilter.hpp	83	include/pdal/RangeFilter.hpp
69	include/pdal/Reader.hpp	84	include/pdal/Reader.hpp
70	include/pdal/ReprojectionFilter.hpp	85	include/pdal/ReprojectionFilter.hpp
		86	include/pdal/SMRFilter.hpp
		87	include/pdal/SampleFilter.hpp
		88	include/pdal/Scaling.hpp
71	include/pdal/SbetCommon.hpp	89	include/pdal/SbetCommon.hpp
72	include/pdal/SbetReader.hpp	90	include/pdal/SbetReader.hpp
73	include/pdal/SbetWriter.hpp	91	include/pdal/SbetWriter.hpp
Lines 80-93 Link Here
80	include/pdal/StageFactory.hpp	98	include/pdal/StageFactory.hpp
81	include/pdal/StageWrapper.hpp	99	include/pdal/StageWrapper.hpp
82	include/pdal/StatsFilter.hpp	100	include/pdal/StatsFilter.hpp
		101	include/pdal/StreamCallbackFilter.hpp
83	include/pdal/SummaryData.hpp	102	include/pdal/SummaryData.hpp
84	include/pdal/TIndexKernel.hpp	103	include/pdal/TIndexKernel.hpp
85	include/pdal/TIndexReader.hpp	104	include/pdal/TIndexReader.hpp
86	include/pdal/TerrasolidReader.hpp	105	include/pdal/TerrasolidReader.hpp
		106	include/pdal/TextReader.hpp
87	include/pdal/TextWriter.hpp	107	include/pdal/TextWriter.hpp
88	include/pdal/TransformationFilter.hpp	108	include/pdal/TransformationFilter.hpp
89	include/pdal/TranslateKernel.hpp	109	include/pdal/TranslateKernel.hpp
90	include/pdal/UserCallback.hpp
91	include/pdal/VariableLengthRecord.hpp	110	include/pdal/VariableLengthRecord.hpp
92	include/pdal/Writer.hpp	111	include/pdal/Writer.hpp
93	include/pdal/XMLSchema.hpp	112	include/pdal/XMLSchema.hpp
Lines 111-117 Link Here
111	include/pdal/util/Algorithm.hpp	130	include/pdal/util/Algorithm.hpp
112	include/pdal/util/Bounds.hpp	131	include/pdal/util/Bounds.hpp
113	include/pdal/util/Charbuf.hpp	132	include/pdal/util/Charbuf.hpp
114	include/pdal/util/Endian.hpp
115	include/pdal/util/Extractor.hpp	133	include/pdal/util/Extractor.hpp
116	include/pdal/util/FileUtils.hpp	134	include/pdal/util/FileUtils.hpp
117	include/pdal/util/Georeference.hpp	135	include/pdal/util/Georeference.hpp
Lines 118-131 Link Here
118	include/pdal/util/IStream.hpp	136	include/pdal/util/IStream.hpp
119	include/pdal/util/Inserter.hpp	137	include/pdal/util/Inserter.hpp
120	include/pdal/util/OStream.hpp	138	include/pdal/util/OStream.hpp
		139	include/pdal/util/ProgramArgs.hpp
121	include/pdal/util/Utils.hpp	140	include/pdal/util/Utils.hpp
		141	include/pdal/util/Uuid.hpp
		142	include/pdal/util/pdal_util_export.hpp
122	include/pdal/util/portable_endian.hpp	143	include/pdal/util/portable_endian.hpp
		144	lib/libpdal_arbiter.a
123	lib/libpdal_base.so	145	lib/libpdal_base.so
124	lib/libpdal_base.so.1	146	lib/libpdal_base.so.3
125	lib/libpdal_base.so.2.0.0	147	lib/libpdal_base.so.4.0.0
		148	lib/libpdal_boost.a
		149	lib/libpdal_jsoncpp.a
126	lib/libpdal_util.so	150	lib/libpdal_util.so
127	lib/libpdal_util.so.1	151	lib/libpdal_util.so.3
128	lib/libpdal_util.so.2.0.0	152	lib/libpdal_util.so.4.0.0
129	lib/libpdalcpp.so	153	lib/libpdalcpp.so
130	%%PYTHON%%lib/libpdal_plang.so	154	%%PYTHON%%lib/libpdal_plang.so
131	%%PYTHON%%lib/libpdal_plang.so.1	155	%%PYTHON%%lib/libpdal_plang.so.1

Return to bug 214830

Lines 1-12 Link Here

(-)math/pdal/Makefile (-13 / +24 lines)
1	# Created by: bart <coder@tuxfamily.org>	1	# Created by: lbartoletti <lbartoletti@tuxfamily.org>
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= pdal	4	PORTNAME= pdal
5	PORTVERSION= 1.1.0	5	PORTVERSION= 1.3.0
6	PORTREVISION= 2
7	CATEGORIES= math databases graphics	6	CATEGORIES= math databases graphics
8		7
9	MAINTAINER= coder@tuxfamily.org	8	MAINTAINER= lbartoletti@tuxfamily.org
10	COMMENT= Library for translating and manipulating point cloud data	9	COMMENT= Library for translating and manipulating point cloud data
11		10
12	LICENSE= BSD3CLAUSE	11	LICENSE= BSD3CLAUSE
Lines 14-20 Link Here
14		13
15	LIB_DEPENDS= libgdal.so:graphics/gdal \	14	LIB_DEPENDS= libgdal.so:graphics/gdal \
16	libgeos.so:graphics/geos \	15	libgeos.so:graphics/geos \
17	libboost_thread.so:devel/boost-libs	16	libboost_thread.so:devel/boost-libs \
		17	libcurl.so:ftp/curl
18		18
19	USES= cmake:outsource compiler:c++11-lib pathfix pkgconfig	19	USES= cmake:outsource compiler:c++11-lib pathfix pkgconfig
20	USE_LDCONFIG= yes	20	USE_LDCONFIG= yes
Lines 27-33 Link Here
27		27
28	OPTIONS_DEFINE= GEOTIFF LIBXML2 LASZIP APPS BASH ATTRIBUTE \	28	OPTIONS_DEFINE= GEOTIFF LIBXML2 LASZIP APPS BASH ATTRIBUTE \
29	ICEBRIDGE PGPOINTCLOUD SQLITE \	29	ICEBRIDGE PGPOINTCLOUD SQLITE \
30	PYTHON TESTS	30	PYTHONPL TESTS
31	OPTIONS_DEFAULT= GEOTIFF LIBXML2 LASZIP APPS	31	OPTIONS_DEFAULT= GEOTIFF LIBXML2 LASZIP APPS
32	#Plugins with lib not in port:	32	#Plugins with lib not in port:
33	#RivLib, Matlab, MrSID, CPD, GeoWave, GreyHound, HexBin	33	#RivLib, Matlab, MrSID, CPD, GeoWave, GreyHound, HexBin
Lines 43-54 Link Here
43	SQLITE_USES= sqlite	43	SQLITE_USES= sqlite
44	SQLITE_CMAKE_OFF= -DBUILD_PLUGIN_SQLITE:BOOL=FALSE	44	SQLITE_CMAKE_OFF= -DBUILD_PLUGIN_SQLITE:BOOL=FALSE
45		45
46	PYTHON_DESC= Enable Python plugin	46	PYTHONPL_DESC= Enable Python plugin
47	PYTHON_CMAKE_ON= -DBUILD_PLUGIN_PYTHON:BOOL=TRUE	47	PYTHONPL_CMAKE_ON= -DBUILD_PLUGIN_PYTHON:BOOL=TRUE
48	PYTHON_USES= python	48	PYTHONPL_USES= ${PYTHON_CMD}
49	PYTHON_BUILD_DEPENDS= ${PYNUMPY}	49	PYTHONPL_BUILD_DEPENDS= ${PYNUMPY}
50	PYTHON_RUN_DEPENDS= ${PYNUMPY}	50	PYTHONPL_RUN_DEPENDS= ${PYNUMPY}
51	PYTHON_CMAKE_OFF= -DBUILD_PLUGIN_PYTHON:BOOL=FALSE	51	PYTHONPL_CMAKE_OFF= -DBUILD_PLUGIN_PYTHON:BOOL=FALSE
52		52
53	TESTS_DESC= Enable Tests	53	TESTS_DESC= Enable Tests
54	TESTS_CMAKE_ON= -DBUILD_PLUGIN_TESTS:BOOL=TRUE	54	TESTS_CMAKE_ON= -DBUILD_PLUGIN_TESTS:BOOL=TRUE
Lines 83-86 Link Here
83	LIBXML2_LIB_DEPENDS= libxml2.so:textproc/libxml2	83	LIBXML2_LIB_DEPENDS= libxml2.so:textproc/libxml2
84	LIBXML2_CMAKE_OFF= -DWITH_LIBXML2:BOOL=FALSE	84	LIBXML2_CMAKE_OFF= -DWITH_LIBXML2:BOOL=FALSE
85		85
86	.include <bsd.port.mk>	86	.include <bsd.port.pre.mk>
		87
		88	.if ${CHOSEN_COMPILER_TYPE} == clang
		89	. if ${COMPILER_VERSION} <= 34
		90	BUILD_DEPENDS+= ${LOCALBASE}/bin/clang36:lang/clang36
		91	CPP= ${LOCALBASE}/bin/clang-cpp36
		92	CC= ${LOCALBASE}/bin/clang36
		93	CXX= ${LOCALBASE}/bin/clang++36
		94	. endif
		95	.endif
		96
		97	.include <bsd.port.post.mk>

Lines 1-32 Link Here

(-)math/pdal/files/patch-git_080e614 (-32 lines)
1	commit 080e614bd975aa3784a463a8a0b50885bc65c726
2	Author: Raphael Kubo da Costa <rakuco@FreeBSD.org>
3	Date: Fri Mar 25 00:21:04 2016 +0100
4
5	Link against ${CMAKE_DL_LIBS} instead of libdl.
6
7	-dl only exists on Linux, so linking fails on other OSes like FreeBSD.
8	Use the portable CMAKE_DL_LIBS variable instead.
9	--- src/util/CMakeLists.txt.orig 2016-03-24 21:27:02 UTC
10	+++ src/util/CMakeLists.txt
11	@@ -33,20 +33,11 @@ set(PDAL_UTIL_SOURCES
12	${PDAL_UTIL_HPP})
13
14	PDAL_ADD_LIBRARY(${PDAL_UTIL_LIB_NAME} SHARED ${PDAL_UTIL_SOURCES})
15	-target_link_libraries(${PDAL_UTIL_LIB_NAME} ${Boost_LIBRARIES})
16	+target_link_libraries(${PDAL_UTIL_LIB_NAME} ${Boost_LIBRARIES} ${CMAKE_DL_LIBS})
17
18	set_target_properties(${PDAL_UTIL_LIB_NAME} PROPERTIES
19	VERSION "${PDAL_BUILD_VERSION}"
20	SOVERSION "${PDAL_API_VERSION}"
21	CLEAN_DIRECT_OUTPUT 1)
22
23	-if (NOT WIN32)
24	- target_link_libraries(${PDAL_UTIL_LIB_NAME} dl)
25	-endif (NOT WIN32)
26	-
27	-if (NOT WIN32)
28	- target_link_libraries(${PDAL_UTIL_LIB_NAME} dl)
29	-endif (NOT WIN32)
30	-
31	set_property(GLOBAL PROPERTY _UTIL_INCLUDED TRUE)
32	-

Lines 1-38 Link Here

(-)math/pdal/files/patch-git_3c7e997 (-38 lines)
1	commit 3c7e9979ea67a56e8d29f7404e1e8153dc93c6bb
2	Author: Raphael Kubo da Costa <rakuco@FreeBSD.org>
3	Date: Mon Mar 28 14:55:29 2016 +0200
4
5	portable_endian: Remove wrong byte-order macro definitions for the BSDs.
6
7	Only OpenBSD has {b,l}etoh{16,32,64} in addition to {b,l}e{16,32,64}toh,
8	so the macro definitions were breaking the build on all those OSes.
9
10	--- include/pdal/util/portable_endian.hpp.orig 2015-11-25 18:45:33 UTC
11	+++ include/pdal/util/portable_endian.hpp
12	@@ -41,23 +41,10 @@
13	# define __PDP_ENDIAN PDP_ENDIAN
14	**/
15
16	-#elif defined(__OpenBSD__)
17	-
18	-# include <sys/endian.h>
19	-
20	-#elif defined(__NetBSD__) \|\| defined(__FreeBSD__) \|\| defined(__DragonFly__)
21	-
22	+#elif defined(__OpenBSD__) \|\| defined(__NetBSD__) \|\| defined(__FreeBSD__) \|\| defined(__DragonFly__)
23	+
24	# include <sys/endian.h>
25	-
26	-# define be16toh betoh16
27	-# define le16toh letoh16
28	-
29	-# define be32toh betoh32
30	-# define le32toh letoh32
31	-
32	-# define be64toh betoh64
33	-# define le64toh letoh64
34	-
35	+
36	#elif defined(__WINDOWS__)
37
38	# include <winsock2.h>

Lines 1-20 Link Here

(-)math/pdal/files/patch-git_5a0b123 (-20 lines)
1	commit 5a0b123bfd7a843b18318ec2e95ce725c5f1f386
2	Author: Raphael Kubo da Costa <rakuco@FreeBSD.org>
3	Date: Mon Mar 28 15:07:22 2016 +0200
4
5	utils: Include sys/wait.h for the WIFEXITED and WEXITSTATUS macros.
6
7	These two macros are defined in sys/wait.h, which was being included
8	indirectly by other headers. This did not work on systems such as
9	FreeBSD, so explicitly include all headers that we actually need.
10
11	--- src/util/Utils.cpp.orig 2015-11-25 18:45:33 UTC
12	+++ src/util/Utils.cpp
13	@@ -43,6 +43,7 @@
14	#ifndef _WIN32
15	#include <cxxabi.h>
16	#include <sys/ioctl.h>
17	+#include <sys/wait.h> // WIFEXITED, WEXITSTATUS
18	#endif
19
20	#ifdef PDAL_COMPILER_MSVC

Lines 1-20 Link Here

(-)math/pdal/files/patch-git_c8a1f88 (-20 lines)
1	commit c8a1f887d7316f76853bd67ffe5a9bb556e54b57
2	Author: Raphael Kubo da Costa <rakuco@FreeBSD.org>
3	Date: Fri Mar 25 17:48:33 2016 +0100
4
5	nanoflann: Include <cstdlib> for ::malloc().
6
7	malloc() is defined in stdlib.h, which was being included indirectly by
8	other on Linux. On systems such as FreeBSD, the code was just failing to
9	build because of the missing symbol.
10
11	--- vendor/nanoflann-1.1.8/nanoflann.hpp.orig 2015-11-25 18:45:33 UTC
12	+++ vendor/nanoflann-1.1.8/nanoflann.hpp
13	@@ -38,6 +38,7 @@
14	#include <algorithm>
15	#include <stdexcept>
16	#include <cstdio> // for fwrite()
17	+#include <cstdlib> // for malloc()
18	#include <cmath> // for fabs(),...
19	#include <limits>
20