[pcl] 03/07: Rebase patches
Jochen Sprickerhof
jspricke-guest at moszumanska.debian.org
Tue Aug 16 21:13:35 UTC 2016
This is an automated email from the git hooks/post-receive script.
jspricke-guest pushed a commit to branch master
in repository pcl.
commit e289d4fc751db379c3392e767a7a2a4a260ead2e
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date: Mon Aug 15 17:16:14 2016 +0200
Rebase patches
---
...es-for-OpenNI-and-OpenNI2-were-wrong-in-c.patch | 82 ----------
...penni-dev-and-openni2-dev-in-PCLConfig.cm.patch | 53 -------
.../patches/0003-Always-build-libpcl_apps.so.patch | 118 --------------
.../0004-Correct-PCL_ROOT-in-PCLConfig.cmake.patch | 10 +-
.../0005-tools-depends-on-visualization.patch | 20 ---
.../0006-fixes-for-boost-1.56-and-Qt4.patch | 112 --------------
debian/patches/0007-Fix-for-boost-1.57.patch | 172 ---------------------
...l_registration-and-segmentation-demo-for-.patch | 65 --------
...x-THIS_METHOD_IS_ONLY_FOR_1x1_EXPRESSIONS.patch | 37 -----
...METHOD_IS_ONLY_FOR_INNER_OR_LAZY_PRODUCTS.patch | 21 ---
...nly-set-QVTK_FOUND-if-it-s-actually-found.patch | 31 ----
debian/patches/0012-Fix-compilation-on-gcc6.patch | 35 -----
debian/patches/series | 11 --
13 files changed, 3 insertions(+), 764 deletions(-)
diff --git a/debian/patches/0001-Package-names-for-OpenNI-and-OpenNI2-were-wrong-in-c.patch b/debian/patches/0001-Package-names-for-OpenNI-and-OpenNI2-were-wrong-in-c.patch
deleted file mode 100644
index 81ef41c..0000000
--- a/debian/patches/0001-Package-names-for-OpenNI-and-OpenNI2-were-wrong-in-c.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From 881e4cf919a86ebc58ab80b51ac5d154f3b8f82e Mon Sep 17 00:00:00 2001
-From: Emmanuel Durand <emmanueldurand at gmail.com>
-Date: Thu, 25 Sep 2014 16:11:47 -0400
-Subject: [PATCH 1/3] Package names for OpenNI and OpenNI2 were wrong in cmake
- modules and in output pkgconfig file
-
----
- cmake/Modules/FindOpenNI.cmake | 4 ++--
- cmake/Modules/FindOpenNI2.cmake | 4 ++--
- io/CMakeLists.txt | 4 ++--
- visualization/CMakeLists.txt | 4 ++--
- 4 files changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/cmake/Modules/FindOpenNI.cmake b/cmake/Modules/FindOpenNI.cmake
-index cb537be..9f772a4 100644
---- a/cmake/Modules/FindOpenNI.cmake
-+++ b/cmake/Modules/FindOpenNI.cmake
-@@ -35,9 +35,9 @@ if(NOT WIN32)
- endif(NOT WIN32)
-
- if(${CMAKE_VERSION} VERSION_LESS 2.8.2)
-- pkg_check_modules(PC_OPENNI openni-dev)
-+ pkg_check_modules(PC_OPENNI libopenni)
- else()
-- pkg_check_modules(PC_OPENNI QUIET openni-dev)
-+ pkg_check_modules(PC_OPENNI QUIET libopenni)
- endif()
-
- set(OPENNI_DEFINITIONS ${PC_OPENNI_CFLAGS_OTHER})
-diff --git a/cmake/Modules/FindOpenNI2.cmake b/cmake/Modules/FindOpenNI2.cmake
-index 036e4e0..713099a 100644
---- a/cmake/Modules/FindOpenNI2.cmake
-+++ b/cmake/Modules/FindOpenNI2.cmake
-@@ -35,9 +35,9 @@ if(NOT WIN32)
- endif(NOT WIN32)
-
- if(${CMAKE_VERSION} VERSION_LESS 2.8.2)
-- pkg_check_modules(PC_OPENNI2 openni2-dev)
-+ pkg_check_modules(PC_OPENNI2 libopenni2)
- else()
-- pkg_check_modules(PC_OPENNI2 QUIET openni2-dev)
-+ pkg_check_modules(PC_OPENNI2 QUIET libopenni2)
- endif()
-
- set(OPENNI2_DEFINITIONS ${PC_OPENNI_CFLAGS_OTHER})
-diff --git a/io/CMakeLists.txt b/io/CMakeLists.txt
-index 347f658..6106349 100644
---- a/io/CMakeLists.txt
-+++ b/io/CMakeLists.txt
-@@ -329,10 +329,10 @@ if(build)
- set(EXT_DEPS eigen3)
-
- if(OPENNI_FOUND)
-- list(APPEND EXT_DEPS openni-dev)
-+ list(APPEND EXT_DEPS libopenni)
- endif(OPENNI_FOUND)
- if(OPENNI2_FOUND)
-- list(APPEND EXT_DEPS openni2-dev)
-+ list(APPEND EXT_DEPS libopenni2)
- endif(OPENNI2_FOUND)
-
- PCL_MAKE_PKGCONFIG("${LIB_NAME}" "${SUBSYS_NAME}" "${SUBSYS_DESC}"
-diff --git a/visualization/CMakeLists.txt b/visualization/CMakeLists.txt
-index d7becc5..746a693 100644
---- a/visualization/CMakeLists.txt
-+++ b/visualization/CMakeLists.txt
-@@ -154,10 +154,10 @@ if(build)
-
- set(EXT_DEPS "")
- if(OPENNI_FOUND)
-- list(APPEND EXT_DEPS openni-dev)
-+ list(APPEND EXT_DEPS libopenni)
- endif(OPENNI_FOUND)
- if(OPENNI2_FOUND)
-- list(APPEND EXT_DEPS openni2-dev)
-+ list(APPEND EXT_DEPS libopenni2)
- endif(OPENNI2_FOUND)
- PCL_MAKE_PKGCONFIG("${LIB_NAME}" "${SUBSYS_NAME}" "${SUBSYS_DESC}"
- "${SUBSYS_DEPS}" "${EXT_DEPS}" "" "" "")
---
-2.1.3
-
diff --git a/debian/patches/0002-Corrected-openni-dev-and-openni2-dev-in-PCLConfig.cm.patch b/debian/patches/0002-Corrected-openni-dev-and-openni2-dev-in-PCLConfig.cm.patch
deleted file mode 100644
index 53a40c8..0000000
--- a/debian/patches/0002-Corrected-openni-dev-and-openni2-dev-in-PCLConfig.cm.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 2f94cf21bead8bbb84211d3a182fd30d390df157 Mon Sep 17 00:00:00 2001
-From: Emmanuel Durand <emmanueldurand at gmail.com>
-Date: Fri, 26 Sep 2014 08:59:46 -0400
-Subject: [PATCH 2/3] Corrected openni-dev and openni2-dev in
- PCLConfig.cmake.in
-
----
- PCLConfig.cmake.in | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/PCLConfig.cmake.in b/PCLConfig.cmake.in
-index 65ea688..5f5b07f 100644
---- a/PCLConfig.cmake.in
-+++ b/PCLConfig.cmake.in
-@@ -174,7 +174,7 @@ macro(find_qhull)
- endif(QHULL_FOUND)
- endmacro(find_qhull)
-
--#remove this as soon as openni-dev is shipped with FindOpenni.cmake
-+#remove this as soon as libopenni is shipped with FindOpenni.cmake
- macro(find_openni)
- if(NOT OPENNI_ROOT AND ("@HAVE_OPENNI@" STREQUAL "ON"))
- set(OPENNI_INCLUDE_DIRS_HINT "@OPENNI_INCLUDE_DIRS@")
-@@ -182,7 +182,7 @@ macro(find_openni)
- endif(NOT OPENNI_ROOT AND ("@HAVE_OPENNI@" STREQUAL "ON"))
-
- if(PKG_CONFIG_FOUND)
-- pkg_check_modules(PC_OPENNI openni-dev)
-+ pkg_check_modules(PC_OPENNI libopenni)
- endif(PKG_CONFIG_FOUND)
- find_path(OPENNI_INCLUDE_DIRS XnStatus.h
- HINTS ${PC_OPENNI_INCLUDEDIR} ${PC_OPENNI_INCLUDE_DIRS}
-@@ -210,7 +210,7 @@ macro(find_openni)
- endif(OPENNI_FOUND)
- endmacro(find_openni)
-
--#remove this as soon as openni2-dev is shipped with FindOpenni2.cmake
-+#remove this as soon as libopenni2 is shipped with FindOpenni2.cmake
- macro(find_openni2)
- if(NOT OPENNI2_ROOT AND ("ON" STREQUAL "ON"))
- get_filename_component(OPENNI2_LIBRARY_HINT "OPENNI_LIBRARY-NOTFOUND" PATH)
-@@ -222,7 +222,7 @@ macro(find_openni2)
- endif(WIN32 AND CMAKE_SIZEOF_VOID_P EQUAL 8)
-
- if(PKG_CONFIG_FOUND)
-- pkg_check_modules(PC_OPENNI2 openni2-dev)
-+ pkg_check_modules(PC_OPENNI2 libopenni2)
- endif(PKG_CONFIG_FOUND)
-
- find_path(OPENNI2_INCLUDE_DIRS OpenNI.h
---
-2.1.3
-
diff --git a/debian/patches/0003-Always-build-libpcl_apps.so.patch b/debian/patches/0003-Always-build-libpcl_apps.so.patch
deleted file mode 100644
index 1f45582..0000000
--- a/debian/patches/0003-Always-build-libpcl_apps.so.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-From 6247f993fde67cb79bc6e9a4556de07ce0d031c6 Mon Sep 17 00:00:00 2001
-From: Jochen Sprickerhof <git at jochen.sprickerhof.de>
-Date: Tue, 11 Nov 2014 11:38:43 +0100
-Subject: [PATCH 3/3] Always build libpcl_apps.so
-
-- Remove superfluous checks for VTK and OpenNI in apps
----
- apps/CMakeLists.txt | 61 +++++++++++++++++++----------------------------------
- 1 file changed, 22 insertions(+), 39 deletions(-)
-
-diff --git a/apps/CMakeLists.txt b/apps/CMakeLists.txt
-index 93b11e9..4f7e658 100644
---- a/apps/CMakeLists.txt
-+++ b/apps/CMakeLists.txt
-@@ -2,25 +2,6 @@ set(SUBSYS_NAME apps)
- set(SUBSYS_DESC "Application examples/samples that show how PCL works")
- set(SUBSYS_DEPS common geometry io filters sample_consensus segmentation visualization kdtree features surface octree registration keypoints tracking search recognition)
-
--# Find VTK
--if(NOT VTK_FOUND)
-- set(DEFAULT FALSE)
-- set(REASON "VTK was not found.")
--else(NOT VTK_FOUND)
-- set(DEFAULT TRUE)
-- set(REASON)
-- include("${VTK_USE_FILE}")
--endif(NOT VTK_FOUND)
--
--# OpenNI found?
--if(NOT OPENNI_FOUND)
-- set(DEFAULT FALSE)
-- set(REASON "OpenNI was not found.")
--else(NOT OPENNI_FOUND)
-- set(DEFAULT TRUE)
-- set(REASON)
--endif(NOT OPENNI_FOUND)
--
- set(DEFAULT FALSE)
- PCL_SUBSYS_OPTION(build "${SUBSYS_NAME}" "${SUBSYS_DESC}" ${DEFAULT} "${REASON}")
- PCL_SUBSYS_DEPEND(build "${SUBSYS_NAME}" DEPS ${SUBSYS_DEPS} OPT_DEPS openni vtk)
-@@ -47,6 +28,12 @@ if(build)
- endif(LIBUSB_1_FOUND)
-
- if (VTK_FOUND)
-+
-+ include("${VTK_USE_FILE}")
-+
-+ set(incs "include/pcl/${SUBSYS_NAME}/render_views_tesselated_sphere.h")
-+ set(srcs "src/render_views_tesselated_sphere.cpp")
-+
- PCL_ADD_EXECUTABLE(pcl_ppf_object_recognition "${SUBSYS_NAME}" src/ppf_object_recognition.cpp)
- target_link_libraries(pcl_ppf_object_recognition pcl_common pcl_io pcl_filters pcl_features pcl_registration pcl_visualization pcl_sample_consensus pcl_segmentation)
-
-@@ -162,11 +149,6 @@ if(build)
-
- endif ()
-
-- set(incs
-- include/pcl/${SUBSYS_NAME}/render_views_tesselated_sphere.h
-- include/pcl/${SUBSYS_NAME}/timer.h)
-- set(srcs src/render_views_tesselated_sphere.cpp)
--
- if (QHULL_FOUND)
- PCL_ADD_EXECUTABLE_OPT_BUNDLE(pcl_openni_3d_convex_hull "${SUBSYS_NAME}" src/openni_3d_convex_hull.cpp)
- target_link_libraries(pcl_openni_3d_convex_hull pcl_common pcl_io pcl_filters pcl_visualization pcl_segmentation pcl_sample_consensus pcl_features pcl_surface)
-@@ -177,10 +159,6 @@ if(build)
- PCL_ADD_EXECUTABLE_OPT_BUNDLE(pcl_openni_tracking "${SUBSYS_NAME}" src/openni_tracking.cpp)
- target_link_libraries(pcl_openni_tracking pcl_common pcl_io pcl_surface pcl_visualization pcl_filters pcl_features pcl_segmentation pcl_tracking pcl_search)
-
-- set(incs "include/pcl/${SUBSYS_NAME}/dominant_plane_segmentation.h" ${incs})
-- set(impl_incs "include/pcl/${SUBSYS_NAME}/impl/dominant_plane_segmentation.hpp")
-- set(srcs src/dominant_plane_segmentation.cpp ${srcs})
--
- PCL_ADD_EXECUTABLE_OPT_BUNDLE(pcl_openni_planar_convex_hull "${SUBSYS_NAME}" src/openni_planar_convex_hull.cpp)
- target_link_libraries(pcl_openni_planar_convex_hull pcl_common pcl_io pcl_filters pcl_visualization pcl_segmentation pcl_sample_consensus pcl_surface)
-
-@@ -189,17 +167,6 @@ if(build)
-
- endif() # QHULL_FOUND
-
-- # Install include files
-- PCL_ADD_INCLUDES("${SUBSYS_NAME}" "${SUBSYS_NAME}" ${incs})
-- PCL_ADD_INCLUDES("${SUBSYS_NAME}" "${SUBSYS_NAME}/impl" ${impl_incs})
--
-- set(LIB_NAME "pcl_${SUBSYS_NAME}")
-- PCL_ADD_LIBRARY("${LIB_NAME}" "${SUBSYS_NAME}" ${srcs} ${impl_incs} ${incs})
-- target_link_libraries("${LIB_NAME}" pcl_common pcl_io pcl_filters pcl_visualization pcl_segmentation pcl_surface pcl_features pcl_sample_consensus pcl_search)
--
-- PCL_MAKE_PKGCONFIG("${LIB_NAME}" "${SUBSYS_NAME}" "${SUBSYS_DESC}" "" "" "" "" "")
--
--
- PCL_ADD_EXECUTABLE_OPT_BUNDLE(pcl_ni_agast "${SUBSYS_NAME}" src/ni_agast.cpp)
- target_link_libraries(pcl_ni_agast pcl_common pcl_io pcl_filters pcl_visualization pcl_segmentation pcl_sample_consensus pcl_features pcl_keypoints pcl_surface pcl_search)
-
-@@ -231,4 +198,20 @@ if(build)
- add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/${subdir}")
- endforeach(subdir)
-
-+ set(incs
-+ "include/pcl/${SUBSYS_NAME}/dominant_plane_segmentation.h"
-+ "include/pcl/${SUBSYS_NAME}/timer.h"
-+ ${incs}
-+ )
-+ set(impl_incs "include/pcl/${SUBSYS_NAME}/impl/dominant_plane_segmentation.hpp")
-+ set(srcs "src/dominant_plane_segmentation.cpp" ${srcs})
-+
-+ set(LIB_NAME "pcl_${SUBSYS_NAME}")
-+ PCL_ADD_LIBRARY("${LIB_NAME}" "${SUBSYS_NAME}" ${srcs} ${impl_incs} ${incs})
-+ target_link_libraries("${LIB_NAME}" pcl_common pcl_io pcl_filters pcl_visualization pcl_segmentation pcl_surface pcl_features pcl_sample_consensus pcl_search)
-+ PCL_MAKE_PKGCONFIG("${LIB_NAME}" "${SUBSYS_NAME}" "${SUBSYS_DESC}" "" "" "" "" "")
-+ # Install include files
-+ PCL_ADD_INCLUDES("${SUBSYS_NAME}" "${SUBSYS_NAME}" ${incs})
-+ PCL_ADD_INCLUDES("${SUBSYS_NAME}" "${SUBSYS_NAME}/impl" ${impl_incs})
-+
- endif(build)
---
-2.1.3
-
diff --git a/debian/patches/0004-Correct-PCL_ROOT-in-PCLConfig.cmake.patch b/debian/patches/0004-Correct-PCL_ROOT-in-PCLConfig.cmake.patch
index 177a04f..d0e5977 100644
--- a/debian/patches/0004-Correct-PCL_ROOT-in-PCLConfig.cmake.patch
+++ b/debian/patches/0004-Correct-PCL_ROOT-in-PCLConfig.cmake.patch
@@ -1,7 +1,6 @@
-From 66f767e9928f068a5a63308a7cfed52495ae420e Mon Sep 17 00:00:00 2001
From: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date: Thu, 13 Nov 2014 10:50:53 +0100
-Subject: [PATCH 4/4] Correct PCL_ROOT in PCLConfig.cmake
+Subject: Correct PCL_ROOT in PCLConfig.cmake
Taken from http://pkgs.fedoraproject.org/cgit/pcl.git/tree/pcl-1.7.1-fedora.patch
---
@@ -9,10 +8,10 @@ Taken from http://pkgs.fedoraproject.org/cgit/pcl.git/tree/pcl-1.7.1-fedora.patc
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/PCLConfig.cmake.in b/PCLConfig.cmake.in
-index 5f5b07f..0dee8fb 100644
+index 994d20e..b0e7aec 100644
--- a/PCLConfig.cmake.in
+++ b/PCLConfig.cmake.in
-@@ -531,8 +531,7 @@ if(WIN32 AND NOT MINGW)
+@@ -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
@@ -22,6 +21,3 @@ index 5f5b07f..0dee8fb 100644
endif(WIN32 AND NOT MINGW)
# check whether PCLConfig.cmake is found into a PCL installation or in a build tree
---
-2.1.3
-
diff --git a/debian/patches/0005-tools-depends-on-visualization.patch b/debian/patches/0005-tools-depends-on-visualization.patch
deleted file mode 100644
index 49d18f8..0000000
--- a/debian/patches/0005-tools-depends-on-visualization.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From 421326315ad0f5012a58677d9f1fcb31fa82f6c3 Tue Dec 2 08:30:14 2014
-From: James Cowgill <james410 at cowgill.org.uk>
-Date: Wed, 25 Feb 2015 09:22:52 +0000
-Subject: Bug#779183: pcl: sometimes FTBFS - fatal error: pcl/visualization/pcl_visualizer.h: No such file or directory
-
-See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=779183
----
-
-diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
-index d5bb290..d533471 100644
---- a/tools/CMakeLists.txt
-+++ b/tools/CMakeLists.txt
-@@ -1,6 +1,6 @@
- set (SUBSYS_NAME tools)
- set (SUBSYS_DESC "Useful PCL-based command line tools")
--set (SUBSYS_DEPS common io filters sample_consensus segmentation search kdtree features surface octree registration recognition geometry keypoints)
-+set (SUBSYS_DEPS common io filters sample_consensus segmentation search kdtree features surface octree registration recognition geometry keypoints visualization)
- set (DEFAULT ON)
- set (REASON "")
-
diff --git a/debian/patches/0006-fixes-for-boost-1.56-and-Qt4.patch b/debian/patches/0006-fixes-for-boost-1.56-and-Qt4.patch
deleted file mode 100644
index 987f0b9..0000000
--- a/debian/patches/0006-fixes-for-boost-1.56-and-Qt4.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-From ccf9dab41c9f477b07d664f5a700c403d6737936 Mon Sep 17 00:00:00 2001
-From: Francisco Facioni <fran6co at gmail.com>
-Date: Wed, 1 Oct 2014 14:33:32 -0300
-Subject: [PATCH] fixes for boost 1.56 and Qt4
-
----
- apps/include/pcl/apps/impl/dominant_plane_segmentation.hpp | 2 ++
- common/include/pcl/common/boost.h | 2 ++
- common/include/pcl/common/time.h | 2 ++
- common/include/pcl/console/time.h | 2 ++
- io/include/pcl/io/boost.h | 2 ++
- tools/boost.h | 2 ++
- visualization/include/pcl/visualization/boost.h | 2 ++
- visualization/tools/image_viewer.cpp | 2 ++
- 8 files changed, 16 insertions(+)
-
---- a/apps/include/pcl/apps/impl/dominant_plane_segmentation.hpp
-+++ b/apps/include/pcl/apps/impl/dominant_plane_segmentation.hpp
-@@ -35,7 +35,9 @@
-
- #pragma once
- #include <boost/thread/thread.hpp>
-+#ifndef Q_MOC_RUN
- #include <boost/date_time/posix_time/posix_time.hpp>
-+#endif
-
- #include <pcl/apps/dominant_plane_segmentation.h>
- #include <pcl/visualization/pcl_visualizer.h>
---- a/common/include/pcl/common/boost.h
-+++ b/common/include/pcl/common/boost.h
-@@ -48,7 +48,9 @@
- #include <boost/shared_ptr.hpp>
- #include <boost/make_shared.hpp>
- #include <boost/mpl/size.hpp>
-+#ifndef Q_MOC_RUN
- #include <boost/date_time/posix_time/posix_time.hpp>
-+#endif
- #include <boost/function.hpp>
- //#include <boost/timer.hpp>
- #include <boost/thread.hpp>
---- a/common/include/pcl/common/time.h
-+++ b/common/include/pcl/common/time.h
-@@ -45,7 +45,9 @@
-
- #include <cmath>
- #include <string>
-+#ifndef Q_MOC_RUN
- #include <boost/date_time/posix_time/posix_time.hpp>
-+#endif
-
- /**
- * \file pcl/common/time.h
---- a/common/include/pcl/console/time.h
-+++ b/common/include/pcl/console/time.h
-@@ -42,7 +42,9 @@
- #pragma GCC system_header
- #endif
-
-+#ifndef Q_MOC_RUN
- #include <boost/date_time/posix_time/posix_time.hpp>
-+#endif
- #include <pcl/console/print.h>
-
- namespace pcl
---- a/io/include/pcl/io/boost.h
-+++ b/io/include/pcl/io/boost.h
-@@ -63,7 +63,9 @@
- #include <boost/mpl/transform.hpp>
- #include <boost/mpl/vector.hpp>
- #include <boost/algorithm/string.hpp>
-+#ifndef Q_MOC_RUN
- #include <boost/date_time/posix_time/posix_time.hpp>
-+#endif
- #include <boost/chrono.hpp>
- #include <boost/tokenizer.hpp>
- #include <boost/foreach.hpp>
---- a/tools/boost.h
-+++ b/tools/boost.h
-@@ -52,7 +52,9 @@
- #include <boost/lexical_cast.hpp>
- #include <boost/make_shared.hpp>
- #include <boost/date_time/gregorian/gregorian_types.hpp>
-+#ifndef Q_MOC_RUN
- #include <boost/date_time/posix_time/posix_time.hpp>
-+#endif
- #include <boost/date_time/posix_time/posix_time_types.hpp>
- #include <boost/thread/thread.hpp>
- //#include <boost/uuid/uuid.hpp>
---- a/visualization/include/pcl/visualization/boost.h
-+++ b/visualization/include/pcl/visualization/boost.h
-@@ -60,7 +60,9 @@
- #include <boost/thread/mutex.hpp>
- #include <boost/thread/thread.hpp>
- #include <boost/foreach.hpp>
-+#ifndef Q_MOC_RUN
- #include <boost/date_time/posix_time/posix_time.hpp>
-+#endif
- #include <boost/filesystem.hpp>
- #endif
-
---- a/visualization/tools/image_viewer.cpp
-+++ b/visualization/tools/image_viewer.cpp
-@@ -37,7 +37,9 @@
- */
-
- #include <boost/thread/thread.hpp>
-+#ifndef Q_MOC_RUN
- #include <boost/date_time/posix_time/posix_time.hpp>
-+#endif
- #include <pcl/point_cloud.h>
- #include <pcl/point_types.h>
- #include <pcl/common/time.h> //fps calculations
diff --git a/debian/patches/0007-Fix-for-boost-1.57.patch b/debian/patches/0007-Fix-for-boost-1.57.patch
deleted file mode 100644
index 7410497..0000000
--- a/debian/patches/0007-Fix-for-boost-1.57.patch
+++ /dev/null
@@ -1,172 +0,0 @@
-From 1d48a7588658b1c33860d1de569055432fb018ed Mon Sep 17 00:00:00 2001
-From: Francisco Facioni <fran6co at gmail.com>
-Date: Mon, 5 Jan 2015 15:38:57 -0300
-Subject: [PATCH] Fix for boost 1.57
-
----
- apps/include/pcl/apps/impl/dominant_plane_segmentation.hpp | 2 +-
- common/include/pcl/common/boost.h | 4 ++--
- common/include/pcl/conversions.h | 2 ++
- common/include/pcl/for_each_type.h | 2 ++
- common/include/pcl/register_point_struct.h | 4 ++--
- tools/boost.h | 4 ++--
- visualization/include/pcl/visualization/interactor_style.h | 3 ++-
- visualization/tools/image_viewer.cpp | 2 +-
- 8 files changed, 14 insertions(+), 9 deletions(-)
-
-diff --git a/apps/include/pcl/apps/impl/dominant_plane_segmentation.hpp b/apps/include/pcl/apps/impl/dominant_plane_segmentation.hpp
-index b457862..2a3fe5b 100644
---- a/apps/include/pcl/apps/impl/dominant_plane_segmentation.hpp
-+++ b/apps/include/pcl/apps/impl/dominant_plane_segmentation.hpp
-@@ -33,9 +33,9 @@
- *
- */
-
-+#ifndef Q_MOC_RUN
- #pragma once
- #include <boost/thread/thread.hpp>
--#ifndef Q_MOC_RUN
- #include <boost/date_time/posix_time/posix_time.hpp>
- #endif
-
-diff --git a/common/include/pcl/common/boost.h b/common/include/pcl/common/boost.h
-index b70f098..acc70af 100644
---- a/common/include/pcl/common/boost.h
-+++ b/common/include/pcl/common/boost.h
-@@ -43,14 +43,13 @@
- #pragma GCC system_header
- #endif
-
-+#ifndef Q_MOC_RUN
- // Marking all Boost headers as system headers to remove warnings
- #include <boost/fusion/sequence/intrinsic/at_key.hpp>
- #include <boost/shared_ptr.hpp>
- #include <boost/make_shared.hpp>
- #include <boost/mpl/size.hpp>
--#ifndef Q_MOC_RUN
- #include <boost/date_time/posix_time/posix_time.hpp>
--#endif
- #include <boost/function.hpp>
- //#include <boost/timer.hpp>
- #include <boost/thread.hpp>
-@@ -58,5 +57,6 @@
- #include <boost/signals2.hpp>
- #include <boost/signals2/slot.hpp>
- #include <boost/algorithm/string.hpp>
-+#endif
-
- #endif // PCL_COMMON_BOOST_H_
-diff --git a/common/include/pcl/conversions.h b/common/include/pcl/conversions.h
-index 13b883d..a5bf20b 100644
---- a/common/include/pcl/conversions.h
-+++ b/common/include/pcl/conversions.h
-@@ -52,7 +52,9 @@
- #include <pcl/for_each_type.h>
- #include <pcl/exceptions.h>
- #include <pcl/console/print.h>
-+#ifndef Q_MOC_RUN
- #include <boost/foreach.hpp>
-+#endif
-
- namespace pcl
- {
-diff --git a/common/include/pcl/for_each_type.h b/common/include/pcl/for_each_type.h
-index 4d05e04..d6973d4 100644
---- a/common/include/pcl/for_each_type.h
-+++ b/common/include/pcl/for_each_type.h
-@@ -44,6 +44,7 @@
- #pragma GCC system_header
- #endif
-
-+#ifndef Q_MOC_RUN
- #include <boost/mpl/is_sequence.hpp>
- #include <boost/mpl/begin_end.hpp>
- #include <boost/mpl/next_prior.hpp>
-@@ -54,6 +55,7 @@
- #include <boost/mpl/not.hpp>
- #include <boost/mpl/aux_/unwrap.hpp>
- #include <boost/type_traits/is_same.hpp>
-+#endif
-
- namespace pcl
- {
-diff --git a/common/include/pcl/register_point_struct.h b/common/include/pcl/register_point_struct.h
-index 88a8135..57a0e42 100644
---- a/common/include/pcl/register_point_struct.h
-+++ b/common/include/pcl/register_point_struct.h
-@@ -51,6 +51,8 @@
- #pragma warning (disable: 4244)
- #endif
-
-+//https://bugreports.qt-project.org/browse/QTBUG-22829
-+#ifndef Q_MOC_RUN
- #include <pcl/pcl_macros.h>
- #include <pcl/point_traits.h>
- #include <boost/mpl/vector.hpp>
-@@ -60,8 +62,6 @@
- #include <boost/preprocessor/cat.hpp>
- #include <boost/preprocessor/comparison.hpp>
- #include <boost/utility.hpp>
--//https://bugreports.qt-project.org/browse/QTBUG-22829
--#ifndef Q_MOC_RUN
- #include <boost/type_traits.hpp>
- #endif
- #include <stddef.h> //offsetof
-diff --git a/tools/boost.h b/tools/boost.h
-index d9a3675..f1b44dc 100644
---- a/tools/boost.h
-+++ b/tools/boost.h
-@@ -45,6 +45,7 @@
- #pragma GCC system_header
- #endif
-
-+#ifndef Q_MOC_RUN
- // Marking all Boost headers as system headers to remove warnings
- #include <boost/random.hpp>
- #include <boost/random/normal_distribution.hpp>
-@@ -52,12 +53,11 @@
- #include <boost/lexical_cast.hpp>
- #include <boost/make_shared.hpp>
- #include <boost/date_time/gregorian/gregorian_types.hpp>
--#ifndef Q_MOC_RUN
- #include <boost/date_time/posix_time/posix_time.hpp>
--#endif
- #include <boost/date_time/posix_time/posix_time_types.hpp>
- #include <boost/thread/thread.hpp>
- //#include <boost/uuid/uuid.hpp>
- //#include <boost/uuid/uuid_generators.hpp>
-+#endif
-
- #endif // PCL_TOOLS_BOOST_H_
-diff --git a/visualization/include/pcl/visualization/interactor_style.h b/visualization/include/pcl/visualization/interactor_style.h
-index fa9bebb..c89bb2d 100644
---- a/visualization/include/pcl/visualization/interactor_style.h
-+++ b/visualization/include/pcl/visualization/interactor_style.h
-@@ -47,8 +47,9 @@
- #include <pcl/visualization/mouse_event.h>
- #include <pcl/visualization/point_picking_event.h>
- #include <pcl/visualization/area_picking_event.h>
-+#ifndef Q_MOC_RUN
- #include <boost/signals2/signal.hpp>
--
-+#endif
- #include <vtkInteractorStyleRubberBandPick.h>
-
- class vtkRendererCollection;
-diff --git a/visualization/tools/image_viewer.cpp b/visualization/tools/image_viewer.cpp
-index db4f48d..03f35dd 100644
---- a/visualization/tools/image_viewer.cpp
-+++ b/visualization/tools/image_viewer.cpp
-@@ -36,8 +36,8 @@
- *
- */
-
--#include <boost/thread/thread.hpp>
- #ifndef Q_MOC_RUN
-+#include <boost/thread/thread.hpp>
- #include <boost/date_time/posix_time/posix_time.hpp>
- #endif
- #include <pcl/point_cloud.h>
---
-2.5.0
-
diff --git a/debian/patches/0008-Fixes-manual_registration-and-segmentation-demo-for-.patch b/debian/patches/0008-Fixes-manual_registration-and-segmentation-demo-for-.patch
deleted file mode 100644
index 3716136..0000000
--- a/debian/patches/0008-Fixes-manual_registration-and-segmentation-demo-for-.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From f5227353551bb8cd96ba320b934c66c42c07be6f Mon Sep 17 00:00:00 2001
-From: Francisco Facioni <fran6co at gmail.com>
-Date: Mon, 5 Jan 2015 15:38:57 -0300
-Subject: [PATCH] Fixes manual_registration and segmentation demo for boost
- 1.57
-
----
- apps/include/pcl/apps/manual_registration.h | 2 ++
- common/include/pcl/common/time_trigger.h | 2 ++
- segmentation/include/pcl/segmentation/boost.h | 3 ++-
- 3 files changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/apps/include/pcl/apps/manual_registration.h b/apps/include/pcl/apps/manual_registration.h
-index 8193428..99454c1 100644
---- a/apps/include/pcl/apps/manual_registration.h
-+++ b/apps/include/pcl/apps/manual_registration.h
-@@ -42,7 +42,9 @@
- #include <QTimer>
-
- // Boost
-+#ifndef Q_MOC_RUN
- #include <boost/thread/thread.hpp>
-+#endif
-
- // PCL
- #include <pcl/console/print.h>
-diff --git a/common/include/pcl/common/time_trigger.h b/common/include/pcl/common/time_trigger.h
-index 697d3af..941f96b 100644
---- a/common/include/pcl/common/time_trigger.h
-+++ b/common/include/pcl/common/time_trigger.h
-@@ -40,9 +40,11 @@
- #define PCL_COMMON_TIME_TRIGGER_H_
-
- #include <pcl/pcl_macros.h>
-+#ifndef Q_MOC_RUN
- #include <boost/function.hpp>
- #include <boost/thread.hpp>
- #include <boost/signals2.hpp>
-+#endif
-
- namespace pcl
- {
-diff --git a/segmentation/include/pcl/segmentation/boost.h b/segmentation/include/pcl/segmentation/boost.h
-index 32135b9..f2baa9f 100644
---- a/segmentation/include/pcl/segmentation/boost.h
-+++ b/segmentation/include/pcl/segmentation/boost.h
-@@ -45,6 +45,7 @@
- #pragma GCC system_header
- #endif
-
-+#ifndef Q_MOC_RUN
- // Marking all Boost headers as system headers to remove warnings
- #include <boost/version.hpp>
- #include <boost/make_shared.hpp>
-@@ -55,6 +56,6 @@
- #if (BOOST_VERSION >= 104400)
- #include <boost/graph/boykov_kolmogorov_max_flow.hpp>
- #endif
--
-+#endif
-
- #endif // PCL_SEGMENTATION_BOOST_H_
---
-2.5.0
-
diff --git a/debian/patches/0009-Fix-THIS_METHOD_IS_ONLY_FOR_1x1_EXPRESSIONS.patch b/debian/patches/0009-Fix-THIS_METHOD_IS_ONLY_FOR_1x1_EXPRESSIONS.patch
deleted file mode 100644
index c36ac7e..0000000
--- a/debian/patches/0009-Fix-THIS_METHOD_IS_ONLY_FOR_1x1_EXPRESSIONS.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From: Jochen Sprickerhof <git at jochen.sprickerhof.de>
-Date: Mon, 17 Aug 2015 11:53:28 +0200
-Subject: Fix THIS_METHOD_IS_ONLY_FOR_1x1_EXPRESSIONS
-
-see: https://buildd.debian.org/status/fetch.php?pkg=pcl&arch=ppc64el&ver=1.7.2-8&stamp=1438282347
-Thanks to ChriSopht in #eigen
----
- apps/in_hand_scanner/src/icp.cpp | 2 +-
- apps/in_hand_scanner/src/visibility_confidence.cpp | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/apps/in_hand_scanner/src/icp.cpp b/apps/in_hand_scanner/src/icp.cpp
-index fcbd45c..6bbfad3 100644
---- a/apps/in_hand_scanner/src/icp.cpp
-+++ b/apps/in_hand_scanner/src/icp.cpp
-@@ -382,7 +382,7 @@ pcl::ihs::ICP::selectModelPoints (const MeshConstPtr& mesh_model,
- for (Mesh::VertexDataCloud::const_iterator it=cloud.begin (); it!=cloud.end (); ++it)
- {
- // Don't consider points that are facing away from the camera.
-- if ((T_inv * it->getNormalVector4fMap ()).z () < 0.f)
-+ if ((T_inv.lazyProduct (it->getNormalVector4fMap ())).z () < 0.f)
- {
- PointNormal pt;
- pt.getVector4fMap () = it->getVector4fMap ();
-diff --git a/apps/in_hand_scanner/src/visibility_confidence.cpp b/apps/in_hand_scanner/src/visibility_confidence.cpp
-index 0b83a1b..90ebfd6 100644
---- a/apps/in_hand_scanner/src/visibility_confidence.cpp
-+++ b/apps/in_hand_scanner/src/visibility_confidence.cpp
-@@ -137,7 +137,7 @@ pcl::ihs::addDirection (const Eigen::Vector4f& normal,
- // acos (angle) = dot (a, b) / (norm (a) * norm (b)
- // m_sphere_vertices are already normalized
- unsigned int index = 0;
-- (aligned_direction.transpose () * pcl::ihs::dome.getVertices ()).maxCoeff (&index);
-+ aligned_direction.transpose ().lazyProduct (pcl::ihs::dome.getVertices ()).maxCoeff (&index);
-
- // Set the observed direction bit at 'index'
- // http://stackoverflow.com/questions/47981/how-do-you-set-clear-and-toggle-a-single-bit-in-c/47990#47990
diff --git a/debian/patches/0010-Fix-THIS_METHOD_IS_ONLY_FOR_INNER_OR_LAZY_PRODUCTS.patch b/debian/patches/0010-Fix-THIS_METHOD_IS_ONLY_FOR_INNER_OR_LAZY_PRODUCTS.patch
deleted file mode 100644
index 34e5239..0000000
--- a/debian/patches/0010-Fix-THIS_METHOD_IS_ONLY_FOR_INNER_OR_LAZY_PRODUCTS.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Jochen Sprickerhof <git at jochen.sprickerhof.de>
-Date: Sat, 10 Oct 2015 08:47:01 +0200
-Subject: Fix THIS_METHOD_IS_ONLY_FOR_INNER_OR_LAZY_PRODUCTS
-
----
- registration/include/pcl/registration/impl/ppf_registration.hpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/registration/include/pcl/registration/impl/ppf_registration.hpp b/registration/include/pcl/registration/impl/ppf_registration.hpp
-index fc752a4..2203862 100644
---- a/registration/include/pcl/registration/impl/ppf_registration.hpp
-+++ b/registration/include/pcl/registration/impl/ppf_registration.hpp
-@@ -317,7 +317,7 @@ pcl::PPFRegistration<PointSource, PointTarget>::posesWithinErrorBounds (Eigen::A
- Eigen::Affine3f &pose2)
- {
- float position_diff = (pose1.translation () - pose2.translation ()).norm ();
-- Eigen::AngleAxisf rotation_diff_mat (pose1.rotation ().inverse () * pose2.rotation ());
-+ Eigen::AngleAxisf rotation_diff_mat (pose1.rotation ().inverse ().lazyProduct (pose2.rotation ()));
-
- float rotation_diff_angle = fabsf (rotation_diff_mat.angle ());
-
diff --git a/debian/patches/0011-Only-set-QVTK_FOUND-if-it-s-actually-found.patch b/debian/patches/0011-Only-set-QVTK_FOUND-if-it-s-actually-found.patch
deleted file mode 100644
index a46acce..0000000
--- a/debian/patches/0011-Only-set-QVTK_FOUND-if-it-s-actually-found.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From: Jochen Sprickerhof <git at jochen.sprickerhof.de>
-Date: Thu, 15 Oct 2015 17:44:48 +0200
-Subject: Only set QVTK_FOUND if it's actually found
-
-list(FIND ..) set's the variable to -1 if the string is not found, so
-QVTK_FOUND was set regardless if it was installed or not. This uses the
-shorter MATCHES syntax to test for the modules.
----
- cmake/Modules/FindQVTK.cmake | 8 +++-----
- 1 file changed, 3 insertions(+), 5 deletions(-)
-
-diff --git a/cmake/Modules/FindQVTK.cmake b/cmake/Modules/FindQVTK.cmake
-index 1e9d683..9f48adf 100644
---- a/cmake/Modules/FindQVTK.cmake
-+++ b/cmake/Modules/FindQVTK.cmake
-@@ -21,12 +21,10 @@ if (${VTK_MAJOR_VERSION} VERSION_LESS "6.0")
- set (VTK_USE_QVTK ON)
- endif(NOT QVTK_FOUND)
- else (${VTK_MAJOR_VERSION} VERSION_LESS "6.0")
-- list (FIND VTK_MODULES_ENABLED vtkGUISupportQt GUI_SUPPORT_QT_FOUND)
-- list (FIND VTK_MODULES_ENABLED vtkRenderingQt RENDERING_QT_FOUND)
-- if (GUI_SUPPORT_QT_FOUND AND RENDERING_QT_FOUND)
-+ if (";${VTK_MODULES_ENABLED};" MATCHES ";vtkCommonCore;" AND ";${VTK_MODULES_ENABLED};" MATCHES ";vtkRenderingQt;")
- set (VTK_USE_QVTK ON)
- set (QVTK_LIBRARY vtkRenderingQt vtkGUISupportQt)
-- else (GUI_SUPPORT_QT_FOUND AND RENDERING_QT_FOUND)
-+ else ()
- unset(QVTK_FOUND)
-- endif (GUI_SUPPORT_QT_FOUND AND RENDERING_QT_FOUND)
-+ endif ()
- endif (${VTK_MAJOR_VERSION} VERSION_LESS "6.0")
diff --git a/debian/patches/0012-Fix-compilation-on-gcc6.patch b/debian/patches/0012-Fix-compilation-on-gcc6.patch
deleted file mode 100644
index f9d66f4..0000000
--- a/debian/patches/0012-Fix-compilation-on-gcc6.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From: Jochen Sprickerhof <git at jochen.sprickerhof.de>
-Date: Sat, 23 Jan 2016 18:16:24 +0100
-Subject: Fix compilation on gcc6
-
----
- .../include/pcl/registration/correspondence_estimation_backprojection.h | 2 +-
- .../pcl/registration/correspondence_estimation_normal_shooting.h | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/registration/include/pcl/registration/correspondence_estimation_backprojection.h b/registration/include/pcl/registration/correspondence_estimation_backprojection.h
-index 9be0043..0a96c58 100644
---- a/registration/include/pcl/registration/correspondence_estimation_backprojection.h
-+++ b/registration/include/pcl/registration/correspondence_estimation_backprojection.h
-@@ -184,7 +184,7 @@ namespace pcl
- * cloud for computing correspondences. By default we use k = 10 nearest
- * neighbors.
- */
-- inline void
-+ inline unsigned int
- getKSearch () const { return (k_); }
-
- /** \brief Clone and cast to CorrespondenceEstimationBase */
-diff --git a/registration/include/pcl/registration/correspondence_estimation_normal_shooting.h b/registration/include/pcl/registration/correspondence_estimation_normal_shooting.h
-index 84e7b32..4c5e0ab 100644
---- a/registration/include/pcl/registration/correspondence_estimation_normal_shooting.h
-+++ b/registration/include/pcl/registration/correspondence_estimation_normal_shooting.h
-@@ -180,7 +180,7 @@ namespace pcl
- * cloud for computing correspondences. By default we use k = 10 nearest
- * neighbors.
- */
-- inline void
-+ inline unsigned int
- getKSearch () const { return (k_); }
-
- /** \brief Clone and cast to CorrespondenceEstimationBase */
diff --git a/debian/patches/series b/debian/patches/series
index cdd2e79..e9338b9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,12 +1 @@
-0001-Package-names-for-OpenNI-and-OpenNI2-were-wrong-in-c.patch
-0002-Corrected-openni-dev-and-openni2-dev-in-PCLConfig.cm.patch
-0003-Always-build-libpcl_apps.so.patch
0004-Correct-PCL_ROOT-in-PCLConfig.cmake.patch
-0005-tools-depends-on-visualization.patch
-0006-fixes-for-boost-1.56-and-Qt4.patch
-0007-Fix-for-boost-1.57.patch
-0008-Fixes-manual_registration-and-segmentation-demo-for-.patch
-0009-Fix-THIS_METHOD_IS_ONLY_FOR_1x1_EXPRESSIONS.patch
-0010-Fix-THIS_METHOD_IS_ONLY_FOR_INNER_OR_LAZY_PRODUCTS.patch
-0011-Only-set-QVTK_FOUND-if-it-s-actually-found.patch
-0012-Fix-compilation-on-gcc6.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/pcl.git
More information about the debian-science-commits
mailing list