public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/pcl] f44: Update to PCL-1.15.0
@ 2026-06-25 5:50 Rich Mattes
0 siblings, 0 replies; only message in thread
From: Rich Mattes @ 2026-06-25 5:50 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : rpms/pcl
Branch : f44
Commit : 1cd4747187324a2a49c3eba53caddd5c5a9d7380
Author : Rich Mattes <richmattes@gmail.com>
Date : 2025-03-15T21:03:33-04:00
Stats : +110/-602 in 10 file(s)
URL : https://src.fedoraproject.org/rpms/pcl/c/1cd4747187324a2a49c3eba53caddd5c5a9d7380?branch=f44
Log:
Update to PCL-1.15.0
Resolves #2347115,#2341009wq
---
diff --git a/.gitignore b/.gitignore
index da03ab8..a95d66a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,4 @@
/pcl-1.11.0-fedora.tar.xz
/pcl-1.11.1-fedora.tar.xz
/pcl-1.12.0-fedora.tar.xz
+/pcl-1.15.0.tar.gz
diff --git a/pcl-1.11.0-sphinx.patch b/pcl-1.11.0-sphinx.patch
deleted file mode 100644
index f942ac4..0000000
--- a/pcl-1.11.0-sphinx.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -up ./doc/advanced/content/conf.py.sphinx ./doc/advanced/content/conf.py
---- ./doc/advanced/content/conf.py.sphinx 2020-05-11 04:59:26.000000000 -0400
-+++ ./doc/advanced/content/conf.py 2020-06-07 16:11:04.398144850 -0400
-@@ -4,7 +4,7 @@
- # -- General configuration -----------------------------------------------------
- # Add any Sphinx extension module names here, as strings. They can be extensions
- # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
--extensions = ['sphinx.ext.imgmath', 'sphinxcontrib.doxylink.doxylink']
-+extensions = ['sphinx.ext.imgmath']
-
- # Add any paths that contain templates here, relative to this directory.
- # templates_path = ['_templates']
-@@ -69,7 +69,7 @@ pygments_style = 'sphinx'
-
- # The theme to use for HTML and HTML Help pages. Major themes that come with
- # Sphinx are currently 'default' and 'sphinxdoc'.
--html_theme = 'sphinx_rtd_theme'
-+html_theme = 'sphinxdoc'
-
- # Theme options are theme-specific and customize the look and feel of a theme
- # further. For a list of options available for each theme, see the
-diff -up ./doc/tutorials/content/conf.py.sphinx ./doc/tutorials/content/conf.py
---- ./doc/tutorials/content/conf.py.sphinx 2020-05-11 04:59:26.000000000 -0400
-+++ ./doc/tutorials/content/conf.py 2020-06-07 16:10:46.555225064 -0400
-@@ -4,7 +4,7 @@
- # -- General configuration -----------------------------------------------------
- # Add any Sphinx extension module names here, as strings. They can be extensions
- # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
--extensions = ['sphinx.ext.imgmath', 'sphinxcontrib.doxylink.doxylink']
-+extensions = ['sphinx.ext.imgmath']
- imgmath_dvipng_args = ['-gamma', '1.5', '-D', '110', '-bg', 'Transparent']
-
- # Add any paths that contain templates here, relative to this directory.
-@@ -70,7 +70,7 @@ pygments_style = 'sphinx'
-
- # The theme to use for HTML and HTML Help pages. Major themes that come with
- # Sphinx are currently 'default' and 'sphinxdoc'.
--html_theme = 'sphinx_rtd_theme'
-+html_theme = 'sphinxdoc'
-
- # Theme options are theme-specific and customize the look and feel of a theme
- # further. For a list of options available for each theme, see the
diff --git a/pcl-1.12.0-boost176.patch b/pcl-1.12.0-boost176.patch
deleted file mode 100644
index bb35d1e..0000000
--- a/pcl-1.12.0-boost176.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up ./cmake/pcl_find_boost.cmake.boost176 ./cmake/pcl_find_boost.cmake
---- ./cmake/pcl_find_boost.cmake.boost176 2021-08-17 16:31:49.409431064 -0400
-+++ ./cmake/pcl_find_boost.cmake 2021-08-17 16:32:59.617234098 -0400
-@@ -28,7 +28,7 @@ if(Boost_SERIALIZATION_FOUND)
- endif()
-
- # Required boost modules
--set(BOOST_REQUIRED_MODULES filesystem date_time iostreams system)
-+set(BOOST_REQUIRED_MODULES filesystem date_time iostreams serialization system)
- find_package(Boost 1.65.0 REQUIRED COMPONENTS ${BOOST_REQUIRED_MODULES})
-
- if(Boost_FOUND)
diff --git a/pcl-1.12.0-metslib.patch b/pcl-1.12.0-metslib.patch
deleted file mode 100644
index 5f95d1c..0000000
--- a/pcl-1.12.0-metslib.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -up ./recognition/include/pcl/recognition/hv/hv_go.h.metslib ./recognition/include/pcl/recognition/hv/hv_go.h
---- ./recognition/include/pcl/recognition/hv/hv_go.h.metslib 2020-05-29 17:47:21.343600510 -0400
-+++ ./recognition/include/pcl/recognition/hv/hv_go.h 2020-05-29 17:48:12.185237506 -0400
-@@ -20,6 +20,6 @@
- #include <pcl/pcl_macros.h>
- #include <pcl/recognition/hv/hypotheses_verification.h>
--#include <pcl/recognition/3rdparty/metslib/mets.hh>
-+#include <metslib/mets.hh>
- #include <pcl/features/normal_3d.h>
-
- #include <memory>
-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 2020-05-11 04:59:26.000000000 -0400
-+++ ./recognition/include/pcl/recognition/impl/hv/hv_go.hpp 2020-05-29 17:47:21.343600510 -0400
-@@ -453,7 +453,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.12.0-oom.patch b/pcl-1.12.0-oom.patch
deleted file mode 100644
index a95b068..0000000
--- a/pcl-1.12.0-oom.patch
+++ /dev/null
@@ -1,446 +0,0 @@
-Index: pcl-1.12.0/surface/CMakeLists.txt
-===================================================================
---- pcl-1.12.0.orig/surface/CMakeLists.txt
-+++ pcl-1.12.0/surface/CMakeLists.txt
-@@ -112,7 +112,12 @@ set(srcs
- src/marching_cubes_hoppe.cpp
- src/marching_cubes_rbf.cpp
- src/bilateral_upsampling.cpp
-- src/mls.cpp
-+ src/mls_n.cpp
-+ src/mls_xyz.cpp
-+ src/mls_xyzi.cpp
-+ src/mls_xyzrgba.cpp
-+ src/mls_xyzrgb.cpp
-+ src/mls_xyzrgbn.cpp
- src/organized_fast_mesh.cpp
- src/simplification_remove_unused_vertices.cpp
- src/surfel_smoothing.cpp
-Index: pcl-1.12.0/surface/src/mls_n.cpp
-===================================================================
---- /dev/null
-+++ pcl-1.12.0/surface/src/mls_n.cpp
-@@ -0,0 +1,54 @@
-+/*
-+ * Software License Agreement (BSD License)
-+ *
-+ * Point Cloud Library (PCL) - www.pointclouds.org
-+ * Copyright (c) 2009-2011, Willow Garage, Inc.
-+ *
-+ * All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ *
-+ * * Redistributions of source code must retain the above copyright
-+ * notice, this list of conditions and the following disclaimer.
-+ * * Redistributions in binary form must reproduce the above
-+ * copyright notice, this list of conditions and the following
-+ * disclaimer in the documentation and/or other materials provided
-+ * with the distribution.
-+ * * Neither the name of Willow Garage, Inc. nor the names of its
-+ * contributors may be used to endorse or promote products derived
-+ * from this software without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-+ * POSSIBILITY OF SUCH DAMAGE.
-+ *
-+ * $Id$
-+ *
-+ */
-+
-+#include <pcl/surface/mls.h>
-+#include <pcl/surface/impl/mls.hpp>
-+#include "mls_calculatePrincipalCurvatures.hpp"
-+
-+#ifndef PCL_NO_PRECOMPILE
-+#include <pcl/point_types.h>
-+#include <pcl/impl/instantiate.hpp>
-+#ifdef PCL_ONLY_CORE_POINT_TYPES
-+ // Instantiations of specific point types
-+ PCL_INSTANTIATE_PRODUCT(MovingLeastSquares, ((pcl::PointXYZ)(pcl::PointXYZI)(pcl::PointXYZRGB)(pcl::PointXYZRGBA)(pcl::PointXYZRGBNormal)(pcl::PointNormal))
-+ ((pcl::PointNormal)))
-+#else
-+ // PCL_INSTANTIATE_PRODUCT(MovingLeastSquares, (PCL_XYZ_POINT_TYPES)(PCL_XYZ_POINT_TYPES))
-+#endif
-+#endif // PCL_NO_PRECOMPILE
-Index: pcl-1.12.0/surface/src/mls_xyz.cpp
-===================================================================
---- /dev/null
-+++ pcl-1.12.0/surface/src/mls_xyz.cpp
-@@ -0,0 +1,53 @@
-+/*
-+ * Software License Agreement (BSD License)
-+ *
-+ * Point Cloud Library (PCL) - www.pointclouds.org
-+ * Copyright (c) 2009-2011, Willow Garage, Inc.
-+ *
-+ * All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ *
-+ * * Redistributions of source code must retain the above copyright
-+ * notice, this list of conditions and the following disclaimer.
-+ * * Redistributions in binary form must reproduce the above
-+ * copyright notice, this list of conditions and the following
-+ * disclaimer in the documentation and/or other materials provided
-+ * with the distribution.
-+ * * Neither the name of Willow Garage, Inc. nor the names of its
-+ * contributors may be used to endorse or promote products derived
-+ * from this software without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-+ * POSSIBILITY OF SUCH DAMAGE.
-+ *
-+ * $Id$
-+ *
-+ */
-+
-+#include <pcl/surface/mls.h>
-+#include <pcl/surface/impl/mls.hpp>
-+
-+#ifndef PCL_NO_PRECOMPILE
-+#include <pcl/point_types.h>
-+#include <pcl/impl/instantiate.hpp>
-+#ifdef PCL_ONLY_CORE_POINT_TYPES
-+ // Instantiations of specific point types
-+ PCL_INSTANTIATE_PRODUCT(MovingLeastSquares, ((pcl::PointXYZ)(pcl::PointXYZI)(pcl::PointXYZRGB)(pcl::PointXYZRGBA)(pcl::PointXYZRGBNormal)(pcl::PointNormal))
-+ ((pcl::PointXYZ)))
-+#else
-+ PCL_INSTANTIATE_PRODUCT(MovingLeastSquares, (PCL_XYZ_POINT_TYPES)(PCL_XYZ_POINT_TYPES))
-+#endif
-+#endif // PCL_NO_PRECOMPILE
-Index: pcl-1.12.0/surface/src/mls_xyzi.cpp
-===================================================================
---- /dev/null
-+++ pcl-1.12.0/surface/src/mls_xyzi.cpp
-@@ -0,0 +1,53 @@
-+/*
-+ * Software License Agreement (BSD License)
-+ *
-+ * Point Cloud Library (PCL) - www.pointclouds.org
-+ * Copyright (c) 2009-2011, Willow Garage, Inc.
-+ *
-+ * All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ *
-+ * * Redistributions of source code must retain the above copyright
-+ * notice, this list of conditions and the following disclaimer.
-+ * * Redistributions in binary form must reproduce the above
-+ * copyright notice, this list of conditions and the following
-+ * disclaimer in the documentation and/or other materials provided
-+ * with the distribution.
-+ * * Neither the name of Willow Garage, Inc. nor the names of its
-+ * contributors may be used to endorse or promote products derived
-+ * from this software without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-+ * POSSIBILITY OF SUCH DAMAGE.
-+ *
-+ * $Id$
-+ *
-+ */
-+
-+#include <pcl/surface/mls.h>
-+#include <pcl/surface/impl/mls.hpp>
-+
-+#ifndef PCL_NO_PRECOMPILE
-+#include <pcl/point_types.h>
-+#include <pcl/impl/instantiate.hpp>
-+#ifdef PCL_ONLY_CORE_POINT_TYPES
-+ // Instantiations of specific point types
-+ PCL_INSTANTIATE_PRODUCT(MovingLeastSquares, ((pcl::PointXYZ)(pcl::PointXYZI)(pcl::PointXYZRGB)(pcl::PointXYZRGBA)(pcl::PointXYZRGBNormal)(pcl::PointNormal))
-+ ((pcl::PointXYZI)))
-+#else
-+ // PCL_INSTANTIATE_PRODUCT(MovingLeastSquares, (PCL_XYZ_POINT_TYPES)(PCL_XYZ_POINT_TYPES))
-+#endif
-+#endif // PCL_NO_PRECOMPILE
-Index: pcl-1.12.0/surface/src/mls_xyzrgba.cpp
-===================================================================
---- /dev/null
-+++ pcl-1.12.0/surface/src/mls_xyzrgba.cpp
-@@ -0,0 +1,53 @@
-+/*
-+ * Software License Agreement (BSD License)
-+ *
-+ * Point Cloud Library (PCL) - www.pointclouds.org
-+ * Copyright (c) 2009-2011, Willow Garage, Inc.
-+ *
-+ * All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ *
-+ * * Redistributions of source code must retain the above copyright
-+ * notice, this list of conditions and the following disclaimer.
-+ * * Redistributions in binary form must reproduce the above
-+ * copyright notice, this list of conditions and the following
-+ * disclaimer in the documentation and/or other materials provided
-+ * with the distribution.
-+ * * Neither the name of Willow Garage, Inc. nor the names of its
-+ * contributors may be used to endorse or promote products derived
-+ * from this software without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-+ * POSSIBILITY OF SUCH DAMAGE.
-+ *
-+ * $Id$
-+ *
-+ */
-+
-+#include <pcl/surface/mls.h>
-+#include <pcl/surface/impl/mls.hpp>
-+
-+#ifndef PCL_NO_PRECOMPILE
-+#include <pcl/point_types.h>
-+#include <pcl/impl/instantiate.hpp>
-+#ifdef PCL_ONLY_CORE_POINT_TYPES
-+ // Instantiations of specific point types
-+ PCL_INSTANTIATE_PRODUCT(MovingLeastSquares, ((pcl::PointXYZ)(pcl::PointXYZI)(pcl::PointXYZRGB)(pcl::PointXYZRGBA)(pcl::PointXYZRGBNormal)(pcl::PointNormal))
-+ ((pcl::PointXYZRGBA)))
-+#else
-+ // PCL_INSTANTIATE_PRODUCT(MovingLeastSquares, (PCL_XYZ_POINT_TYPES)(PCL_XYZ_POINT_TYPES))
-+#endif
-+#endif // PCL_NO_PRECOMPILE
-Index: pcl-1.12.0/surface/src/mls_xyzrgb.cpp
-===================================================================
---- /dev/null
-+++ pcl-1.12.0/surface/src/mls_xyzrgb.cpp
-@@ -0,0 +1,53 @@
-+/*
-+ * Software License Agreement (BSD License)
-+ *
-+ * Point Cloud Library (PCL) - www.pointclouds.org
-+ * Copyright (c) 2009-2011, Willow Garage, Inc.
-+ *
-+ * All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ *
-+ * * Redistributions of source code must retain the above copyright
-+ * notice, this list of conditions and the following disclaimer.
-+ * * Redistributions in binary form must reproduce the above
-+ * copyright notice, this list of conditions and the following
-+ * disclaimer in the documentation and/or other materials provided
-+ * with the distribution.
-+ * * Neither the name of Willow Garage, Inc. nor the names of its
-+ * contributors may be used to endorse or promote products derived
-+ * from this software without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-+ * POSSIBILITY OF SUCH DAMAGE.
-+ *
-+ * $Id$
-+ *
-+ */
-+
-+#include <pcl/surface/mls.h>
-+#include <pcl/surface/impl/mls.hpp>
-+
-+#ifndef PCL_NO_PRECOMPILE
-+#include <pcl/point_types.h>
-+#include <pcl/impl/instantiate.hpp>
-+#ifdef PCL_ONLY_CORE_POINT_TYPES
-+ // Instantiations of specific point types
-+ PCL_INSTANTIATE_PRODUCT(MovingLeastSquares, ((pcl::PointXYZ)(pcl::PointXYZI)(pcl::PointXYZRGB)(pcl::PointXYZRGBA)(pcl::PointXYZRGBNormal)(pcl::PointNormal))
-+ ((pcl::PointXYZRGB)))
-+#else
-+ //PCL_INSTANTIATE_PRODUCT(MovingLeastSquares, (PCL_XYZ_POINT_TYPES)(PCL_XYZ_POINT_TYPES))
-+#endif
-+#endif // PCL_NO_PRECOMPILE
-Index: pcl-1.12.0/surface/src/mls_xyzrgbn.cpp
-===================================================================
---- /dev/null
-+++ pcl-1.12.0/surface/src/mls_xyzrgbn.cpp
-@@ -0,0 +1,53 @@
-+/*
-+ * Software License Agreement (BSD License)
-+ *
-+ * Point Cloud Library (PCL) - www.pointclouds.org
-+ * Copyright (c) 2009-2011, Willow Garage, Inc.
-+ *
-+ * All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ *
-+ * * Redistributions of source code must retain the above copyright
-+ * notice, this list of conditions and the following disclaimer.
-+ * * Redistributions in binary form must reproduce the above
-+ * copyright notice, this list of conditions and the following
-+ * disclaimer in the documentation and/or other materials provided
-+ * with the distribution.
-+ * * Neither the name of Willow Garage, Inc. nor the names of its
-+ * contributors may be used to endorse or promote products derived
-+ * from this software without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-+ * POSSIBILITY OF SUCH DAMAGE.
-+ *
-+ * $Id$
-+ *
-+ */
-+
-+#include <pcl/surface/mls.h>
-+#include <pcl/surface/impl/mls.hpp>
-+
-+#ifndef PCL_NO_PRECOMPILE
-+#include <pcl/point_types.h>
-+#include <pcl/impl/instantiate.hpp>
-+#ifdef PCL_ONLY_CORE_POINT_TYPES
-+ // Instantiations of specific point types
-+ PCL_INSTANTIATE_PRODUCT(MovingLeastSquares, ((pcl::PointXYZ)(pcl::PointXYZI)(pcl::PointXYZRGB)(pcl::PointXYZRGBA)(pcl::PointXYZRGBNormal)(pcl::PointNormal))
-+ ((pcl::PointXYZRGBNormal)))
-+#else
-+ //PCL_INSTANTIATE_PRODUCT(MovingLeastSquares, (PCL_XYZ_POINT_TYPES)(PCL_XYZ_POINT_TYPES))
-+#endif
-+#endif // PCL_NO_PRECOMPILE
-Index: pcl-1.12.0/surface/include/pcl/surface/impl/mls.hpp
-===================================================================
---- pcl-1.12.0.orig/surface/include/pcl/surface/impl/mls.hpp
-+++ pcl-1.12.0/surface/include/pcl/surface/impl/mls.hpp
-@@ -533,38 +533,6 @@ pcl::MLSResult::getPolynomialPartialDeri
- return (d);
- }
-
--Eigen::Vector2f
--pcl::MLSResult::calculatePrincipalCurvatures (const double u, const double v) const
--{
-- Eigen::Vector2f k (1e-5, 1e-5);
--
-- // Note: this use the Monge Patch to derive the Gaussian curvature and Mean Curvature found here http://mathworld.wolfram.com/MongePatch.html
-- // Then:
-- // k1 = H + sqrt(H^2 - K)
-- // k2 = H - sqrt(H^2 - K)
-- if (order > 1 && c_vec.size () >= (order + 1) * (order + 2) / 2 && std::isfinite (c_vec[0]))
-- {
-- const PolynomialPartialDerivative d = getPolynomialPartialDerivative (u, v);
-- const double Z = 1 + d.z_u * d.z_u + d.z_v * d.z_v;
-- const double Zlen = std::sqrt (Z);
-- const double K = (d.z_uu * d.z_vv - d.z_uv * d.z_uv) / (Z * Z);
-- const double H = ((1.0 + d.z_v * d.z_v) * d.z_uu - 2.0 * d.z_u * d.z_v * d.z_uv + (1.0 + d.z_u * d.z_u) * d.z_vv) / (2.0 * Zlen * Zlen * Zlen);
-- const double disc2 = H * H - K;
-- assert (disc2 >= 0.0);
-- const double disc = std::sqrt (disc2);
-- k[0] = H + disc;
-- k[1] = H - disc;
--
-- if (std::abs (k[0]) > std::abs (k[1])) std::swap (k[0], k[1]);
-- }
-- else
-- {
-- PCL_ERROR ("No Polynomial fit data, unable to calculate the principal curvatures!\n");
-- }
--
-- return (k);
--}
--
- pcl::MLSResult::MLSProjectionResults
- pcl::MLSResult::projectPointOrthogonalToPolynomialSurface (const double u, const double v, const double w) const
- {
-Index: pcl-1.12.0/surface/src/mls_calculatePrincipalCurvatures.hpp
-===================================================================
---- /dev/null
-+++ pcl-1.12.0/surface/src/mls_calculatePrincipalCurvatures.hpp
-@@ -0,0 +1,31 @@
-+Eigen::Vector2f
-+pcl::MLSResult::calculatePrincipalCurvatures (const double u, const double v) const
-+{
-+ Eigen::Vector2f k (1e-5, 1e-5);
-+
-+ // Note: this use the Monge Patch to derive the Gaussian curvature and Mean Curvature found here http://mathworld.wolfram.com/MongePatch.html
-+ // Then:
-+ // k1 = H + sqrt(H^2 - K)
-+ // k2 = H - sqrt(H^2 - K)
-+ if (order > 1 && c_vec.size () >= (order + 1) * (order + 2) / 2 && std::isfinite (c_vec[0]))
-+ {
-+ const PolynomialPartialDerivative d = getPolynomialPartialDerivative (u, v);
-+ const double Z = 1 + d.z_u * d.z_u + d.z_v * d.z_v;
-+ const double Zlen = std::sqrt (Z);
-+ const double K = (d.z_uu * d.z_vv - d.z_uv * d.z_uv) / (Z * Z);
-+ const double H = ((1.0 + d.z_v * d.z_v) * d.z_uu - 2.0 * d.z_u * d.z_v * d.z_uv + (1.0 + d.z_u * d.z_u) * d.z_vv) / (2.0 * Zlen * Zlen * Zlen);
-+ const double disc2 = H * H - K;
-+ assert (disc2 >= 0.0);
-+ const double disc = std::sqrt (disc2);
-+ k[0] = H + disc;
-+ k[1] = H - disc;
-+
-+ if (std::abs (k[0]) > std::abs (k[1])) std::swap (k[0], k[1]);
-+ }
-+ else
-+ {
-+ PCL_ERROR ("No Polynomial fit data, unable to calculate the principal curvatures!\n");
-+ }
-+
-+ return (k);
-+}
diff --git a/pcl-1.12.0-sse2.patch b/pcl-1.12.0-sse2.patch
deleted file mode 100644
index f8a1e83..0000000
--- a/pcl-1.12.0-sse2.patch
+++ /dev/null
@@ -1,48 +0,0 @@
---- pcl-pcl-1.12.0/cmake/pcl_find_sse.cmake 2021-08-13 13:31:26.035282081 -0700
-+++ pcl-pcl-1.12.0/cmake/pcl_find_sse.cmake.new 2021-08-13 13:31:31.965314984 -0700
-@@ -4,20 +4,6 @@
- set(SSE_FLAGS)
- set(SSE_DEFINITIONS)
-
-- if(NOT CMAKE_CROSSCOMPILING)
-- # Test GCC/G++ and CLANG
-- if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_CLANG)
-- include(CheckCXXCompilerFlag)
-- check_cxx_compiler_flag("-march=native" HAVE_MARCH)
-- if(HAVE_MARCH)
-- list(APPEND SSE_FLAGS "-march=native")
-- else()
-- list(APPEND SSE_FLAGS "-mtune=native")
-- endif()
-- message(STATUS "Using CPU native flags for SSE optimization: ${SSE_FLAGS}")
-- endif()
-- endif()
--
- # Unfortunately we need to check for SSE to enable "-mfpmath=sse" alongside
- # "-march=native". The reason for this is that by default, 32bit architectures
- # tend to use the x87 FPU (which has 80 bit internal precision), thus leading
-@@ -203,21 +189,9 @@
- endif()
-
- if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_CLANG)
-- if(SSE_LEVEL GREATER_EQUAL 1.0)
-- if(SSE_LEVEL GREATER_EQUAL 4.2)
-- set(SSE_FLAGS "-msse4.2")
-- elseif(SSE_LEVEL GREATER_EQUAL 4.1)
-- set(SSE_FLAGS "-msse4.1")
-- elseif(SSE_LEVEL GREATER_EQUAL 3.1)
-- set(SSE_FLAGS "-msse3")
-- elseif(SSE_LEVEL GREATER_EQUAL 3.0)
-- set(SSE_FLAGS "-msse3")
-- elseif(SSE_LEVEL GREATER_EQUAL 2.0)
-- set(SSE_FLAGS "-msse2")
-- else()
-- set(SSE_FLAGS "-msse")
-- endif()
-- string(APPEND SSE_FLAGS " -mfpmath=sse")
-+ if("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64" AND "${CMAKE_SIZEOF_VOID_P}" STREQUAL "8")
-+ MESSAGE(STATUS "Enabling SSE Support (${CMAKE_SYSTEM_PROCESSOR}, ${CMAKE_SIZEOF_VOID_P})")
-+ set(SSE_FLAGS "-msse2")
- else()
- # Setting -ffloat-store to alleviate 32bit vs 64bit discrepancies on non-SSE
- # platforms.
diff --git a/pcl-1.15.0-sphinx.patch b/pcl-1.15.0-sphinx.patch
new file mode 100644
index 0000000..ee09f89
--- /dev/null
+++ b/pcl-1.15.0-sphinx.patch
@@ -0,0 +1,42 @@
+diff -up ./doc/advanced/content/conf.py.sphinx ./doc/advanced/content/conf.py
+--- ./doc/advanced/content/conf.py.sphinx 2025-02-22 09:20:17.000000000 -0500
++++ ./doc/advanced/content/conf.py 2025-03-15 12:24:16.111724947 -0400
+@@ -4,7 +4,7 @@
+ # -- General configuration -----------------------------------------------------
+ # Add any Sphinx extension module names here, as strings. They can be extensions
+ # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
+-extensions = ['sphinx.ext.imgmath', 'sphinxcontrib.doxylink']
++extensions = ['sphinx.ext.imgmath']
+
+ # Add any paths that contain templates here, relative to this directory.
+ # templates_path = ['_templates']
+@@ -69,7 +69,7 @@ pygments_style = 'sphinx'
+
+ # The theme to use for HTML and HTML Help pages. Major themes that come with
+ # Sphinx are currently 'default' and 'sphinxdoc'.
+-html_theme = 'sphinx_rtd_theme'
++html_theme = 'sphinxdoc'
+
+ # Theme options are theme-specific and customize the look and feel of a theme
+ # further. For a list of options available for each theme, see the
+diff -up ./doc/tutorials/content/conf.py.sphinx ./doc/tutorials/content/conf.py
+--- ./doc/tutorials/content/conf.py.sphinx 2025-02-22 09:20:17.000000000 -0500
++++ ./doc/tutorials/content/conf.py 2025-03-15 12:24:43.373103253 -0400
+@@ -4,7 +4,7 @@
+ # -- General configuration -----------------------------------------------------
+ # Add any Sphinx extension module names here, as strings. They can be extensions
+ # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
+-extensions = ['sphinx.ext.imgmath', 'sphinxcontrib.doxylink']
++extensions = ['sphinx.ext.imgmath']
+ imgmath_dvipng_args = ['-gamma', '1.5', '-D', '110', '-bg', 'Transparent']
+
+ # Add any paths that contain templates here, relative to this directory.
+@@ -70,7 +70,7 @@ pygments_style = 'sphinx'
+
+ # The theme to use for HTML and HTML Help pages. Major themes that come with
+ # Sphinx are currently 'default' and 'sphinxdoc'.
+-html_theme = 'sphinx_rtd_theme'
++html_theme = 'sphinxdoc'
+
+ # Theme options are theme-specific and customize the look and feel of a theme
+ # further. For a list of options available for each theme, see the
diff --git a/pcl-1.15.0-sse2.patch b/pcl-1.15.0-sse2.patch
new file mode 100644
index 0000000..c575d48
--- /dev/null
+++ b/pcl-1.15.0-sse2.patch
@@ -0,0 +1,42 @@
+diff -up ./cmake/pcl_find_sse.cmake.sse2 ./cmake/pcl_find_sse.cmake
+--- ./cmake/pcl_find_sse.cmake.sse2 2025-02-22 09:20:17.000000000 -0500
++++ ./cmake/pcl_find_sse.cmake 2025-03-15 12:22:52.180169422 -0400
+@@ -197,35 +197,15 @@ function(PCL_CHECK_FOR_SSE)
+ endif()
+
+ if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_CLANG)
+- if(SSE_LEVEL GREATER_EQUAL 1.0)
+- if(SSE_LEVEL GREATER_EQUAL 4.2)
+- set(SSE_FLAGS "-msse4.2")
+- elseif(SSE_LEVEL GREATER_EQUAL 4.1)
+- set(SSE_FLAGS "-msse4.1")
+- elseif(SSE_LEVEL GREATER_EQUAL 3.1)
+- set(SSE_FLAGS "-msse3")
+- elseif(SSE_LEVEL GREATER_EQUAL 3.0)
+- set(SSE_FLAGS "-msse3")
+- elseif(SSE_LEVEL GREATER_EQUAL 2.0)
+- set(SSE_FLAGS "-msse2")
+- else()
+- set(SSE_FLAGS "-msse")
+- endif()
+- string(APPEND SSE_FLAGS " -mfpmath=sse")
++ if("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64" AND "${CMAKE_SIZEOF_VOID_P}" STREQUAL "8")
++ MESSAGE(STATUS "Enabling SSE Support (${CMAKE_SYSTEM_PROCESSOR}, ${CMAKE_SIZEOF_VOID_P})")
++ set(SSE_FLAGS "-msse2")
+ else()
+ # Setting -ffloat-store to alleviate 32bit vs 64bit discrepancies on non-SSE
+ # platforms.
+ string(APPEND SSE_FLAGS " -ffloat-store")
+ endif()
+
+- if(PCL_ENABLE_MARCHNATIVE AND (NOT CMAKE_CROSSCOMPILING))
+- if(HAVE_MARCH)
+- string(APPEND SSE_FLAGS " -march=native")
+- else()
+- string(APPEND SSE_FLAGS " -mtune=native")
+- endif()
+- message(STATUS "Using CPU native flags for SSE optimization: ${SSE_FLAGS}")
+- endif()
+ elseif(MSVC AND NOT CMAKE_SIZEOF_VOID_P)
+ if(SSE_LEVEL GREATER_EQUAL 2.0)
+ set( SSE_FLAGS "/arch:SSE2")
diff --git a/pcl.spec b/pcl.spec
index 3efdd7d..d23e5d4 100644
--- a/pcl.spec
+++ b/pcl.spec
@@ -1,53 +1,52 @@
-%undefine __cmake_in_source_build
-%global apiversion 1.12
-%global soversion 1.12
+%global apiversion 1.15
+%global soversion 1.15
Name: pcl
-Version: 1.12.0
+Version: 1.15.0
Release: %autorelease
Summary: Library for point cloud processing
-# Automatically converted from old format: BSD - review is highly recommended.
-License: LicenseRef-Callaway-BSD
+# PCL is BSD-3-Clause
+# lzf.h/cpp in io are BSD-2-Clause
+# outofcore/include/pcl/outofcore/cJSON.h is MIT
+# recognition/include/pcl/recognition/3rdparty/metslib is BSD-2-Clause
+License: BSD-3-Clause and BSD-2-Clause and MIT
URL: http://pointclouds.org/
-# Source snapshots contain un-redistributable sources from nvidia
-# create_tarball_pcl.sh provided to strip non-free sources
-Source0: %{name}-%{version}-fedora.tar.xz
-Source1: create_tarball_pcl.sh
+Source0: https://github.com/PointCloudLibrary/%{name}/archive/%{name}-%{version}/%{name}-%{version}.tar.gz
+
+# System metslib doesn't build under c++17
+# Included version contains fixes.
+Provides: bundled(metslib)
# Only enable sse2, and only on x86_64
-Patch0: %{name}-1.12.0-sse2.patch
-# Look for external metslib, not upstream
-Patch1: %{name}-1.12.0-metslib.patch
+Patch0: %{name}-1.15.0-sse2.patch
# Patch for PCLConfig.cmake to find pcl
Patch2: %{name}-1.12.0-fedora.patch
# Exclude the "build" directory from doxygen processing.
Patch3: %{name}-1.11.0-doxyfix.patch
-# Split up explicit template instantiations so that builders don't run out of memory
-Patch4: %{name}-1.12.0-oom.patch
# Use a built-in sphinx documentation theme and disable doxylink plugin
-Patch5: %{name}-1.11.0-sphinx.patch
-Patch6: %{name}-1.12.0-boost176.patch
-
+Patch5: %{name}-1.15.0-sphinx.patch
# For plain building
BuildRequires: cmake, gcc-c++, boost-devel
# Documentation
BuildRequires: doxygen, graphviz, /usr/bin/sphinx-build
# mandatory
-BuildRequires: eigen3-static, flann-devel, vtk-devel, gl2ps-devel, hdf5-devel, libxml2-devel, netcdf-cxx-devel, jsoncpp-devel, metslib-static, libXext-devel
-
+BuildRequires: eigen3-static, flann-devel, vtk-devel, gl2ps-devel, hdf5-devel, libxml2-devel, netcdf-cxx-devel, jsoncpp-devel, libXext-devel, libatomic
# To fix Imported target "VTK::Java" includes non-existent path "/usr/lib/jvm/java/include" in its INTERFACE_INCLUDE_DIRECTORIES
%ifarch %{java_arches}
BuildRequires: java-devel
%endif
# optional
-BuildRequires: qt5-qtbase-devel, qhull-devel, libusbx-devel, gtest-devel, qt5-qtwebkit-devel
+BuildRequires: cjson-devel, libpcap-devel, qt5-qtbase-devel, qhull-devel, libusbx-devel, gtest-devel, qt5-qtwebkit-devel
%ifarch x86_64
BuildRequires: openni-devel
%endif
+# Testing
+BuildRequires: gtest-devel
+
%description
The Point Cloud Library (or PCL) is a large scale, open project for point
cloud processing.
@@ -89,17 +88,13 @@ Library.
%prep
-%setup -qn %{name}-%{version}
+%setup -qn %{name}-%{name}-%{version}
%patch -P0 -p1 -b .sse2
-%patch -P1 -p1 -b .metslib
%patch -P2 -p0 -b .fedora
%patch -P3 -p0 -b .doxyfix
-%patch -P4 -p1 -b .oom
%patch -P5 -p1 -b .sphinx
-%patch -P6 -p1 -b .boost176
# 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
rm -rf surface/include/pcl/surface/3rdparty/opennurbs
@@ -109,10 +104,10 @@ sed -i 's|@PCL_SOURCE_DIR@/build|@PCL_SOURCE_DIR@/%{_vpath_builddir}|' doc/doxyg
%build
# try to reduce memory usage of compile process (can cause OOM errors
# esp. on ARM builders)
-%global optflags %(echo %{optflags} | sed -e 's/-g /-g1 /' -e 's/-pipe //' -e's/-ffat-lto-objects/-fno-fat-lto-objects/')
+#%global optflags %(echo %{optflags} | sed -e 's/-g /-g1 /' -e 's/-pipe //' -e's/-ffat-lto-objects/-fno-fat-lto-objects/')
%cmake \
- -DCMAKE_BUILD_TYPE=None \
+ -DCMAKE_BUILD_TYPE=Release \
-DWITH_DOCS=ON \
-DWITH_CUDA=OFF \
-DWITH_TUTORIALS=ON \
@@ -120,6 +115,7 @@ sed -i 's|@PCL_SOURCE_DIR@/build|@PCL_SOURCE_DIR@/%{_vpath_builddir}|' doc/doxyg
-DBUILD_global_tests=OFF \
-DOPENNI_INCLUDE_DIR:PATH=/usr/include/ni \
-DLIB_INSTALL_DIR=%{_lib} \
+ -DPCL_WARNINGS_ARE_ERRORS=OFF \
%ifarch x86_64
-DPCL_ENABLE_SSE=ON \
%else
@@ -169,8 +165,6 @@ mv $RPM_BUILD_ROOT%{_datadir}/%{name}-*/Modules $RPM_BUILD_ROOT%{_libdir}/cmake/
%check
%ctest || true
-%ldconfig_scriptlets
-
%files
%license LICENSE.txt
diff --git a/sources b/sources
index a3e23c6..f0062b4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (pcl-1.12.0-fedora.tar.xz) = 0aa4bec392c304f6f8086c9c316383da90fe2d7ae5c095d51f9ac8ce680c3addd27c61a8e6240c8367b5e57eb20b608b9e146c1b0ba3ce232be3e31b259b0c1d
+SHA512 (pcl-1.15.0.tar.gz) = a1ab4858b8e5bde5b21bb3e04dcdcd9ca69204aa37a90dee336d4da452cb4be0a5b6a2b2b477668d4e82891955398825e97009fb5805df931af3c7d253e9100e
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2026-06-25 5:50 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:50 [rpms/pcl] f44: Update to PCL-1.15.0 Rich Mattes
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox