[pcl] Update to 1.10.0

ports/pcl/CONTROL

@@ -1,8 +1,8 @@
 Source: pcl
-Version: 1.9.1-13
+Version: 1.11.0
 Homepage: https://github.com/PointCloudLibrary/pcl
 Description: Point Cloud Library (PCL) is open source library for 2D/3D image and point cloud processing.
-Build-Depends: eigen3, flann, qhull, vtk, libpng, boost-system, boost-filesystem, boost-thread, boost-date-time, boost-iostreams, boost-random, boost-foreach, boost-dynamic-bitset, boost-property-map, boost-graph, boost-multi-array, boost-signals2, boost-ptr-container, boost-uuid, boost-interprocess, boost-asio
+Build-Depends: eigen3, flann, qhull, vtk, libpng, boost-system, boost-filesystem, boost-thread, boost-date-time, boost-iostreams, boost-random, boost-foreach, boost-dynamic-bitset, boost-property-map, boost-graph, boost-multi-array, boost-signals2, boost-sort, boost-ptr-container, boost-uuid, boost-interprocess, boost-asio
 
 Feature: openni2
 Description: OpenNI2 support for PCL

ports/pcl/boost-1.70.patch

@@ -1,27 +1,14 @@
-diff --git a/segmentation/include/pcl/segmentation/supervoxel_clustering.h b/segmentation/include/pcl/segmentation/supervoxel_clustering.h
-index 05e6002..99e3a07 100644
---- a/segmentation/include/pcl/segmentation/supervoxel_clustering.h
-+++ b/segmentation/include/pcl/segmentation/supervoxel_clustering.h
-@@ -525,7 +525,7 @@ namespace pcl
-       };
-
-       //Make boost::ptr_list can access the private class SupervoxelHelper
--      friend void boost::checked_delete<> (const typename pcl::SupervoxelClustering<PointT>::SupervoxelHelper *);
-+      //friend void boost::checked_delete<> (const typename pcl::SupervoxelClustering<PointT>::SupervoxelHelper *);
-
-       typedef boost::ptr_list<SupervoxelHelper> HelperListT;
-       HelperListT supervoxel_helpers_;
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 68cc438..8cfa1c6 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -416,6 +416,9 @@ endif()
-
- # Boost (required)
- include("${PCL_SOURCE_DIR}/cmake/pcl_find_boost.cmake")
-+if (NOT APPLE)
-+    add_definitions(-fext-numeric-literals)
-+endif()
-
- ### ---[ Create the config.h file
- set(pcl_config_h_in "${CMAKE_CURRENT_SOURCE_DIR}/pcl_config.h.in")
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b301cf1..789b660 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -462,6 +462,9 @@ endif()
+
+ # Boost (required)
+ include("${PCL_SOURCE_DIR}/cmake/pcl_find_boost.cmake")
++if (NOT APPLE AND NOT WIN32)
++    add_definitions(-fext-numeric-literals)
++endif()
+
+ ### ---[ Create the config.h file
+ set(pcl_config_h_in "${CMAKE_CURRENT_SOURCE_DIR}/pcl_config.h.in")

ports/pcl/fix-link-libpng.patch

@@ -1,20 +1,20 @@
 diff --git a/io/CMakeLists.txt b/io/CMakeLists.txt
-index a17cb2d..b2a56b3 100644
+index f234971..86ea242 100644
 --- a/io/CMakeLists.txt
 +++ b/io/CMakeLists.txt
