rpms/opencv/FC-4 opencv-0.9.7-intrinsics-simple.patch, 1.1, 1.2 opencv.spec, 1.11, 1.12

[Simon Perreault (nomis80)]

Author: nomis80

Update of /cvs/extras/rpms/opencv/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30114

Modified Files:
	opencv-0.9.7-intrinsics-simple.patch opencv.spec 
Log Message:
* Tue Mar  7 2006 Simon Perreault <nomis80 at nomis80.org> - 0.9.7-13
- Changed intrinsics patch so that it matches upstream.


opencv-0.9.7-intrinsics-simple.patch:

Index: opencv-0.9.7-intrinsics-simple.patch
===================================================================
RCS file: /cvs/extras/rpms/opencv/FC-4/opencv-0.9.7-intrinsics-simple.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- opencv-0.9.7-intrinsics-simple.patch	7 Mar 2006 04:07:32 -0000	1.1
+++ opencv-0.9.7-intrinsics-simple.patch	7 Mar 2006 19:51:18 -0000	1.2
@@ -6,7 +6,7 @@
    #include <float.h>
  
 -  #if defined WIN64 && defined EM64T && defined _MSC_VER
-+  #if defined WIN64 && defined EM64T && defined _MSC_VER || defined __GNUC__
++  #if defined WIN64 && defined EM64T && defined _MSC_VER || defined __SSE2__
      #include <emmintrin.h>
    #endif
  


Index: opencv.spec
===================================================================
RCS file: /cvs/extras/rpms/opencv/FC-4/opencv.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- opencv.spec	7 Mar 2006 19:44:59 -0000	1.11
+++ opencv.spec	7 Mar 2006 19:51:18 -0000	1.12
@@ -5,7 +5,7 @@
 
 Name:           opencv
 Version:        0.9.7
-Release:        12%{?dist}
+Release:        13%{?dist}
 Summary:        Collection of algorithms for computer vision
 
 Group:          Development/Libraries
@@ -13,7 +13,7 @@
 URL:            http://www.intel.com/technology/computing/opencv/index.htm
 Source0:        http://prdownloads.sourceforge.net/opencvlibrary/opencv-%{version}.tar.gz
 Source1:        opencv-samples-Makefile
-Patch0:         opencv-0.9.7-intrinsics.patch
+Patch0:         opencv-0.9.7-intrinsics-simple.patch
 Patch1:         opencv-0.9.7-pythondir.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -122,6 +122,9 @@
 
 
 %changelog
+* Tue Mar  7 2006 Simon Perreault <nomis80 at nomis80.org> - 0.9.7-13
+- Changed intrinsics patch so that it matches upstream.
+
 * Tue Mar  7 2006 Simon Perreault <nomis80 at nomis80.org> - 0.9.7-12
 - More intrinsics patch fixing.