rpms/opencv/FC-4 opencv-0.9.7-intrinsics.patch, 1.2, 1.3 opencv.spec, 1.6, 1.7
Simon Perreault (nomis80)
fedora-extras-commits at redhat.com
Tue Mar 7 17:09:57 UTC 2006
Author: nomis80
Update of /cvs/extras/rpms/opencv/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24385
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-8
- Again fixed intrinsics patch so that Python modules build 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- opencv-0.9.7-intrinsics.patch 7 Mar 2006 16:53:42 -0000 1.2
+++ opencv-0.9.7-intrinsics.patch 7 Mar 2006 17:09:57 -0000 1.3
@@ -1,6 +1,6 @@
diff -urp opencv-0.9.7.orig/configure.in opencv-0.9.7/configure.in
---- opencv-0.9.7.orig/configure.in 2005-07-25 08:26:34.000000000 -0400
-+++ opencv-0.9.7/configure.in 2006-03-07 11:37:37.287015530 -0500
+--- opencv-0.9.7.orig/configure.in 2006-03-06 22:58:41.000000000 -0500
++++ opencv-0.9.7/configure.in 2006-03-07 12:05:24.000000000 -0500
@@ -281,6 +281,11 @@ dnl
#
#AC_SUBST(CXXOPENMP)
@@ -14,8 +14,8 @@
AC_CONFIG_FILES([Makefile
diff -urp opencv-0.9.7.orig/cv/src/_cv.h opencv-0.9.7/cv/src/_cv.h
---- opencv-0.9.7.orig/cv/src/_cv.h 2005-06-10 06:09:22.000000000 -0400
-+++ opencv-0.9.7/cv/src/_cv.h 2006-03-07 11:40:07.946072812 -0500
+--- opencv-0.9.7.orig/cv/src/_cv.h 2006-03-06 22:58:41.000000000 -0500
++++ opencv-0.9.7/cv/src/_cv.h 2006-03-07 12:05:24.000000000 -0500
@@ -42,6 +42,10 @@
#ifndef _CV_INTERNAL_H_
#define _CV_INTERNAL_H_
@@ -28,8 +28,8 @@
/* disable warnings related to inline functions */
#pragma warning( disable: 4711 4710 4514 )
diff -urp opencv-0.9.7.orig/cvaux/src/_cvaux.h opencv-0.9.7/cvaux/src/_cvaux.h
---- opencv-0.9.7.orig/cvaux/src/_cvaux.h 2004-08-08 14:52:26.000000000 -0400
-+++ opencv-0.9.7/cvaux/src/_cvaux.h 2006-03-07 11:40:44.758355511 -0500
+--- opencv-0.9.7.orig/cvaux/src/_cvaux.h 2006-03-06 22:58:41.000000000 -0500
++++ opencv-0.9.7/cvaux/src/_cvaux.h 2006-03-07 12:05:24.000000000 -0500
@@ -41,6 +41,10 @@
#ifndef __CVAUX_H__
#define __CVAUX_H__
@@ -42,8 +42,8 @@
#pragma warning( disable: 4710 4711 4514 ) /* function AAA selected for automatic inline expansion */
#endif
diff -urp opencv-0.9.7.orig/cxcore/include/cxtypes.h opencv-0.9.7/cxcore/include/cxtypes.h
---- opencv-0.9.7.orig/cxcore/include/cxtypes.h 2005-07-20 06:53:14.000000000 -0400
-+++ opencv-0.9.7/cxcore/include/cxtypes.h 2006-03-07 11:37:37.288015510 -0500
+--- opencv-0.9.7.orig/cxcore/include/cxtypes.h 2006-03-06 22:58:41.000000000 -0500
++++ opencv-0.9.7/cxcore/include/cxtypes.h 2006-03-07 12:05:24.000000000 -0500
@@ -48,7 +48,8 @@
#include <string.h>
#include <float.h>
@@ -55,8 +55,8 @@
#endif
diff -urp opencv-0.9.7.orig/cxcore/src/_cxcore.h opencv-0.9.7/cxcore/src/_cxcore.h
---- opencv-0.9.7.orig/cxcore/src/_cxcore.h 2005-06-10 06:46:49.000000000 -0400
-+++ opencv-0.9.7/cxcore/src/_cxcore.h 2006-03-07 11:39:18.422040124 -0500
+--- opencv-0.9.7.orig/cxcore/src/_cxcore.h 2006-03-06 22:58:41.000000000 -0500
++++ opencv-0.9.7/cxcore/src/_cxcore.h 2006-03-07 12:05:24.000000000 -0500
@@ -42,6 +42,10 @@
#ifndef _CXCORE_INTERNAL_H_
#define _CXCORE_INTERNAL_H_
@@ -68,9 +68,35 @@
#if defined _MSC_VER && _MSC_VER >= 1200
/* disable warnings related to inline functions */
#pragma warning( disable: 4711 4710 4514 )
+diff -urp opencv-0.9.7.orig/interfaces/swig/python/error.h opencv-0.9.7/interfaces/swig/python/error.h
+--- opencv-0.9.7.orig/interfaces/swig/python/error.h 2006-03-06 22:58:41.000000000 -0500
++++ opencv-0.9.7/interfaces/swig/python/error.h 2006-03-07 12:06:40.000000000 -0500
+@@ -44,6 +44,9 @@
+ // Mark Asbach <asbach at ient.rwth-aachen.de>
+ // Institute of Communications Engineering, RWTH Aachen University
+
++#ifdef HAVE_CONFIG_H
++#include <cvconfig.h>
++#endif
+
+ #include "cxcore.h"
+
+diff -urp opencv-0.9.7.orig/interfaces/swig/python/pycvseq.h opencv-0.9.7/interfaces/swig/python/pycvseq.h
+--- opencv-0.9.7.orig/interfaces/swig/python/pycvseq.h 2006-03-06 22:58:41.000000000 -0500
++++ opencv-0.9.7/interfaces/swig/python/pycvseq.h 2006-03-07 12:07:13.000000000 -0500
+@@ -39,6 +39,9 @@
+ //
+ //M*/
+
++#ifdef HAVE_CONFIG_H
++#include <cvconfig.h>
++#endif
+
+ #include "cxcore.h"
+
diff -urp opencv-0.9.7.orig/otherlibs/highgui/_highgui.h opencv-0.9.7/otherlibs/highgui/_highgui.h
---- opencv-0.9.7.orig/otherlibs/highgui/_highgui.h 2005-02-01 06:33:24.000000000 -0500
-+++ opencv-0.9.7/otherlibs/highgui/_highgui.h 2006-03-07 11:42:21.432472106 -0500
+--- opencv-0.9.7.orig/otherlibs/highgui/_highgui.h 2006-03-06 22:58:42.000000000 -0500
++++ opencv-0.9.7/otherlibs/highgui/_highgui.h 2006-03-07 12:05:24.000000000 -0500
@@ -42,6 +42,12 @@
#ifndef __HIGHGUI_H_
#define __HIGHGUI_H_
@@ -98,8 +124,8 @@
#define HG_OK 0 /* Don't bet on it! */
#define HG_BADNAME -1 /* Bad window or file name */
diff -urp opencv-0.9.7.orig/tests/cv/src/cvtest.h opencv-0.9.7/tests/cv/src/cvtest.h
---- opencv-0.9.7.orig/tests/cv/src/cvtest.h 2005-06-20 11:12:24.000000000 -0400
-+++ opencv-0.9.7/tests/cv/src/cvtest.h 2006-03-07 11:44:30.908949495 -0500
+--- opencv-0.9.7.orig/tests/cv/src/cvtest.h 2006-03-06 22:58:41.000000000 -0500
++++ opencv-0.9.7/tests/cv/src/cvtest.h 2006-03-07 12:05:24.000000000 -0500
@@ -42,6 +42,10 @@
#ifndef _CVTEST_H_
#define _CVTEST_H_
@@ -112,8 +138,8 @@
#include <windows.h>
#endif
diff -urp opencv-0.9.7.orig/tests/cxcore/src/cxcoretest.h opencv-0.9.7/tests/cxcore/src/cxcoretest.h
---- opencv-0.9.7.orig/tests/cxcore/src/cxcoretest.h 2005-06-20 11:13:30.000000000 -0400
-+++ opencv-0.9.7/tests/cxcore/src/cxcoretest.h 2006-03-07 11:43:55.992629792 -0500
+--- opencv-0.9.7.orig/tests/cxcore/src/cxcoretest.h 2006-03-06 22:58:41.000000000 -0500
++++ opencv-0.9.7/tests/cxcore/src/cxcoretest.h 2006-03-07 12:05:24.000000000 -0500
@@ -42,6 +42,10 @@
#ifndef _CXCORE_TEST_H_
#define _CXCORE_TEST_H_
@@ -126,8 +152,8 @@
#include <windows.h>
#endif
diff -urp opencv-0.9.7.orig/tests/cxts/_cxts.h opencv-0.9.7/tests/cxts/_cxts.h
---- opencv-0.9.7.orig/tests/cxts/_cxts.h 2005-06-02 10:59:49.000000000 -0400
-+++ opencv-0.9.7/tests/cxts/_cxts.h 2006-03-07 11:43:03.487652756 -0500
+--- opencv-0.9.7.orig/tests/cxts/_cxts.h 2006-03-06 22:58:41.000000000 -0500
++++ opencv-0.9.7/tests/cxts/_cxts.h 2006-03-07 12:05:24.000000000 -0500
@@ -42,6 +42,10 @@
#ifndef __CXTS_INTERNAL_H__
#define __CXTS_INTERNAL_H__
Index: opencv.spec
===================================================================
RCS file: /cvs/extras/rpms/opencv/FC-4/opencv.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- opencv.spec 7 Mar 2006 16:53:42 -0000 1.6
+++ opencv.spec 7 Mar 2006 17:09:57 -0000 1.7
@@ -5,7 +5,7 @@
Name: opencv
Version: 0.9.7
-Release: 7%{?dist}
+Release: 8%{?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-8
+- Again fixed intrinsics patch so that Python modules build on x86_64.
+
* Tue Mar 7 2006 Simon Perreault <nomis80 at nomis80.org> - 0.9.7-7
- Fixed intrinsics patch so that it works.
More information about the scm-commits
mailing list