Accepting request 53430 from KDE:Distro:Factory

Accepted submit request 53430 from user coolo

OBS-URL: https://build.opensuse.org/request/show/53430
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/opencv?expand=0&rev=10
This commit is contained in:
Ruediger Oertel 2010-11-20 11:23:28 +00:00 committed by Git OBS Bridge
parent 1ac60eb220
commit c6b54a46a1
3 changed files with 17 additions and 0 deletions

10
opencv-gcc-46.diff Normal file
View File

@ -0,0 +1,10 @@
--- include/opencv/cxcore.hpp
+++ include/opencv/cxcore.hpp
@@ -51,6 +51,7 @@
#include <algorithm>
#include <cmath>
#include <complex>
+#include <cstddef>
#include <map>
#include <new>
#include <string>

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Thu Nov 11 15:50:25 CET 2010 - dmueller@suse.de
- fix build with gcc 4.6
-------------------------------------------------------------------
Fri Oct 8 07:29:48 UTC 2010 - reddwarf@opensuse.org

View File

@ -33,6 +33,7 @@ Patch1: %{name}-2.1-samples.patch
Patch2: libpng14.patch
# PATCH-FIX-UPSTREAM %{name}-2.1-underlinking.patch sf#3083546 reddwarf@opensuse.org -- Link against libv4l2
Patch3: %{name}-2.1-underlinking.patch
Patch4: opencv-gcc-46.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: gstreamer-0_10-devel gstreamer-0_10-plugins-base-devel
%if 0%{?suse_version} >= 1110
@ -112,6 +113,7 @@ This package contains the documentation and examples for the OpenCV library.
%patch1 -p1
%patch2 -p1
%patch3
%patch4
# Windows specific and with wrong end of line
%{__rm} -f doc/packaging.txt
%{__chmod} +x samples/c/build_all.sh