From 29d82ddfb58fabb2aba173ce881daf83020c5d87 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Arkadiusz=20Mi=C5=9Bkiewicz?= Date: Tue, 14 Jul 2009 11:33:50 +0000 Subject: [PATCH] - rel 5; build fixed Changed files: opencv-build.patch -> 1.1 opencv.spec -> 1.6 --- opencv-build.patch | 11 +++++++++++ opencv.spec | 4 +++- 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 opencv-build.patch diff --git a/opencv-build.patch b/opencv-build.patch new file mode 100644 index 0000000..e9c0b96 --- /dev/null +++ b/opencv-build.patch @@ -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 + #elif defined HAVE_ALLOCA + #include +-#elif ++#else + #error + #endif + diff --git a/opencv.spec b/opencv.spec index c9e2317..3efa7e3 100644 --- a/opencv.spec +++ b/opencv.spec @@ -3,7 +3,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 @@ -11,6 +11,7 @@ Source0: http://dl.sourceforge.net/opencvlibrary/%{name}-%{version}%{snap}.tar.g # 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 @@ -69,6 +70,7 @@ OpenCV Python bindings. %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 -- 2.44.0