From 3e71750029740df700b46dfa3761c42509f08e54 Mon Sep 17 00:00:00 2001
From: Tsukasa Sugiura <t.sugiura0204@gmail.com>
Date: Thu, 29 Nov 2018 11:20:09 +0900
Subject: [PATCH] [pcl] Update to PCL 1.9.1 (#4842)

Update PCL port to PCL 1.9.1.
---
 ports/pcl/CONTROL         |  2 +-
 ports/pcl/pcl_utils.patch | 36 +++++++++++++++++++++---------------
 ports/pcl/portfile.cmake  |  4 ++--
 3 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/ports/pcl/CONTROL b/ports/pcl/CONTROL
index 0a12f78c8..a9f23813d 100644
--- a/ports/pcl/CONTROL
+++ b/ports/pcl/CONTROL
@@ -1,5 +1,5 @@
 Source: pcl
-Version: 1.9.0-1
+Version: 1.9.1-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
 
diff --git a/ports/pcl/pcl_utils.patch b/ports/pcl/pcl_utils.patch
index 3f266cdfd..9c12e4d05 100644
--- a/ports/pcl/pcl_utils.patch
+++ b/ports/pcl/pcl_utils.patch
@@ -1,22 +1,28 @@
 diff --git a/cmake/pcl_utils.cmake b/cmake/pcl_utils.cmake
-index 41a64a269..a12718339 100644
+index f523dbc8c..a171b6d24 100644
 --- a/cmake/pcl_utils.cmake
 +++ b/cmake/pcl_utils.cmake
-@@ -105,7 +105,7 @@ macro(SET_INSTALL_DIRS)
+@@ -97,21 +97,12 @@ macro(SET_INSTALL_DIRS)
+   if (NOT DEFINED LIB_INSTALL_DIR)
+     set(LIB_INSTALL_DIR "lib")
    endif (NOT DEFINED LIB_INSTALL_DIR)
-     if(NOT ANDROID)
-       set(INCLUDE_INSTALL_ROOT
--          "include/${PROJECT_NAME_LOWER}-${PCL_MAJOR_VERSION}.${PCL_MINOR_VERSION}")
-+          "include")
-     else(NOT ANDROID)
-       set(INCLUDE_INSTALL_ROOT "include") # Android, don't put into subdir
-     endif(NOT ANDROID)
-@@ -114,7 +114,7 @@ macro(SET_INSTALL_DIRS)
+-    if(NOT ANDROID)
+-      set(INCLUDE_INSTALL_ROOT
+-          "include/${PROJECT_NAME_LOWER}-${PCL_VERSION_MAJOR}.${PCL_VERSION_MINOR}")
+-    else(NOT ANDROID)
+-      set(INCLUDE_INSTALL_ROOT "include") # Android, don't put into subdir
+-    endif(NOT ANDROID)
++    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)
+-    if(WIN32 AND NOT MINGW)
 -        set(PCLCONFIG_INSTALL_DIR "cmake")
-+        set(PCLCONFIG_INSTALL_DIR "share/pcl")
-       else(WIN32 AND NOT MINGW)
-         set(PCLCONFIG_INSTALL_DIR "share/${PROJECT_NAME_LOWER}-${PCL_MAJOR_VERSION}.${PCL_MINOR_VERSION}")
-       endif(WIN32 AND NOT MINGW)
+-      else(WIN32 AND NOT MINGW)
+-        set(PCLCONFIG_INSTALL_DIR "share/${PROJECT_NAME_LOWER}-${PCL_VERSION_MAJOR}.${PCL_VERSION_MINOR}")
+-      endif(WIN32 AND NOT MINGW)
++    set(PCLCONFIG_INSTALL_DIR "share/pcl")
+ endmacro(SET_INSTALL_DIRS)
+ 
+ 
diff --git a/ports/pcl/portfile.cmake b/ports/pcl/portfile.cmake
index 650e6de1a..4036d5346 100644
--- a/ports/pcl/portfile.cmake
+++ b/ports/pcl/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO PointCloudLibrary/pcl
-    REF pcl-1.9.0
-    SHA512 b2fb6cb1f8b4d203c711ac580e12946cacfba3f06bec95536e01705c63e709d488cee85d2a24b758c958972a0f4f3544a10a2c308ea637e9e23874e9de59becc
+    REF pcl-1.9.1
+    SHA512 ca95028c23861ac2df0fa7e18fdd0202255cb2e49ab714325eb36c35289442c6eedbf489e6f9f232b30fa2a93eff4c9619f8a14d3fdfe58f353a4a6e26206bdf
     HEAD_REF master
     PATCHES pcl_utils.patch
             pcl_config.patch