rpms/opencv/FC-4 opencv-0.9.7-intrinsics.patch, 1.5, 1.6 opencv.spec, 1.10, 1.11

Simon Perreault (nomis80) fedora-extras-commits at redhat.com
Tue Mar 7 19:45:00 UTC 2006


Author: nomis80

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

Modified Files:
	opencv-0.9.7-intrinsics.patch opencv.spec 
Log Message:
* Tue Mar  7 2006 Simon Perreault <nomis80 at nomis80.org> - 0.9.7-12
- More intrinsics patch fixing.


opencv-0.9.7-intrinsics.patch:

Index: opencv-0.9.7-intrinsics.patch
===================================================================
RCS file: /cvs/extras/rpms/opencv/FC-4/opencv-0.9.7-intrinsics.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- opencv-0.9.7-intrinsics.patch	7 Mar 2006 19:06:04 -0000	1.5
+++ opencv-0.9.7-intrinsics.patch	7 Mar 2006 19:44:59 -0000	1.6
@@ -151,3 +151,45 @@
  #include "highgui.h"
  %}
  
+diff -urp opencv-0.9.7.orig/apps/haartraining/src/_cvcommon.h opencv-0.9.7/apps/haartraining/src/_cvcommon.h
+--- opencv-0.9.7.orig/apps/haartraining/src/_cvcommon.h	2006-03-07 14:23:05.000000000 -0500
++++ opencv-0.9.7/apps/haartraining/src/_cvcommon.h	2006-03-07 14:34:25.000000000 -0500
+@@ -42,6 +42,10 @@
+ #ifndef __CVCOMMON_H_
+ #define __CVCOMMON_H_
+ 
++#ifdef HAVE_CONFIG_H
++#include <cvconfig.h>
++#endif
++
+ #include <cv.h>
+ #include <cxmisc.h>
+ 
+diff -urp opencv-0.9.7.orig/apps/haartraining/src/_cvhaartraining.h opencv-0.9.7/apps/haartraining/src/_cvhaartraining.h
+--- opencv-0.9.7.orig/apps/haartraining/src/_cvhaartraining.h	2006-03-07 14:23:05.000000000 -0500
++++ opencv-0.9.7/apps/haartraining/src/_cvhaartraining.h	2006-03-07 14:33:31.000000000 -0500
+@@ -48,6 +48,10 @@
+ #ifndef __CVHAARTRAINING_H_
+ #define __CVHAARTRAINING_H_
+ 
++#ifdef HAVE_CONFIG_H
++#include <cvconfig.h>
++#endif
++
+ #include <_cvcommon.h>
+ #include <cvclassifier.h>
+ #include <string.h>
+diff -urp opencv-0.9.7.orig/apps/haartraining/src/performance.cpp opencv-0.9.7/apps/haartraining/src/performance.cpp
+--- opencv-0.9.7.orig/apps/haartraining/src/performance.cpp	2006-03-07 14:23:05.000000000 -0500
++++ opencv-0.9.7/apps/haartraining/src/performance.cpp	2006-03-07 14:35:41.000000000 -0500
+@@ -44,6 +44,10 @@
+  *
+  * Measure performance of classifier
+  */
++#ifdef HAVE_CONFIG_H
++#include <cvconfig.h>
++#endif
++
+ #include "cv.h"
+ #include <stdio.h>
+ #include <math.h>


Index: opencv.spec
===================================================================
RCS file: /cvs/extras/rpms/opencv/FC-4/opencv.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- opencv.spec	7 Mar 2006 19:06:04 -0000	1.10
+++ opencv.spec	7 Mar 2006 19:44:59 -0000	1.11
@@ -5,7 +5,7 @@
 
 Name:           opencv
 Version:        0.9.7
-Release:        11%{?dist}
+Release:        12%{?dist}
 Summary:        Collection of algorithms for computer vision
 
 Group:          Development/Libraries
@@ -122,6 +122,9 @@
 
 
 %changelog
+* Tue Mar  7 2006 Simon Perreault <nomis80 at nomis80.org> - 0.9.7-12
+- More intrinsics patch fixing.
+
 * Tue Mar  7 2006 Simon Perreault <nomis80 at nomis80.org> - 0.9.7-11
 - Don't do "make check" because it doesn't run any tests anyway.
 - Back to main intrinsics patch.




More information about the fedora-extras-commits mailing list