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

Accepting request 124297 from KDE:Distro:Factory

Browse Source 
Add more info in changes file (forwarded request 124276 from koprok)

OBS-URL: https://build.opensuse.org/request/show/124297
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/opencv?expand=0&rev=32
This commit is contained in:
Stephan Kulow 2012-06-10 21:01:25 +00:00 committed by Git OBS Bridge
parent 3a8c3635ad
commit 400d48dd10
6 changed files with 25 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
OpenCV-2.4.0.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3b5fedb2fc6ad0aa1509676468f571ba21456679e7d48a8242a096d62e2c6ac9
size 47156770

3
OpenCV-2.4.1.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:29b6ab4fcda5cf89015507f4625d672ade5b041a48535792214f3b19fe92b1f3
size 47211018

12
opencv-2.3-underlinking.patch
View File

@ -1,12 +0,0 @@
Index: CMakeLists.txt
===================================================================
--- CMakeLists.txt.orig
+++ CMakeLists.txt
@@ -544,6 +544,7 @@ if(UNIX)
endif()
if(WITH_V4L)
CHECK_MODULE(libv4l1 HAVE_LIBV4L)
+ CHECK_MODULE(libv4l2 HAVE_LIBV4L2)
CHECK_INCLUDE_FILE(linux/videodev.h HAVE_CAMV4L)
CHECK_INCLUDE_FILE(linux/videodev2.h HAVE_CAMV4L2)
else()

11
opencv-underlinking.patch Normal file
View File

@ -0,0 +1,11 @@
diff -urN OpenCV-2.4.1-orig/cmake/OpenCVFindLibsVideo.cmake OpenCV-2.4.1/cmake/OpenCVFindLibsVideo.cmake
--- OpenCV-2.4.1-orig/cmake/OpenCVFindLibsVideo.cmake 2012-05-31 17:05:39.000000000 +0300
+++ OpenCV-2.4.1/cmake/OpenCVFindLibsVideo.cmake 2012-06-08 11:26:23.643869881 +0300
@@ -75,6 +75,7 @@
ocv_clear_vars(HAVE_LIBV4L HAVE_CAMV4L HAVE_CAMV4L2)
if(WITH_V4L)
CHECK_MODULE(libv4l1 HAVE_LIBV4L)
+ CHECK_MODULE(libv4l2 HAVE_LIBV4L2)
CHECK_INCLUDE_FILE(linux/videodev.h HAVE_CAMV4L)
CHECK_INCLUDE_FILE(linux/videodev2.h HAVE_CAMV4L2)
endif(WITH_V4L)

7
opencv.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Fri Jun 8 11:07:47 EEST 2012 - koprok@nand.bg
- Update to OpenCV 2.4.1
More info at:
http://code.opencv.org/projects/opencv/wiki/ChangeLog
-------------------------------------------------------------------
Tue May 15 14:24:05 EEST 2012 - koprok@nand.bg

8
opencv.spec
View File

@ -21,7 +21,7 @@
Name: opencv
%define libname lib%{name}
%define soname 2_4
Version: 2.4.0
Version: 2.4.1
Release: 0
Summary: Collection of algorithms for computer vision
License: BSD-3-Clause
@ -30,8 +30,8 @@ Url: http://%{name}.willowgarage.com/wiki/
Source0: http://downloads.sourceforge.net/project/%{name}library/%{name}-unix/%{version}/OpenCV-%{version}.tar.bz2
# PATCH-FIX-UPSTREAM opencv-samples.patch koprok@nand.bg -- Improve samples installation.
Patch1: %{name}-samples.patch
# 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.
Patch2: %{name}-2.3-underlinking.patch
# PATCH-FIX-UPSTREAM opencv-underlinking.patch koprok@nand.bg -- Make libopencv_highgui.so link to libv4l2 since it's using symbols defined there.
Patch2: %{name}-underlinking.patch
# PATCH-FIX-OPENSUSE opencv-datadir.patch koprok@nand.bg -- Install data files in share/opencv instead of share/OpenCV.
Patch3: %{name}-datadir.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -105,7 +105,7 @@ This package contains the documentation and examples for the OpenCV library.
%prep
%setup -qn OpenCV-%{version}
%patch1 -p1
%patch2
%patch2 -p1
%patch3 -p1
# Windows specific and with wrong end of line