Author: qboosh Date: Sun Jan 23 18:07:04 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- gstreamer enabled by default
- added options/bconds/BRs for unicap and pvapi
---- Files affected:
packages/opencv:
opencv.spec (1.22 -> 1.23)
---- Diffs:
================================================================
Index: packages/opencv/opencv.spec
diff -u packages/opencv/opencv.spec:1.22 packages/opencv/opencv.spec:1.23
--- packages/opencv/opencv.spec:1.22 Sun Jan 23 07:42:37 2011
+++ packages/opencv/opencv.spec Sun Jan 23 19:06:59 2011
@@ -1,7 +1,9 @@
# $Revision$, $Date$
#
# Conditional build:
-%bcond_with gstreamer # GStreamer support
+%bcond_without gstreamer # GStreamer support
+%bcond_with pvapi # PvAPI (AVT GigE cameras) support
+%bcond_with unicap # Unicap support (GPL)
%bcond_with xine # XINE support (GPL)
#
Summary: A library of programming functions mainly aimed at real time
computer vision
@@ -10,7 +12,11 @@
Version: 2.2.0
Release: 6
Epoch: 1
+%if %{with unicap} || %{with xine}
+License: GPL (enforced by used libraries), BSD (opencv itself)
+%else
License: BSD
+%endif
Group: Libraries
Source0:
http://downloads.sourceforge.net/opencvlibrary/OpenCV-%{version}.tar.bz2
# Source0-md5: 122c9ac793a46854ef2819fedbbd6b1b
@@ -18,6 +24,7 @@
Patch1: %{name}-cflags.patch
Patch2: %{name}-link.patch
URL: http://opencv.willowgarage.com/
+%{?with_pvapi:BuildRequires: AVT_GigE_SDK-devel}
BuildRequires: OpenEXR-devel
BuildRequires: cmake >= 2.4
BuildRequires: doxygen
@@ -35,6 +42,10 @@
BuildRequires: libstdc++-devel
BuildRequires: libtiff-devel
BuildRequires: libtool
+%if %{with unicap}
+BuildRequires: libucil-devel
+BuildRequires: libunicap-devel
+%endif
BuildRequires: libv4l-devel
BuildRequires: pkgconfig
BuildRequires: python-devel
@@ -46,9 +57,6 @@
BuildRequires: zlib-devel
%{?with_xine:BuildRequires: xine-lib-devel}
# TODO:
-# - unicap (libunicap, libucil)
-# - gstreamer
-# - pvapi (PvApi.h)
# - Qt (bcond replacing GTK+?)
# - tbb (tbb.pc)
# - cuda (on bcond)
@@ -56,8 +64,6 @@
# - ipp (libippi)
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-%define skip_post_check_so libhighgui.so.%{version}
-
%description
OpenCV (Open Source Computer Vision) is a library of programming
functions mainly aimed at real time computer vision.
@@ -139,14 +145,10 @@
%endif
-DBUILD_NEW_PYTHON_SUPPORT=ON \
-DUSE_O3=OFF \
- -DWITH_1394=ON \
- -DWITH_FFMPEG=ON \
- -DWITH_GSTREAMER=OFF \
- -DWITH_GTK=ON \
- -DWITH_V4L=ON \
-%if %{with xine}
- -DWITH_XINE=ON
-%endif
+ %{!?with_gstreamer:-DWITH_GSTREAMER=OFF} \
+ %{!?with_pvapi:-DWITH_PVAPI=OFF} \
+ %{?with_unicap:-DWITH_UNICAP=ON} \
+ %{?with_xine:-DWITH_XINE=ON}
%{__make}
@@ -198,6 +200,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.23 2011/01/23 18:06:59 qboosh
+- gstreamer enabled by default
+- added options/bconds/BRs for unicap and pvapi
+
Revision 1.22 2011/01/23 06:42:37 qboosh
- updated cflags patch to remove -march=i686 from CFLAGS
- pass cmake options to disable -O3 overrides and -msse/-msse2 on CPUs which
possibly don't support SSE
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/opencv/opencv.spec?r1=1.22&r2=1.23&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
