[mrpt] More fixes for new opencv

[rmattes]

commit d7c16419b241fef2e604782ec4bed30d694f470d
Author: Rich Mattes <richmattes at gmail.com>
Date:   Sat Dec 1 16:53:45 2012 -0500

    More fixes for new opencv

 mrpt-0.9.6-cvnonfree.patch |   16 ++++++++++++++--
 mrpt.spec                  |   11 ++++++-----
 2 files changed, 20 insertions(+), 7 deletions(-)
---
diff --git a/mrpt-0.9.6-cvnonfree.patch b/mrpt-0.9.6-cvnonfree.patch
index c65d0be..13ea718 100644
--- a/mrpt-0.9.6-cvnonfree.patch
+++ b/mrpt-0.9.6-cvnonfree.patch
@@ -1,6 +1,6 @@
 diff -up ./libs/base/include/mrpt/otherlibs/do_opencv_includes.h.cvnonfree ./libs/base/include/mrpt/otherlibs/do_opencv_includes.h
---- ./libs/base/include/mrpt/otherlibs/do_opencv_includes.h.cvnonfree	2012-11-11 20:09:45.172716618 -0500
-+++ ./libs/base/include/mrpt/otherlibs/do_opencv_includes.h	2012-11-11 20:09:51.818968842 -0500
+--- ./libs/base/include/mrpt/otherlibs/do_opencv_includes.h.cvnonfree	2012-05-21 11:32:41.000000000 -0400
++++ ./libs/base/include/mrpt/otherlibs/do_opencv_includes.h	2012-11-28 19:04:05.886538231 -0500
 @@ -56,7 +56,7 @@
  #		include <opencv2/legacy/legacy.hpp>  // CvImage
  #		include <opencv2/legacy/compat.hpp>
@@ -10,3 +10,15 @@ diff -up ./libs/base/include/mrpt/otherlibs/do_opencv_includes.h.cvnonfree ./lib
  #		endif
  #	endif
  #	else
+diff -up ./libs/vision/src/CFeatureExtraction_SIFT.cpp.cvnonfree ./libs/vision/src/CFeatureExtraction_SIFT.cpp
+--- ./libs/vision/src/CFeatureExtraction_SIFT.cpp.cvnonfree	2012-11-28 19:05:20.579385445 -0500
++++ ./libs/vision/src/CFeatureExtraction_SIFT.cpp	2012-11-28 19:05:48.411330762 -0500
+@@ -349,7 +349,7 @@ void  CFeatureExtraction::extractFeature
+ //***********************************************************************************************
+ 		case OpenCV:
+ 		{
+-#if MRPT_HAS_OPENCV && MRPT_OPENCV_VERSION_NUM >= 0x211
++#if MRPT_HAS_OPENCV && MRPT_OPENCV_VERSION_NUM >= 0x211 && MRPT_HAS_SIFT_HESS
+ 			SiftFeatureDetector SIFTDetector(
+ 				options.SIFTOptions.threshold, //SIFT::DetectorParams::GET_DEFAULT_THRESHOLD(),
+ 				options.SIFTOptions.edgeThreshold //SIFT::DetectorParams::GET_DEFAULT_EDGE_THRESHOLD() );
diff --git a/mrpt.spec b/mrpt.spec
index 14b11ae..36fa6d0 100644
--- a/mrpt.spec
+++ b/mrpt.spec
@@ -319,9 +319,10 @@ cd build
   -DBUILD_KINECT=OFF \
   -DBUILD_ARIA=OFF \
   -DBUILD_XSENS=OFF \
+  -DDISABLE_SIFT_HESS=ON \
   ..
 
-make VERBOSE=1 
+make VERBOSE=1 -j 3
 #%{?_smp_mflags}
 make documentation_html
 make man_pages_all
@@ -597,7 +598,7 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
 * Thu Jan 21 2010 - Jose Luis Blanco <joseluisblancoc at gmail.com> 0.8.0-0.1.20100102svn1398
 - Packaging of new upstream version 0.8.0.
 
-* Mon Aug 18 2009 - Jose Luis Blanco <joseluisblancoc at gmail.com> 0.7.1-0.1.20090818svn1148
+* Tue Aug 18 2009 - Jose Luis Blanco <joseluisblancoc at gmail.com> 0.7.1-0.1.20090818svn1148
 - Packaging of new upstream version 0.7.1, patched.
 
 * Mon Aug 17 2009 - Jose Luis Blanco <joseluisblancoc at gmail.com> 0.7.1-0.1.20090817svn1147
@@ -615,17 +616,17 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
 * Thu Feb 19 2009 - Jose Luis Blanco <joseluisblancoc at gmail.com> 0.6.5-0.3.20090213svn807
 - Fixed ownship of datadir/mrpt/config_files/ by two sub-packages.
 
-* Sat Feb 13 2009 - Jose Luis Blanco <joseluisblancoc at gmail.com> 0.6.5-0.2.20090213svn807
+* Fri Feb 13 2009 - Jose Luis Blanco <joseluisblancoc at gmail.com> 0.6.5-0.2.20090213svn807
 - All applications are now in mrpt-apps.
 
-* Sat Feb 13 2009 - Jose Luis Blanco <joseluisblancoc at gmail.com> 0.6.5-0.1.20090213
+* Fri Feb 13 2009 - Jose Luis Blanco <joseluisblancoc at gmail.com> 0.6.5-0.1.20090213
 - New upstream sources.
 - Individual packages created for each MRPT application.
 - Removed unneeded dependencies from -devel package.
 - Fixed "doc" package should own the mrpt-doc directory.
 - Mime types moved to mrpt-core package.
 
-* Sun Jan 18 2009 - Jose Luis Blanco <joseluisblancoc at gmail.com> 0.6.5-0.1.20090118svn746
+* Thu Jan 18 2009 - Jose Luis Blanco <joseluisblancoc at gmail.com> 0.6.5-0.1.20090118svn746
 - New upstream sources.
 - Fixed license tag to "GPLv3+".
 - Added "export LD_LIBRARY_PATH..." at "check" to allow the tests to work.