packages: opencv/opencv.spec, opencv/opencv-build.patch (NEW) - rel 5; buil...

[arekm]

Author: arekm                        Date: Tue Jul 14 11:33:55 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 5; build fixed

---- Files affected:
packages/opencv:
   opencv.spec (1.5 -> 1.6) , opencv-build.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/opencv/opencv.spec
diff -u packages/opencv/opencv.spec:1.5 packages/opencv/opencv.spec:1.6
--- packages/opencv/opencv.spec:1.5	Fri Jul  3 22:55:05 2009
+++ packages/opencv/opencv.spec	Tue Jul 14 13:33:50 2009
@@ -4,7 +4,7 @@
 Summary:	A library of programming functions mainly aimed at real time computer vision
 Name:		opencv
 Version:	1.1
-Release:	0.%{snap}.4
+Release:	0.%{snap}.5
 Epoch:		1
 License:	BSD
 Group:		Libraries
@@ -12,6 +12,7 @@
 # Source0-md5:	b147b7cd3c059831c415c5a2bcecdf95
 Patch0:		%{name}-ffmpeg.patch
 Patch1:		%{name}-am.patch
+Patch2:		%{name}-build.patch
 URL:		http://opencv.willowgarage.com
 BuildRequires:	autoconf >= 2.53
 BuildRequires:	automake
@@ -70,6 +71,7 @@
 %setup -q -n %{name}-%{version}.0
 %patch0 -p0
 %patch1 -p1
+%patch2 -p1
 
 sed -i -e 's#ACLOCAL_AMFLAGS.*##g' Makefile.am
 sed -i -e 's#pkgpython#pkgpyexec#g' interfaces/swig/python/Makefile.am
@@ -139,6 +141,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.6  2009/07/14 11:33:50  arekm
+- rel 5; build fixed
+
 Revision 1.5  2009/07/03 20:55:05  hawk
 - strict internal dep for python-opencv, release 4
 

================================================================
Index: packages/opencv/opencv-build.patch
diff -u /dev/null packages/opencv/opencv-build.patch:1.1
--- /dev/null	Tue Jul 14 13:33:55 2009
+++ packages/opencv/opencv-build.patch	Tue Jul 14 13:33:50 2009
@@ -0,0 +1,11 @@
+--- opencv-1.1.0/cxcore/include/cxmisc.h~	2008-07-29 21:05:04.000000000 +0200
++++ opencv-1.1.0/cxcore/include/cxmisc.h	2009-07-14 13:27:44.962942767 +0200
+@@ -130,7 +130,7 @@
+     #include <alloca.h>
+ #elif defined HAVE_ALLOCA
+     #include <stdlib.h>
+-#elif
++#else
+     #error
+ #endif
+ 
================================================================

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