Add patches for Boost 1.67

diff --git a/debian/patches/2338.patch b/debian/patches/2338.patch
new file mode 100644 (file)
index 0000000..29875ea
--- /dev/null
+++ b/debian/patches/2338.patch
@@ -0,0 +1,37 @@
+From 2309bdab20fb2a385d374db6a87349199279db18 Mon Sep 17 00:00:00 2001
+From: Maarten de Vries <maarten@de-vri.es>
+Date: Mon, 11 Jun 2018 16:02:11 +0200
+Subject: [PATCH] outofcore: Explictly use mt19937 random generator for boost
+ 1.67.
+
+---
+ outofcore/include/pcl/outofcore/impl/octree_disk_container.hpp | 2 +-
+ outofcore/include/pcl/outofcore/octree_disk_container.h        | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/outofcore/include/pcl/outofcore/impl/octree_disk_container.hpp b/outofcore/include/pcl/outofcore/impl/octree_disk_container.hpp
+index 7d261259ed..2cda7afae0 100644
+--- a/outofcore/include/pcl/outofcore/impl/octree_disk_container.hpp
++++ b/outofcore/include/pcl/outofcore/impl/octree_disk_container.hpp
+@@ -74,7 +74,7 @@ namespace pcl
+     OutofcoreOctreeDiskContainer<PointT>::rand_gen_ (static_cast<unsigned int> (std::time(NULL)));
+ 
+     template<typename PointT>
+-    boost::uuids::random_generator OutofcoreOctreeDiskContainer<PointT>::uuid_gen_ (&rand_gen_);
++    boost::uuids::basic_random_generator<boost::mt19937> OutofcoreOctreeDiskContainer<PointT>::uuid_gen_ (&rand_gen_);
+ 
+     template<typename PointT>
+     const uint64_t OutofcoreOctreeDiskContainer<PointT>::READ_BLOCK_SIZE_ = static_cast<uint64_t> (2e12);
+diff --git a/outofcore/include/pcl/outofcore/octree_disk_container.h b/outofcore/include/pcl/outofcore/octree_disk_container.h
+index 9978b9cefc..320ce29fd7 100644
+--- a/outofcore/include/pcl/outofcore/octree_disk_container.h
++++ b/outofcore/include/pcl/outofcore/octree_disk_container.h
+@@ -296,7 +296,7 @@ namespace pcl
+ 
+         static boost::mutex rng_mutex_;
+         static boost::mt19937 rand_gen_;
+-        static boost::uuids::random_generator uuid_gen_;
++        static boost::uuids::basic_random_generator<boost::mt19937> uuid_gen_;
+ 
+     };
+   } //namespace outofcore

diff --git a/debian/patches/2422.patch b/debian/patches/2422.patch
new file mode 100644 (file)
index 0000000..c322646
--- /dev/null
+++ b/debian/patches/2422.patch
@@ -0,0 +1,23 @@
+From 6257edf55b10ee1aa0146181a83acc5f014c91ac Mon Sep 17 00:00:00 2001
+From: Sergey Alexandrov <alexandrov88@gmail.com>
+Date: Sun, 9 Sep 2018 14:50:06 -0400
+Subject: [PATCH] Newer versions of Boost complain about floating-point
+ argument
+
+---
+ test/io/test_grabbers.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/test/io/test_grabbers.cpp b/test/io/test_grabbers.cpp
+index 25c5b75e10..004bc070d1 100644
+--- a/test/io/test_grabbers.cpp
++++ b/test/io/test_grabbers.cpp
+@@ -49,7 +49,7 @@ TEST (PCL, PCDGrabber)
+   grabber.registerCallback (fxn);
+   grabber.start ();
+   // 1 second should be /plenty/ of time
+-  boost::this_thread::sleep (boost::posix_time::microseconds (1E6));
++  boost::this_thread::sleep (boost::posix_time::seconds (1));
+   grabber.stop ();
+ 
+   //// Make sure they match

diff --git a/debian/patches/series b/debian/patches/series
index 207a13fab1a0cd750059643188b9d9df42ebfc01..9caf062185c21fba2917cec32b5be06eac327b22 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,4 @@
 0001-Fix-PCL_ROOT-path.patch
 0002-Dereference-shared_ptr-fix-for-GCC8.patch
+2422.patch
+2338.patch