[mrpt/f18] Added patch to build without opencv nonfree headers

[rmattes]

commit 390b01630d7cb490eb31666b46460134db7eb9ef
Author: Rich Mattes <richmattes at gmail.com>
Date:   Sun Nov 11 20:47:44 2012 -0500

    Added patch to build without opencv nonfree headers

 mrpt-0.9.6-cvnonfree.patch |   12 ++++++++++++
 mrpt.spec                  |    5 ++++-
 2 files changed, 16 insertions(+), 1 deletions(-)
---
diff --git a/mrpt-0.9.6-cvnonfree.patch b/mrpt-0.9.6-cvnonfree.patch
new file mode 100644
index 0000000..c65d0be
--- /dev/null
+++ b/mrpt-0.9.6-cvnonfree.patch
@@ -0,0 +1,12 @@
+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
+@@ -56,7 +56,7 @@
+ #		include <opencv2/legacy/legacy.hpp>  // CvImage
+ #		include <opencv2/legacy/compat.hpp>
+ #		if MRPT_OPENCV_VERSION_NUM>=0x240
+-#			include <opencv2/nonfree/nonfree.hpp>
++//#			include <opencv2/nonfree/nonfree.hpp>
+ #		endif
+ #	endif
+ #	else
diff --git a/mrpt.spec b/mrpt.spec
index a961893..14b11ae 100644
--- a/mrpt.spec
+++ b/mrpt.spec
@@ -30,7 +30,9 @@ Patch1: mrpt-0.9.5.gzip.patch
 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
-
+# Patch to disable inclusion of OpenCV 2.4's nonfree headers, which are 
+# not included in the Fedora packages
+Patch4: mrpt-0.9.6-cvnonfree.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: cmake
@@ -281,6 +283,7 @@ with Doxygen.
 %patch1 -p2 -b .gzip
 %patch2 -p2 -b .eigen306
 %patch3 -p2 -b .pcl16
+%patch4 -p0 -b .cvnonfree
 
 # Fix encoding of the mrpt-book file
 #gzip -d doc/mrpt-book.ps.gz