Accepting request 50057 from KDE:Distro:Factory
Copy from KDE:Distro:Factory/opencv based on submit request 50057 from user dirkmueller OBS-URL: https://build.opensuse.org/request/show/50057 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/opencv?expand=0&rev=9
This commit is contained in:
parent
1926012812
commit
1ac60eb220
12
opencv-2.1-underlinking.patch
Normal file
12
opencv-2.1-underlinking.patch
Normal file
@ -0,0 +1,12 @@
|
||||
Index: CMakeLists.txt
|
||||
===================================================================
|
||||
--- CMakeLists.txt.orig
|
||||
+++ CMakeLists.txt
|
||||
@@ -403,6 +403,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()
|
@ -1,3 +1,8 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Oct 8 07:29:48 UTC 2010 - reddwarf@opensuse.org
|
||||
|
||||
- add -underlinking patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Apr 22 11:43:38 EEST 2010 - koprok@nand.bg
|
||||
|
||||
|
@ -22,7 +22,7 @@ Name: opencv
|
||||
%define libname lib%{name}
|
||||
%define soname 2
|
||||
Version: 2.1.0
|
||||
Release: 2
|
||||
Release: 5
|
||||
Summary: Collection of algorithms for computer vision
|
||||
Group: Development/Libraries
|
||||
License: BSD3c
|
||||
@ -31,6 +31,8 @@ Source0: http://downloads.sourceforge.net/project/%{name}library/%{name}-
|
||||
Patch0: %{name}-2.1-libdir.patch
|
||||
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
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
BuildRequires: gstreamer-0_10-devel gstreamer-0_10-plugins-base-devel
|
||||
%if 0%{?suse_version} >= 1110
|
||||
@ -109,6 +111,7 @@ This package contains the documentation and examples for the OpenCV library.
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
%patch3
|
||||
# Windows specific and with wrong end of line
|
||||
%{__rm} -f doc/packaging.txt
|
||||
%{__chmod} +x samples/c/build_all.sh
|
||||
|
Loading…
Reference in New Issue
Block a user