[pcl] Update to release 1.5.1
rmattes
rmattes at fedoraproject.org
Thu Apr 5 02:15:32 UTC 2012
commit 64be9f5ad0524e0a0bcff948de15c59836d36571
Author: Rich Mattes <richmattes at gmail.com>
Date: Wed Apr 4 22:15:25 2012 -0400
Update to release 1.5.1
- Add new patch for gcc-4.7 fixes
.gitignore | 1 +
PCL-1.4.0-Source-fedora.patch | 8 +-
pcl-1.4.0-gcc47.patch | 525 -----------------------------------------
pcl-1.5.1-gcc47.patch | 82 +++++++
pcl.spec | 18 +-
sources | 2 +-
6 files changed, 98 insertions(+), 538 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 3feb3d2..9cab334 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
/PCL-1.3.1-Source.tar.bz2
/PCL-1.3.1-Source
/PCL-1.4.0-Source.tar.bz2
+/PCL-1.5.1-Source.tar.bz2
diff --git a/PCL-1.4.0-Source-fedora.patch b/PCL-1.4.0-Source-fedora.patch
index 443ecc5..e59cd5f 100644
--- a/PCL-1.4.0-Source-fedora.patch
+++ b/PCL-1.4.0-Source-fedora.patch
@@ -64,16 +64,10 @@ diff -urN PCL-1.3.1-Source/PCLConfig.cmake.in PCL-1.3.1-Source.fedora/PCLConfig.
diff -urN PCL-1.3.1-Source/visualization/CMakeLists.txt PCL-1.3.1-Source.fedora/visualization/CMakeLists.txt
--- PCL-1.3.1-Source/visualization/CMakeLists.txt 2011-12-03 00:35:48.000000000 +0100
+++ PCL-1.3.1-Source.fedora/visualization/CMakeLists.txt 2012-01-16 19:40:43.437690160 +0100
-@@ -83,9 +83,9 @@
- target_link_libraries(${LIB_NAME} pcl_io pcl_kdtree pcl_range_image
- vtkCommon vtkWidgets vtkHybrid)
- set(EXT_DEPS "")
+@@ -85,3 +85,3 @@
- if(OPENNI_FOUND)
- list(APPEND EXT_DEPS openni-dev)
- endif(OPENNI_FOUND)
+ #if(OPENNI_FOUND)
+ # 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.5.1-gcc47.patch b/pcl-1.5.1-gcc47.patch
new file mode 100644
index 0000000..3d202a5
--- /dev/null
+++ b/pcl-1.5.1-gcc47.patch
@@ -0,0 +1,82 @@
+diff -up ./tracking/include/pcl/tracking/impl/kld_adaptive_particle_filter.hpp.gcc47 ./tracking/include/pcl/tracking/impl/kld_adaptive_particle_filter.hpp
+--- ./tracking/include/pcl/tracking/impl/kld_adaptive_particle_filter.hpp.gcc47 2012-02-27 19:52:53.813318632 -0500
++++ ./tracking/include/pcl/tracking/impl/kld_adaptive_particle_filter.hpp 2012-02-27 19:53:22.815364954 -0500
+@@ -54,7 +54,7 @@ pcl::tracking::KLDAdaptiveParticleFilter
+ // initializing for sampling without replacement
+ std::vector<int> a (particles_->points.size ());
+ std::vector<double> q (particles_->points.size ());
+- genAliasTable (a, q, particles_);
++ this->genAliasTable (a, q, particles_);
+
+ const std::vector<double> zero_mean (StateT::stateDimension (), 0.0);
+
+diff -up ./tracking/include/pcl/tracking/impl/kld_adaptive_particle_filter_omp.hpp.gcc47 ./tracking/include/pcl/tracking/impl/kld_adaptive_particle_filter_omp.hpp
+--- ./tracking/include/pcl/tracking/impl/kld_adaptive_particle_filter_omp.hpp.gcc47 2012-02-27 20:05:28.374624954 -0500
++++ ./tracking/include/pcl/tracking/impl/kld_adaptive_particle_filter_omp.hpp 2012-02-27 20:06:40.305196260 -0500
+@@ -8,14 +8,14 @@ pcl::tracking::KLDAdaptiveParticleFilter
+ {
+ #pragma omp parallel for schedule (dynamic, threads_)
+ for (int i = 0; i < particle_num_; i++)
+- computeTransformedPointCloudWithoutNormal (particles_->points[i], *transed_reference_vector_[i]);
++ this->computeTransformedPointCloudWithoutNormal (particles_->points[i], *transed_reference_vector_[i]);
+
+ PointCloudInPtr coherence_input (new PointCloudIn);
+- cropInputPointCloud (input_, *coherence_input);
++ this->cropInputPointCloud (input_, *coherence_input);
+ if (change_counter_ == 0)
+ {
+ // test change detector
+- if (!use_change_detector_ || testChangeDetection (coherence_input))
++ if (!use_change_detector_ || this->testChangeDetection (coherence_input))
+ {
+ changed_ = true;
+ change_counter_ = change_detector_interval_;
+@@ -54,11 +54,11 @@ pcl::tracking::KLDAdaptiveParticleFilter
+ #pragma omp parallel for schedule (dynamic, threads_)
+ for (int i = 0; i < particle_num_; i++)
+ {
+- computeTransformedPointCloudWithNormal (particles_->points[i], *indices_list[i], *transed_reference_vector_[i]);
++ this->computeTransformedPointCloudWithNormal (particles_->points[i], *indices_list[i], *transed_reference_vector_[i]);
+ }
+
+ PointCloudInPtr coherence_input (new PointCloudIn);
+- cropInputPointCloud (input_, *coherence_input);
++ this->cropInputPointCloud (input_, *coherence_input);
+
+ coherence_->setTargetCloud (coherence_input);
+ coherence_->initCompute ();
+diff -up ./tracking/include/pcl/tracking/impl/particle_filter_omp.hpp.gcc47 ./tracking/include/pcl/tracking/impl/particle_filter_omp.hpp
+--- ./tracking/include/pcl/tracking/impl/particle_filter_omp.hpp.gcc47 2012-02-27 19:36:30.818287347 -0500
++++ ./tracking/include/pcl/tracking/impl/particle_filter_omp.hpp 2012-02-27 19:52:33.441585017 -0500
+@@ -8,14 +8,14 @@ pcl::tracking::ParticleFilterOMPTracker<
+ {
+ #pragma omp parallel for schedule (dynamic, threads_)
+ for (int i = 0; i < particle_num_; i++)
+- computeTransformedPointCloudWithoutNormal (particles_->points[i], *transed_reference_vector_[i]);
++ this->computeTransformedPointCloudWithoutNormal (particles_->points[i], *transed_reference_vector_[i]);
+
+ PointCloudInPtr coherence_input (new PointCloudIn);
+- cropInputPointCloud (input_, *coherence_input);
++ this->cropInputPointCloud (input_, *coherence_input);
+ if (change_counter_ == 0)
+ {
+ // test change detector
+- if (!use_change_detector_ || testChangeDetection (coherence_input))
++ if (!use_change_detector_ || this->testChangeDetection (coherence_input))
+ {
+ changed_ = true;
+ change_counter_ = change_detector_interval_;
+@@ -54,11 +54,11 @@ pcl::tracking::ParticleFilterOMPTracker<
+ #pragma omp parallel for schedule (dynamic, threads_)
+ for (int i = 0; i < particle_num_; i++)
+ {
+- computeTransformedPointCloudWithNormal (particles_->points[i], *indices_list[i], *transed_reference_vector_[i]);
++ this->computeTransformedPointCloudWithNormal (particles_->points[i], *indices_list[i], *transed_reference_vector_[i]);
+ }
+
+ PointCloudInPtr coherence_input (new PointCloudIn);
+- cropInputPointCloud (input_, *coherence_input);
++ this->cropInputPointCloud (input_, *coherence_input);
+
+ coherence_->setTargetCloud (coherence_input);
+ coherence_->initCompute ();
diff --git a/pcl.spec b/pcl.spec
index 4735062..92da1eb 100644
--- a/pcl.spec
+++ b/pcl.spec
@@ -1,14 +1,14 @@
Name: pcl
-Version: 1.4.0
-Release: 2%{?dist}
+Version: 1.5.1
+Release: 1%{?dist}
Summary: Library for point cloud processing
Group: System Environment/Libraries
License: BSD
URL: http://pointclouds.org/
-Source0: http://dev.pointclouds.org/attachments/download/610/PCL-1.4.0-Source.tar.bz2
+Source0: http://dev.pointclouds.org/attachments/download/771/PCL-1.5.1-Source.tar.bz2
Patch0: PCL-1.4.0-Source-fedora.patch
-Patch1: pcl-1.4.0-gcc47.patch
+Patch1: pcl-1.5.1-gcc47.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# For plain building
@@ -133,6 +133,10 @@ done
mkdir -p $RPM_BUILD_ROOT%{_libdir}/cmake/pcl
mv $RPM_BUILD_ROOT%{_datadir}/%{name}-*/*.cmake $RPM_BUILD_ROOT%{_libdir}/cmake/pcl
+
+# Remove installed documentation, will add with doc tags later
+rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/%{name}-1.5
+
#mv $RPM_BUILD_ROOT%{_libdir}/pcl/*.cmake $RPM_BUILD_ROOT%{_libdir}/cmake/pcl
#rmdir $RPM_BUILD_ROOT%{_libdir}/pcl
@@ -158,7 +162,7 @@ rm -rf $RPM_BUILD_ROOT
%defattr(-,root,root,-)
%doc AUTHORS.txt LICENSE.txt
%{_libdir}/*.so.*
-%{_datadir}/%{name}-1.4
+%{_datadir}/%{name}-1.5
%files devel
%defattr(-,root,root,-)
@@ -180,6 +184,10 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Mon Apr 04 2012 Rich Mattes <richmattes at gmail.com> - 1.5.1-1
+- Update to release 1.5.1
+- Add new patch for gcc-4.7 fixes
+
* Tue Feb 28 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.0-2
- Rebuilt for c++ ABI breakage
diff --git a/sources b/sources
index b61e0e3..b6623e5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-63fd633a6306ae9b334131b250a2f893 PCL-1.4.0-Source.tar.bz2
+d96479ab65245c64d91a6fe1d803275a PCL-1.5.1-Source.tar.bz2
More information about the scm-commits
mailing list