[pcl] Update to PCL 1.9.0 (#4677)

Update PCL port to PCL 1.9.0.
2025-02-23 02:57:09 +01:00 · 2018-11-09 03:45:58 +09:00 · 2018-11-09 03:45:58 +09:00 · efe7c7eb28
commit efe7c7eb28
parent 9fe14bc18e
12 changed files with 11 additions and 177 deletions
--- a/ports/pcl/CONTROL
+++ b/ports/pcl/CONTROL
@ -1,5 +1,5 @@
 Source: pcl
-Version: 1.8.1-12
+Version: 1.9.0-1
 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

--- a/ports/pcl/boost_uuid_random_generator_compat.patch
+++ b/ports/pcl/boost_uuid_random_generator_compat.patch
@ -1,13 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 0405dca2..00e5238e 100644
--- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -168,6 +168,8 @@ if(CMAKE_COMPILER_IS_MSVC)
-   endif()
- endif()
- 
-+add_definitions(-DBOOST_UUID_RANDOM_GENERATOR_COMPAT)
-+
- if(CMAKE_COMPILER_IS_PATHSCALE)
-   if("${CMAKE_CXX_FLAGS}" STREQUAL "")
-     SET(CMAKE_CXX_FLAGS "-Wno-uninitialized -zerouv -pthread -mp")
--- a/ports/pcl/cmakelists.patch
+++ b/ports/pcl/cmakelists.patch
@ -1,25 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index d36a581fb..b68962e97 100644
--- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -258,7 +258,7 @@ if(OPENMP_FOUND)
-       set(OPENMP_DLL VCOMP120)
-     elseif(MSVC_VERSION EQUAL 1900)
-       set(OPENMP_DLL VCOMP140)
-    elseif(MSVC_VERSION EQUAL 1910)
-+    elseif(MSVC_VERSION MATCHES "^191[0-9]$")
-       set(OPENMP_DLL VCOMP140)
-     endif()
-     if(OPENMP_DLL)
-@@ -327,9 +327,9 @@ endif(WITH_PNG)
- # Qhull
- option(WITH_QHULL "Include convex-hull operations" TRUE)
- if(WITH_QHULL)
-  if(NOT PCL_SHARED_LIBS OR WIN32)
-+  if(NOT PCL_SHARED_LIBS)
-     set(QHULL_USE_STATIC ON)
-  endif(NOT PCL_SHARED_LIBS OR WIN32)
-+  endif(NOT PCL_SHARED_LIBS)
-   find_package(Qhull)
-   if(QHULL_FOUND)
-     include_directories(${QHULL_INCLUDE_DIRS})
--- a/ports/pcl/find_cuda.patch
+++ b/ports/pcl/find_cuda.patch
@ -1,15 +0,0 @@
-diff --git a/cmake/pcl_find_cuda.cmake b/cmake/pcl_find_cuda.cmake
-index fd9cfa9..ae9e612 100644
--- a/cmake/pcl_find_cuda.cmake
-+++ b/cmake/pcl_find_cuda.cmake
-@@ -43,7 +43,9 @@ if(CUDA_FOUND)
- 	
- 	# Find a complete list for CUDA compute capabilities at http://developer.nvidia.com/cuda-gpus
- 
-        if(NOT ${CUDA_VERSION_STRING} VERSION_LESS "8.0")
-+        if(NOT ${CUDA_VERSION_STRING} VERSION_LESS "9.0")
-+                set(__cuda_arch_bin "3.0 3.5 5.0 5.2 5.3 6.0 6.1 7.0")
-+        elseif(NOT ${CUDA_VERSION_STRING} VERSION_LESS "8.0")
-                 set(__cuda_arch_bin "2.0 2.1(2.0) 3.0 3.5 5.0 5.2 5.3 6.0 6.1")
-         elseif(NOT ${CUDA_VERSION_STRING} VERSION_LESS "6.5")
-                 set(__cuda_arch_bin "2.0 2.1(2.0) 3.0 3.5 5.0 5.2")
--- a/ports/pcl/find_flann.patch
+++ b/ports/pcl/find_flann.patch
@ -1,5 +1,5 @@
 diff --git a/cmake/Modules/FindFLANN.cmake b/cmake/Modules/FindFLANN.cmake
-index b5739dc95..d2c3fd07e 100644
+index 1cecacfa9..3169d6d7b 100644
 --- a/cmake/Modules/FindFLANN.cmake
 +++ b/cmake/Modules/FindFLANN.cmake
@@ -10,8 +10,8 @@
@ -13,12 +13,3 @@ index b5739dc95..d2c3fd07e 100644
 else(FLANN_USE_STATIC)
   set(FLANN_RELEASE_NAME flann_cpp)
   set(FLANN_DEBUG_NAME flann_cpp-gd)
-@@ -41,7 +41,7 @@ find_library(FLANN_LIBRARY_DEBUG
-              NAMES ${FLANN_DEBUG_NAME} ${FLANN_RELEASE_NAME}
- 	     HINTS ${PC_FLANN_LIBDIR} ${PC_FLANN_LIBRARY_DIRS} "${FLANN_ROOT}" "$ENV{FLANN_ROOT}"
- 	     PATHS "$ENV{PROGRAMFILES}/Flann" "$ENV{PROGRAMW6432}/Flann" 
-	     PATH_SUFFIXES lib)
-+	     PATH_SUFFIXES lib debug/lib)
- 
- if(NOT FLANN_LIBRARY_DEBUG)
-   set(FLANN_LIBRARY_DEBUG ${FLANN_LIBRARY})
--- a/ports/pcl/find_openni2.patch
+++ b/ports/pcl/find_openni2.patch
@ -1,12 +0,0 @@
-diff --git a/cmake/Modules/FindOpenNI2.cmake b/cmake/Modules/FindOpenNI2.cmake
-index 713099a14..f31de96a6 100644
--- a/cmake/Modules/FindOpenNI2.cmake
-+++ b/cmake/Modules/FindOpenNI2.cmake
-@@ -51,6 +51,7 @@ find_path(OPENNI2_INCLUDE_DIRS OpenNI.h
-     PATHS
-     "$ENV{OPENNI2_INCLUDE${OPENNI2_SUFFIX}}"  # Win64 needs '64' suffix
-     /usr/include/openni2  # common path for deb packages
-+    PATH_SUFFIXES include/openni2
- )
- 
- find_library(OPENNI2_LIBRARY
--- a/ports/pcl/find_qhull.patch
+++ b/ports/pcl/find_qhull.patch
@ -1,13 +0,0 @@
-diff --git a/cmake/Modules/FindQhull.cmake b/cmake/Modules/FindQhull.cmake
-index 698bd151b..44c1d5d8d 100644
--- a/cmake/Modules/FindQhull.cmake
-+++ b/cmake/Modules/FindQhull.cmake
-@@ -55,7 +55,7 @@ find_library(QHULL_LIBRARY_DEBUG
-              NAMES ${QHULL_DEBUG_NAME} ${QHULL_RELEASE_NAME}
-              HINTS "${QHULL_ROOT}" "$ENV{QHULL_ROOT}"
-              PATHS "$ENV{PROGRAMFILES}/QHull" "$ENV{PROGRAMW6432}/QHull" 
-             PATH_SUFFIXES project build bin lib)
-+             PATH_SUFFIXES project build bin lib debug/lib)
- 
- if(NOT QHULL_LIBRARY_DEBUG)
-   set(QHULL_LIBRARY_DEBUG ${QHULL_LIBRARY})
--- a/ports/pcl/pcl_config.patch
+++ b/ports/pcl/pcl_config.patch
@ -1,26 +1,8 @@
 diff --git a/PCLConfig.cmake.in b/PCLConfig.cmake.in