-@@ -330,11 +330,13 @@ if(build)
-     add_definitions(${VTK_DEFINES})
-     PCL_ADD_LIBRARY("${LIB_NAME}" "${SUBSYS_NAME}" ${srcs} ${incs} ${compression_incs} ${impl_incs} ${OPENNI_INCLUDES} ${OPENNI2_INCLUDES})
-     target_include_directories(${LIB_NAME} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include" ${VTK_INCLUDE_DIRECTORIES})
--    link_directories(${VTK_LINK_DIRECTORIES})
--    target_link_libraries("${LIB_NAME}" pcl_common pcl_io_ply ${VTK_LIBRARIES} )
-+    
-     if(PNG_FOUND)
-       target_link_libraries("${LIB_NAME}" ${PNG_LIBRARIES})
-     endif(PNG_FOUND)
-+    
-+    link_directories(${VTK_LINK_DIRECTORIES})
-+    target_link_libraries("${LIB_NAME}" pcl_common pcl_io_ply ${VTK_LIBRARIES} )
+@@ -333,12 +333,13 @@ set(LIB_NAME "pcl_${SUBSYS_NAME}")
+ add_definitions(${VTK_DEFINES})
+ PCL_ADD_LIBRARY(${LIB_NAME} COMPONENT ${SUBSYS_NAME} SOURCES ${srcs} ${incs} ${compression_incs} ${impl_incs} ${OPENNI_INCLUDES} ${OPENNI2_INCLUDES})
+ target_include_directories(${LIB_NAME} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include")
+-link_directories(${VTK_LINK_DIRECTORIES})
+-target_link_libraries("${LIB_NAME}" pcl_common pcl_io_ply ${VTK_LIBRARIES})
+ if(PNG_FOUND)
+   target_link_libraries("${LIB_NAME}" ${PNG_LIBRARIES})
+ endif()
 
-     if(LIBUSB_1_FOUND)
-       target_link_libraries("${LIB_NAME}" ${LIBUSB_1_LIBRARIES})
++link_directories(${VTK_LINK_DIRECTORIES})
++target_link_libraries("${LIB_NAME}" pcl_common pcl_io_ply ${VTK_LIBRARIES})
++
+ if(LIBUSB_1_FOUND)
+   target_link_libraries("${LIB_NAME}" ${LIBUSB_1_LIBRARIES})
+ endif()

ports/pcl/pcl_config.patch

@@ -1,45 +1,33 @@
 diff --git a/PCLConfig.cmake.in b/PCLConfig.cmake.in
-index 7ec40baa0..837d78c82 100644
+index 9f78fcf..0cbe94f 100644
 --- a/PCLConfig.cmake.in
 +++ b/PCLConfig.cmake.in
-@@ -388,25 +388,18 @@ file(TO_CMAKE_PATH "${PCL_DIR}" PCL_DIR)
+@@ -396,25 +396,16 @@ file(TO_CMAKE_PATH "${PCL_DIR}" PCL_DIR)
  if(WIN32 AND NOT MINGW)
  # PCLConfig.cmake is installed to PCL_ROOT/cmake
    get_filename_component(PCL_ROOT "${PCL_DIR}" PATH)
 +  get_filename_component(PCL_ROOT "${PCL_ROOT}" PATH)
- else(WIN32 AND NOT MINGW)
+ else()
  # PCLConfig.cmake is installed to PCL_ROOT/share/pcl-x.y
    get_filename_component(PCL_ROOT "${CMAKE_CURRENT_LIST_DIR}/../.." ABSOLUTE)
- endif(WIN32 AND NOT MINGW)
+ endif()
 
  # check whether PCLConfig.cmake is found into a PCL installation or in a build tree
 -if(EXISTS "${PCL_ROOT}/include/pcl-${PCL_VERSION_MAJOR}.${PCL_VERSION_MINOR}/pcl/pcl_config.h")
-+if(EXISTS "${PCL_ROOT}/include/pcl/pcl_config.h")
-   # Found a PCL installation
-   # pcl_message("Found a PCL installation")
--  set(PCL_INCLUDE_DIRS "${PCL_ROOT}/include/pcl-${PCL_VERSION_MAJOR}.${PCL_VERSION_MINOR}")
+-  # Found a PCL installation
+-  # pcl_message("Found a PCL installation")
+-  set(PCL_CONF_INCLUDE_DIR "${PCL_ROOT}/include/pcl-${PCL_VERSION_MAJOR}.${PCL_VERSION_MINOR}")
 -  set(PCL_LIBRARY_DIRS "${PCL_ROOT}/@LIB_INSTALL_DIR@")
 -  if(EXISTS "${PCL_ROOT}/3rdParty")
 -    set(PCL_ALL_IN_ONE_INSTALLER ON)
--  endif(EXISTS "${PCL_ROOT}/3rdParty")
+-  endif()
 -elseif(EXISTS "${PCL_ROOT}/include/pcl/pcl_config.h")
 -  # Found a non-standard (likely ANDROID) PCL installation
 -  # pcl_message("Found a PCL installation")
-   set(PCL_INCLUDE_DIRS "${PCL_ROOT}/include")
++if(EXISTS "${PCL_ROOT}/include/pcl/pcl_config.h")
+   set(PCL_CONF_INCLUDE_DIR "${PCL_ROOT}/include")
 -  set(PCL_LIBRARY_DIRS "${PCL_ROOT}/lib")
 +  set(PCL_LIBRARY_DIRS "${PCL_ROOT}/@LIB_INSTALL_DIR@" "${PCL_ROOT}/debug/@LIB_INSTALL_DIR@")
    if(EXISTS "${PCL_ROOT}/3rdParty")
      set(PCL_ALL_IN_ONE_INSTALLER ON)
-   endif(EXISTS "${PCL_ROOT}/3rdParty")
-@@ -416,9 +409,9 @@ elseif(EXISTS "${PCL_DIR}/include/pcl/pcl_config.h")
-   set(PCL_INCLUDE_DIRS "${PCL_DIR}/include") # for pcl_config.h
-   set(PCL_LIBRARY_DIRS "${PCL_DIR}/@LIB_INSTALL_DIR@")
-   set(PCL_SOURCES_TREE "@CMAKE_SOURCE_DIR@")
--else(EXISTS "${PCL_ROOT}/include/pcl-${PCL_VERSION_MAJOR}.${PCL_VERSION_MINOR}/pcl/pcl_config.h")
-+else(EXISTS "${PCL_ROOT}/include/pcl/pcl_config.h")
-   pcl_report_not_found("PCL can not be found on this machine")
--endif(EXISTS "${PCL_ROOT}/include/pcl-${PCL_VERSION_MAJOR}.${PCL_VERSION_MINOR}/pcl/pcl_config.h")
-+endif(EXISTS "${PCL_ROOT}/include/pcl/pcl_config.h")
-
- #set a suffix for debug libraries
- set(PCL_DEBUG_SUFFIX "@CMAKE_DEBUG_POSTFIX@")
+   endif()

ports/pcl/pcl_utils.patch

@@ -1,28 +1,28 @@
 diff --git a/cmake/pcl_utils.cmake b/cmake/pcl_utils.cmake
-index f523dbc8c..a171b6d24 100644
+index d87d02d..7c951bf 100644
 --- a/cmake/pcl_utils.cmake
 +++ b/cmake/pcl_utils.cmake
-@@ -97,21 +97,12 @@ macro(SET_INSTALL_DIRS)
-   if (NOT DEFINED LIB_INSTALL_DIR)
+@@ -94,21 +94,12 @@ macro(SET_INSTALL_DIRS)
+   if(NOT DEFINED LIB_INSTALL_DIR)
      set(LIB_INSTALL_DIR "lib")
-   endif (NOT DEFINED LIB_INSTALL_DIR)
+   endif()
 -    if(NOT ANDROID)
 -      set(INCLUDE_INSTALL_ROOT
 -          "include/${PROJECT_NAME_LOWER}-${PCL_VERSION_MAJOR}.${PCL_VERSION_MINOR}")
--    else(NOT ANDROID)
+-    else()
 -      set(INCLUDE_INSTALL_ROOT "include") # Android, don't put into subdir
--    endif(NOT ANDROID)
-+    set(INCLUDE_INSTALL_ROOT "include") 
+-    endif()
++    set(INCLUDE_INSTALL_ROOT "include")
      set(INCLUDE_INSTALL_DIR "${INCLUDE_INSTALL_ROOT}/pcl")
      set(DOC_INSTALL_DIR "share/doc/${PROJECT_NAME_LOWER}-${PCL_VERSION_MAJOR}.${PCL_VERSION_MINOR}")
      set(BIN_INSTALL_DIR "bin")
      set(PKGCFG_INSTALL_DIR "${LIB_INSTALL_DIR}/pkgconfig")
 -    if(WIN32 AND NOT MINGW)
 -        set(PCLCONFIG_INSTALL_DIR "cmake")
--      else(WIN32 AND NOT MINGW)
+-      else()
 -        set(PCLCONFIG_INSTALL_DIR "share/${PROJECT_NAME_LOWER}-${PCL_VERSION_MAJOR}.${PCL_VERSION_MINOR}")
--      endif(WIN32 AND NOT MINGW)
+-      endif()
 +    set(PCLCONFIG_INSTALL_DIR "share/pcl")
- endmacro(SET_INSTALL_DIRS)
+ endmacro()