rpms/opencv/FC-4 opencv-0.9.7-intrinsics.patch, 1.3, 1.4 opencv.spec, 1.7, 1.8

Simon Perreault (nomis80) fedora-extras-commits at redhat.com
Tue Mar 7 17:44:36 UTC 2006


Author: nomis80

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

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-9
- Still more fixing of intrinsics patch for Python bindings on x86_64.


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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- opencv-0.9.7-intrinsics.patch	7 Mar 2006 17:09:57 -0000	1.3
+++ opencv-0.9.7-intrinsics.patch	7 Mar 2006 17:44:35 -0000	1.4
@@ -165,3 +165,31 @@
  #if (defined WIN32 || defined WIN64) && (_MSC_VER >= 1200 || defined _ICL)
  #pragma warning( disable: 4514 )
  #endif
+diff -urp opencv-0.9.7.orig/interfaces/swig/general/cv.i opencv-0.9.7/interfaces/swig/general/cv.i
+--- opencv-0.9.7.orig/interfaces/swig/general/cv.i	2006-03-06 22:58:41.000000000 -0500
++++ opencv-0.9.7/interfaces/swig/general/cv.i	2006-03-07 12:33:16.000000000 -0500
+@@ -49,6 +49,10 @@
+ 
+ 
+ %{
++#ifdef HAVE_CONFIG_H
++#include <cvconfig.h>
++#endif
++
+ #include "cv.h"
+ %}
+ 
+diff -urp opencv-0.9.7.orig/interfaces/swig/general/highgui.i opencv-0.9.7/interfaces/swig/general/highgui.i
+--- opencv-0.9.7.orig/interfaces/swig/general/highgui.i	2006-03-06 22:58:41.000000000 -0500
++++ opencv-0.9.7/interfaces/swig/general/highgui.i	2006-03-07 12:33:46.000000000 -0500
+@@ -48,6 +48,10 @@
+ %module(package="opencv") highgui
+ 
+ %{
++#ifdef HAVE_CONFIG_H
++#include <cvconfig.h>
++#endif
++
+ #include "highgui.h"
+ %}
+ 


Index: opencv.spec
===================================================================
RCS file: /cvs/extras/rpms/opencv/FC-4/opencv.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- opencv.spec	7 Mar 2006 17:09:57 -0000	1.7
+++ opencv.spec	7 Mar 2006 17:44:35 -0000	1.8
@@ -5,7 +5,7 @@
 
 Name:           opencv
 Version:        0.9.7
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Collection of algorithms for computer vision
 
 Group:          Development/Libraries
@@ -126,6 +126,9 @@
 
 
 %changelog
+* Tue Mar  7 2006 Simon Perreault <nomis80 at nomis80.org> - 0.9.7-9
+- Still more fixing of intrinsics patch for Python bindings on x86_64.
+
 * Tue Mar  7 2006 Simon Perreault <nomis80 at nomis80.org> - 0.9.7-8
 - Again fixed intrinsics patch so that Python modules build on x86_64.
 




More information about the fedora-extras-commits mailing list