SHA256
1
0
forked from pool/opencv

Accepting request 79592 from KDE:Distro:Factory

- Dropped opencv-2.3-ffmpeg.patch, applied upstream
 (forwarded request 79589 from koprok)

OBS-URL: https://build.opensuse.org/request/show/79592
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/opencv?expand=0&rev=23
This commit is contained in:
Sascha Peilicke
2011-08-24 12:04:40 +00:00
committed by Git OBS Bridge
parent d5f10eed26
commit ca20cb32d4
11 changed files with 169 additions and 448 deletions

View File

@@ -21,20 +21,21 @@
Name: opencv
%define libname lib%{name}
%define soname 2_3
Version: 2.3.0
Version: 2.3.1
Release: 14
License: BSD3c
Summary: Collection of algorithms for computer vision
Url: http://%{name}.willowgarage.com/wiki/
Group: Development/Libraries
Source0: http://downloads.sourceforge.net/project/%{name}library/%{name}-unix/2.3/OpenCV-%{version}.tar.bz2
Patch0: %{name}-2.3-libdir.patch
Patch1: %{name}-2.3-samples.patch
Source0: http://downloads.sourceforge.net/project/%{name}library/%{name}-unix/%{version}/OpenCV-%{version}.tar.bz2
# PATCH-FIX-UPSTREAM %{name}-libdir.patch koprok@nand.bg -- Add an option to install libraries and python packages in lib64.
Patch0: %{name}-libdir.patch
# PATCH-FIX-UPSTREAM %{name}-samples.patch koprok@nand.bg -- Improve samples installation.
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.
Patch3: %{name}-2.3-underlinking.patch
Patch7: %{name}-2.3-cmake.patch
# PATCH-FIX-UPSTREAM %{name}-2.3-ffmpeg.patch reddwarf@opensuse.org -- Allows to compile with latest ffmpeg. Took from upstream SVN.
Patch8: %{name}-2.3-ffmpeg.patch
# PATCH-FIX-OPENSUSE %{name}-datadir.patch koprok@nand.bg -- Install data files in share/opencv instead of share/OpenCV.
Patch9: %{name}-datadir.patch
%if 0%{?suse_version} >= 1120
BuildRequires: gstreamer-0_10-plugins-base-devel
BuildRequires: gstreamer-0_10-devel
@@ -61,8 +62,7 @@ BuildRequires: libffmpeg-devel
%endif
%if 0%{?suse_version} >= 1130
BuildRequires: python-numpy-devel
%endif
%if 0%{?suse_version} >= 1120
%else
BuildRequires: python-numpy
%endif
%if 0%{?suse_version} < 1210
@@ -126,10 +126,7 @@ This package contains the documentation and examples for the OpenCV library.
%patch0 -p1
%patch1 -p1
%patch3
%patch7 -p1
%if %{with ffmpeg}
%patch8
%endif
%patch9 -p1
# Windows specific and with wrong end of line
rm -f doc/packaging.txt
@@ -182,7 +179,7 @@ rm -rf %{buildroot}
%defattr(0644, root, root, 0755)
%attr(0755, root, root) %{_bindir}/%{name}_*
%{_datadir}/%{name}
%exclude %{_datadir}/%{name}/OpenCVConfig.cmake
%exclude %{_datadir}/%{name}/OpenCVConfig*.cmake
%files devel
%defattr(0644, root, root, 0755)
@@ -190,14 +187,15 @@ rm -rf %{buildroot}
%{_includedir}/opencv2
%{_libdir}/lib*.so
%{_libdir}/pkgconfig/%{name}.pc
%{_datadir}/%{name}/OpenCVConfig.cmake
%{_datadir}/%{name}/OpenCVConfig*.cmake
%files -n python-%{name}
%defattr(0644, root, root, 0755)
%if 0%{?suse_version} < 1120
%{py_sitedir}/cv.so
%{py_sitedir}/cv.py
%{py_sitedir}/cv2.so
%else
%{python_sitearch}/cv.so
%{python_sitearch}/cv.py
%{python_sitearch}/cv2.so
%endif