From: Jochen Sprickerhof Date: Fri, 24 Dec 2021 22:54:52 +0000 (+0100) Subject: Rebase patches X-Git-Tag: archive/raspbian/1.14.0+dfsg-2+rpi1^2~47 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=2dbb61b249d0a24432a7dee2f4162e5f730c7cdd;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 77f56b9a..8aed0381 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 a1283a8..0941d0f 100644 +index 27ef980..b8e5148 100644 --- a/PCLConfig.cmake.in +++ b/PCLConfig.cmake.in -@@ -389,7 +389,7 @@ if(WIN32 AND NOT MINGW) +@@ -390,7 +390,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 index d094d5dc..9d5b6581 100644 --- 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 @@ -8,10 +8,10 @@ Subject: Link against atomic if needed (found on armel) 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 63b38df..e44ec3e 100644 +index 1e61bfd..02b690d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -60,6 +60,20 @@ elseif(MINGW) +@@ -57,6 +57,20 @@ elseif(MINGW) set(CMAKE_COMPILER_IS_MINGW 1) endif() @@ -33,7 +33,7 @@ index 63b38df..e44ec3e 100644 # 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 91f2404..435a50e 100644 +index ff79c20..f12a472 100644 --- a/cmake/pcl_targets.cmake +++ b/cmake/pcl_targets.cmake @@ -230,7 +230,7 @@ function(PCL_ADD_LIBRARY _name) @@ -45,12 +45,12 @@ index 91f2404..435a50e 100644 endif() if(MINGW) -@@ -385,7 +385,7 @@ macro(PCL_ADD_TEST _name _exename) +@@ -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}) - # must link explicitly against boost only on Windows - target_link_libraries(${_exename} ${Boost_LIBRARIES}) + #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 44a01472..f62b6af0 100644 --- a/debian/patches/0003-Use-newly-build-libs-when-testing.patch +++ b/debian/patches/0003-Use-newly-build-libs-when-testing.patch @@ -8,10 +8,10 @@ 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 435a50e..4a2e2c3 100644 +index f12a472..ff71d78 100644 --- a/cmake/pcl_targets.cmake +++ b/cmake/pcl_targets.cmake -@@ -407,6 +407,7 @@ macro(PCL_ADD_TEST _name _exename) +@@ -410,6 +410,7 @@ macro(PCL_ADD_TEST _name _exename) set_target_properties(${_exename} PROPERTIES FOLDER "Tests") add_test(NAME ${_name} COMMAND ${_exename} ${PCL_ADD_TEST_ARGUMENTS}) diff --git a/debian/patches/0004-Disable-failing-tests.patch b/debian/patches/0004-Disable-failing-tests.patch index 0e05b451..17ec20b9 100644 --- a/debian/patches/0004-Disable-failing-tests.patch +++ b/debian/patches/0004-Disable-failing-tests.patch @@ -24,10 +24,10 @@ 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 29fbbc9..f332cd3 100644 +index 5211a2c..e197644 100644 --- a/test/features/test_normal_estimation.cpp +++ b/test/features/test_normal_estimation.cpp -@@ -278,7 +278,7 @@ TEST (PCL, NormalEstimationOpenMP) +@@ -409,7 +409,7 @@ TEST (PCL, NormalEstimationOpenMP) // IntegralImageNormalEstimation could crash or produce // incorrect normals. // This test reproduces the issue. diff --git a/debian/patches/0005-Adopt-unit-test-for-i386.patch b/debian/patches/0005-Adopt-unit-test-for-i386.patch index ab3bbcf9..332e1d55 100644 --- a/debian/patches/0005-Adopt-unit-test-for-i386.patch +++ b/debian/patches/0005-Adopt-unit-test-for-i386.patch @@ -6,9 +6,8 @@ Subject: Adopt unit test for i386 test/features/test_curvatures_estimation.cpp | 12 ++++++------ test/features/test_gasd_estimation.cpp | 2 +- test/filters/test_convolution.cpp | 2 ++ - test/filters/test_sampling.cpp | 4 ++++ test/octree/test_octree.cpp | 2 +- - 5 files changed, 14 insertions(+), 8 deletions(-) + 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/test/features/test_curvatures_estimation.cpp b/test/features/test_curvatures_estimation.cpp index 11e858f..51e5ba3 100644 @@ -82,31 +81,6 @@ index 26e5cbe..f61a8f4 100644 } int -diff --git a/test/filters/test_sampling.cpp b/test/filters/test_sampling.cpp -index d7e1070..46d7cf8 100644 ---- a/test/filters/test_sampling.cpp -+++ b/test/filters/test_sampling.cpp -@@ -86,16 +86,20 @@ TEST (CovarianceSampling, Filters) - covariance_sampling.setNumberOfSamples (static_cast (cloud_turtle_normals->size ()) / 8); - double cond_num_turtle = covariance_sampling.computeConditionNumber (); - -+#ifndef __i386__ - // Conditioning number should be loosely close to the expected number. Adopting 10% of the reference value - EXPECT_NEAR (cond_num_turtle, 20661.7663, 2e4); -+#endif - - IndicesPtr turtle_indices (new pcl::Indices ()); - covariance_sampling.filter (*turtle_indices); - covariance_sampling.setIndices (turtle_indices); - double cond_num_turtle_sampled = covariance_sampling.computeConditionNumber (); - -+#ifndef __i386__ - // Conditioning number should be loosely close to the expected number. Adopting 10% of the reference value - EXPECT_NEAR (cond_num_turtle_sampled, 5795.5057, 5e3); -+#endif - - // Ensure it respects the requested sampling size - EXPECT_EQ (static_cast (cloud_turtle_normals->size ()) / 8, turtle_indices->size ()); diff --git a/test/octree/test_octree.cpp b/test/octree/test_octree.cpp index fc37ad1..210a3c2 100644 --- a/test/octree/test_octree.cpp diff --git a/debian/patches/0006-Fix-alignment-in-tests-for-armhf-armel.patch b/debian/patches/0006-Fix-alignment-in-tests-for-armhf-armel.patch deleted file mode 100644 index a87371e8..00000000 --- a/debian/patches/0006-Fix-alignment-in-tests-for-armhf-armel.patch +++ /dev/null @@ -1,54 +0,0 @@ -From: Jochen Sprickerhof -Date: Fri, 8 Oct 2021 19:22:51 +0200 -Subject: Fix alignment in tests for armhf/armel - ---- - test/common/test_pointcloud.cpp | 1 + - test/filters/test_crop_hull.cpp | 1 + - test/filters/test_functor_filter.cpp | 2 ++ - 3 files changed, 4 insertions(+) - -diff --git a/test/common/test_pointcloud.cpp b/test/common/test_pointcloud.cpp -index 2e43620..922177d 100644 ---- a/test/common/test_pointcloud.cpp -+++ b/test/common/test_pointcloud.cpp -@@ -16,6 +16,7 @@ using namespace pcl; - - ////////////////////////////////////////////// - struct pointCloudTest : public testing::Test { -+ EIGEN_MAKE_ALIGNED_OPERATOR_NEW - protected: - PointCloud cloud; - }; -diff --git a/test/filters/test_crop_hull.cpp b/test/filters/test_crop_hull.cpp -index d46838a..fcac94c 100644 ---- a/test/filters/test_crop_hull.cpp -+++ b/test/filters/test_crop_hull.cpp -@@ -101,6 +101,7 @@ class PCLCropHullTestFixture : public ::testing::Test - baseOffsetList_.emplace_back(10, 1, 5); - baseOffsetList_.emplace_back(10, 5, 1); - } -+ EIGEN_MAKE_ALIGNED_OPERATOR_NEW - protected: - - void -diff --git a/test/filters/test_functor_filter.cpp b/test/filters/test_functor_filter.cpp -index e4a1190..741ffb1 100644 ---- a/test/filters/test_functor_filter.cpp -+++ b/test/filters/test_functor_filter.cpp -@@ -52,6 +52,7 @@ struct FunctorFilterRandom : public testing::TestWithParam { - - shared_ptr> cloud; - PointCloud out_cloud, negative_cloud, positive_cloud; -+ EIGEN_MAKE_ALIGNED_OPERATOR_NEW - }; - - TEST_P(FunctorFilterRandom, functioning) -@@ -172,6 +173,7 @@ struct FunctorFilterFunctionObject : public ::testing::Test { - cloud.resize(2); - } - PointCloud cloud; -+ EIGEN_MAKE_ALIGNED_OPERATOR_NEW - }; - TYPED_TEST_SUITE_P(FunctorFilterFunctionObject); - diff --git a/debian/patches/series b/debian/patches/series index 73fa7a81..5023766f 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -3,5 +3,4 @@ 0003-Use-newly-build-libs-when-testing.patch 0004-Disable-failing-tests.patch 0005-Adopt-unit-test-for-i386.patch -0006-Fix-alignment-in-tests-for-armhf-armel.patch 0007-Adopt-unit-tests-for-arm64-and-ppc64el.patch