packages: opencv/opencv.spec, opencv/opencv-c.patch (NEW) - added c patch (...

[qboosh]

Author: qboosh                       Date: Thu Mar 10 17:05:16 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- added c patch (C compatibility for legacy headers)
- release 7

---- Files affected:
packages/opencv:
   opencv.spec (1.25 -> 1.26) , opencv-c.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/opencv/opencv.spec
diff -u packages/opencv/opencv.spec:1.25 packages/opencv/opencv.spec:1.26
--- packages/opencv/opencv.spec:1.25	Sat Jan 29 10:05:14 2011
+++ packages/opencv/opencv.spec	Thu Mar 10 18:05:07 2011
@@ -13,7 +13,7 @@
 Summary(pl.UTF-8):	Biblioteka funkcji do grafiki komputerowej w czasie rzeczywistym
 Name:		opencv
 Version:	2.2.0
-Release:	6
+Release:	7
 Epoch:		1
 %if %{with unicap} || %{with xine}
 License:	GPL (enforced by used libraries), BSD (opencv itself)
@@ -27,6 +27,7 @@
 Patch1:		%{name}-cflags.patch
 Patch2:		%{name}-link.patch
 Patch3:		%{name}-unicap-c++.patch
+Patch4:		%{name}-c.patch
 URL:		http://opencv.willowgarage.com/
 %{?with_pvapi:BuildRequires:	AVT_GigE_SDK-devel}
 BuildRequires:	OpenEXR-devel
@@ -139,6 +140,7 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
 install -d build
@@ -212,6 +214,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.26  2011/03/10 17:05:07  qboosh
+- added c patch (C compatibility for legacy headers)
+- release 7
+
 Revision 1.25  2011/01/29 09:05:14  qboosh
 - qt bcond (GTK+ is the default)
 

================================================================
Index: packages/opencv/opencv-c.patch
diff -u /dev/null packages/opencv/opencv-c.patch:1.1
--- /dev/null	Thu Mar 10 18:05:16 2011
+++ packages/opencv/opencv-c.patch	Thu Mar 10 18:05:07 2011
@@ -0,0 +1,21 @@
+--- OpenCV-2.2.0/modules/legacy/include/opencv2/legacy/blobtrack.hpp.orig	2010-12-05 04:35:25.000000000 +0100
++++ OpenCV-2.2.0/modules/legacy/include/opencv2/legacy/blobtrack.hpp	2011-03-09 19:14:52.579414618 +0100
+@@ -47,6 +47,9 @@
+ //#if _MSC_VER >= 1200
+ 
+ #include "opencv2/core/core_c.h"
++
++#ifdef __cplusplus
++
+ #include <stdio.h>
+ 
+ #if _MSC_VER >= 1200 || defined __BORLANDC__
+@@ -943,6 +946,8 @@
+ CV_EXPORTS void cvTestSeqAddIntensityVariation(CvTestSeq* pTestSeq, float DI_per_frame, float MinI, float MaxI);
+ CV_EXPORTS void cvTestSeqSetFrame(CvTestSeq* pTestSeq, int n);
+ 
++#endif /* __cplusplus */
++
+ #endif
+ 
+ /* End of file. */
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/opencv/opencv.spec?r1=1.25&r2=1.26&f=u