[mrpt] Fixed openmp conflict with pcl

[rmattes]

commit 89e847845e54beafa58511b6a377348d9b69ade7
Author: Rich Mattes <richmattes at gmail.com>
Date:   Sat Aug 25 00:24:59 2012 -0400

    Fixed openmp conflict with pcl

 create_tarball_mrpt.sh |    6 ++++++
 mrpt-0.9.6-pcl16.patch |   20 ++++++++++++++++----
 mrpt.spec              |   20 +++++++++++++++++++-
 3 files changed, 41 insertions(+), 5 deletions(-)
---
diff --git a/create_tarball_mrpt.sh b/create_tarball_mrpt.sh
new file mode 100644
index 0000000..2ce0031
--- /dev/null
+++ b/create_tarball_mrpt.sh
@@ -0,0 +1,6 @@
+tar xvf mrpt-0.9.6.tar.gz
+rm -rf mrpt-0.9.6/hwdrivers/src/{xSens,aria,libfreenect}
+rm -rf mrpt-0.9.6/kinect-win32-driver
+rm -rf mrpt-0.9.6/otherlibs/{eigen3,gtest-1.6.0}
+tar cjf mrpt-0.9.6-free.tar.bz2 mrpt-0.9.6
+rm -rf mrpt-0.9.6/
diff --git a/mrpt-0.9.6-pcl16.patch b/mrpt-0.9.6-pcl16.patch
index 0f3c8fa..dbf390b 100644
--- a/mrpt-0.9.6-pcl16.patch
+++ b/mrpt-0.9.6-pcl16.patch
@@ -1,6 +1,18 @@
+diff -up ./mrpt-0.9.6/CMakeLists.txt.pcl16 ./mrpt-0.9.6/CMakeLists.txt
+--- ./mrpt-0.9.6/CMakeLists.txt.pcl16	2012-08-24 22:38:59.084571179 -0400
++++ ./mrpt-0.9.6/CMakeLists.txt	2012-08-24 22:39:10.915025328 -0400
+@@ -1897,7 +1897,7 @@ IF(CMAKE_COMPILER_IS_GNUCXX)
+ 
+ 	# Parallel stdlibc++?
+ 	IF(MRPT_ENABLE_LIBSTD_PARALLEL_MODE)
+-		SET(EXTRA_CPP_FLAGS "${EXTRA_CPP_FLAGS} -D_GLIBCXX_PARALLEL -fopenmp")
++		SET(EXTRA_CPP_FLAGS "${EXTRA_CPP_FLAGS}  -fopenmp")
+ 	ENDIF(MRPT_ENABLE_LIBSTD_PARALLEL_MODE)
+ 
+ 	IF(CMAKE_BUILD_TYPE MATCHES "Debug")
 diff -up ./mrpt-0.9.6/libs/maps/include/mrpt/maps.h.pcl16 ./mrpt-0.9.6/libs/maps/include/mrpt/maps.h
---- ./mrpt-0.9.6/libs/maps/include/mrpt/maps.h.pcl16	2012-08-20 22:46:07.429892777 -0400
-+++ ./mrpt-0.9.6/libs/maps/include/mrpt/maps.h	2012-08-21 21:46:03.886491638 -0400
+--- ./mrpt-0.9.6/libs/maps/include/mrpt/maps.h.pcl16	2012-01-07 13:47:43.000000000 -0500
++++ ./mrpt-0.9.6/libs/maps/include/mrpt/maps.h	2012-08-21 23:14:08.639936100 -0400
 @@ -30,7 +30,7 @@
  #define _mrpt_maps_H
  
@@ -11,8 +23,8 @@ diff -up ./mrpt-0.9.6/libs/maps/include/mrpt/maps.h.pcl16 ./mrpt-0.9.6/libs/maps
  //  not defining mrpt_*_EXPORTS) or MRPT is being built with precompiled headers.
  #if !defined(mrpt_maps_EXPORTS) || MRPT_ENABLE_PRECOMPILED_HDRS || defined(MRPT_ALWAYS_INCLUDE_ALL_HEADERS)
 diff -up ./mrpt-0.9.6/libs/maps/src/maps/CBeaconMap.cpp.pcl16 ./mrpt-0.9.6/libs/maps/src/maps/CBeaconMap.cpp
---- ./mrpt-0.9.6/libs/maps/src/maps/CBeaconMap.cpp.pcl16	2012-08-20 23:01:58.643169529 -0400
-+++ ./mrpt-0.9.6/libs/maps/src/maps/CBeaconMap.cpp	2012-08-21 21:46:18.299040726 -0400
+--- ./mrpt-0.9.6/libs/maps/src/maps/CBeaconMap.cpp.pcl16	2012-01-07 13:47:43.000000000 -0500
++++ ./mrpt-0.9.6/libs/maps/src/maps/CBeaconMap.cpp	2012-08-21 23:14:08.640936138 -0400
 @@ -27,7 +27,7 @@
     +---------------------------------------------------------------------------+ */
  
diff --git a/mrpt.spec b/mrpt.spec
index 298c7e1..0ec86cc 100644
--- a/mrpt.spec
+++ b/mrpt.spec
@@ -16,10 +16,19 @@ URL: http://www.mrpt.org/
 #  svn export http://babel.isa.uma.es/mrpt-browse-code/mrpt-0.7.0 mrpt-0.7.0
 #  tar -czvf mrpt-0.7.0-20090529svn1047.tar.gz mrpt-0.70
 #Source: http://archive.mrpt.org/fedora-packages/mrpt-0.9.5-20110917svn2662.tar.gz
-Source0: http://downloads.sourceforge.net/%{name}/MRPT-all/MRPT-0.9.6/%{name}-%{version}.tar.gz
+
+#Source downloaded from:
+#http://downloads.sourceforge.net/%{name}/MRPT-all/MRPT-0.9.6/%{name}-%{version}.tar.gz
+# Then create_tarball_mrpt.sh was run to generate:
+Source0: %{name}-%{version}-free.tar.bz2
+Source1: create_tarball_%{name}.sh
+#Fixes build issues related to gcc 4.7
 Patch0: mrpt-0.9.5.gcc47.patch
+#Fix for gzip api change (gzFile changed from a typedef to a struct)
 Patch1: mrpt-0.9.5.gzip.patch
+# Patch to add missing inclusion guards to a header
 Patch2: mrpt-0.9.6-eigen306.patch
+# Patch to enable openmp for building against PCL's libsample_consensus
 Patch3: mrpt-0.9.6-pcl16.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -280,6 +289,12 @@ with Doxygen.
 mkdir build
 cd build
 %cmake -DCMAKE_MRPT_IS_RPM_PACKAGE=1 \
+  -DMRPT_ENABLE_LIBSTD_PARALLEL_MODE=ON \
+  -DDISABLE_SSE3=IN \
+%ifnarch x86_64
+  -DDISABLE_SSE2=OFF \
+%endif
+  -DMRPT_OPTIMIZE_NATIVE=OFF \
   -DCMAKE_BUILD_TYPE=NONE \
   -DEIGEN_USE_EMBEDDED_VERSION=OFF \
   -DBUILD_KINECT=OFF \
@@ -490,6 +505,9 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
 
 
 %changelog
+* Sat Aug 25 2012 Rich Mattes <richmattes at gmail.com> - 0.9.6-1
+- Updated to 0.9.6
+
 * Fri Jul 20 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.5-0.6.20110917svn2662
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild