From: Jochen Sprickerhof Date: Sun, 13 Aug 2017 10:49:05 +0000 (+0200) Subject: Remove patches, applied upstream X-Git-Tag: archive/raspbian/1.14.0+dfsg-2+rpi1^2~158 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=853d079fce189bb0c0e16a114ffc01a0ba2e2cb3;p=pcl.git Remove patches, applied upstream --- diff --git a/debian/patches/0002-Remove-relicts-of-nonfree-ia_-fpcs.patch b/debian/patches/0002-Remove-relicts-of-nonfree-ia_-fpcs.patch deleted file mode 100644 index 18933d58..00000000 --- a/debian/patches/0002-Remove-relicts-of-nonfree-ia_-fpcs.patch +++ /dev/null @@ -1,51 +0,0 @@ -From: Jochen Sprickerhof -Date: Mon, 15 Aug 2016 23:56:12 +0200 -Subject: Remove relicts of nonfree ia_*fpcs - ---- - registration/CMakeLists.txt | 5 ----- - test/registration/CMakeLists.txt | 10 ---------- - 2 files changed, 15 deletions(-) - -diff --git a/registration/CMakeLists.txt b/registration/CMakeLists.txt -index f2a7df2..217c190 100644 ---- a/registration/CMakeLists.txt -+++ b/registration/CMakeLists.txt -@@ -71,9 +71,6 @@ if(build) - "include/pcl/${SUBSYS_NAME}/distances.h" - "include/pcl/${SUBSYS_NAME}/exceptions.h" - "include/pcl/${SUBSYS_NAME}/sample_consensus_prerejective.h" -- "include/pcl/${SUBSYS_NAME}/ia_fpcs.h" -- "include/pcl/${SUBSYS_NAME}/ia_kfpcs.h" -- "include/pcl/${SUBSYS_NAME}/matching_candidate.h" - "include/pcl/${SUBSYS_NAME}/transformation_estimation_3point.h" - ) - -@@ -120,8 +117,6 @@ if(build) - "include/pcl/${SUBSYS_NAME}/impl/transformation_validation_euclidean.hpp" - "include/pcl/${SUBSYS_NAME}/impl/gicp.hpp" - "include/pcl/${SUBSYS_NAME}/impl/sample_consensus_prerejective.hpp" -- "include/pcl/${SUBSYS_NAME}/impl/ia_fpcs.hpp" -- "include/pcl/${SUBSYS_NAME}/impl/ia_kfpcs.hpp" - "include/pcl/${SUBSYS_NAME}/impl/transformation_estimation_3point.hpp" - ) - -diff --git a/test/registration/CMakeLists.txt b/test/registration/CMakeLists.txt -index 7a4dd2c..ed71882 100644 ---- a/test/registration/CMakeLists.txt -+++ b/test/registration/CMakeLists.txt -@@ -20,13 +20,3 @@ PCL_ADD_TEST(correspondence_rejectors test_correspondence_rejectors - FILES test_correspondence_rejectors.cpp - LINK_WITH pcl_gtest pcl_io pcl_registration pcl_features - ARGUMENTS "${PCL_SOURCE_DIR}/test/bunny.pcd") -- --PCL_ADD_TEST(fpcs_ia test_fpcs_ia -- FILES test_fpcs_ia.cpp test_fpcs_ia_data.h -- LINK_WITH pcl_gtest pcl_io pcl_registration pcl_features pcl_search pcl_kdtree -- ARGUMENTS "${PCL_SOURCE_DIR}/test/bun0.pcd" "${PCL_SOURCE_DIR}/test/bun4.pcd") -- --PCL_ADD_TEST(kfpcs_ia test_kfpcs_ia -- FILES test_kfpcs_ia.cpp test_kfpcs_ia_data.h -- LINK_WITH pcl_gtest pcl_io pcl_registration pcl_features pcl_search pcl_kdtree -- ARGUMENTS "${PCL_SOURCE_DIR}/test/office1_keypoints.pcd" "${PCL_SOURCE_DIR}/test/office2_keypoints.pcd") -\ No newline at end of file diff --git a/debian/patches/0003-Clear-privacy-breach-logo.patch b/debian/patches/0003-Clear-privacy-breach-logo.patch deleted file mode 100644 index db0fca93..00000000 --- a/debian/patches/0003-Clear-privacy-breach-logo.patch +++ /dev/null @@ -1,21 +0,0 @@ -From: Jochen Sprickerhof -Date: Tue, 16 Aug 2016 12:08:00 +0200 -Subject: Clear privacy-breach-logo - ---- - doc/doxygen/pcl.doxy | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/doc/doxygen/pcl.doxy b/doc/doxygen/pcl.doxy -index 0e273ff..4e7b9fe 100644 ---- a/doc/doxygen/pcl.doxy -+++ b/doc/doxygen/pcl.doxy -@@ -16,8 +16,6 @@ href="http://en.wikipedia.org/wiki/BSD_licenses#3-clause_license_.28.22New_BSD_L - BSD license and is open source software. It is free for commercial and - research use. - --\image html http://www.pointclouds.org/assets/images/contents/logos/pointcloudlibrary_logo.png -- - PCL is cross-platform, and has been successfully compiled and deployed on - Linux, MacOS, Windows, and Android. To simplify development, PCL is split into - a series of smaller code libraries, that can be compiled separately. This diff --git a/debian/patches/0004-Correct-PCL_ROOT-in-PCLConfig.cmake.patch b/debian/patches/0004-Correct-PCL_ROOT-in-PCLConfig.cmake.patch deleted file mode 100644 index d0e5977f..00000000 --- a/debian/patches/0004-Correct-PCL_ROOT-in-PCLConfig.cmake.patch +++ /dev/null @@ -1,23 +0,0 @@ -From: Jochen Sprickerhof -Date: Thu, 13 Nov 2014 10:50:53 +0100 -Subject: Correct PCL_ROOT in PCLConfig.cmake - -Taken from http://pkgs.fedoraproject.org/cgit/pcl.git/tree/pcl-1.7.1-fedora.patch ---- - PCLConfig.cmake.in | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/PCLConfig.cmake.in b/PCLConfig.cmake.in -index 994d20e..b0e7aec 100644 ---- a/PCLConfig.cmake.in -+++ b/PCLConfig.cmake.in -@@ -710,8 +710,7 @@ if(WIN32 AND NOT MINGW) - get_filename_component(PCL_ROOT "${PCL_DIR}" PATH) - else(WIN32 AND NOT MINGW) - # PCLConfig.cmake is installed to PCL_ROOT/share/pcl-x.y -- get_filename_component(PCL_ROOT "${PCL_DIR}" PATH) -- get_filename_component(PCL_ROOT "${PCL_ROOT}" PATH) -+ set(PCL_ROOT "@CMAKE_INSTALL_PREFIX@") - endif(WIN32 AND NOT MINGW) - - # check whether PCLConfig.cmake is found into a PCL installation or in a build tree diff --git a/debian/patches/0004-Remove-2d-library-contains-no-symbols.patch b/debian/patches/0004-Remove-2d-library-contains-no-symbols.patch deleted file mode 100644 index 45bb9317..00000000 --- a/debian/patches/0004-Remove-2d-library-contains-no-symbols.patch +++ /dev/null @@ -1,32 +0,0 @@ -From: Jochen Sprickerhof -Date: Thu, 18 Aug 2016 00:17:37 +0200 -Subject: Remove 2d library (contains no symbols) - ---- - 2d/CMakeLists.txt | 6 ------ - 1 file changed, 6 deletions(-) - -diff --git a/2d/CMakeLists.txt b/2d/CMakeLists.txt -index 967a300..afaa998 100644 ---- a/2d/CMakeLists.txt -+++ b/2d/CMakeLists.txt -@@ -27,8 +27,6 @@ if(build) - "include/pcl/${SUBSYS_NAME}/impl/morphology.hpp" - ) - -- set(LIB_NAME "pcl_${SUBSYS_NAME}") -- - if(${VTK_FOUND}) - set(VTK_USE_FILE "${VTK_USE_FILE}" CACHE INTERNAL "VTK_USE_FILE") - include("${VTK_USE_FILE}") -@@ -36,10 +34,6 @@ if(build) - endif(${VTK_FOUND}) - - include_directories("${CMAKE_CURRENT_SOURCE_DIR}/include" ${VTK_INCLUDE_DIRECTORIES}) -- PCL_ADD_LIBRARY("${LIB_NAME}" "${SUBSYS_NAME}" ${srcs} ${incs} ${impl_incs}) -- link_directories(${VTK_LINK_DIRECTORIES}) -- target_link_libraries("${LIB_NAME}" ${VTK_LIBRARIES} pcl_io) -- PCL_MAKE_PKGCONFIG("${LIB_NAME}" "${SUBSYS_NAME}" "${SUBSYS_DESC}" "${SUBSYS_DEPS}" "" "" "" "") - - #Install include files - PCL_ADD_INCLUDES("${SUBSYS_NAME}" "${SUBSYS_NAME}" ${incs}) diff --git a/debian/patches/fix-gl-build.patch b/debian/patches/fix-gl-build.patch deleted file mode 100644 index 7d901d5d..00000000 --- a/debian/patches/fix-gl-build.patch +++ /dev/null @@ -1,19 +0,0 @@ -Description: Try to fix build failure on arm64 -Author: Gianfranco Costamagna - ---- pcl-1.8.0+dfsg1.orig/apps/point_cloud_editor/include/pcl/apps/point_cloud_editor/cloud.h -+++ pcl-1.8.0+dfsg1/apps/point_cloud_editor/include/pcl/apps/point_cloud_editor/cloud.h -@@ -45,6 +45,13 @@ - #include - #include - #include -+#ifdef OPENGL_IS_A_FRAMEWORK -+# include -+# include -+#else -+# include -+# include -+#endif - - /// @brief A wrapper which allows to use any implementation of cloud provided by - /// a third-party library. diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index 58863cb4..00000000 --- a/debian/patches/series +++ /dev/null @@ -1,5 +0,0 @@ -0004-Correct-PCL_ROOT-in-PCLConfig.cmake.patch -0002-Remove-relicts-of-nonfree-ia_-fpcs.patch -0003-Clear-privacy-breach-logo.patch -0004-Remove-2d-library-contains-no-symbols.patch -fix-gl-build.patch