[packages/pcl] - updated to 1.6.0 - old link patch obsolete; new one fixes build when VTK is not enabled
qboosh
qboosh at pld-linux.org
Sat Dec 22 10:33:34 CET 2012
commit 92237c8c8e7a931ae5dc53aef53eae57406d47ec
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sat Dec 22 10:34:48 2012 +0100
- updated to 1.6.0
- old link patch obsolete; new one fixes build when VTK is not enabled
pcl-link.patch | 17 ++++-----
pcl.spec | 106 ++++++++++++++++++++++++++++++---------------------------
2 files changed, 62 insertions(+), 61 deletions(-)
---
diff --git a/pcl.spec b/pcl.spec
index 09a4688..6dfa77b 100644
--- a/pcl.spec
+++ b/pcl.spec
@@ -6,13 +6,13 @@
Summary: Point Cloud Library - library for point cloud processing
Summary(pl.UTF-8): Point Cloud Library - biblioteka do operacji na chmurze punktów
Name: pcl
-Version: 1.4.0
+Version: 1.6.0
Release: 0.1
License: BSD
Group: Libraries
-#Source0Download: http://pointclouds.org/downloads/source.html
-Source0: http://dev.pointclouds.org/attachments/download/610/PCL-%{version}-Source.tar.bz2
-# Source0-md5: 63fd633a6306ae9b334131b250a2f893
+#Source0Download: http://pointclouds.org/downloads/
+Source0: http://www.pointclouds.org/assets/files/1.6.0/PCL-%{version}-Source.tar.bz2
+# Source0-md5: f83ca5d0ff290412b0807864b95eba26
Patch0: %{name}-link.patch
URL: http://pointclouds.org/
BuildRequires: OpenNI-devel
@@ -29,7 +29,7 @@ BuildRequires: python
BuildRequires: sed >= 4.0
%if %{with apidocs}
BuildRequires: doxygen
-BuildRequires: python-sphinxcontrib-doxylink
+BuildRequires: python-sphinxcontrib-doxylink >= 1.3
BuildRequires: sphinx-pdg
%endif
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -82,7 +82,7 @@ Dokumentacja API oraz wprowadzenie do biblioteki PCL.
%setup -q -n PCL-%{version}-Source
%patch0 -p1
-# don't use SSE/SSE2/SSE3 just because compiler supports it
+# don't use SSE/SSE2/SSE3 just because compiler and builder host supports it
%{__sed} -i -e '/^PCL_CHECK_FOR_SSE/d' CMakeLists.txt
%build
@@ -91,7 +91,7 @@ cd build
%cmake ..
%{__make}
-# why it's not called on build???
+# why it's not called on build?
%if %{with apidocs}
cd doc/doxygen
doxygen doxyfile
@@ -114,78 +114,84 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
%doc AUTHORS.txt LICENSE.txt
-%attr(755,root,root) %{_bindir}/convert_pcd_ascii_binary
-%attr(755,root,root) %{_bindir}/openni_grab_frame
-%attr(755,root,root) %{_bindir}/openni_grabber_example
-%attr(755,root,root) %{_bindir}/openni_io
-%attr(755,root,root) %{_bindir}/pcd_convert_NaN_nan
+%attr(755,root,root) %{_bindir}/pcl_convert_pcd_ascii_binary
+%attr(755,root,root) %{_bindir}/pcl_openni_grabber_example
+%attr(755,root,root) %{_bindir}/pcl_openni_io
+%attr(755,root,root) %{_bindir}/pcl_pcd_convert_NaN_nan
+%attr(755,root,root) %{_bindir}/pcl_ply2obj
+%attr(755,root,root) %{_bindir}/pcl_ply2ply
+%attr(755,root,root) %{_bindir}/pcl_ply2raw
+%attr(755,root,root) %{_bindir}/pcl_plyheader
%attr(755,root,root) %{_libdir}/libpcl_common.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libpcl_common.so.1.4
+%attr(755,root,root) %ghost %{_libdir}/libpcl_common.so.1.6
%attr(755,root,root) %{_libdir}/libpcl_features.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libpcl_features.so.1.4
+%attr(755,root,root) %ghost %{_libdir}/libpcl_features.so.1.6
%attr(755,root,root) %{_libdir}/libpcl_filters.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libpcl_filters.so.1.4
+%attr(755,root,root) %ghost %{_libdir}/libpcl_filters.so.1.6
+%attr(755,root,root) %{_libdir}/libpcl_geometry.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libpcl_geometry.so.1.6
%attr(755,root,root) %{_libdir}/libpcl_io.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libpcl_io.so.1.4
+%attr(755,root,root) %ghost %{_libdir}/libpcl_io.so.1.6
+%attr(755,root,root) %{_libdir}/libpcl_io_ply.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libpcl_io_ply.so.1.6
%attr(755,root,root) %{_libdir}/libpcl_kdtree.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libpcl_kdtree.so.1.4
+%attr(755,root,root) %ghost %{_libdir}/libpcl_kdtree.so.1.6
%attr(755,root,root) %{_libdir}/libpcl_keypoints.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libpcl_keypoints.so.1.4
+%attr(755,root,root) %ghost %{_libdir}/libpcl_keypoints.so.1.6
%attr(755,root,root) %{_libdir}/libpcl_octree.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libpcl_octree.so.1.4
-%attr(755,root,root) %{_libdir}/libpcl_range_image.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libpcl_range_image.so.1.4
-%attr(755,root,root) %{_libdir}/libpcl_range_image_border_extractor.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libpcl_range_image_border_extractor.so.1.4
+%attr(755,root,root) %ghost %{_libdir}/libpcl_octree.so.1.6
%attr(755,root,root) %{_libdir}/libpcl_registration.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libpcl_registration.so.1.4
+%attr(755,root,root) %ghost %{_libdir}/libpcl_registration.so.1.6
%attr(755,root,root) %{_libdir}/libpcl_sample_consensus.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libpcl_sample_consensus.so.1.4
+%attr(755,root,root) %ghost %{_libdir}/libpcl_sample_consensus.so.1.6
%attr(755,root,root) %{_libdir}/libpcl_search.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libpcl_search.so.1.4
+%attr(755,root,root) %ghost %{_libdir}/libpcl_search.so.1.6
%attr(755,root,root) %{_libdir}/libpcl_segmentation.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libpcl_segmentation.so.1.4
+%attr(755,root,root) %ghost %{_libdir}/libpcl_segmentation.so.1.6
%attr(755,root,root) %{_libdir}/libpcl_surface.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libpcl_surface.so.1.4
+%attr(755,root,root) %ghost %{_libdir}/libpcl_surface.so.1.6
+%attr(755,root,root) %{_libdir}/libpcl_tracking.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libpcl_tracking.so.1.6
%files devel
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libpcl_common.so
%attr(755,root,root) %{_libdir}/libpcl_features.so
%attr(755,root,root) %{_libdir}/libpcl_filters.so
+%attr(755,root,root) %{_libdir}/libpcl_geometry.so
%attr(755,root,root) %{_libdir}/libpcl_io.so
+%attr(755,root,root) %{_libdir}/libpcl_io_ply.so
%attr(755,root,root) %{_libdir}/libpcl_kdtree.so
%attr(755,root,root) %{_libdir}/libpcl_keypoints.so
%attr(755,root,root) %{_libdir}/libpcl_octree.so
-%attr(755,root,root) %{_libdir}/libpcl_range_image.so
-%attr(755,root,root) %{_libdir}/libpcl_range_image_border_extractor.so
%attr(755,root,root) %{_libdir}/libpcl_registration.so
%attr(755,root,root) %{_libdir}/libpcl_sample_consensus.so
%attr(755,root,root) %{_libdir}/libpcl_search.so
%attr(755,root,root) %{_libdir}/libpcl_segmentation.so
%attr(755,root,root) %{_libdir}/libpcl_surface.so
-%{_includedir}/pcl-1.4
-%{_pkgconfigdir}/pcl_common-1.4.pc
-%{_pkgconfigdir}/pcl_features-1.4.pc
-%{_pkgconfigdir}/pcl_filters-1.4.pc
-%{_pkgconfigdir}/pcl_io-1.4.pc
-%{_pkgconfigdir}/pcl_kdtree-1.4.pc
-%{_pkgconfigdir}/pcl_keypoints-1.4.pc
-%{_pkgconfigdir}/pcl_octree-1.4.pc
-%{_pkgconfigdir}/pcl_range_image-1.4.pc
-%{_pkgconfigdir}/pcl_range_image_border_extractor-1.4.pc
-%{_pkgconfigdir}/pcl_registration-1.4.pc
-%{_pkgconfigdir}/pcl_sample_consensus-1.4.pc
-%{_pkgconfigdir}/pcl_search-1.4.pc
-%{_pkgconfigdir}/pcl_segmentation-1.4.pc
-%{_pkgconfigdir}/pcl_surface-1.4.pc
-%dir %{_datadir}/pcl-1.4
-%{_datadir}/pcl-1.4/PCLConfig*.cmake
+%attr(755,root,root) %{_libdir}/libpcl_tracking.so
+%{_includedir}/pcl-1.6
+%{_pkgconfigdir}/pcl_common-1.6.pc
+%{_pkgconfigdir}/pcl_features-1.6.pc
+%{_pkgconfigdir}/pcl_filters-1.6.pc
+%{_pkgconfigdir}/pcl_geometry-1.6.pc
+%{_pkgconfigdir}/pcl_io-1.6.pc
+%{_pkgconfigdir}/pcl_kdtree-1.6.pc
+%{_pkgconfigdir}/pcl_keypoints-1.6.pc
+%{_pkgconfigdir}/pcl_octree-1.6.pc
+%{_pkgconfigdir}/pcl_registration-1.6.pc
+%{_pkgconfigdir}/pcl_sample_consensus-1.6.pc
+%{_pkgconfigdir}/pcl_search-1.6.pc
+%{_pkgconfigdir}/pcl_segmentation-1.6.pc
+%{_pkgconfigdir}/pcl_surface-1.6.pc
+%{_pkgconfigdir}/pcl_tracking-1.6.pc
+%dir %{_datadir}/pcl-1.6
+%{_datadir}/pcl-1.6/PCLConfig*.cmake
%if %{with apidocs}
%files apidocs
%defattr(644,root,root,755)
-%dir %{_docdir}/pcl
-%{_docdir}/pcl/html
-%{_docdir}/pcl/tutorials
+%dir %{_docdir}/pcl-1.6
+%{_docdir}/pcl-1.6/html
+%{_docdir}/pcl-1.6/tutorials
%endif
diff --git a/pcl-link.patch b/pcl-link.patch
index 7307ca8..acda245 100644
--- a/pcl-link.patch
+++ b/pcl-link.patch
@@ -1,11 +1,6 @@
---- PCL-1.4.0-Source/io/CMakeLists.txt.orig 2012-01-02 02:39:42.000000000 +0100
-+++ PCL-1.4.0-Source/io/CMakeLists.txt 2012-02-05 07:40:35.813404104 +0100
-@@ -112,7 +112,7 @@
- target_link_libraries(${LIB_NAME} pcl_common ${VTK_IO_TARGET_LINK_LIBRARIES})
-
- if(OPENNI_FOUND)
-- target_link_libraries(${LIB_NAME} ${OPENNI_LIBRARIES})
-+ target_link_libraries(${LIB_NAME} ${OPENNI_LIBRARIES} usb-1.0)
- endif(OPENNI_FOUND)
-
- set(EXT_DEPS eigen3)
+--- PCL-1.6.0-Source/examples/segmentation/CMakeLists.txt.orig 2012-07-18 01:11:32.000000000 +0200
++++ PCL-1.6.0-Source/examples/segmentation/CMakeLists.txt 2012-12-21 17:53:09.575024862 +0100
+@@ -1,2 +1,2 @@
+ PCL_ADD_EXAMPLE(pcl_example_extract_clusters_normals FILES example_extract_clusters_normals.cpp
+- LINK_WITH pcl_common pcl_visualization pcl_keypoints pcl_io pcl_segmentation)
++ LINK_WITH pcl_common pcl_keypoints pcl_io pcl_segmentation)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/pcl.git/commitdiff/92237c8c8e7a931ae5dc53aef53eae57406d47ec
More information about the pld-cvs-commit
mailing list