[packages/opencv] - added ffmpeg bcond
baggins
baggins at pld-linux.org
Tue Apr 2 14:52:11 CEST 2013
commit b3920a9d039b930caa4166a1dcdc1fa03656eef7
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Tue Apr 2 14:52:00 2013 +0200
- added ffmpeg bcond
opencv.spec | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
---
diff --git a/opencv.spec b/opencv.spec
index 4d82508..dd7d41e 100644
--- a/opencv.spec
+++ b/opencv.spec
@@ -14,6 +14,7 @@
%bcond_with opencl_amdfft # AMD OpenCL FFT routines
%bcond_without opengl # OpenGL support
# - highgui options:
+%bcond_without ffmpeg # FFMpeg support in highgui
%bcond_without gstreamer # GStreamer support in highgui
%bcond_with openni # OpenNI (Natural Interaction) support in highgui
%bcond_with pvapi # PvAPI (AVT GigE cameras) support in highgui (proprietary)
@@ -65,7 +66,7 @@ BuildRequires: OpenEXR-devel
BuildRequires: cmake >= 2.4
BuildRequires: doxygen
BuildRequires: eigen3 >= 3
-BuildRequires: ffmpeg-devel >= 0.7
+%{?with_ffmpeg:BuildRequires: ffmpeg-devel >= 0.7}
%if %{with gstreamer}
BuildRequires: gstreamer-devel >= 0.10
BuildRequires: gstreamer-plugins-base-devel >= 0.10
@@ -183,6 +184,7 @@ cd build
-DENABLE_SSE2=%{?with_sse2:ON}%{!?with_sse2:OFF} \
-DBUILD_NEW_PYTHON_SUPPORT=ON \
-DUSE_O3=OFF \
+ %{?with_ffmpeg:-DWITH_FFMPEG=ON} \
%{!?with_gstreamer:-DWITH_GSTREAMER=OFF} \
%{?with_opencl:-DWITH_OPENCL=ON} \
%{?with_opencl_amdblas:-DWITH_OPENCLAMDBLAS=ON} \
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/opencv.git/commitdiff/b3920a9d039b930caa4166a1dcdc1fa03656eef7
More information about the pld-cvs-commit
mailing list