From 0d55bfc954a205c13b44f8e9f1d2798f3dc265df Mon Sep 17 00:00:00 2001 From: Rich Mattes Date: Oct 26 2013 16:46:07 +0000 Subject: Update to release 1.7.1 --- diff --git a/.gitignore b/.gitignore index 8f527ff..d8b68b1 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /PCL-1.5.1-Source.tar.bz2 /PCL-1.6.0-Source.tar.bz2 /pcl-1.7.0.tar.gz +/pcl-1.7.1.tar.gz diff --git a/pcl-1.7.0-geometrypkgconfig.patch b/pcl-1.7.0-geometrypkgconfig.patch deleted file mode 100644 index 17d4f00..0000000 --- a/pcl-1.7.0-geometrypkgconfig.patch +++ /dev/null @@ -1,97 +0,0 @@ -From e1d3505d4a6743de05a4baf9ec66bfec2f9e5b01 Mon Sep 17 00:00:00 2001 -From: jdt141 -Date: Sun, 8 Sep 2013 22:22:06 -0400 -Subject: [PATCH] Addition of pkg-config header only file generation for - geometry lib - ---- - cmake/pcl_targets.cmake | 33 +++++++++++++++++++++++++++++++++ - cmake/pkgconfig-headeronly.cmake.in | 12 ++++++++++++ - geometry/CMakeLists.txt | 6 +++--- - 3 files changed, 48 insertions(+), 3 deletions(-) - create mode 100644 cmake/pkgconfig-headeronly.cmake.in - -diff --git a/cmake/pcl_targets.cmake b/cmake/pcl_targets.cmake -index 8a5e343..1f7c2b5 100644 ---- a/cmake/pcl_targets.cmake -+++ b/cmake/pcl_targets.cmake -@@ -454,6 +454,39 @@ macro(PCL_MAKE_PKGCONFIG _name _component _desc _pcl_deps _ext_deps _int_deps _c - COMPONENT pcl_${_component}) - endmacro(PCL_MAKE_PKGCONFIG) - -+############################################################################### -+# Make a pkg-config file for a header-only library. -+# Essentially a duplicate of PCL_MAKE_PKGCONFIG, but -+# ensures that no -L or l flags will be created -+# Do not include general PCL stuff in the -+# arguments; they will be added automaticaly. -+# _name The library name. "pcl_" will be preprended to this. -+# _component The part of PCL that this pkg-config file belongs to. -+# _desc Description of the library. -+# _pcl_deps External dependencies to pcl libs, as a list. (will get mangled to external pkg-config name) -+# _ext_deps External dependencies, as a list. -+# _int_deps Internal dependencies, as a list. -+# _cflags Compiler flags necessary to build with the library. -+macro(PCL_MAKE_PKGCONFIG_HEADER_ONLY _name _component _desc _pcl_deps _ext_deps _int_deps _cflags) -+set(PKG_NAME ${_name}) -+set(PKG_DESC ${_desc}) -+set(PKG_CFLAGS ${_cflags}) -+#set(PKG_LIBFLAGS ${_lib_flags}) -+LIST_TO_STRING(_ext_deps_str "${_ext_deps}") -+set(PKG_EXTERNAL_DEPS ${_ext_deps_str}) -+foreach(_dep ${_pcl_deps}) -+set(PKG_EXTERNAL_DEPS "${PKG_EXTERNAL_DEPS} pcl_${_dep}-${PCL_MAJOR_VERSION}.${PCL_MINOR_VERSION}") -+endforeach(_dep) -+set(PKG_INTERNAL_DEPS "") -+foreach(_dep ${_int_deps}) -+set(PKG_INTERNAL_DEPS "${PKG_INTERNAL_DEPS} -l${_dep}") -+endforeach(_dep) -+set(_pc_file ${CMAKE_CURRENT_BINARY_DIR}/${_name}-${PCL_MAJOR_VERSION}.${PCL_MINOR_VERSION}.pc) -+configure_file(${PROJECT_SOURCE_DIR}/cmake/pkgconfig-headeronly.cmake.in ${_pc_file} @ONLY) -+install(FILES ${_pc_file} DESTINATION ${PKGCFG_INSTALL_DIR} -+COMPONENT pcl_${_component}) -+endmacro(PCL_MAKE_PKGCONFIG_HEADER_ONLY) -+ - - ############################################################################### - # PRIVATE -diff --git a/cmake/pkgconfig-headeronly.cmake.in b/cmake/pkgconfig-headeronly.cmake.in -new file mode 100644 -index 0000000..6359f03 ---- /dev/null -+++ b/cmake/pkgconfig-headeronly.cmake.in -@@ -0,0 +1,12 @@ -+# This file was generated by CMake for @PROJECT_NAME@ library @PKG_NAME@ -+prefix=@CMAKE_INSTALL_PREFIX@ -+exec_prefix=${prefix} -+libdir=${prefix}/@LIB_INSTALL_DIR@ -+#includedir=${prefix}/@INCLUDE_INSTALL_DIR@ -+includedir=${prefix}/include/@PROJECT_NAME_LOWER@-@PCL_MAJOR_VERSION@.@PCL_MINOR_VERSION@ -+Name: @PKG_NAME@ -+Description: @PKG_DESC@ -+Version: @PCL_VERSION@ -+Requires: @PKG_EXTERNAL_DEPS@ -+Libs: -+Cflags: -I${includedir} @PKG_CFLAGS@ -diff --git a/geometry/CMakeLists.txt b/geometry/CMakeLists.txt -index ec387a6..ec8d9d3 100644 ---- a/geometry/CMakeLists.txt -+++ b/geometry/CMakeLists.txt -@@ -37,11 +37,11 @@ if(build) - # src/geometry.cpp - # ) - --# set(LIB_NAME pcl_${SUBSYS_NAME}) -+set(LIB_NAME pcl_${SUBSYS_NAME}) - include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include) --# PCL_ADD_LIBRARY(${LIB_NAME} ${SUBSYS_NAME} ${srcs} ${incs} ${impl_incs}) -+# PCL_ADD_LIBRARY(${LIB_NAME} ${SUBSYS_NAME} ${srcs} ${incs} ${impl_incs}) - # target_link_libraries(${LIB_NAME} pcl_common) --# PCL_MAKE_PKGCONFIG(${LIB_NAME} ${SUBSYS_NAME} "${SUBSYS_DESC}" "${SUBSYS_DEPS}" "" "" "" "") -+PCL_MAKE_PKGCONFIG_HEADER_ONLY(${LIB_NAME} ${SUBSYS_NAME} "${SUBSYS_DESC}" "${SUBSYS_DEPS}" "" "" "") - - # Install include files - PCL_ADD_INCLUDES(${SUBSYS_NAME} ${SUBSYS_NAME} ${incs}) --- -1.8.4 - diff --git a/pcl-1.7.0-metslib.patch b/pcl-1.7.0-metslib.patch deleted file mode 100644 index f120238..0000000 --- a/pcl-1.7.0-metslib.patch +++ /dev/null @@ -1,81 +0,0 @@ -diff -up ./CMakeLists.txt.metslib ./CMakeLists.txt ---- ./CMakeLists.txt.metslib 2013-08-22 00:27:46.852171410 +0000 -+++ ./CMakeLists.txt 2013-08-22 00:34:44.075844009 +0000 -@@ -14,6 +14,9 @@ string(TOLOWER ${PROJECT_NAME} PROJECT_N - ### ---[ Find universal dependencies - set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/Modules/" ${CMAKE_MODULE_PATH}) - -+# ---[ Include pkgconfig -+include (FindPkgConfig) -+ - # ---[ Release/Debug specific flags - if(CMAKE_BUILD_TYPE STREQUAL "Release" OR CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo") - add_definitions("-DBOOST_DISABLE_ASSERTS -DEIGEN_NO_DEBUG") -@@ -260,6 +263,14 @@ if (FZAPI_FOUND) - include_directories(SYSTEM ${FZAPI_INCLUDE_DIR}) - endif() - -+# metslib -+if (PKG_CONFIG_FOUND) -+ pkg_check_modules(METSLIB metslib) -+ if (METSLIB_FOUND) -+ set (HAVE_METSLIB ON) -+ endif() -+endif() -+ - # LibPNG - find_package(PNG) - if (PNG_FOUND) -diff -up ./recognition/CMakeLists.txt.metslib ./recognition/CMakeLists.txt ---- ./recognition/CMakeLists.txt.metslib 2013-08-22 00:25:29.927344682 +0000 -+++ ./recognition/CMakeLists.txt 2013-08-22 00:36:27.885019317 +0000 -@@ -102,6 +102,9 @@ if(build) - src/implicit_shape_model.cpp - ) - -+ if (HAVE_METSLIB) -+ set(metslib_incs "") -+ else() - set(metslib_incs - include/pcl/${SUBSYS_NAME}/3rdparty/metslib/abstract-search.hh - include/pcl/${SUBSYS_NAME}/3rdparty/metslib/local-search.hh -@@ -113,9 +116,15 @@ if(build) - include/pcl/${SUBSYS_NAME}/3rdparty/metslib/tabu-search.hh - include/pcl/${SUBSYS_NAME}/3rdparty/metslib/termination-criteria.hh - ) -+ endif() - - set(LIB_NAME pcl_${SUBSYS_NAME}) - include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include) -+ if (HAVE_METSLIB) -+ include_directories(${METSLIB_INCLUDE_DIRS}) -+ else() -+ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include/pcl/recognition/3rdparty/) -+ endif() - PCL_ADD_LIBRARY(${LIB_NAME} ${SUBSYS_NAME} ${srcs} ${incs} ${impl_incs} ${hv_incs} ${hv_impl_incs} ${cg_incs} ${cg_impl_incs} ${metslib_incs}) - target_link_libraries(${LIB_NAME} pcl_common pcl_kdtree pcl_octree pcl_search pcl_features pcl_registration pcl_sample_consensus pcl_filters pcl_io) - PCL_MAKE_PKGCONFIG(${LIB_NAME} ${SUBSYS_NAME} "${SUBSYS_DESC}" "${SUBSYS_DEPS}" "" "" "" "") -diff -up ./recognition/include/pcl/recognition/hv/hv_go.h.metslib ./recognition/include/pcl/recognition/hv/hv_go.h ---- ./recognition/include/pcl/recognition/hv/hv_go.h.metslib 2013-08-22 00:25:02.204772392 +0000 -+++ ./recognition/include/pcl/recognition/hv/hv_go.h 2013-08-22 00:25:19.472128846 +0000 -@@ -11,7 +11,7 @@ - #include - #include - #include --#include "pcl/recognition/3rdparty/metslib/mets.hh" -+#include "metslib/mets.hh" - #include - #include - #include -diff -up ./recognition/include/pcl/recognition/impl/hv/hv_go.hpp.metslib ./recognition/include/pcl/recognition/impl/hv/hv_go.hpp ---- ./recognition/include/pcl/recognition/impl/hv/hv_go.hpp.metslib 2013-08-22 00:51:52.759313219 +0000 -+++ ./recognition/include/pcl/recognition/impl/hv/hv_go.hpp 2013-08-22 00:52:07.656623522 +0000 -@@ -445,7 +445,7 @@ void pcl::GlobalHypothesesVerification sa (model, best_recorder, neigh, noimprove, linear_cooling, initial_temp_, 1e-7, 2); -- sa.setApplyAndEvaluate(true); -+ //sa.setApplyAndEvaluate(true); - - { - pcl::ScopeTime t ("SA search..."); diff --git a/pcl-1.7.0-opennidev.patch b/pcl-1.7.0-opennidev.patch deleted file mode 100644 index 4b4367e..0000000 --- a/pcl-1.7.0-opennidev.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -up ./io/CMakeLists.txt.opennidev ./io/CMakeLists.txt ---- ./io/CMakeLists.txt.opennidev 2013-09-14 12:21:16.274813752 -0400 -+++ ./io/CMakeLists.txt 2013-09-14 12:21:21.485017759 -0400 -@@ -236,7 +236,7 @@ if(build) - - set(EXT_DEPS eigen3) - if(OPENNI_FOUND) -- list(APPEND EXT_DEPS openni-dev) -+ #list(APPEND EXT_DEPS openni-dev) - endif(OPENNI_FOUND) - PCL_MAKE_PKGCONFIG(${LIB_NAME} ${SUBSYS_NAME} "${SUBSYS_DESC}" - "${SUBSYS_DEPS}" "${EXT_DEPS}" "" "" "") -diff -up ./visualization/CMakeLists.txt.opennidev ./visualization/CMakeLists.txt ---- ./visualization/CMakeLists.txt.opennidev 2013-09-14 12:21:24.992155022 -0400 -+++ ./visualization/CMakeLists.txt 2013-09-14 12:21:43.830891570 -0400 -@@ -160,7 +160,7 @@ if(build) - - set(EXT_DEPS "") - if(OPENNI_FOUND) -- list(APPEND EXT_DEPS openni-dev) -+ #list(APPEND EXT_DEPS openni-dev) - endif(OPENNI_FOUND) - PCL_MAKE_PKGCONFIG(${LIB_NAME} ${SUBSYS_NAME} "${SUBSYS_DESC}" - "${SUBSYS_DEPS}" "${EXT_DEPS}" "" "" "") diff --git a/pcl-1.7.1-metslib.patch b/pcl-1.7.1-metslib.patch new file mode 100644 index 0000000..f2366b4 --- /dev/null +++ b/pcl-1.7.1-metslib.patch @@ -0,0 +1,81 @@ +diff -up ./CMakeLists.txt.metslib ./CMakeLists.txt +--- ./CMakeLists.txt.metslib 2013-10-07 09:09:35.000000000 -0400 ++++ ./CMakeLists.txt 2013-10-26 11:13:00.702474733 -0400 +@@ -14,6 +14,9 @@ string(TOLOWER ${PROJECT_NAME} PROJECT_N + ### ---[ Find universal dependencies + set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/Modules/" ${CMAKE_MODULE_PATH}) + ++# ---[ Include pkgconfig ++include (FindPkgConfig) ++ + # ---[ Release/Debug specific flags + if(CMAKE_BUILD_TYPE STREQUAL "Release" OR CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo") + add_definitions("-DBOOST_DISABLE_ASSERTS -DEIGEN_NO_DEBUG") +@@ -274,6 +277,14 @@ if (PNG_FOUND) + include_directories(${PNG_INCLUDE_DIR}) + endif(PNG_FOUND) + ++# metslib ++if (PKG_CONFIG_FOUND) ++ pkg_check_modules(METSLIB metslib) ++ if (METSLIB_FOUND) ++ set (HAVE_METSLIB ON) ++ endif() ++endif() ++ + # Qhull + if(NOT PCL_SHARED_LIBS OR WIN32) + set(QHULL_USE_STATIC ON) +diff -up ./recognition/CMakeLists.txt.metslib ./recognition/CMakeLists.txt +--- ./recognition/CMakeLists.txt.metslib 2013-10-07 09:09:35.000000000 -0400 ++++ ./recognition/CMakeLists.txt 2013-10-26 11:12:04.421310348 -0400 +@@ -127,6 +127,9 @@ if(build) + src/implicit_shape_model.cpp + ) + ++ if (HAVE_METSLIB) ++ set(metslib_incs "") ++ else() + set(metslib_incs + include/pcl/${SUBSYS_NAME}/3rdparty/metslib/abstract-search.hh + include/pcl/${SUBSYS_NAME}/3rdparty/metslib/local-search.hh +@@ -138,9 +141,14 @@ if(build) + include/pcl/${SUBSYS_NAME}/3rdparty/metslib/tabu-search.hh + include/pcl/${SUBSYS_NAME}/3rdparty/metslib/termination-criteria.hh + ) +- ++ endif() + set(LIB_NAME pcl_${SUBSYS_NAME}) + include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include) ++ if (HAVE_METSLIB) ++ include_directories(${METSLIB_INCLUDE_DIRS}) ++ else() ++ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include/pcl/recognition/3rdparty/) ++ endif() + PCL_ADD_LIBRARY(${LIB_NAME} ${SUBSYS_NAME} ${srcs} ${incs} ${impl_incs} ${ransac_based_incs} ${ransac_based_impl_incs} ${hv_incs} ${hv_impl_incs} ${cg_incs} ${cg_impl_incs} ${metslib_incs}) + target_link_libraries(${LIB_NAME} pcl_common pcl_kdtree pcl_octree pcl_search pcl_features pcl_registration pcl_sample_consensus pcl_filters pcl_io) + PCL_MAKE_PKGCONFIG(${LIB_NAME} ${SUBSYS_NAME} "${SUBSYS_DESC}" "${SUBSYS_DEPS}" "" "" "" "") +diff -up ./recognition/include/pcl/recognition/hv/hv_go.h.metslib ./recognition/include/pcl/recognition/hv/hv_go.h +--- ./recognition/include/pcl/recognition/hv/hv_go.h.metslib 2013-10-07 09:09:35.000000000 -0400 ++++ ./recognition/include/pcl/recognition/hv/hv_go.h 2013-10-26 11:12:04.421310348 -0400 +@@ -11,7 +11,7 @@ + #include + #include + #include +-#include "pcl/recognition/3rdparty/metslib/mets.hh" ++#include "metslib/mets.hh" + #include + #include + #include +diff -up ./recognition/include/pcl/recognition/impl/hv/hv_go.hpp.metslib ./recognition/include/pcl/recognition/impl/hv/hv_go.hpp +--- ./recognition/include/pcl/recognition/impl/hv/hv_go.hpp.metslib 2013-10-07 09:09:35.000000000 -0400 ++++ ./recognition/include/pcl/recognition/impl/hv/hv_go.hpp 2013-10-26 11:12:04.422310387 -0400 +@@ -445,7 +445,7 @@ void pcl::GlobalHypothesesVerification sa (model, best_recorder, neigh, noimprove, linear_cooling, initial_temp_, 1e-7, 2); +- sa.setApplyAndEvaluate(true); ++ //sa.setApplyAndEvaluate(true); + + { + pcl::ScopeTime t ("SA search..."); diff --git a/pcl.spec b/pcl.spec index 620c017..17915ca 100644 --- a/pcl.spec +++ b/pcl.spec @@ -1,25 +1,20 @@ %global apiversion 1.7 Name: pcl -Version: 1.7.0 -Release: 4%{?dist} +Version: 1.7.1 +Release: 1%{?dist} Summary: Library for point cloud processing Group: System Environment/Libraries License: BSD URL: http://pointclouds.org/ -Source0: https://github.com/PointCloudLibrary/pcl/archive/pcl-1.7.0.tar.gz +Source0: https://github.com/PointCloudLibrary/pcl/archive/pcl-%{version}.tar.gz # Patch to compile against vtk 6.0.0 Patch0: %{name}-vtk6.patch # Patch to compile against system metslib -Patch1: %{name}-1.7.0-metslib.patch +Patch1: %{name}-1.7.1-metslib.patch # Patch for PCLConfig.cmake to find pcl Patch2: %{name}-1.7.0-fedora.patch -# Add pkgconfig for pcl_geometry. -# https://github.com/PointCloudLibrary/pcl/commit/e1d3505d4a6743de05a4baf9ec66bfec2f9e5b01.patch -Patch3: %{name}-1.7.0-geometrypkgconfig.patch -# Stops openni-dev from being added to pkgconfig files (rhbz#1007941) -Patch4: %{name}-1.7.0-opennidev.patch # For plain building BuildRequires: cmake, gcc-c++, boost-devel # Documentation @@ -53,7 +48,7 @@ Requires: %{name} = %{version}-%{release} Requires: pkgconfig Requires: eigen3-devel, qhull-devel, cminpack-devel, flann-devel, vtk-devel %ifarch %{ix86} x86_64 -Requires: openni-devel +Requires: openni-devel %endif %description devel @@ -88,8 +83,6 @@ Library. %patch0 -p1 -b .vtk6 %patch1 -p0 -b .metslib %patch2 -p0 -b .fedora -%patch3 -p1 -%patch4 -p0 # Just to make it obvious we're not using any of these rm -fr recognition/include/pcl/recognition/3rdparty/metslib rm -fr surface/src/3rdparty/opennurbs @@ -172,9 +165,7 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/%{name}-%{apiversion} # At the moment fails due to RPATH problem # (RPATH not built into test apps as required) #%check -#cd build -#make test - +#make -C build test || true %post -p /sbin/ldconfig @@ -203,6 +194,9 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/%{name}-%{apiversion} %changelog +* Sat Oct 26 2013 Rich Mattes - 1.7.1-1 +- Update to release 1.7.1 + * Sat Sep 14 2013 Rich Mattes - 1.7.0-4 - Add patch to remove openni-dev from pkgconfig files (rhbz#1007941) - Add patch to generate pcl_geometry pkgconfig file again diff --git a/sources b/sources index 595f48e..e6f6346 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e2ac2d2e72825d991c6d194f9586b5d8 pcl-1.7.0.tar.gz +ce8fa17662544eb4bb7b084191a61ad5 pcl-1.7.1.tar.gz