public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Rich Mattes <richmattes@gmail.com>
To: git-commits@fedoraproject.org
Subject: [rpms/pcl] f44: Add upstream patch for boost random changes
Date: Thu, 25 Jun 2026 05:49:48 GMT	[thread overview]
Message-ID: <178236658814.1.9019610351108678793.rpms-pcl-f5400c013ac8@fedoraproject.org> (raw)

            A new commit has been pushed.

            Repo   : rpms/pcl
            Branch : f44
            Commit : f5400c013ac824ec940ec94d55d7e5841d2f4b0a
            Author : Rich Mattes <richmattes@gmail.com>
            Date   : 2019-02-13T21:49:06-05:00
            Stats  : +42/-2 in 2 file(s)
            URL    : https://src.fedoraproject.org/rpms/pcl/c/f5400c013ac824ec940ec94d55d7e5841d2f4b0a?branch=f44

            Log:
            Add upstream patch for boost random changes

Add -j2 to speed up build without using mflags

---
diff --git a/pcl-boost-random.patch b/pcl-boost-random.patch
new file mode 100644
index 0000000..29875ea
--- /dev/null
+++ b/pcl-boost-random.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/pcl.spec b/pcl.spec
index b957932..a64dae4 100644
--- a/pcl.spec
+++ b/pcl.spec
@@ -26,9 +26,11 @@ Patch3:         %{name}-1.7.2-doxyfix.patch
 Patch4:         %{name}-1.8.1-gcc7.patch
 # Upstream commit to generate pcl-2d.pc
 Patch5:         %{name}-f26bd2.patch
-
 # https://github.com/PointCloudLibrary/pcl/commit/491b7c7e12ce39c59fb1f22718812a02e7f58065.patch
 Patch6:         %{name}-1.8.1-boost168.patch
+# Upstream commit to change boost random generator
+# https://github.com/PointCloudLibrary/pcl/pull/2338
+Patch7:         %{name}-boost-random.patch
 
 # For plain building
 BuildRequires:  cmake, gcc-c++, boost-devel
@@ -92,6 +94,7 @@ Library.
 %patch4 -p0 -b .gcc7
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1 
 # 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
@@ -128,7 +131,7 @@ pushd build
   ..
 
 # Don't use mflags, we're hitting out of memory errors on the koji builders
-make 
+make -j2
 make doc
 make tutorials
 make advanced

                 reply	other threads:[~2026-06-25  5:49 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=178236658814.1.9019610351108678793.rpms-pcl-f5400c013ac8@fedoraproject.org \
    --to=richmattes@gmail.com \
    --cc=git-commits@fedoraproject.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox