Update to pdal 1.7.2.

2018-05-19 15:01:48 +00:00 · 2018-05-19 15:01:48 +00:00 · 0970332dca
commit 0970332dca
parent d951271ae4
9 changed files with 46 additions and 55 deletions
--- a/geo/pdal/Makefile
+++ b/geo/pdal/Makefile
@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.6 2018/04/11 07:47:09 landry Exp $
+# $OpenBSD: Makefile,v 1.7 2018/05/19 15:01:48 landry Exp $

 COMMENT =	translator library for point cloud formats

-DISTNAME =	PDAL-1.7.1-src
+DISTNAME =	PDAL-1.7.2-src
 PKGNAME =	${DISTNAME:L:C/-src//}

 SHARED_LIBS =	pdal_base 1.0 # 6.1
--- a/geo/pdal/distinfo
+++ b/geo/pdal/distinfo
@ -1,2 +1,2 @@
-SHA256 (PDAL-1.7.1-src.tar.gz) = t4C2Tmi/aM8xUwp7WCIigwPGcVFsgoKmxuGcPyf7s0U=
-SIZE (PDAL-1.7.1-src.tar.gz) = 67541733
+SHA256 (PDAL-1.7.2-src.tar.gz) = 9d0ox/JbzRPEYKhFhg7e1nRG86u2tqLi85Sndq0DQoo=
+SIZE (PDAL-1.7.2-src.tar.gz) = 68321591
--- a/geo/pdal/patches/patch-cmake_macros_cmake
+++ b/geo/pdal/patches/patch-cmake_macros_cmake
@ -1,11 +1,11 @@
-$OpenBSD: patch-cmake_macros_cmake,v 1.2 2017/10/28 18:36:19 landry Exp $
+$OpenBSD: patch-cmake_macros_cmake,v 1.3 2018/05/19 15:01:48 landry Exp $

 No need to put a version on the plugins

 Index: cmake/macros.cmake
 --- cmake/macros.cmake.orig
 +++ cmake/macros.cmake
-@@ -137,14 +137,12 @@ macro(PDAL_ADD_PLUGIN _name _type _shortname)
+@@ -141,14 +141,12 @@ macro(PDAL_ADD_PLUGIN _name _type _shortname)
 
     set_property(TARGET ${${_name}} PROPERTY FOLDER "Plugins/${_type}")
     set_target_properties(${${_name}} PROPERTIES
--- a/geo/pdal/patches/patch-cmake_unix_compiler_options_cmake
+++ b/geo/pdal/patches/patch-cmake_unix_compiler_options_cmake
@ -1,15 +0,0 @@
-$OpenBSD: patch-cmake_unix_compiler_options_cmake,v 1.1 2018/04/11 07:47:09 landry Exp $
-
-https://github.com/PDAL/PDAL/issues/1915
-
-Index: cmake/unix_compiler_options.cmake
--- cmake/unix_compiler_options.cmake.orig
-+++ cmake/unix_compiler_options.cmake
-@@ -24,7 +24,6 @@ function(PDAL_TARGET_COMPILE_SETTINGS target)
-         ${PDAL_CXX_STANDARD}
-         -Wextra
-         -Wpedantic
-        -Werror
-         -Wall
-         -Wno-unused-parameter
-         -Wno-unused-variable
--- a/geo/pdal/patches/patch-dimbuilder_CMakeLists_txt
+++ b/geo/pdal/patches/patch-dimbuilder_CMakeLists_txt
@ -1,6 +1,5 @@
-$OpenBSD: patch-dimbuilder_CMakeLists_txt,v 1.3 2018/04/11 07:47:09 landry Exp $
+$OpenBSD: patch-dimbuilder_CMakeLists_txt,v 1.4 2018/05/19 15:01:48 landry Exp $

-no libdl on OpenBSD
 we dont want to link with execinfo

 Index: dimbuilder/CMakeLists.txt
@ -15,17 +14,11 @@ Index: dimbuilder/CMakeLists.txt
 #
 # We include Utils.cpp here rather than linking in the Utils library because
 # some people building linux packages disable rpath, which means that
-@@ -29,13 +27,7 @@ target_include_directories(dimbuilder PRIVATE
-     ${PDAL_INCLUDE_DIR}
-     ${PDAL_JSONCPP_INCLUDE_DIR})
+@@ -31,7 +29,6 @@ target_include_directories(dimbuilder PRIVATE
 PDAL_TARGET_COMPILE_SETTINGS(dimbuilder)
-target_link_libraries(dimbuilder
-    PRIVATE
-        ${EXECINFO_LIBRARY})
+ target_link_libraries(dimbuilder
+     PRIVATE
+-        ${EXECINFO_LIBRARY}
+         ${CMAKE_DL_LIBS}
+ )
 if (PDAL_HAVE_JSONCPP)
-     target_link_libraries(dimbuilder ${JSON_CPP_LINK_TYPE}
-         ${PDAL_JSONCPP_LIB_NAME})
-endif()
-if (UNIX AND NOT APPLE)
-    target_link_libraries(dimbuilder PRIVATE  ${CMAKE_DL_LIBS})
- endif()
--- a/geo/pdal/patches/patch-pdal_PluginDirectory_cpp
+++ b/geo/pdal/patches/patch-pdal_PluginDirectory_cpp
@ -1,14 +1,16 @@
-$OpenBSD: patch-pdal_PluginDirectory_cpp,v 1.1 2018/04/11 07:47:09 landry Exp $
+$OpenBSD: patch-pdal_PluginDirectory_cpp,v 1.2 2018/05/19 15:01:48 landry Exp $
+
+https://github.com/PDAL/PDAL/pull/2027

 Index: pdal/PluginDirectory.cpp
 --- pdal/PluginDirectory.cpp.orig
 +++ pdal/PluginDirectory.cpp
@@ -45,7 +45,7 @@ namespace
 #if defined(__APPLE__) && defined(__MACH__)
-     static const std::string dynamicLibraryExtension("dylib");
+     static const std::string dynamicLibraryExtension(".dylib");
     static const char pathSeparator(':');
 -#elif defined(__linux__) || defined(__FreeBSD__) || defined(__DragonFly__) || defined(__FreeBSD_kernel__) || defined(__GNU__)
-+#elif defined(__linux__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) || defined(__FreeBSD_kernel__) || defined(__GNU__)
-     static const std::string dynamicLibraryExtension("so");
+#elif defined(__linux__) || defined(__FreeBSD__) || defined(__DragonFly__) || defined(__FreeBSD_kernel__) || defined(__GNU__) || defined(__OpenBSD__)
+     static const std::string dynamicLibraryExtension(".so");
     static const char pathSeparator(':');
 #elif defined _WIN32
--- a/geo/pdal/patches/patch-pdal_util_CMakeLists_txt
+++ b/geo/pdal/patches/patch-pdal_util_CMakeLists_txt
@ -1,6 +1,5 @@
-$OpenBSD: patch-pdal_util_CMakeLists_txt,v 1.2 2018/04/11 07:47:09 landry Exp $
+$OpenBSD: patch-pdal_util_CMakeLists_txt,v 1.3 2018/05/19 15:01:48 landry Exp $

-no libdl on OpenBSD
 we dont want to link with execinfo

 Index: pdal/util/CMakeLists.txt
@ -15,22 +14,11 @@ Index: pdal/util/CMakeLists.txt
 set(PDAL_UTIL_SOURCES
     "${PDAL_UTIL_DIR}/Bounds.cpp"
     "${PDAL_UTIL_DIR}/Charbuf.cpp"
-@@ -19,18 +17,10 @@ set(PDAL_UTIL_SOURCES
+@@ -19,7 +17,6 @@ set(PDAL_UTIL_SOURCES
 PDAL_ADD_FREE_LIBRARY(${PDAL_UTIL_LIB_NAME} SHARED ${PDAL_UTIL_SOURCES})
 target_link_libraries(${PDAL_UTIL_LIB_NAME}
     PRIVATE
 -        ${EXECINFO_LIBRARY}
         ${PDAL_BOOST_LIB_NAME}
+         ${CMAKE_DL_LIBS}
 )
- target_include_directories(${PDAL_UTIL_LIB_NAME} PRIVATE
-     ${PDAL_VENDOR_DIR}/pdalboost)
-
-if (UNIX AND NOT APPLE)
-    target_link_libraries(${PDAL_UTIL_LIB_NAME}
-        PRIVATE
-            dl
-    )
-endif()
- 
- set_target_properties(${PDAL_UTIL_LIB_NAME} PROPERTIES
-     VERSION "${PDAL_BUILD_VERSION}"
--- a/geo/pdal/patches/patch-plugins_sqlite_io_SQLiteCommon_hpp
+++ b/geo/pdal/patches/patch-plugins_sqlite_io_SQLiteCommon_hpp
@ -1,4 +1,6 @@
-$OpenBSD: patch-plugins_sqlite_io_SQLiteCommon_hpp,v 1.1 2018/04/11 07:47:09 landry Exp $
+$OpenBSD: patch-plugins_sqlite_io_SQLiteCommon_hpp,v 1.2 2018/05/19 15:01:48 landry Exp $
+
+https://github.com/PDAL/PDAL/pull/2027

 Index: plugins/sqlite/io/SQLiteCommon.hpp
 --- plugins/sqlite/io/SQLiteCommon.hpp.orig
--- a/geo/pdal/patches/patch-test_unit_PluginManagerTest_cpp
+++ b/geo/pdal/patches/patch-test_unit_PluginManagerTest_cpp
@ -0,0 +1,21 @@
+$OpenBSD: patch-test_unit_PluginManagerTest_cpp,v 1.1 2018/05/19 15:01:48 landry Exp $
+
+https://github.com/PDAL/PDAL/pull/2027
+
+Index: test/unit/PluginManagerTest.cpp
+--- test/unit/PluginManagerTest.cpp.orig
+++ test/unit/PluginManagerTest.cpp
+@@ -121,11 +121,10 @@ TEST(PluginManagerTest, validnames)
+ {
+ #if defined(__APPLE__) && defined(__MACH__)
+     static const std::string dlext(".dylib");
+-#elif defined(__linux__) || defined(__FreeBSD__) || defined(__DragonFly__) || \
+-      defined(__FreeBSD_kernel__) || defined(__GNU__)
+-    static const std::string dlext(".so");
+ #elif defined _WIN32
+     static const std::string dlext(".dll");
+#else
+    static const std::string dlext(".so");
+ #endif
+ 
+     StringList type1 { "reader", "writer" };