pool/opencv
SHA256
9
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 98468 from KDE:Distro:Factory

Browse Source 
- Add upstream r6881 to fix clang compatibility (forwarded request 98467 from namtrac)

OBS-URL: https://build.opensuse.org/request/show/98468
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/opencv?expand=0&rev=28
This commit is contained in:
Stephan Kulow
2012-01-04 06:25:38 +00:00
committed by Git OBS Bridge
parent 569dc5ae3d
commit 9a768f8315
3 changed files with 41 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
opencv-clang.patch Normal file
View File

@@ -0,0 +1,22 @@
--- opencv/modules/flann/include/opencv2/flann/any.h (revision 6809)
+++ opencv/modules/flann/include/opencv2/flann/any.h (revision 6881)
@@ -31,4 +31,10 @@
};
+inline std::ostream& operator <<(std::ostream& out, const empty_any&)
+{
+ out << "[empty_any]";
+ return out;
+}
+
struct base_any_policy
{
--- opencv/modules/flann/include/opencv2/flann/lsh_index.h (revision 6724)
+++ opencv/modules/flann/include/opencv2/flann/lsh_index.h (revision 6881)
@@ -57,5 +57,5 @@
struct LshIndexParams : public IndexParams
{
- LshIndexParams(unsigned int table_number, unsigned int key_size, unsigned int multi_probe_level)
+ LshIndexParams(unsigned int table_number = 12, unsigned int key_size = 20, unsigned int multi_probe_level = 2)
{
(* this)["algorithm"] = FLANN_INDEX_LSH;

5
opencv.changes
View File

@@ -1,3 +1,8 @@
-------------------------------------------------------------------
Sat Dec 31 14:21:49 UTC 2011 - idonmez@suse.com
- Add upstream r6881 to fix clang compatibility
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Oct 18 08:19:10 UTC 2011 - coolo@suse.com Tue Oct 18 08:19:10 UTC 2011 - coolo@suse.com

25
opencv.spec
View File

@@ -22,21 +22,23 @@ Name: opencv
%define libname lib%{name} %define libname lib%{name}
%define soname 2_3 %define soname 2_3
Version: 2.3.1a Version: 2.3.1a
Release: 1 Release: 0
%define dirver 2.3.1 %define dirver 2.3.1
License: BSD-3-Clause
Summary: Collection of algorithms for computer vision Summary: Collection of algorithms for computer vision
Url: http://%{name}.willowgarage.com/wiki/ License: BSD-3-Clause
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Url: http://%{name}.willowgarage.com/wiki/
Source0: http://downloads.sourceforge.net/project/%{name}library/%{name}-unix/%{dirver}/OpenCV-%{version}.tar.bz2 Source0: http://downloads.sourceforge.net/project/%{name}library/%{name}-unix/%{dirver}/OpenCV-%{version}.tar.bz2
# PATCH-FIX-UPSTREAM %%{name}-libdir.patch koprok@nand.bg -- Add an option to install libraries and python packages in lib64. # PATCH-FIX-UPSTREAM opencv-libdir.patch koprok@nand.bg -- Add an option to install libraries and python packages in lib64.
Patch0: %{name}-libdir.patch Patch0: %{name}-libdir.patch
# PATCH-FIX-UPSTREAM %%{name}-samples.patch koprok@nand.bg -- Improve samples installation. # PATCH-FIX-UPSTREAM opencv-samples.patch koprok@nand.bg -- Improve samples installation.
Patch1: %{name}-samples.patch Patch1: %{name}-samples.patch
# PATCH-FIX-UPSTREAM %%{name}-2.3-underlinking.patch reddwarf@opensuse.org -- Make libopencv_highgui.so link to libv4l2 since it's using symbols defined there. # PATCH-FIX-UPSTREAM opencv-2.3-underlinking.patch reddwarf@opensuse.org -- Make libopencv_highgui.so link to libv4l2 since it's using symbols defined there.
Patch3: %{name}-2.3-underlinking.patch Patch2: %{name}-2.3-underlinking.patch
# PATCH-FIX-OPENSUSE %%{name}-datadir.patch koprok@nand.bg -- Install data files in share/opencv instead of share/OpenCV. # PATCH-FIX-OPENSUSE opencv-datadir.patch koprok@nand.bg -- Install data files in share/opencv instead of share/OpenCV.
Patch9: %{name}-datadir.patch Patch3: %{name}-datadir.patch
# PATCH-FIX-UPSTREAM opencv-clang.patch idoenmez@suse.de -- Upstream r6881 to fix clang compatibility
Patch4: %{name}-clang.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: OpenEXR-devel BuildRequires: OpenEXR-devel
BuildRequires: cmake BuildRequires: cmake
@@ -108,8 +110,9 @@ This package contains the documentation and examples for the OpenCV library.
%setup -qn OpenCV-%{dirver} %setup -qn OpenCV-%{dirver}
%patch0 -p1 %patch0 -p1
%patch1 -p1 %patch1 -p1
%patch3 %patch2
%patch9 -p1 %patch3 -p1
%patch4 -p1
# Windows specific and with wrong end of line # Windows specific and with wrong end of line
rm -f doc/packaging.txt rm -f doc/packaging.txt