From: Jochen Sprickerhof Date: Sun, 1 Jan 2023 10:56:39 +0000 (+0100) Subject: Rebase patches X-Git-Tag: archive/raspbian/1.14.0+dfsg-2+rpi1^2~25 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=95416543c3d6ed359371c0822ced283367fb0cf5;p=pcl.git Rebase patches --- diff --git a/debian/patches/0001-Fix-PCL_ROOT-path.patch b/debian/patches/0001-Fix-PCL_ROOT-path.patch index 8aed0381..c1d70949 100644 --- a/debian/patches/0001-Fix-PCL_ROOT-path.patch +++ b/debian/patches/0001-Fix-PCL_ROOT-path.patch @@ -7,10 +7,10 @@ Subject: Fix PCL_ROOT path 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PCLConfig.cmake.in b/PCLConfig.cmake.in -index 27ef980..b8e5148 100644 +index ddf93eb..4d048eb 100644 --- a/PCLConfig.cmake.in +++ b/PCLConfig.cmake.in -@@ -390,7 +390,7 @@ if(WIN32 AND NOT MINGW) +@@ -391,7 +391,7 @@ if(WIN32 AND NOT MINGW) endif() else() # PCLConfig.cmake is installed to PCL_ROOT/share/pcl-x.y diff --git a/debian/patches/0002-Link-against-atomic-if-needed-found-on-armel.patch b/debian/patches/0002-Link-against-atomic-if-needed-found-on-armel.patch deleted file mode 100644 index 9d5b6581..00000000 --- a/debian/patches/0002-Link-against-atomic-if-needed-found-on-armel.patch +++ /dev/null @@ -1,56 +0,0 @@ -From: Jochen Sprickerhof -Date: Sun, 2 Feb 2020 00:22:36 +0100 -Subject: Link against atomic if needed (found on armel) - ---- - CMakeLists.txt | 14 ++++++++++++++ - cmake/pcl_targets.cmake | 4 ++-- - 2 files changed, 16 insertions(+), 2 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 1e61bfd..02b690d 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -57,6 +57,20 @@ elseif(MINGW) - set(CMAKE_COMPILER_IS_MINGW 1) - endif() - -+# https://github.com/fish-shell/fish-shell/issues/5865 -+include(CheckCXXSourceCompiles) -+CHECK_CXX_SOURCE_COMPILES(" -+#include -+struct big { int foo[64]; }; -+std::atomic x; -+int main() { -+ return x.load().foo[13]; -+}" -+LIBATOMIC_NOT_NEEDED) -+IF (NOT LIBATOMIC_NOT_NEEDED) -+ SET(ATOMIC_LIBRARY "atomic") -+ENDIF() -+ - # Create a variable with expected default CXX flags - # This will be used further down the road to check if the user explicitly provided CXX flags - if(CMAKE_COMPILER_IS_MSVC) -diff --git a/cmake/pcl_targets.cmake b/cmake/pcl_targets.cmake -index ff79c20..f12a472 100644 ---- a/cmake/pcl_targets.cmake -+++ b/cmake/pcl_targets.cmake -@@ -230,7 +230,7 @@ function(PCL_ADD_LIBRARY _name) - endif() - - if((UNIX AND NOT ANDROID) OR MINGW) -- target_link_libraries(${_name} m) -+ target_link_libraries(${_name} m ${ATOMIC_LIBRARY}) - endif() - - if(MINGW) -@@ -391,7 +391,7 @@ macro(PCL_ADD_TEST _name _exename) - #target_link_libraries(${_exename} ${GTEST_BOTH_LIBRARIES} ${PCL_ADD_TEST_LINK_WITH}) - target_link_libraries(${_exename} ${PCL_ADD_TEST_LINK_WITH} ${CLANG_LIBRARIES}) - -- target_link_libraries(${_exename} Threads::Threads) -+ target_link_libraries(${_exename} Threads::Threads ${ATOMIC_LIBRARY}) - - #Only applies to MSVC - if(MSVC) diff --git a/debian/patches/0003-Use-newly-build-libs-when-testing.patch b/debian/patches/0003-Use-newly-build-libs-when-testing.patch index f62b6af0..58e4ddb6 100644 --- a/debian/patches/0003-Use-newly-build-libs-when-testing.patch +++ b/debian/patches/0003-Use-newly-build-libs-when-testing.patch @@ -8,13 +8,13 @@ This exports the LD_LIBRARY_PATH so the newly build libs will be used. 1 file changed, 1 insertion(+) diff --git a/cmake/pcl_targets.cmake b/cmake/pcl_targets.cmake -index f12a472..ff71d78 100644 +index 86d06d0..75c81e3 100644 --- a/cmake/pcl_targets.cmake +++ b/cmake/pcl_targets.cmake -@@ -410,6 +410,7 @@ macro(PCL_ADD_TEST _name _exename) +@@ -415,6 +415,7 @@ macro(PCL_ADD_TEST _name _exename) set_target_properties(${_exename} PROPERTIES FOLDER "Tests") - add_test(NAME ${_name} COMMAND ${_exename} ${PCL_ADD_TEST_ARGUMENTS}) + add_test(NAME ${_name} COMMAND ${_exename} ${ARGS_ARGUMENTS}) + set_tests_properties(${_name} PROPERTIES ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/${LIB_INSTALL_DIR}") add_dependencies(tests ${_exename}) diff --git a/debian/patches/0004-Disable-failing-tests.patch b/debian/patches/0004-Disable-failing-tests.patch index 17ec20b9..e7d2031d 100644 --- a/debian/patches/0004-Disable-failing-tests.patch +++ b/debian/patches/0004-Disable-failing-tests.patch @@ -9,7 +9,7 @@ Subject: Disable failing tests 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/test/features/CMakeLists.txt b/test/features/CMakeLists.txt -index d89d80c..d05945f 100644 +index 4dbab6e..6dc21fc 100644 --- a/test/features/CMakeLists.txt +++ b/test/features/CMakeLists.txt @@ -92,10 +92,6 @@ if(BUILD_io) @@ -24,7 +24,7 @@ index d89d80c..d05945f 100644 FILES test_moment_of_inertia_estimation.cpp LINK_WITH pcl_gtest pcl_io pcl_features diff --git a/test/features/test_normal_estimation.cpp b/test/features/test_normal_estimation.cpp -index 5211a2c..e197644 100644 +index c93f910..b297609 100644 --- a/test/features/test_normal_estimation.cpp +++ b/test/features/test_normal_estimation.cpp @@ -409,7 +409,7 @@ TEST (PCL, NormalEstimationOpenMP) @@ -37,7 +37,7 @@ index 5211a2c..e197644 100644 PointCloud::Ptr cloudptr(new PointCloud()); diff --git a/test/octree/test_octree.cpp b/test/octree/test_octree.cpp -index 0a4df9e..fc37ad1 100644 +index e150248..4130a90 100644 --- a/test/octree/test_octree.cpp +++ b/test/octree/test_octree.cpp @@ -1121,7 +1121,7 @@ public: diff --git a/debian/patches/0005-Adopt-unit-test-for-i386.patch b/debian/patches/0005-Adopt-unit-test-for-i386.patch index c850d4c0..50950d43 100644 --- a/debian/patches/0005-Adopt-unit-test-for-i386.patch +++ b/debian/patches/0005-Adopt-unit-test-for-i386.patch @@ -64,7 +64,7 @@ index 0b000cb..c8f8598 100644 } diff --git a/test/filters/test_convolution.cpp b/test/filters/test_convolution.cpp -index 26e5cbe..f61a8f4 100644 +index 2bae7ae..3e5c0a0 100644 --- a/test/filters/test_convolution.cpp +++ b/test/filters/test_convolution.cpp @@ -393,6 +393,7 @@ TEST (Convolution, convolveRowsXYZRGB) @@ -84,7 +84,7 @@ index 26e5cbe..f61a8f4 100644 int diff --git a/test/io/test_tim_grabber.cpp b/test/io/test_tim_grabber.cpp -index 8897af5..ed97958 100644 +index f245e0c..046900f 100644 --- a/test/io/test_tim_grabber.cpp +++ b/test/io/test_tim_grabber.cpp @@ -89,7 +89,7 @@ TEST_F (TimGrabberTest, Test1) @@ -97,7 +97,7 @@ index 8897af5..ed97958 100644 EXPECT_NEAR (correct_point.z, answer_point.z, 1.0e-3); } diff --git a/test/octree/test_octree.cpp b/test/octree/test_octree.cpp -index fc37ad1..210a3c2 100644 +index 4130a90..d6110ac 100644 --- a/test/octree/test_octree.cpp +++ b/test/octree/test_octree.cpp @@ -1538,7 +1538,7 @@ TEST (PCL, Octree_Pointcloud_Ray_Traversal) @@ -110,10 +110,10 @@ index fc37ad1..210a3c2 100644 } } diff --git a/test/sample_consensus/test_sample_consensus_plane_models.cpp b/test/sample_consensus/test_sample_consensus_plane_models.cpp -index 48a0011..27aba91 100644 +index 82141b3..351ca93 100644 --- a/test/sample_consensus/test_sample_consensus_plane_models.cpp +++ b/test/sample_consensus/test_sample_consensus_plane_models.cpp -@@ -465,10 +465,10 @@ TEST (SampleConsensusModelPlane, OptimizeFarFromOrigin) +@@ -556,10 +556,10 @@ TEST (SampleConsensusModelPlane, OptimizeFarFromOrigin) Eigen::VectorXf coeffs(4); // Doesn't have to be initialized, the function doesn't use them Eigen::VectorXf optimized_coeffs(4); model.optimizeModelCoefficients(inliers, coeffs, optimized_coeffs); diff --git a/debian/patches/0007-Adopt-unit-tests-for-arm64-and-ppc64el.patch b/debian/patches/0007-Adopt-unit-tests-for-arm64-and-ppc64el.patch index a26a41cd..a4eae423 100644 --- a/debian/patches/0007-Adopt-unit-tests-for-arm64-and-ppc64el.patch +++ b/debian/patches/0007-Adopt-unit-tests-for-arm64-and-ppc64el.patch @@ -3,32 +3,9 @@ Date: Mon, 13 Dec 2021 22:14:08 +0100 Subject: Adopt unit tests for arm64 and ppc64el --- - test/common/test_pca.cpp | 4 ++-- test/segmentation/test_non_linear.cpp | 2 +- - 2 files changed, 3 insertions(+), 3 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/test/common/test_pca.cpp b/test/common/test_pca.cpp -index 9c3a64e..8143a6b 100644 ---- a/test/common/test_pca.cpp -+++ b/test/common/test_pca.cpp -@@ -53,7 +53,7 @@ TEST(PCA, projection) - { - pca.project (point, projected); - pca.reconstruct (projected, reconstructed); -- EXPECT_NEAR_VECTORS (reconstructed.getVector3fMap (), point.getVector3fMap (), 2.5e-4); -+ EXPECT_NEAR_VECTORS (reconstructed.getVector3fMap (), point.getVector3fMap (), 5e-4); - } - } - -@@ -87,7 +87,7 @@ TEST(PCA, cloud_projection) - for(std::size_t i = 0; i < cloud.size(); i++) - EXPECT_NEAR_VECTORS (cloud[i].getVector3fMap (), - cloud_reconstructed[i].getVector3fMap (), -- 2.5e-4); -+ 5e-4); - } - catch (pcl::InitFailedException &/*e*/) - { diff --git a/test/segmentation/test_non_linear.cpp b/test/segmentation/test_non_linear.cpp index 1410182..823070f 100644 --- a/test/segmentation/test_non_linear.cpp diff --git a/debian/patches/0007-Drop-PCL_SOURCES_TREE-from-installation-cmake.patch b/debian/patches/0007-Drop-PCL_SOURCES_TREE-from-installation-cmake.patch deleted file mode 100644 index d19fdd24..00000000 --- a/debian/patches/0007-Drop-PCL_SOURCES_TREE-from-installation-cmake.patch +++ /dev/null @@ -1,29 +0,0 @@ -From: Jochen Sprickerhof -Date: Sat, 25 Dec 2021 09:30:57 +0100 -Subject: Drop $PCL_SOURCES_TREE from installation cmake - -It is not used elsewhere and makes the build unreproducible. ---- - PCLConfig.cmake.in | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/PCLConfig.cmake.in b/PCLConfig.cmake.in -index b8e5148..5ba9165 100644 ---- a/PCLConfig.cmake.in -+++ b/PCLConfig.cmake.in -@@ -409,7 +409,6 @@ elseif(EXISTS "${PCL_DIR}/include/pcl/pcl_config.h") - # pcl_message("PCL found into a build tree.") - set(PCL_CONF_INCLUDE_DIR "${PCL_DIR}/include") # for pcl_config.h - set(PCL_LIBRARY_DIRS "${PCL_DIR}/@LIB_INSTALL_DIR@") -- set(PCL_SOURCES_TREE "@CMAKE_SOURCE_DIR@") - else() - pcl_report_not_found("PCL can not be found on this machine") - endif() -@@ -504,7 +503,6 @@ foreach(component ${PCL_TO_FIND_COMPONENTS}) - pcl/cuda/${cuda_component} pcl/cuda/${component} - pcl/gpu/${gpu_component} pcl/gpu/${component} - HINTS ${PCL_INCLUDE_DIRS} -- "${PCL_SOURCES_TREE}" - PATH_SUFFIXES - ${component}/include - apps/${component}/include diff --git a/debian/patches/0008-Don-t-require-boost-in-pkg-config.patch b/debian/patches/0008-Don-t-require-boost-in-pkg-config.patch deleted file mode 100644 index 2c5c50c1..00000000 --- a/debian/patches/0008-Don-t-require-boost-in-pkg-config.patch +++ /dev/null @@ -1,22 +0,0 @@ -From: Jochen Sprickerhof -Date: Wed, 29 Dec 2021 10:42:28 +0100 -Subject: Don't require boost in pkg-config - -There is no boost.pc. Regression of 87e12d1c8. ---- - io/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/io/CMakeLists.txt b/io/CMakeLists.txt -index 163639b..460b3d5 100644 ---- a/io/CMakeLists.txt -+++ b/io/CMakeLists.txt -@@ -415,7 +415,7 @@ if(PCAP_FOUND) - target_link_libraries("${LIB_NAME}" ${PCAP_LIBRARIES}) - endif() - --set(EXT_DEPS boost eigen3) -+set(EXT_DEPS eigen3) - - if(WITH_OPENNI) - list(APPEND EXT_DEPS libopenni) diff --git a/debian/patches/0009-Repair-sparse_matrix.hpp.patch b/debian/patches/0009-Repair-sparse_matrix.hpp.patch deleted file mode 100644 index d1097c54..00000000 --- a/debian/patches/0009-Repair-sparse_matrix.hpp.patch +++ /dev/null @@ -1,57 +0,0 @@ -From: Thomas Dickerson -Date: Thu, 12 May 2022 14:28:41 -0400 -Subject: Repair sparse_matrix.hpp - -Unclear why nobody has noticed for a decade that this code was just totally uncompilable. `SparseMatrix` does not have methods `Columns()` or `Rows()`, and `m_ppElements[i]` is a pointer so can't possibly have anything called with `.`. ---- - .../pcl/surface/3rdparty/poisson4/sparse_matrix.hpp | 18 +++++++++--------- - 1 file changed, 9 insertions(+), 9 deletions(-) - -diff --git a/surface/include/pcl/surface/3rdparty/poisson4/sparse_matrix.hpp b/surface/include/pcl/surface/3rdparty/poisson4/sparse_matrix.hpp -index e6564cd..02c2db5 100644 ---- a/surface/include/pcl/surface/3rdparty/poisson4/sparse_matrix.hpp -+++ b/surface/include/pcl/surface/3rdparty/poisson4/sparse_matrix.hpp -@@ -250,9 +250,9 @@ namespace pcl - template - SparseMatrix& SparseMatrix::operator *= (const T& V) - { -- for (int i=0; iRows(); i++) -+ for (int i=0; i - SparseMatrix SparseMatrix::Multiply( const SparseMatrix& M ) const - { -- SparseMatrix R( this->Rows(), M.Columns() ); -- for(int i=0; i R( rows, M._maxEntriesPerRow ); -+ for(int i=0; i - SparseMatrix SparseMatrix::Transpose() const - { -- SparseMatrix M( this->Columns(), this->Rows() ); -+ SparseMatrix M( _maxEntriesPerRow, rows ); - -- for (int i=0; iRows(); i++) -+ for (int i=0; i -Date: Fri, 20 May 2022 14:47:52 +0200 -Subject: Fix variable name in poisson4 - ---- - surface/include/pcl/surface/3rdparty/poisson4/sparse_matrix.hpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/surface/include/pcl/surface/3rdparty/poisson4/sparse_matrix.hpp b/surface/include/pcl/surface/3rdparty/poisson4/sparse_matrix.hpp -index 02c2db5..24f0a54 100644 ---- a/surface/include/pcl/surface/3rdparty/poisson4/sparse_matrix.hpp -+++ b/surface/include/pcl/surface/3rdparty/poisson4/sparse_matrix.hpp -@@ -252,7 +252,7 @@ namespace pcl - { - for (int i=0; i