[rpms/pcl] f44: Update to release 1.8.1

[rpms/pcl] f44: Update to release 1.8.1

[Rich Mattes]

A new commit has been pushed.

Repo   : rpms/pcl
Branch : f44
Commit : 94e75872ea47dc24f91be60087ef841a2fa497e6
Author : Rich Mattes <richmattes@gmail.com>
Date   : 2018-02-09T22:41:28-05:00
Stats  : +60/-59 in 7 file(s)
URL    : https://src.fedoraproject.org/rpms/pcl/c/94e75872ea47dc24f91be60087ef841a2fa497e6?branch=f44

Log:
Update to release 1.8.1

---
diff --git a/.gitignore b/.gitignore
index 9955f29..75293de 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@
 /pcl-0ddf11a6ad1175b6f1c253da003de20c1295cde0.tar.gz
 /pcl-1.8.0rc1-fedora.tar.xz
 /pcl-1.8.0-fedora.tar.xz
+/pcl-1.8.1-fedora.tar.xz

diff --git a/pcl-0ddf-boost157.patch b/pcl-0ddf-boost157.patch
deleted file mode 100644
index 1f7513e..0000000
--- a/pcl-0ddf-boost157.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -up pcl-0ddf11a6ad1175b6f1c253da003de20c1295cde0/apps/CMakeLists.txt\~ pcl-0ddf11a6ad1175b6f1c253da003de20c1295cde0/apps/CMakeLists.txt
---- pcl-0ddf11a6ad1175b6f1c253da003de20c1295cde0/apps/CMakeLists.txt~	2014-09-10 23:22:57.000000000 +0200
-+++ pcl-0ddf11a6ad1175b6f1c253da003de20c1295cde0/apps/CMakeLists.txt	2015-01-28 20:07:04.092952946 +0100
-@@ -77,12 +77,12 @@ if(build)
- 
-       # Manual registration demo
-       QT4_WRAP_UI(manual_registration_ui src/manual_registration/manual_registration.ui)
--      QT4_WRAP_CPP(manual_registration_moc include/pcl/apps/manual_registration.h OPTIONS -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED -DBOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION)
-+      QT4_WRAP_CPP(manual_registration_moc include/pcl/apps/manual_registration.h OPTIONS -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED -DBOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION -DBOOST_NEXT_PRIOR_HPP_INCLUDED)
-       PCL_ADD_EXECUTABLE_OPT_BUNDLE(pcl_manual_registration "${SUBSYS_NAME}" ${manual_registration_ui} ${manual_registration_moc} src/manual_registration/manual_registration.cpp)
-       target_link_libraries(pcl_manual_registration pcl_common pcl_io pcl_visualization pcl_segmentation pcl_features pcl_surface ${QVTK_LIBRARY} ${QT_LIBRARIES})
- 
-       QT4_WRAP_UI(pcd_video_player_ui src/pcd_video_player/pcd_video_player.ui)
--      QT4_WRAP_CPP(pcd_video_player_moc include/pcl/apps/pcd_video_player.h OPTIONS -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED -DBOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION)
-+      QT4_WRAP_CPP(pcd_video_player_moc include/pcl/apps/pcd_video_player.h OPTIONS -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED -DBOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION -DBOOST_NEXT_PRIOR_HPP_INCLUDED)
-       PCL_ADD_EXECUTABLE_OPT_BUNDLE(pcl_pcd_video_player "${SUBSYS_NAME}" ${pcd_video_player_ui} ${pcd_video_player_moc} src/pcd_video_player/pcd_video_player.cpp)
-       target_link_libraries(pcl_pcd_video_player pcl_common pcl_io pcl_visualization pcl_segmentation pcl_features pcl_surface ${QVTK_LIBRARY} ${QT_LIBRARIES})
- 
-@@ -144,13 +144,13 @@ if(build)
-       if (QT4_FOUND AND VTK_USE_QVTK)
-         # OpenNI Passthrough application demo
-         QT4_WRAP_UI(openni_passthrough_ui src/openni_passthrough.ui)
--        QT4_WRAP_CPP(openni_passthrough_moc include/pcl/apps/openni_passthrough.h OPTIONS -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED -DBOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION)
-+        QT4_WRAP_CPP(openni_passthrough_moc include/pcl/apps/openni_passthrough.h OPTIONS -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED -DBOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION -DBOOST_NEXT_PRIOR_HPP_INCLUDED)
-         PCL_ADD_EXECUTABLE(pcl_openni_passthrough "${SUBSYS_NAME}" ${openni_passthrough_ui} ${openni_passthrough_moc} src/openni_passthrough.cpp)
-         target_link_libraries(pcl_openni_passthrough pcl_common pcl_io pcl_filters pcl_visualization ${QVTK_LIBRARY} ${QT_LIBRARIES})
- 
-         # OpenNI Organized Connected Component application demo
-         QT4_WRAP_UI(organized_segmentation_demo_ui src/organized_segmentation_demo.ui)
--        QT4_WRAP_CPP(organized_segmentation_demo_moc include/pcl/apps/organized_segmentation_demo.h OPTIONS -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED -DBOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION)
-+        QT4_WRAP_CPP(organized_segmentation_demo_moc include/pcl/apps/organized_segmentation_demo.h OPTIONS -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED -DBOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION -DBOOST_NEXT_PRIOR_HPP_INCLUDED)
-         PCL_ADD_EXECUTABLE_OPT_BUNDLE(pcl_organized_segmentation_demo "${SUBSYS_NAME}" ${organized_segmentation_demo_ui} ${organized_segmentation_demo_moc} src/organized_segmentation_demo.cpp)
-         target_link_libraries(pcl_organized_segmentation_demo pcl_common pcl_io pcl_visualization pcl_segmentation pcl_features pcl_surface ${QVTK_LIBRARY} ${QT_LIBRARIES})
- 
-
-Diff finished.  Wed Jan 28 20:07:55 2015

diff --git a/pcl-1.8.0-fedora.patch b/pcl-1.8.0-fedora.patch
deleted file mode 100644
index a7a63d3..0000000
--- a/pcl-1.8.0-fedora.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -up ./io/CMakeLists.txt.fedora ./io/CMakeLists.txt
-diff -up ./PCLConfig.cmake.in.fedora ./PCLConfig.cmake.in
---- ./PCLConfig.cmake.in.fedora	2016-01-26 03:33:57.000000000 -0500
-+++ ./PCLConfig.cmake.in	2016-02-06 11:51:14.741824126 -0500
-@@ -710,8 +710,7 @@ if(WIN32 AND NOT MINGW)
-   get_filename_component(PCL_ROOT "${PCL_DIR}" PATH)
- else(WIN32 AND NOT MINGW)
- # PCLConfig.cmake is installed to PCL_ROOT/share/pcl-x.y
--  get_filename_component(PCL_ROOT "${PCL_DIR}" PATH)
--  get_filename_component(PCL_ROOT "${PCL_ROOT}" PATH)
-+  set(PCL_ROOT "@CMAKE_INSTALL_PREFIX@")
- endif(WIN32 AND NOT MINGW)
- 
- # check whether PCLConfig.cmake is found into a PCL installation or in a build tree
-diff -up ./visualization/CMakeLists.txt.fedora ./visualization/CMakeLists.txt

diff --git a/pcl-1.8.1-fedora.patch b/pcl-1.8.1-fedora.patch
new file mode 100644
index 0000000..2baa03b
--- /dev/null
+++ b/pcl-1.8.1-fedora.patch
@@ -0,0 +1,12 @@
+diff -up ./PCLConfig.cmake.in.fedora ./PCLConfig.cmake.in
+--- ./PCLConfig.cmake.in.fedora	2018-02-09 12:59:25.329878911 -0500
++++ ./PCLConfig.cmake.in	2018-02-09 13:01:36.772813799 -0500
+@@ -717,7 +717,7 @@ if(WIN32 AND NOT MINGW)
+   get_filename_component(PCL_ROOT "${PCL_DIR}" PATH)
+ else(WIN32 AND NOT MINGW)
+ # PCLConfig.cmake is installed to PCL_ROOT/share/pcl-x.y
+-  get_filename_component(PCL_ROOT "${CMAKE_CURRENT_LIST_DIR}/../.." ABSOLUTE)
++  set(PCL_ROOT "@CMAKE_INSTALL_PREFIX@")
+ endif(WIN32 AND NOT MINGW)
+ 
+ # check whether PCLConfig.cmake is found into a PCL installation or in a build tree

diff --git a/pcl-1.8.1-gcc7.patch b/pcl-1.8.1-gcc7.patch
new file mode 100644
index 0000000..64572fb
--- /dev/null
+++ b/pcl-1.8.1-gcc7.patch
@@ -0,0 +1,36 @@
+diff -up ./filters/include/pcl/filters/impl/covariance_sampling.hpp.gcc7 ./filters/include/pcl/filters/impl/covariance_sampling.hpp
+--- ./filters/include/pcl/filters/impl/covariance_sampling.hpp.gcc7	2018-02-09 13:19:28.427716435 -0500
++++ ./filters/include/pcl/filters/impl/covariance_sampling.hpp	2018-02-09 13:20:22.447908704 -0500
+@@ -210,7 +210,7 @@ pcl::CovarianceSampling<PointT, PointNT>
+   for (size_t i = 0; i < 6; ++i)
+   {
+     for (size_t p_i = 0; p_i < candidate_indices.size (); ++p_i)
+-      L[i].push_back (std::make_pair (p_i, fabs (v[p_i].dot (x.block<6, 1> (0, i)))));
++      L[i].push_back (std::make_pair ((int)p_i, (double)std::abs(v[p_i].dot (x.block<6, 1> (0, i)))));
+ 
+     // Sort in decreasing order
+     L[i].sort (sort_dot_list_function);
+diff -up ./segmentation/include/pcl/segmentation/ground_plane_comparator.h.gcc7 ./segmentation/include/pcl/segmentation/ground_plane_comparator.h
+--- ./segmentation/include/pcl/segmentation/ground_plane_comparator.h.gcc7	2018-02-09 20:35:03.502254072 -0500
++++ ./segmentation/include/pcl/segmentation/ground_plane_comparator.h	2018-02-09 20:35:18.848285399 -0500
+@@ -147,7 +147,7 @@ namespace pcl
+       const std::vector<float>&
+       getPlaneCoeffD () const
+       {
+-        return (plane_coeff_d_);
++        return (*plane_coeff_d_);
+       }
+ 
+       /** \brief Set the tolerance in radians for difference in normal direction between neighboring points, to be considered part of the same plane.
+diff -up ./segmentation/include/pcl/segmentation/plane_coefficient_comparator.h.gcc7 ./segmentation/include/pcl/segmentation/plane_coefficient_comparator.h
+--- ./segmentation/include/pcl/segmentation/plane_coefficient_comparator.h.gcc7	2018-02-09 20:10:38.707297757 -0500
++++ ./segmentation/include/pcl/segmentation/plane_coefficient_comparator.h	2018-02-09 20:11:09.931359717 -0500
+@@ -141,7 +141,7 @@ namespace pcl
+       const std::vector<float>&
+       getPlaneCoeffD () const
+       {
+-        return (plane_coeff_d_);
++        return (*plane_coeff_d_);
+       }
+ 
+       /** \brief Set the tolerance in radians for difference in normal direction between neighboring points, to be considered part of the same plane.

diff --git a/pcl.spec b/pcl.spec
index ebbd2d3..81cfb59 100644
--- a/pcl.spec
+++ b/pcl.spec
@@ -1,10 +1,10 @@
 %global apiversion 1.8
-%global commit 93b7758468c459d350669314414f57b2048c728c
+%global commit 39732f5a7c8455ed51fd0f6278d8b25322a68dd9
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 
 Name:           pcl
-Version:        1.8.0
-Release:        15%{?dist}
+Version:        1.8.1
+Release:        1%{?dist}
 Summary:        Library for point cloud processing
 
 Group:          System Environment/Libraries
@@ -20,11 +20,11 @@ Patch0:         %{name}-1.8.0-sse2.patch
 # Look for external metslib, not upstream
 Patch1:         %{name}-1.8.0-metslib.patch
 # Patch for PCLConfig.cmake to find pcl
-Patch2:         %{name}-1.8.0-fedora.patch
+Patch2:         %{name}-1.8.1-fedora.patch
 # Exclude the "build" directory from doxygen processing.
 Patch3:         %{name}-1.7.2-doxyfix.patch
-# Pass -DBOOST_NEXT_PRIOR_HPP_INCLUDED to moc.
-Patch4:         %{name}-0ddf-boost157.patch
+# 
+Patch4:         %{name}-1.8.1-gcc7.patch
 # For plain building
 BuildRequires:  cmake, gcc-c++, boost-devel
 # Documentation
@@ -89,7 +89,7 @@ Library.
 %patch1 -p1 -b .metslib
 %patch2 -p0 -b .fedora
 %patch3 -p0 -b .doxyfix
-%patch4 -p1 -b .boost157
+%patch4 -p0 -b .gcc7
 # Just to make it obvious we're not using any of these
 rm -fr recognition/include/pcl/recognition/3rdparty/metslib
 rm -fr surface/src/3rdparty/opennurbs
@@ -190,6 +190,9 @@ ARGS='-V' make -C build test || true
 %doc build/doc/advanced/advanced
 
 %changelog
+* Fri Feb 09 2018 Rich Mattes <richmattes@gmail.com> - 1.8.1-1
+- Update to release 1.8.1
+
 * Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0-15
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
 

diff --git a/sources b/sources
index 43484b1..823de3b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8e976237550b014ca811a545d3f45c1c  pcl-1.8.0-fedora.tar.xz
+SHA512 (pcl-1.8.1-fedora.tar.xz) = 24b09b337735c177976c0e07faa58123b4fe173a51f2d2470317ba5c8595bd76dc2616eb8bbb442bc760fc623d9bdc8f70b053bae937e56f5d4c08a0698cf3d3