public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/pcl] f44: Separate template instantiations further to avoid oom
@ 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 : bad0d53f7408bc6000f726e5c69dd97491b9bb84
Author : Rich Mattes <richmattes@gmail.com>
Date : 2019-02-16T20:57:47-05:00
Stats : +380/-25 in 4 file(s)
URL : https://src.fedoraproject.org/rpms/pcl/c/bad0d53f7408bc6000f726e5c69dd97491b9bb84?branch=f44
Log:
Separate template instantiations further to avoid oom
Add patch to silence boost endian warnings.
Update sse2 patch to disable march=native
---
diff --git a/pcl-1.9.1-boostendian.patch b/pcl-1.9.1-boostendian.patch
new file mode 100644
index 0000000..123754e
--- /dev/null
+++ b/pcl-1.9.1-boostendian.patch
@@ -0,0 +1,62 @@
+diff -up ./common/include/pcl/PCLPointCloud2.h.boostendian ./common/include/pcl/PCLPointCloud2.h
+--- ./common/include/pcl/PCLPointCloud2.h.boostendian 2018-11-26 06:50:33.000000000 -0500
++++ ./common/include/pcl/PCLPointCloud2.h 2019-02-16 18:54:23.721929035 -0500
+@@ -3,12 +3,12 @@
+
+ #ifdef USE_ROS
+ #error USE_ROS setup requires PCL to compile against ROS message headers, which is now deprecated
+-#endif
++#endif
+
+ #include <string>
+ #include <vector>
+ #include <ostream>
+-#include <boost/detail/endian.hpp>
++#include <boost/predef/other/endian.h>
+
+ // Include the correct Header path here
+ #include <pcl/PCLHeader.h>
+@@ -23,9 +23,9 @@ namespace pcl
+ is_bigendian (false), point_step (0), row_step (0),
+ data (), is_dense (false)
+ {
+-#if defined(BOOST_BIG_ENDIAN)
++#if BOOST_ENDIAN_BIG_BYTE
+ is_bigendian = true;
+-#elif defined(BOOST_LITTLE_ENDIAN)
++#elif BOOST_ENDIAN_LITTLE_BYTE
+ is_bigendian = false;
+ #else
+ #error "unable to determine system endianness"
+diff -up ./io/include/pcl/io/ply/byte_order.h.boostendian ./io/include/pcl/io/ply/byte_order.h
+--- ./io/include/pcl/io/ply/byte_order.h.boostendian 2018-11-26 06:50:33.000000000 -0500
++++ ./io/include/pcl/io/ply/byte_order.h 2019-02-16 18:55:00.669028787 -0500
+@@ -40,7 +40,7 @@
+ #ifndef PCL_IO_PLY_BYTE_ORDER_H
+ #define PCL_IO_PLY_BYTE_ORDER_H
+
+-#include <boost/detail/endian.hpp>
++#include <boost/predef/other/endian.h>
+
+ namespace pcl
+ {
+@@ -58,16 +58,16 @@ namespace pcl
+ {
+ little_endian_byte_order,
+ big_endian_byte_order,
+-#if defined(BOOST_BIG_ENDIAN)
++#if BOOST_ENDIAN_BIG_BYTE
+ host_byte_order = big_endian_byte_order,
+-#elif defined(BOOST_LITTLE_ENDIAN)
++#elif BOOST_ENDIAN_LITTLE_BYTE
+ host_byte_order = little_endian_byte_order,
+ #else
+ #error "unable to determine system endianness"
+ #endif
+ network_byte_order = big_endian_byte_order
+ };
+-
++
+ template <std::size_t N>
+ void swap_byte_order (char* bytes);
+
diff --git a/pcl-1.9.1-oom.patch b/pcl-1.9.1-oom.patch
index 076c4ff..416ea1c 100644
--- a/pcl-1.9.1-oom.patch
+++ b/pcl-1.9.1-oom.patch
@@ -1,17 +1,23 @@
diff -up ./surface/CMakeLists.txt.oom ./surface/CMakeLists.txt
---- ./surface/CMakeLists.txt.oom 2019-02-16 14:45:04.746519567 -0500
-+++ ./surface/CMakeLists.txt 2019-02-16 14:45:12.869544417 -0500
-@@ -100,6 +100,7 @@ if(build)
+--- ./surface/CMakeLists.txt.oom 2018-11-26 06:50:33.000000000 -0500
++++ ./surface/CMakeLists.txt 2019-02-16 20:54:35.581123820 -0500
+@@ -99,7 +99,12 @@ if(build)
+ src/marching_cubes_hoppe.cpp
src/marching_cubes_rbf.cpp
src/bilateral_upsampling.cpp
- src/mls.cpp
-+ src/mls2.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
-diff -up ./surface/src/mls2.cpp.oom ./surface/src/mls2.cpp
---- ./surface/src/mls2.cpp.oom 2019-02-16 14:44:05.684338885 -0500
-+++ ./surface/src/mls2.cpp 2019-02-16 14:44:48.231469044 -0500
+diff -up ./surface/src/mls_n.cpp.oom ./surface/src/mls_n.cpp
+--- ./surface/src/mls_n.cpp.oom 2019-02-16 20:55:10.920291479 -0500
++++ ./surface/src/mls_n.cpp 2019-02-16 20:51:12.570160727 -0500
@@ -0,0 +1,53 @@
+/*
+ * Software License Agreement (BSD License)
@@ -61,20 +67,293 @@ diff -up ./surface/src/mls2.cpp.oom ./surface/src/mls2.cpp
+#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)(pcl::PointXYZI)(pcl::PointXYZRGB)))
++ ((pcl::PointNormal)))
++#else
++ PCL_INSTANTIATE_PRODUCT(MovingLeastSquares, (PCL_XYZ_POINT_TYPES)(PCL_XYZ_POINT_TYPES))
++#endif
++#endif // PCL_NO_PRECOMPILE
+diff -up ./surface/src/mls_xyz.cpp.oom ./surface/src/mls_xyz.cpp
+--- ./surface/src/mls_xyz.cpp.oom 2019-02-16 20:54:51.891201203 -0500
++++ ./surface/src/mls_xyz.cpp 2019-02-16 20:51:33.080258031 -0500
+@@ -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
+diff -up ./surface/src/mls_xyzi.cpp.oom ./surface/src/mls_xyzi.cpp
+--- ./surface/src/mls_xyzi.cpp.oom 2019-02-16 20:54:55.133216580 -0500
++++ ./surface/src/mls_xyzi.cpp 2019-02-16 20:51:59.602383856 -0500
+@@ -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
+diff -up ./surface/src/mls_xyzrgba.cpp.oom ./surface/src/mls_xyzrgba.cpp
+--- ./surface/src/mls_xyzrgba.cpp.oom 2019-02-16 20:54:57.832229383 -0500
++++ ./surface/src/mls_xyzrgba.cpp 2019-02-16 20:52:31.126533414 -0500
+@@ -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
+diff -up ./surface/src/mls_xyzrgb.cpp.oom ./surface/src/mls_xyzrgb.cpp
+--- ./surface/src/mls_xyzrgb.cpp.oom 2019-02-16 20:55:03.524256391 -0500
++++ ./surface/src/mls_xyzrgb.cpp 2019-02-16 20:53:02.609682766 -0500
+@@ -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
+diff -up ./surface/src/mls_xyzrgbn.cpp.oom ./surface/src/mls_xyzrgbn.cpp
+--- ./surface/src/mls_xyzrgbn.cpp.oom 2019-02-16 20:55:07.030273022 -0500
++++ ./surface/src/mls_xyzrgbn.cpp 2019-02-16 20:53:34.215832702 -0500
+@@ -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
-diff -up ./surface/src/mls.cpp.oom ./surface/src/mls.cpp
---- ./surface/src/mls.cpp.oom 2019-02-16 14:43:57.559314025 -0500
-+++ ./surface/src/mls.cpp 2019-02-16 14:44:30.521414865 -0500
-@@ -46,7 +46,7 @@
- #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)(pcl::PointXYZI)(pcl::PointXYZRGB)(pcl::PointXYZRGBA)(pcl::PointXYZRGBNormal)(pcl::PointNormal)))
-+ ((pcl::PointXYZRGBA)(pcl::PointXYZRGBNormal)(pcl::PointNormal)))
- #else
- PCL_INSTANTIATE_PRODUCT(MovingLeastSquares, (PCL_XYZ_POINT_TYPES)(PCL_XYZ_POINT_TYPES))
- #endif
diff --git a/pcl-1.9.1-sse2.patch b/pcl-1.9.1-sse2.patch
index 3b59242..f99d195 100644
--- a/pcl-1.9.1-sse2.patch
+++ b/pcl-1.9.1-sse2.patch
@@ -1,7 +1,16 @@
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)
+--- ./cmake/pcl_find_sse.cmake.sse2 2018-11-26 06:50:33.000000000 -0500
++++ ./cmake/pcl_find_sse.cmake 2019-02-16 19:05:16.618761462 -0500
+@@ -7,7 +7,7 @@ macro(PCL_CHECK_FOR_SSE)
+ if(NOT CMAKE_CROSSCOMPILING)
+ # Test GCC/G++ and CLANG
+ if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_CLANG)
+- list(APPEND SSE_FLAGS "-march=native")
++ #list(APPEND SSE_FLAGS "-march=native")
+ message(STATUS "Using CPU native flags for SSE optimization: ${SSE_FLAGS}")
+ endif()
+ endif()
+@@ -164,18 +164,9 @@ macro(PCL_CHECK_FOR_SSE)
set(CMAKE_REQUIRED_FLAGS)
if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_CLANG)
@@ -14,7 +23,8 @@ diff -up ./cmake/pcl_find_sse.cmake.sse2 ./cmake/pcl_find_sse.cmake
- elseif(HAVE_SSE3_EXTENSIONS)
- list(APPEND SSE_FLAGS "-msse3" "-mfpmath=sse")
- elseif(HAVE_SSE2_EXTENSIONS)
-+ if("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64")
++ 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})")
list(APPEND SSE_FLAGS "-msse2" "-mfpmath=sse")
- elseif(HAVE_SSE_EXTENSIONS)
- list(APPEND SSE_FLAGS "-msse" "-mfpmath=sse")
diff --git a/pcl.spec b/pcl.spec
index a403340..3f71005 100644
--- a/pcl.spec
+++ b/pcl.spec
@@ -22,6 +22,8 @@ Patch2: %{name}-1.8.1-fedora.patch
Patch3: %{name}-1.7.2-doxyfix.patch
# Split up explicit template instantiations so that builders don't run out of memory
Patch4: %{name}-1.9.1-oom.patch
+# Upstream patch to disable boost endian warnings
+Patch5: %{name}-1.9.1-boostendian.patch
# For plain building
BuildRequires: cmake, gcc-c++, boost-devel
@@ -83,6 +85,7 @@ Library.
%patch2 -p0 -b .fedora
%patch3 -p0 -b .doxyfix
%patch4 -p1 -b .oom
+%patch5 -p1 -b .boostendian
# Just to make it obvious we're not using any of these
rm -fr recognition/include/pcl/recognition/3rdparty/metslib
@@ -102,6 +105,7 @@ pushd build
%endif
%cmake \
+ -DCMAKE_BUILD_TYPE=Release \
-DWITH_DOCS=ON \
-DWITH_CUDA=OFF \
-DWITH_TUTORIALS=ON \
^ 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: Separate template instantiations further to avoid oom Rich Mattes
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox