public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/pcl] f44: Update to release 1.9.1
@ 2026-06-25  5:49 Rich Mattes
  0 siblings, 0 replies; only message in thread
From: Rich Mattes @ 2026-06-25  5:49 UTC (permalink / raw)
  To: git-commits

A new commit has been pushed.

Repo   : rpms/pcl
Branch : f44
Commit : 90d5d1268085f1cd6a5ecce2242119c96a0bb293
Author : Rich Mattes <richmattes@gmail.com>
Date   : 2019-02-14T20:50:17-05:00
Stats  : +34/-192 in 11 file(s)
URL    : https://src.fedoraproject.org/rpms/pcl/c/90d5d1268085f1cd6a5ecce2242119c96a0bb293?branch=f44

Log:
Update to release 1.9.1

---
diff --git a/.gitignore b/.gitignore
index 75293de..2485c6f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@
 /pcl-1.8.0rc1-fedora.tar.xz
 /pcl-1.8.0-fedora.tar.xz
 /pcl-1.8.1-fedora.tar.xz
+/pcl-1.9.1-fedora.tar.xz

diff --git a/pcl-1.7.2-metslib.patch b/pcl-1.7.2-metslib.patch
deleted file mode 100644
index e21332a..0000000
--- a/pcl-1.7.2-metslib.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up ./recognition/include/pcl/recognition/impl/hv/hv_go.hpp.metslib ./recognition/include/pcl/recognition/impl/hv/hv_go.hpp
---- ./recognition/include/pcl/recognition/impl/hv/hv_go.hpp.metslib	2013-10-07 09:09:35.000000000 -0400
-+++ ./recognition/include/pcl/recognition/impl/hv/hv_go.hpp	2013-10-26 11:12:04.422310387 -0400
-@@ -445,7 +445,7 @@ void pcl::GlobalHypothesesVerification<M
-   mets::noimprove_termination_criteria noimprove (max_iterations_);
-   mets::linear_cooling linear_cooling;
-   mets::simulated_annealing<move_manager> sa (model, best_recorder, neigh, noimprove, linear_cooling, initial_temp_, 1e-7, 2);
--  sa.setApplyAndEvaluate(true);
-+  //sa.setApplyAndEvaluate(true);
- 
-   {
-     pcl::ScopeTime t ("SA search...");

diff --git a/pcl-1.8.0-cxx11.patch b/pcl-1.8.0-cxx11.patch
deleted file mode 100644
index 536fe6f..0000000
--- a/pcl-1.8.0-cxx11.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up ./common/include/pcl/pcl_macros.h.cxx11 ./common/include/pcl/pcl_macros.h
---- ./common/include/pcl/pcl_macros.h.cxx11	2016-01-31 10:36:30.820804485 -0500
-+++ ./common/include/pcl/pcl_macros.h	2016-01-31 10:36:37.878068320 -0500
-@@ -70,7 +70,7 @@ namespace pcl
- #include <stdarg.h>
- #include <stdio.h>
- #define _USE_MATH_DEFINES
--#include <math.h>
-+#include <cmath>
- 
- // MSCV doesn't have std::{isnan,isfinite}
- #if defined _WIN32 && defined _MSC_VER

diff --git a/pcl-1.8.0-sse2.patch b/pcl-1.8.0-sse2.patch
deleted file mode 100644
index b4c9bd0..0000000
--- a/pcl-1.8.0-sse2.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -ur pcl-1.8.0/cmake/pcl_find_sse.cmake pcl-1.8.0.sse2/cmake/pcl_find_sse.cmake
---- pcl-1.8.0/cmake/pcl_find_sse.cmake	2016-06-14 17:51:26.000000000 +0200
-+++ pcl-1.8.0.sse2/cmake/pcl_find_sse.cmake	2016-09-01 13:28:25.118580269 +0200
-@@ -168,18 +168,8 @@
-     set(CMAKE_REQUIRED_FLAGS)
- 
-     if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_CLANG)
--        if(HAVE_SSE4_2_EXTENSIONS)
--            SET(SSE_FLAGS "${SSE_FLAGS} -msse4.2 -mfpmath=sse")
--        elseif(HAVE_SSE4_1_EXTENSIONS)
--            SET(SSE_FLAGS "${SSE_FLAGS} -msse4.1 -mfpmath=sse")
--        elseif(HAVE_SSSE3_EXTENSIONS)
--            SET(SSE_FLAGS "${SSE_FLAGS} -mssse3 -mfpmath=sse")
--        elseif(HAVE_SSE3_EXTENSIONS)
--            SET(SSE_FLAGS "${SSE_FLAGS} -msse3 -mfpmath=sse")
--        elseif(HAVE_SSE2_EXTENSIONS)
-+        if(HAVE_SSE2_EXTENSIONS)
-             SET(SSE_FLAGS "${SSE_FLAGS} -msse2 -mfpmath=sse")
--        elseif(HAVE_SSE_EXTENSIONS)
--            SET(SSE_FLAGS "${SSE_FLAGS} -msse -mfpmath=sse")
-         else()
-             # Setting -ffloat-store to alleviate 32bit vs 64bit discrepancies on non-SSE
-             # platforms.

diff --git a/pcl-1.8.1-boost168.patch b/pcl-1.8.1-boost168.patch
deleted file mode 100644
index 932c71d..0000000
--- a/pcl-1.8.1-boost168.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 491b7c7e12ce39c59fb1f22718812a02e7f58065 Mon Sep 17 00:00:00 2001
-From: Jan Beich <jbeich@FreeBSD.org>
-Date: Mon, 9 Jul 2018 11:11:07 +0000
-Subject: [PATCH] pcl_visualizer: unbreak with boost 1.68
-
-visualization/src/pcl_visualizer.cpp:103:10: fatal error: 'boost/uuid/sha1.hpp' file not found
- #include <boost/uuid/sha1.hpp>
-          ^~~~~~~~~~~~~~~~~~~~~
----
- visualization/src/pcl_visualizer.cpp | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/visualization/src/pcl_visualizer.cpp b/visualization/src/pcl_visualizer.cpp
-index e4a6ed3031..afdddb3551 100644
---- a/visualization/src/pcl_visualizer.cpp
-+++ b/visualization/src/pcl_visualizer.cpp
-@@ -104,7 +104,11 @@
- #include <pcl/visualization/pcl_visualizer.h>
- #include <pcl/visualization/common/common.h>
- #include <pcl/common/time.h>
-+#if (BOOST_VERSION >= 106600)
-+#include <boost/uuid/detail/sha1.hpp>
-+#else
- #include <boost/uuid/sha1.hpp>
-+#endif
- #include <boost/filesystem.hpp>
- #include <pcl/console/parse.h>
- 

diff --git a/pcl-1.8.1-gcc7.patch b/pcl-1.8.1-gcc7.patch
deleted file mode 100644
index 64572fb..0000000
--- a/pcl-1.8.1-gcc7.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-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-1.9.1-sse2.patch b/pcl-1.9.1-sse2.patch
new file mode 100644
index 0000000..ff95d9c
--- /dev/null
+++ b/pcl-1.9.1-sse2.patch
@@ -0,0 +1,23 @@
+diff -up ./cmake/pcl_find_sse.cmake.sse2 ./cmake/pcl_find_sse.cmake
+--- ./cmake/pcl_find_sse.cmake.sse2	2019-02-14 19:17:00.289728926 -0500
++++ ./cmake/pcl_find_sse.cmake	2019-02-14 19:17:53.095018236 -0500
+@@ -164,18 +164,8 @@ macro(PCL_CHECK_FOR_SSE)
+     set(CMAKE_REQUIRED_FLAGS)
+ 
+     if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_CLANG)
+-        if(HAVE_SSE4_2_EXTENSIONS)
+-            list(APPEND SSE_FLAGS "-msse4.2" "-mfpmath=sse")
+-        elseif(HAVE_SSE4_1_EXTENSIONS)
+-            list(APPEND SSE_FLAGS "-msse4.1" "-mfpmath=sse")
+-        elseif(HAVE_SSSE3_EXTENSIONS)
+-            list(APPEND SSE_FLAGS "-mssse3" "-mfpmath=sse")
+-        elseif(HAVE_SSE3_EXTENSIONS)
+-            list(APPEND SSE_FLAGS "-msse3" "-mfpmath=sse")
+-        elseif(HAVE_SSE2_EXTENSIONS)
++	if(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64")
+             list(APPEND SSE_FLAGS "-msse2" "-mfpmath=sse")
+-        elseif(HAVE_SSE_EXTENSIONS)
+-            list(APPEND SSE_FLAGS "-msse" "-mfpmath=sse")
+         else()
+             # Setting -ffloat-store to alleviate 32bit vs 64bit discrepancies on non-SSE
+             # platforms.

diff --git a/pcl-boost-random.patch b/pcl-boost-random.patch
deleted file mode 100644
index 29875ea..0000000
--- a/pcl-boost-random.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-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-f26bd2.patch b/pcl-f26bd2.patch
deleted file mode 100644
index 2199fff..0000000
--- a/pcl-f26bd2.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From f26bd2f898b45cc24854031e3a13397f315c2099 Mon Sep 17 00:00:00 2001
-From: Sergey Alexandrov <alexandrov88@gmail.com>
-Date: Thu, 31 Aug 2017 11:59:19 +0200
-Subject: [PATCH] Generate pkgconfig for 2d module
-
----
- 2d/CMakeLists.txt | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/2d/CMakeLists.txt b/2d/CMakeLists.txt
-index afaa998460..5a3db10408 100644
---- a/2d/CMakeLists.txt
-+++ b/2d/CMakeLists.txt
-@@ -35,6 +35,9 @@ if(build)
- 
-     include_directories("${CMAKE_CURRENT_SOURCE_DIR}/include" ${VTK_INCLUDE_DIRECTORIES})
- 
-+    set(LIB_NAME "pcl_${SUBSYS_NAME}")
-+    PCL_MAKE_PKGCONFIG_HEADER_ONLY("${LIB_NAME}" "${SUBSYS_NAME}" "${SUBSYS_DESC}" "${SUBSYS_DEPS}" "" "" "" "")
-+
-     #Install include files
-     PCL_ADD_INCLUDES("${SUBSYS_NAME}" "${SUBSYS_NAME}" ${incs})
-     PCL_ADD_INCLUDES("${SUBSYS_NAME}" "${SUBSYS_NAME}/impl" ${impl_incs})

diff --git a/pcl.spec b/pcl.spec
index d03e252..9ac5dec 100644
--- a/pcl.spec
+++ b/pcl.spec
@@ -1,10 +1,8 @@
-%global apiversion 1.8
-%global commit 39732f5a7c8455ed51fd0f6278d8b25322a68dd9
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
+%global apiversion 1.9
 
 Name:           pcl
-Version:        1.8.1
-Release:        7%{?dist}
+Version:        1.9.1
+Release:        1%{?dist}
 Summary:        Library for point cloud processing
 License:        BSD
 URL:            http://pointclouds.org/
@@ -15,22 +13,13 @@ Source0:        %{name}-%{version}-fedora.tar.xz
 Source1:        create_tarball_pcl.sh
 
 # Only enable sse2, and only on x86_64
-Patch0:         %{name}-1.8.0-sse2.patch
+Patch0:         %{name}-1.9.1-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.1-fedora.patch
 # Exclude the "build" directory from doxygen processing.
 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
@@ -40,7 +29,7 @@ BuildRequires:  doxygen, graphviz, python-sphinx
 # mandatory
 BuildRequires:  eigen3-static, flann-devel, cminpack-devel, vtk-devel, gl2ps-devel, hdf5-devel, python-devel, libxml2-devel, netcdf-cxx-devel, jsoncpp-devel, metslib-static
 # optional
-BuildRequires:  qt5-qtbase-devel, qhull-devel, libusbx-devel, gtest-devel, qt5-qtwebkit-devel, python-sphinx, texlive-latex
+BuildRequires:  qt5-qtbase-devel, qhull-devel, libusbx-devel, gtest-devel, qt5-qtwebkit-devel, python-sphinx, texlive-scheme-basic, texlive-newunicodechar
 %ifarch %{ix86} x86_64
 BuildRequires:  openni-devel
 %endif
@@ -91,10 +80,7 @@ Library.
 %patch1 -p1 -b .metslib
 %patch2 -p0 -b .fedora
 %patch3 -p0 -b .doxyfix
-%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
@@ -200,6 +186,9 @@ ARGS='-V' make -C build test || true
 %doc build/doc/advanced/advanced
 
 %changelog
+* Thu Feb 14 2019 Rich Mattes <richmattes@gmail.com> - 1.9.1-1
+- Update to release 1.9.1
+
 * Sun Feb 03 2019 Volker Fröhlich <volker27@gmx.at> - 1.8.1-7
 - Resolve build with Boost 1.69
 

diff --git a/sources b/sources
index 823de3b..ee09c77 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (pcl-1.8.1-fedora.tar.xz) = 24b09b337735c177976c0e07faa58123b4fe173a51f2d2470317ba5c8595bd76dc2616eb8bbb442bc760fc623d9bdc8f70b053bae937e56f5d4c08a0698cf3d3
+SHA512 (pcl-1.9.1-fedora.tar.xz) = 10316090482638e8d073e928dffda0dbfcdb0f2b6028deb39613cec48bb328401c681a790897321c68f4628955119cff3b4687b74eb6324588427ef547b033e9

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2026-06-25  5:49 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-06-25  5:49 [rpms/pcl] f44: Update to release 1.9.1 Rich Mattes

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox