CMakeLists.txt

@@ -28,14 +28,14 @@ mark_as_advanced(CMAKE_VERBOSE_MAKEFILE)
 
 # the next line is the ONLY place in the entire pdal system where
 # the version info is hard-coded
-set(PDAL_VERSION_STRING "1.7.0" CACHE STRING "PDAL version" FORCE)
+set(PDAL_VERSION_STRING "1.7.1" CACHE STRING "PDAL version" FORCE)
 
 DISSECT_VERSION()
 GET_OS_INFO()
 SET_INSTALL_DIRS()
 
 set(PDAL_API_VERSION "6")
-set(PDAL_BUILD_VERSION "7.0.0")
+set(PDAL_BUILD_VERSION "7.0.1")
 
 # Name of C++ library
 

CPackConfig.cmake

@@ -62,7 +62,7 @@ SET(CPACK_SOURCE_CYGWIN "")
 SET(CPACK_SOURCE_GENERATOR "TBZ2;TGZ")
 SET(CPACK_SOURCE_IGNORE_FILES "/\\.gitattributes;/\\.vagrant;/\\.DS_Store;/CVS/;/\\.git/;\\.swp$;~$;\\.\\#;/\\#;CMakeScripts/;CMakeCache.txt;.xcodeproj;build.make;_CPack_Packages;cmake_install.cmake;Testing;PDAL.build/;/bin/;/lib/;/build/;Makefile;CMakeFiles;CTestTestfile.cmake;/test/data/local/;/doc/doxygen/;/doc/build/;/doc/presentations/;/doc/_static/logo/dongle/;/cmake/examples/;/include/pdal/pdal_defines.h;.gz2;.bz2")
 SET(CPACK_SOURCE_OUTPUT_CONFIG_FILE "/PDAL/CPackSourceConfig.cmake")
-SET(CPACK_SOURCE_PACKAGE_FILE_NAME "PDAL-1.7.0-src")
+SET(CPACK_SOURCE_PACKAGE_FILE_NAME "PDAL-1.7.1-src")
 SET(CPACK_SOURCE_TBZ2 "")
 SET(CPACK_SOURCE_TGZ "")
 SET(CPACK_SOURCE_TXZ "")

CPackSourceConfig.cmake

@@ -45,7 +45,7 @@ SET(CPACK_OUTPUT_CONFIG_FILE "/PDAL/CPackConfig.cmake")
 SET(CPACK_PACKAGE_DEFAULT_LOCATION "/")
 SET(CPACK_PACKAGE_DESCRIPTION_FILE "/usr/share/cmake-3.5/Templates/CPack.GenericDescription.txt")
 SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "PDAL built using CMake")
-SET(CPACK_PACKAGE_FILE_NAME "PDAL-1.7.0-src")
+SET(CPACK_PACKAGE_FILE_NAME "PDAL-1.7.1-src")
 SET(CPACK_PACKAGE_INSTALL_DIRECTORY "PDAL 1.7.7")
 SET(CPACK_PACKAGE_INSTALL_REGISTRY_KEY "PDAL 1.7.7")
 SET(CPACK_PACKAGE_NAME "PDAL")
@@ -65,7 +65,7 @@ SET(CPACK_SOURCE_GENERATOR "TBZ2;TGZ")
 SET(CPACK_SOURCE_IGNORE_FILES "/\\.gitattributes;/\\.vagrant;/\\.DS_Store;/CVS/;/\\.git/;\\.swp$;~$;\\.\\#;/\\#;CMakeScripts/;CMakeCache.txt;.xcodeproj;build.make;_CPack_Packages;cmake_install.cmake;Testing;PDAL.build/;/bin/;/lib/;/build/;Makefile;CMakeFiles;CTestTestfile.cmake;/test/data/local/;/doc/doxygen/;/doc/build/;/doc/presentations/;/doc/_static/logo/dongle/;/cmake/examples/;/include/pdal/pdal_defines.h;.gz2;.bz2")
 SET(CPACK_SOURCE_INSTALLED_DIRECTORIES "/PDAL;/")
 SET(CPACK_SOURCE_OUTPUT_CONFIG_FILE "/PDAL/CPackSourceConfig.cmake")
-SET(CPACK_SOURCE_PACKAGE_FILE_NAME "PDAL-1.7.0-src")
+SET(CPACK_SOURCE_PACKAGE_FILE_NAME "PDAL-1.7.1-src")
 SET(CPACK_SOURCE_TBZ2 "")
 SET(CPACK_SOURCE_TGZ "")
 SET(CPACK_SOURCE_TOPLEVEL_TAG "Linux-Source")

HOWTORELEASE.txt

@@ -30,6 +30,8 @@ Release Process
 
   - doc/download.rst point to new release
 
+  - appveyor.yml
+
   - Make and push new release branch
 
     ::
@@ -45,8 +47,18 @@ Release Process
   - Make DockerHub build entry for new release branch.
 
 
-2) Update README to include any relevant info about the release that
-   might have changed.
+2) Write and update release notes. Use the PDAL "releases" section to create one.
+   Write the document in Markdown for convenience on GitHub.
+
+   - Manually store a copy of it in ./doc/development/release-notes/1.7.0.md
+     for future reference.
+
+   - Convert it to reStructuredText using pandoc and add the output to the
+     RELEASENOTES.txt document
+
+     ::
+
+        pandoc --from markdown --to rst --output=1.7.rst doc/development/release-notes/1.7.0.md
 
 3) Update ChangeLog with git2cl
 

PDALConfig.cmake

@@ -26,7 +26,7 @@ endmacro()
 
 set(PDAL_VERSION_MAJOR 1)
 set(PDAL_VERSION_MINOR 7)
-set(PDAL_VERSION_PATCH 0)
+set(PDAL_VERSION_PATCH 1)
 
 set(PDAL_INCLUDE_DIRS)
 set(PDAL_LIBRARY_DIRS)

PDALConfigVersion.cmake

@@ -9,16 +9,16 @@
 # The variable CVF_VERSION must be set before calling configure_file().
 
 
-set(PACKAGE_VERSION "1.7.0")
+set(PACKAGE_VERSION "1.7.1")
 
 if(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION)
   set(PACKAGE_VERSION_COMPATIBLE FALSE)
 else()
 
-  if("1.7.0" MATCHES "^([0-9]+)\\.")
+  if("1.7.1" MATCHES "^([0-9]+)\\.")
     set(CVF_VERSION_MAJOR "${CMAKE_MATCH_1}")
   else()
-    set(CVF_VERSION_MAJOR "1.7.0")
+    set(CVF_VERSION_MAJOR "1.7.1")
   endif()
 
   if(PACKAGE_FIND_VERSION_MAJOR STREQUAL CVF_VERSION_MAJOR)

PDALTargets.cmake

@@ -59,14 +59,14 @@ set_target_properties(pdal_util PROPERTIES
 set_property(TARGET pdal_base APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
 set_target_properties(pdal_base PROPERTIES
   IMPORTED_LINK_DEPENDENT_LIBRARIES_NOCONFIG "pdal_util"
-  IMPORTED_LOCATION_NOCONFIG "/PDAL/lib/libpdal_base.so.7.0.0"
+  IMPORTED_LOCATION_NOCONFIG "/PDAL/lib/libpdal_base.so.7.0.1"
   IMPORTED_SONAME_NOCONFIG "libpdal_base.so.6"
   )
 
 # Import target "pdal_util" for configuration ""
 set_property(TARGET pdal_util APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
 set_target_properties(pdal_util PROPERTIES
-  IMPORTED_LOCATION_NOCONFIG "/PDAL/lib/libpdal_util.so.7.0.0"
+  IMPORTED_LOCATION_NOCONFIG "/PDAL/lib/libpdal_util.so.7.0.1"
   IMPORTED_SONAME_NOCONFIG "libpdal_util.so.6"
   )
 

RELEASENOTES.txt

@@ -130,6 +130,9 @@ Bug fixes
 -  Fixed an issue where dimensions from ``readers.pcd`` and
    ``writers.pcd`` could get confused with dimensions from
    ``readers.sbet`` and ``writers.sbet``.
+-  Fixed index computation in ``filters.voxelcentroidnearestneighbor``
+   and ``filters.voxelcenternearestneighbor`` #1901
+-  Fixed libdl linking #1900
 
 ================================================================================
 1.6.0

apps/pdal-config

@@ -58,7 +58,7 @@ case $1 in
     ;;
 
   --version)
-    echo 1.7.0
+    echo 1.7.1
     ;;
 
   --python-version)

apps/pdal.pc

@@ -6,7 +6,7 @@ includedir=/usr/local/include
 Name: PDAL
 Description: Point Data Abstraction Library
 Requires:   gdal libxml-2.0 geos
-Version: 1.7.0
+Version: 1.7.1
 Libs: -L${libdir} -lpdalcpp
 Cflags: -I${includedir}/pdal  
 

appveyor.yml

@@ -67,7 +67,7 @@ deploy:
     secret_access_key:
       secure: cSqZlsaCxFwXgxJw0BLd7npMFvQk3Vbr74ZPLaBQWLKnOz1cKss9qab1SzSygwkh
     on:
-      branch: 1.6-maintenance
+      branch: 1.7-maintenance
     bucket: "pdal"
     folder: "osgeo4w/"
     artifact: pdalosgeo4w

debian/changelog

+pdal (1.7.1-1~exp1) experimental; urgency=medium
+
+  * New upstream release.
+  * Drop dlopen.patch, fixed upstream. Refresh remaining patches.
+  * Add upstream patch to link in libdl where necessary.
+  * Update symbols for amd64.
+  * Bump Standards-Version to 4.1.4, no changes.
+  * Remove duplicate Files section from copyright file.
+
+ -- Bas Couwenberg <sebastic@debian.org>  Mon, 09 Apr 2018 12:04:17 +0200
+
 pdal (1.7.0-1~exp1) experimental; urgency=medium
 
   * New upstream release.

debian/control

@@ -41,7 +41,7 @@ Build-Depends: debhelper (>= 9),
                docbook-xsl,
                docbook-xml,
                xsltproc
-Standards-Version: 4.1.3
+Standards-Version: 4.1.4
 Vcs-Browser: https://salsa.debian.org/debian-gis-team/pdal
 Vcs-Git: https://salsa.debian.org/debian-gis-team/pdal.git
 Homepage: http://pdal.io/

debian/copyright

@@ -36,11 +36,6 @@ Files: plugins/greyhound/io/bounds.cpp
 Copyright: 2016, Connor Manning (connor@hobu.co)
 License: LGPL-2.1+
 
-Files: plugins/greyhound/io/bounds.cpp
- plugins/greyhound/io/bounds.hpp
-Copyright: 2016, Connor Manning (connor@hobu.co)
-License: LGPL-2.1+
-
 Files: plugins/python/plang/Redirector.hpp
  plugins/python/plang/Redirector.cpp
 Copyright: 2011, Mateusz Loskot <mateusz@loskot.net>

debian/libpdal-base6.symbols

-# SymbolsHelper-Confirmed: 1.7.0 amd64
+# SymbolsHelper-Confirmed: 1.7.1 amd64
 libpdal_base.so.6 #PACKAGE# #MINVER#
  BoundaryNames@Base 1.6.0
  (optional=templinst)_Z11loadOctTreeIdEiR6OctreeIT_ER8XForm4x4IS1_ER11PointSourceibPSt6vectorINS2_11PointSampleESaISA_EEPS9_I14ProjectiveDataI7Point3DIS1_ES1_ESaISH_EE@Base 1.6.0
@@ -498,9 +498,6 @@ libpdal_base.so.6 #PACKAGE# #MINVER#
  _ZN4pdal11FerryFilter8preparedERNS_14BasePointTableE@Base 1.1.0
  _ZN4pdal11FerryFilterD0Ev@Base 1.1.0
  _ZN4pdal11FerryFilterD1Ev@Base 1.1.0
- _ZN4pdal11GeotiffTags5errorD0Ev@Base 1.5.0
- _ZN4pdal11GeotiffTags5errorD1Ev@Base 1.5.0
- _ZN4pdal11GeotiffTags5errorD2Ev@Base 1.5.0
  _ZN4pdal11GeotiffTagsC1ERKNS_16SpatialReferenceE@Base 1.5.0
  _ZN4pdal11GeotiffTagsC2ERKNS_16SpatialReferenceE@Base 1.5.0
  _ZN4pdal11LeExtractorrsERa@Base 1.2.0
@@ -1625,6 +1622,9 @@ libpdal_base.so.6 #PACKAGE# #MINVER#
  _ZN4pdal6filter5PointD0Ev@Base 1.6.0
  _ZN4pdal6filter5PointD1Ev@Base 1.6.0
  _ZN4pdal6filter5PointD2Ev@Base 1.6.0
+ _ZN4pdal7Geotiff5errorD0Ev@Base 1.7.1
+ _ZN4pdal7Geotiff5errorD1Ev@Base 1.7.1
+ _ZN4pdal7Geotiff5errorD2Ev@Base 1.7.1
  _ZN4pdal7GridPnp10intersectsERSt4pairIS1_IddES2_ES4_@Base 1.7.0
  _ZN4pdal7GridPnp16generateRefPointERNS0_4CellERSt4pairImmE@Base 1.7.0
  _ZN4pdal7GridPnp20determinePointStatusERNS0_4CellERSt4pairImmE@Base 1.7.0
@@ -4012,7 +4012,6 @@ libpdal_base.so.6 #PACKAGE# #MINVER#
  _ZTIN4pdal10pdal_errorE@Base 1.1.0
  _ZTIN4pdal11DeltaKernelE@Base 1.1.0
  _ZTIN4pdal11FerryFilterE@Base 1.1.0
- _ZTIN4pdal11GeotiffTags5errorE@Base 1.5.0
  _ZTIN4pdal11LeExtractorE@Base 1.2.0
  _ZTIN4pdal11MergeFilterE@Base 1.1.0
  _ZTIN4pdal11MergeKernelE@Base 1.1.0
@@ -4147,6 +4146,7 @@ libpdal_base.so.6 #PACKAGE# #MINVER#
  _ZTIN4pdal6ReaderE@Base 1.1.0
  _ZTIN4pdal6WriterE@Base 1.1.0
  _ZTIN4pdal6filter5PointE@Base 1.6.0
+ _ZTIN4pdal7Geotiff5errorE@Base 1.7.1
  _ZTIN4pdal7PolygonE@Base 1.4.0
  _ZTIN4pdal7ScalingE@Base 1.3.0
  _ZTIN4pdal7arbiter12ArbiterErrorE@Base 1.3.0
@@ -4335,7 +4335,6 @@ libpdal_base.so.6 #PACKAGE# #MINVER#
  _ZTSN4pdal10pdal_errorE@Base 1.1.0
  _ZTSN4pdal11DeltaKernelE@Base 1.1.0
  _ZTSN4pdal11FerryFilterE@Base 1.1.0
- _ZTSN4pdal11GeotiffTags5errorE@Base 1.5.0
  _ZTSN4pdal11LeExtractorE@Base 1.2.0
  _ZTSN4pdal11MergeFilterE@Base 1.1.0
  _ZTSN4pdal11MergeKernelE@Base 1.1.0
@@ -4471,6 +4470,7 @@ libpdal_base.so.6 #PACKAGE# #MINVER#
  _ZTSN4pdal6ReaderE@Base 1.1.0
  _ZTSN4pdal6WriterE@Base 1.1.0
  _ZTSN4pdal6filter5PointE@Base 1.6.0
+ _ZTSN4pdal7Geotiff5errorE@Base 1.7.1
  _ZTSN4pdal7PolygonE@Base 1.4.0
  _ZTSN4pdal7ScalingE@Base 1.3.0
  _ZTSN4pdal7arbiter12ArbiterErrorE@Base 1.3.0
@@ -4727,7 +4727,6 @@ libpdal_base.so.6 #PACKAGE# #MINVER#
  _ZTVN4pdal10pdal_errorE@Base 1.1.0
  _ZTVN4pdal11DeltaKernelE@Base 1.1.0
  _ZTVN4pdal11FerryFilterE@Base 1.1.0
- _ZTVN4pdal11GeotiffTags5errorE@Base 1.5.0
  _ZTVN4pdal11LeExtractorE@Base 1.2.0
  _ZTVN4pdal11MergeFilterE@Base 1.1.0
  _ZTVN4pdal11MergeKernelE@Base 1.1.0
@@ -4846,6 +4845,7 @@ libpdal_base.so.6 #PACKAGE# #MINVER#
  _ZTVN4pdal6KernelE@Base 1.1.0
  _ZTVN4pdal6ReaderE@Base 1.1.0
  _ZTVN4pdal6filter5PointE@Base 1.6.0
+ _ZTVN4pdal7Geotiff5errorE@Base 1.7.1
  _ZTVN4pdal7PolygonE@Base 1.4.0
  _ZTVN4pdal7ScalingE@Base 1.3.0
  _ZTVN4pdal7arbiter12ArbiterErrorE@Base 1.3.0

debian/patches/Link-in-libdl-where-necessary.patch

+Description: Link in libdl where necessary. Fix minor bugs in lib builds.
+Author: Andrew Bell <andrew.bell.ia@gmail.com>
+Origin: https://github.com/PDAL/PDAL/pull/1903/commits/756a27e2c30e57455f138ec67ee9868da176e772
+
+--- a/plugins/python/filters/CMakeLists.txt
++++ b/plugins/python/filters/CMakeLists.txt
+@@ -7,19 +7,18 @@ PDAL_ADD_PLUGIN(python_libname filter py
+     FILES
+         ${PLANG}
+         PythonFilter.cpp
++    LINK_WITH
++        ${PYTHON_LIBRARY}
++        ${CMAKE_DL_LIBS}
+     )
+ target_include_directories(${python_libname} PRIVATE
+     ${PYTHON_INCLUDE_DIR} ${PDAL_JSONCPP_INCLUDE_DIR})
+ 
+-target_link_libraries(${python_libname} PUBLIC
+-    ${PYTHON_LIBRARY} ${CMAKE_DL_LIBS})
+-
+ if (WITH_TESTS)
+     PDAL_ADD_TEST(pdal_filters_python_test
+         FILES
+             ../test/PythonFilterTest.cpp
+-            ${PLANG}
+-        LINK_WITH ${programmable_libname} )
+-    target_link_libraries(pdal_filters_python_test PUBLIC
+-        ${PYTHON_LIBRARY} ${CMAKE_DL_LIBS})
++        LINK_WITH
++            ${python_libname}
++    )
+ endif()
+--- a/plugins/python/io/CMakeLists.txt
++++ b/plugins/python/io/CMakeLists.txt
+@@ -4,14 +4,14 @@ PDAL_ADD_PLUGIN(numpy_reader reader nump
+         NumpyReader.cpp
+         ../plang/Environment.cpp
+         ../plang/Redirector.cpp
++    LINK_WITH
++        ${PYTHON_LIBRARY}
++        ${CMAKE_DL_LIBS}
+     )
+ 
+ target_include_directories(${numpy_reader} PRIVATE
+     ${PYTHON_INCLUDE_DIR})
+ 
+-target_link_libraries(${numpy_reader} PUBLIC
+-    ${PYTHON_LIBRARY})
+-
+ # Install headers so Python extension
+ # can use them later
+ 
+@@ -25,9 +25,6 @@ if (WITH_TESTS)
+     PDAL_ADD_TEST(pdal_io_numpy_test
+         FILES
+             ../test/NumpyReaderTest.cpp
+-            ../plang/Environment.cpp
+-            ../plang/Redirector.cpp
+-        LINK_WITH ${numpy_reader} )
+-    target_link_libraries(pdal_io_numpy_test PUBLIC
+-        ${PYTHON_LIBRARY})
++        LINK_WITH
++            ${numpy_reader})
+ endif()

debian/patches/dlopen.patch

-Description: Fix linking to libdl for dlopen().
- [100%] Linking CXX executable ../../../bin/pdal_io_numpy_test
- cd /build/pdal-1.7.0/obj-x86_64-linux-gnu/plugins/python/io && /usr/bin/cmake -E cmake_link_script CMakeFiles/pdal_io_numpy_test.dir/link.txt --verbose=1
- /usr/bin/c++  -g -O2 -fdebug-prefix-map=/build/pdal-1.7.0=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wno-error=maybe-uninitialized -Wdate-time -D_FORTIFY_SOURCE=2 -O2 -g -DNDEBUG  -Wl,-z,relro -Wl,-z,now -rdynamic CMakeFiles/pdal_io_numpy_test.dir/__/test/NumpyReaderTest.cpp.o CMakeFiles/pdal_io_numpy_test.dir/__/plang/Environment.cpp.o CMakeFiles/pdal_io_numpy_test.dir/__/plang/Redirector.cpp.o ../../../test/unit/CMakeFiles/pdal_test_support.dir/Support.cpp.o  -o ../../../bin/pdal_io_numpy_test -Wl,-rpath,/build/pdal-1.7.0/obj-x86_64-linux-gnu/lib ../../../lib/libgtest.a ../../../lib/libpdal_plugin_reader_numpy.so.7.0.0 -lpython2.7 ../../../lib/libpdal_base.so.7.0.0 -lpthread -lgdal -lgeos_c -lgeotiff -lxml2 -lz -lcurl -ljsoncpp ../../../lib/libpdal_util.so.7.0.0 
- /usr/bin/ld: CMakeFiles/pdal_io_numpy_test.dir/__/plang/Environment.cpp.o: undefined reference to symbol 'dlopen@@GLIBC_2.2.5'
- //lib/x86_64-linux-gnu/libdl.so.2: error adding symbols: DSO missing from command line
- collect2: error: ld returned 1 exit status
-Author: Bas Couwenberg <sebastic@debian.org>
-Forwarded: https://github.com/PDAL/PDAL/pull/1900
-
---- a/pdal/util/CMakeLists.txt
-+++ b/pdal/util/CMakeLists.txt
-@@ -27,7 +27,7 @@ target_include_directories(${PDAL_UTIL_L
- 
- if (UNIX AND NOT APPLE)
-     target_link_libraries(${PDAL_UTIL_LIB_NAME}
--        PRIVATE
-+        PUBLIC
-             dl
-     )
- endif()

debian/patches/privacy-breach.patch

@@ -30,7 +30,7 @@ Forwarded: not-needed
 -.. |travisstatus| image:: https://travis-ci.org/PDAL/PDAL.png?branch=master
 -   :target: https://travis-ci.org/PDAL/PDAL
 -
--.. |appveyorstatus| image:: https://ci.appveyor.com/api/projects/status/6dehrm0v22cw58d3/branch/master?svg=true
+-.. |appveyorstatus| image:: https://ci.appveyor.com/api/projects/status/6dehrm0v22cw58d3
 -   :target: https://ci.appveyor.com/project/hobu/pdal
 -
  .. _travis:

debian/patches/series

@@ -2,4 +2,4 @@ privacy-breach.patch
 disable-sphinxcontrib-bibtex.patch
 use-mathjax-package.patch
 sphinx-DOCUMENTATION_OPTIONS-does-not-define-SOURCELINK_SUFFIX.patch
-dlopen.patch
+Link-in-libdl-where-necessary.patch

doc/development/release-notes/1.7.0.md

@@ -65,4 +65,7 @@
 - A build error that would be generated if Python was found but not requested has been resolved.
 - PDAL defaults to using [normal CMake interface](https://cmake.org/cmake/help/v3.11/policy/CMP0022.html) linking (#1890)
 - Fixed an issue where dimensions from `readers.pcd` and `writers.pcd` could get confused with dimensions from `readers.sbet` and `writers.sbet`.
+- Fixed index computation in `filters.voxelcentroidnearestneighbor` and `filters.voxelcenternearestneighbor` #1901
+- Fixed libdl linking #1900
+