Attachment 589072 Details for Bug 828087 – proposed changes in opencv.spec

[patch] proposed changes in opencv.spec

opencv-buildrequires.patch (text/plain), 1.12 KB, created by Honza Horak on 2012-06-04 08:43:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Honza Horak

Created: 2012-06-04 08:43:03 UTC

Size: 1.12 KB

patch

obsolete

>diff --git a/opencv.spec b/opencv.spec
>index 3606520..d98f471 100644
>--- a/opencv.spec
>+++ b/opencv.spec
>@@ -22,12 +22,10 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
> BuildRequires:  libtool
> BuildRequires:  cmake >= 2.6.3
> BuildRequires:  chrpath
>-BuildRequires:  f2c
> 
>-BuildRequires:  eigen2-devel
>+%{?_with_eigen2:BuildRequires:  eigen2-devel}
>+%{?_with_eigen3:BuildRequires:  eigen3-devel}
> BuildRequires:  gtk2-devel
>-BuildRequires:  imlib2-devel
>-BuildRequires:  libucil-devel
> BuildRequires:  libtheora-devel
> BuildRequires:  libvorbis-devel
> %ifnarch s390 s390x
>@@ -40,10 +38,12 @@ BuildRequires:  libjpeg-devel
> BuildRequires:  libtiff-devel
> BuildRequires:  libv4l-devel
> BuildRequires:  OpenEXR-devel
>+%{?_with_openni:
> %ifarch %{ix86} x86_64
> BuildRequires:  openni-devel
> BuildRequires:  openni-primesense
> %endif
>+}
> %ifarch %{ix86} x86_64 ia64
> BuildRequires:  tbb-devel
> %endif
>@@ -132,7 +132,9 @@ pushd build
>  -DCUDA_PROPAGATE_HOST_FLAGS=0 \
> } \
> %ifarch %{ix86} x86_64
>+%{?_with_openni: \
>  -DWITH_OPENNI=ON \
>+} \
> %endif
>  %{!?_with_xine:-DWITH_XINE=0} \
>  -DINSTALL_C_EXAMPLES=1 \

Actions: View | Diff

Attachments on bug 828087: 589072