From 192f9f57256721561c6fba23272c39adf628f2ba Mon Sep 17 00:00:00 2001 From: hawk Date: Fri, 16 Dec 2011 12:23:52 +0000 Subject: [PATCH] - opencv bcond, added comment about ffmpeg/opencv build dependency loop Changed files: ffmpeg.spec -> 1.236 --- ffmpeg.spec | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/ffmpeg.spec b/ffmpeg.spec index 52139c9..dbc3521 100644 --- a/ffmpeg.spec +++ b/ffmpeg.spec @@ -1,11 +1,19 @@ # TODO # - is bug803 patch still needed? the code changed somehow # +# Workaround ffmpeg.spec & opencv.spec updating: +# +# 1. make-request -r --without opencv ffmpeg.spec +# 2. make-request -r opencv.spec +# 3. bump release of ffmpeg.spec +# 4. make-request -r ffmpeg.spec +# # Conditional build: %bcond_with nonfree # non free options of package (currently: faac) %bcond_with aacplus # AAC+ encoding via libaacplus (requires nonfree) %bcond_without autoreqdep # don't care about package name deps generated by rpm %bcond_without frei0r # build without frei0r video filtering +%bcond_without opencv # build without opencv video filtering %bcond_without x264 # build without x264 encoder %bcond_without va # VAAPI (Video Acceleration API) %bcond_without vpx # VP8, a high-quality video codec @@ -15,7 +23,7 @@ Summary: FFmpeg - a very fast video and audio converter Summary(pl.UTF-8): FFmpeg - szybki konwerter audio/wideo Name: ffmpeg Version: 0.9 -Release: 1 +Release: 2 # LGPL or GPL, chosen at configure time (GPL version is more featured) # (postprocessing, some filters, x264, xavs, xvid, x11grab) # using v3 allows Apache-licensed libs (opencore-amr, libvo-*enc) @@ -58,6 +66,7 @@ BuildRequires: libvorbis-devel # X264_BUILD >= 118 %{?with_x264:BuildRequires: libx264-devel >= 0.1.3-1.20111212_2245} BuildRequires: opencore-amr-devel +%{?with_opencv:BuildRequires: opencv-devel} BuildRequires: openjpeg-devel >= 1.3-2 BuildRequires: speex-devel >= 1:1.2-rc1 %ifarch %{ix86} @@ -310,6 +319,7 @@ EOF --enable-libnut \ --enable-libopencore-amrnb \ --enable-libopencore-amrwb \ + %{?with_opencv:--enable-libopencv} \ --enable-libopenjpeg \ --enable-librtmp \ --enable-libschroedinger \ @@ -340,8 +350,6 @@ EOF %endif --enable-runtime-cpudetect -# --enable-libopencv would cause dependency loop - # force oldscaler build %{__sed} -i -e 's|#define.*CONFIG_OLDSCALER.*0|#define CONFIG_OLDSCALER 1|g' config.h -- 2.43.0