[rpms/pcl] f44: Update to 1.8.0 release candidate (rhbz#1303049)

[rpms/pcl] f44: Update to 1.8.0 release candidate (rhbz#1303049)

[Rich Mattes]

A new commit has been pushed.

Repo   : rpms/pcl
Branch : f44
Commit : 1e7064d71c4788f0563d5bd9e6f5ba6c52ee3351
Author : Rich Mattes <richmattes@gmail.com>
Date   : 2016-02-01T20:49:46-05:00
Stats  : +85/-16 in 6 file(s)
URL    : https://src.fedoraproject.org/rpms/pcl/c/1e7064d71c4788f0563d5bd9e6f5ba6c52ee3351?branch=f44

Log:
Update to 1.8.0 release candidate (rhbz#1303049)

---
diff --git a/.gitignore b/.gitignore
index 2ca8e9d..aa70f42 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@
 /pcl-1.7.0.tar.gz
 /pcl-1.7.1.tar.gz
 /pcl-0ddf11a6ad1175b6f1c253da003de20c1295cde0.tar.gz
+/pcl-1.8.0rc1-fedora.tar.xz

diff --git a/create_tarball_pcl.sh b/create_tarball_pcl.sh
new file mode 100755
index 0000000..1713522
--- /dev/null
+++ b/create_tarball_pcl.sh
@@ -0,0 +1,25 @@
+#!/bin/bash
+
+if [ ! -n "$1" ]; then
+	echo "Usage: $0 version"
+	exit 0
+fi;
+
+if [ ! -f pcl-"$1".tar.gz ]; then
+	wget https://github.com/PointCloudLibrary/pcl/archive/pcl-"$1".tar.gz
+fi;
+
+echo "Extracting archive..."
+tar xf pcl-"$1".tar.gz
+mv pcl-pcl-"$1" pcl-"$1"
+pushd pcl-"$1"
+echo "Removing non-free items..."
+rm -rf cuda
+rm -rf gpu/utils/include/pcl/gpu/utils/device/cutil_math.h
+popd
+echo "Compressing free archive..."
+tar cJf pcl-"$1"-fedora.tar.xz pcl-"$1"
+echo "Cleaning up..."
+rm -rf pcl-"$1"
+echo "Done"
+

diff --git a/pcl-1.8.0-cxx11.patch b/pcl-1.8.0-cxx11.patch
new file mode 100644
index 0000000..536fe6f
--- /dev/null
+++ b/pcl-1.8.0-cxx11.patch
@@ -0,0 +1,12 @@
+diff -up ./common/include/pcl/pcl_macros.h.cxx11 ./common/include/pcl/pcl_macros.h
+--- ./common/include/pcl/pcl_macros.h.cxx11	2016-01-31 10:36:30.820804485 -0500
++++ ./common/include/pcl/pcl_macros.h	2016-01-31 10:36:37.878068320 -0500
+@@ -70,7 +70,7 @@ namespace pcl
+ #include <stdarg.h>
+ #include <stdio.h>
+ #define _USE_MATH_DEFINES
+-#include <math.h>
++#include <cmath>
+ 
+ // MSCV doesn't have std::{isnan,isfinite}
+ #if defined _WIN32 && defined _MSC_VER

diff --git a/pcl-1.8.0-metslib.patch b/pcl-1.8.0-metslib.patch
new file mode 100644
index 0000000..849ff04
--- /dev/null
+++ b/pcl-1.8.0-metslib.patch
@@ -0,0 +1,24 @@
+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	2016-01-30 16:05:23.845437989 -0500
++++ ./recognition/include/pcl/recognition/hv/hv_go.h	2016-01-30 16:05:30.949710187 -0500
+@@ -11,7 +11,7 @@
+ #include <pcl/pcl_macros.h>
+ #include <pcl/recognition/hv/hypotheses_verification.h>
+ #include <pcl/common/common.h>
+-#include <pcl/recognition/3rdparty/metslib/mets.hh>
++#include <metslib/mets.hh>
+ #include <pcl/features/normal_3d.h>
+ #include <boost/graph/graph_traits.hpp>
+ #include <boost/graph/adjacency_list.hpp>
+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	2016-01-26 03:33:57.000000000 -0500
++++ ./recognition/include/pcl/recognition/impl/hv/hv_go.hpp	2016-01-30 11:44:33.314400566 -0500
+@@ -448,7 +448,7 @@ void pcl::GlobalHypothesesVerification<M
+   mets::noimprove_termination_criteria noimprove (max_iterations_);
+   mets::linear_cooling linear_cooling;
+   mets::simulated_annealing<move_manager> 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 5de5e74..3190264 100644
--- a/pcl.spec
+++ b/pcl.spec
@@ -1,36 +1,39 @@
-%global apiversion 1.7
-%global commit 0ddf11a6ad1175b6f1c253da003de20c1295cde0
+%global apiversion 1.8
+%global commit 93b7758468c459d350669314414f57b2048c728c
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 
 Name:           pcl
-Version:        1.7.2
-Release:        11%{?dist}
+Version:        1.8.0
+Release:        0.1.rc1%{?dist}
 Summary:        Library for point cloud processing
 
 Group:          System Environment/Libraries
 License:        BSD
 URL:            http://pointclouds.org/
-Source0:        https://github.com/PointCloudLibrary/%{name}/archive/%{commit}/%{name}-%{commit}.tar.gz
+# Source snapshots contain un-redistributable sources from nvidia
+# create_tarball_pcl.sh provided to strip non-free sources
+Source0:        %{name}-%{version}rc1-fedora.tar.xz
+Source1:        create_tarball_pcl.sh
+
 # Only enable sse2, and only on x86_64
 Patch0:         %{name}-1.7.2-sse2.patch
-# Patch to compile against system metslib
-Patch1:         %{name}-1.7.2-metslib.patch
+# Look for external metslib, not upstream
+Patch1:         %{name}-1.8.0-metslib.patch
 # Patch for PCLConfig.cmake to find pcl
 Patch2:         %{name}-1.7.2-fedora.patch
 # Exclude the "build" directory from doxygen processing.
 Patch3:         %{name}-1.7.2-doxyfix.patch
 # Pass -DBOOST_NEXT_PRIOR_HPP_INCLUDED to moc.
 Patch4:         %{name}-0ddf-boost157.patch
-
 # For plain building
 BuildRequires:  cmake, gcc-c++, boost-devel
 # Documentation
 BuildRequires:  doxygen, graphviz, python-sphinx
 
 # mandatory
-BuildRequires:  eigen3-static, flann-devel, cminpack-devel, vtk-devel, gl2ps-devel, hdf5-devel, python-devel, libxml2-devel, metslib-static, netcdf-cxx-devel, jsoncpp-devel
+BuildRequires:  eigen3-static, flann-devel, cminpack-devel, vtk-devel, gl2ps-devel, hdf5-devel, python-devel, libxml2-devel, netcdf-cxx-devel, jsoncpp-devel, metslib-static
 # optional
-BuildRequires:  qhull-devel, libusb1-devel, gtest-devel, qtwebkit-devel, python-sphinx
+BuildRequires:  qt5-qtbase-devel, qhull-devel, libusb1-devel, gtest-devel, qt5-qtwebkit-devel, python-sphinx
 %ifarch %{ix86} x86_64
 BuildRequires:  openni-devel
 %endif
@@ -81,10 +84,9 @@ Library.
 
 
 %prep
-%setup -qn %{name}-%{commit}
+%setup -qn %{name}-%{version}rc1
 %patch0 -p1 -b .sse2
-%patch1 -p0 -b .metslib
-%patch2 -p0 -b .fedora
+%patch1 -p1 -b .metslib
 %patch3 -p0 -b .doxyfix
 %patch4 -p1 -b .boost157
 # Just to make it obvious we're not using any of these
@@ -100,6 +102,7 @@ mkdir build
 pushd build
 %cmake \
   -DWITH_DOCS=ON \
+  -DWITH_CUDA=OFF \
   -DWITH_TUTORIALS=ON \
   -DCMAKE_BUILD_TYPE=NONE \
   -DBUILD_apps=ON \
@@ -117,7 +120,7 @@ pushd build
   ..
 
 # Don't use mflags, we're hitting out of memory errors on the koji builders
-make
+make %{?_smp_mflags}
 make doc tutorials advanced
 popd
 
@@ -162,7 +165,8 @@ mv $RPM_BUILD_ROOT%{_datadir}/%{name}-*/*.cmake $RPM_BUILD_ROOT%{_libdir}/cmake/
 
 
 %files
-%doc AUTHORS.txt LICENSE.txt
+%license LICENSE.txt
+%doc AUTHORS.txt 
 %{_libdir}/*.so.*
 %{_datadir}/%{name}-%{apiversion}
 
@@ -183,6 +187,9 @@ mv $RPM_BUILD_ROOT%{_datadir}/%{name}-*/*.cmake $RPM_BUILD_ROOT%{_libdir}/cmake/
 %doc build/doc/advanced/advanced
 
 %changelog
+* Mon Feb 01 2016 Rich Mattes <richmattes@gmail.com> - 1.8.0-0.1.rc1
+- Update to 1.8.0 release candidate (rhbz#1303049)
+
 * Fri Jan 22 2016 Orion Poplawski <orion@cora.nwra.com> - 1.7.2-11
 - Rebuild for boost 1.60
 

diff --git a/sources b/sources
index 548428a..15377a6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e30c8954bcd60098b36ef74dc018a1ff  pcl-0ddf11a6ad1175b6f1c253da003de20c1295cde0.tar.gz
+e8e3cd3e3b8a83e59d061fa70bdd551b  pcl-1.8.0rc1-fedora.tar.xz