-index f4ef6a0ff..3a2c259dc 100644
+index 7ec40baa0..837d78c82 100644
 --- a/PCLConfig.cmake.in
 +++ b/PCLConfig.cmake.in
-@@ -155,7 +155,7 @@ macro(find_qhull)
-     NAMES "@QHULL_LIBRARY_DEBUG_NAME@"
-     HINTS "${QHULL_ROOT}" "$ENV{QHULL_ROOT}"
-     PATHS "$ENV{PROGRAMFILES}/qhull" "$ENV{PROGRAMW6432}/qhull" 
-    PATH_SUFFIXES project build bin lib)
-+    PATH_SUFFIXES project build bin lib debug/lib)
-   
-   find_package_handle_standard_args(qhull DEFAULT_MSG QHULL_LIBRARY QHULL_INCLUDE_DIRS)
- 
-@@ -443,7 +443,7 @@ macro(find_flann)
-     HINTS ${PC_FLANN_LIBDIR} ${PC_FLANN_LIBRARY_DIRS} "${FLANN_ROOT}" "$ENV{FLANN_ROOT}"
-     PATHS "$ENV{PROGRAMFILES}/flann 1.6.9" "$ENV{PROGRAMW6432}/flann 1.6.9" 
-           "$ENV{PROGRAMFILES}/flann" "$ENV{PROGRAMW6432}/flann"
-    PATH_SUFFIXES lib)
-+    PATH_SUFFIXES lib debug/lib)
- 
-   find_package_handle_standard_args(Flann DEFAULT_MSG FLANN_LIBRARY FLANN_INCLUDE_DIRS)
-   if(FLANN_FOUND)
-@@ -715,25 +715,18 @@ file(TO_CMAKE_PATH "${PCL_DIR}" PCL_DIR)
+@@ -388,25 +388,18 @@ 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)
@ -49,13 +31,13 @@ index f4ef6a0ff..3a2c259dc 100644
   if(EXISTS "${PCL_ROOT}/3rdParty")
     set(PCL_ALL_IN_ONE_INSTALLER ON)
   endif(EXISTS "${PCL_ROOT}/3rdParty")
-@@ -743,9 +736,9 @@ elseif(EXISTS "${PCL_DIR}/include/pcl/pcl_config.h")
+@@ -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")  
+   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")
 
--- a/ports/pcl/config_install.patch
+++ b/ports/pcl/config_install.patch
@ -1,5 +1,5 @@
 diff --git a/cmake/pcl_utils.cmake b/cmake/pcl_utils.cmake
-index 69f1e76a4..37305815e 100644
+index 41a64a269..a12718339 100644
 --- a/cmake/pcl_utils.cmake
 +++ b/cmake/pcl_utils.cmake
@@ -105,7 +105,7 @@ macro(SET_INSTALL_DIRS)
--- a/ports/pcl/portfile.cmake
+++ b/ports/pcl/portfile.cmake
@ -3,19 +3,12 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO PointCloudLibrary/pcl
-    REF pcl-1.8.1
-    SHA512 9e7c87fb750a176712f08d215a906012c9e8174b687bbc8c08fa65de083b4468951bd8017b10409015d5eff0fc343885d2aae5c340346118b1a251af7bdd5cd7
+    REF pcl-1.9.0
+    SHA512 b2fb6cb1f8b4d203c711ac580e12946cacfba3f06bec95536e01705c63e709d488cee85d2a24b758c958972a0f4f3544a10a2c308ea637e9e23874e9de59becc
    HEAD_REF master
-    PATCHES cmakelists.patch
-            config.patch
-            config_install.patch
+    PATCHES pcl_utils.patch
+            pcl_config.patch
            find_flann.patch
-            find_qhull.patch
-            find_openni2.patch
-            find_cuda.patch
-            vs2017-15.4-workaround.patch
-            boost_uuid_random_generator_compat.patch
-            uuid-detail-sha1.patch
 )

 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" PCL_SHARED_LIBS)
--- a/ports/pcl/uuid-detail-sha1.patch
+++ b/ports/pcl/uuid-detail-sha1.patch
@ -1,13 +0,0 @@
-diff --git a/visualization/src/pcl_visualizer.cpp b/visualization/src/pcl_visualizer.cpp
-index 5b12331..b83f320 100644
--- a/visualization/src/pcl_visualizer.cpp
-+++ b/visualization/src/pcl_visualizer.cpp
-@@ -100,7 +100,7 @@
- #include <pcl/visualization/pcl_visualizer.h>
- #include <pcl/visualization/common/common.h>
- #include <pcl/common/time.h>
-#include <boost/uuid/sha1.hpp>
-+#include <boost/uuid/detail/sha1.hpp>
- #include <boost/filesystem.hpp>
- #include <pcl/console/parse.h>
- 
--- a/ports/pcl/vs2017-15.4-workaround.patch
+++ b/ports/pcl/vs2017-15.4-workaround.patch
@ -1,41 +0,0 @@
-diff --git a/io/include/pcl/io/ply/ply_parser.h b/io/include/pcl/io/ply/ply_parser.h
-index 649d19a..45709a8 100644
--- a/io/include/pcl/io/ply/ply_parser.h
-+++ b/io/include/pcl/io/ply/ply_parser.h
-@@ -115,7 +115,7 @@ namespace pcl
- 
-           class scalar_property_definition_callbacks_type
-           {
-            private:
-+            public:
-               template <typename T>
-               struct callbacks_element
-               {
-@@ -123,7 +123,8 @@ namespace pcl
-                 typedef T scalar_type;
-                 typename scalar_property_definition_callback_type<scalar_type>::type callback;
-               };
-             
-+
-+            private:
-               typedef boost::mpl::inherit_linearly<
-                 scalar_types,
-                 boost::mpl::inherit<
-@@ -218,6 +219,7 @@ namespace pcl
-                       boost::mpl::_1,boost::mpl::transform<Sequence2, pair_with<boost::mpl::_2> > > >
-                 {};
- 
-+            public:
-               template <typename T>
-               struct callbacks_element
-               {
-@@ -225,7 +227,8 @@ namespace pcl
-                 typedef typename T::second scalar_type;
-                 typename list_property_definition_callback_type<size_type, scalar_type>::type callback;
-               };
-           
-+
-+            private:
-               typedef boost::mpl::inherit_linearly<sequence_product<size_types, scalar_types>::type, boost::mpl::inherit<boost::mpl::_1, callbacks_element<boost::mpl::_2> > >::type callbacks;
-               callbacks callbacks_;
-