- expllicit req for webrtc-libilbc to avoid confusion with libilbc

[packages/ffmpeg.git] / ffmpeg.spec

diff --git a/ffmpeg.spec b/ffmpeg.spec
index 5070fdbf51b4940189bd0859b763c74c467c2f51..4ff59dfd2eacfc5b991c02355f905ae4be2a6a90 100644 (file)
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -1,4 +1,3 @@
-# TODO: libilbc (requires webrtc.org version)
 #
 # How to deal with ffmpeg/opencv checken-egg problem:
 #      1. make-request -r --without opencv ffmpeg.spec
@@ -13,7 +12,7 @@
 %bcond_without caca            # textual display using libcaca
 %bcond_without flite           # flite voice synthesis support
 %bcond_without frei0r          # frei0r video filtering
-%bcond_with    ilbc            # iLBC de/encoding via libilbc
+%bcond_without ilbc            # iLBC de/encoding via WebRTC libilbc
 %bcond_without openal          # OpenAL 1.1 capture support
 %bcond_without opencv          # OpenCV video filtering
 %bcond_without pulseaudio      # PulseAudio input support
@@ -27,7 +26,7 @@ Summary:      FFmpeg - a very fast video and audio converter
 Summary(pl.UTF-8):     FFmpeg - szybki konwerter audio/wideo
 Name:          ffmpeg
 Version:       1.0
-Release:       1
+Release:       4
 # 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)
@@ -69,7 +68,6 @@ BuildRequires:        libcdio-devel
 BuildRequires: libdc1394-devel >= 2
 BuildRequires: libgsm-devel
 BuildRequires: libiec61883-devel
-%{?with_ilbc:BuildRequires:    libilbc-devel}
 BuildRequires: libmodplug-devel
 BuildRequires: libnut-devel
 BuildRequires: libraw1394-devel >= 2
@@ -104,18 +102,20 @@ BuildRequires:    speex-devel >= 1:1.2-rc1
 %{?with_doc:BuildRequires:     texinfo}
 BuildRequires: twolame-devel
 %{?with_utvideo:BuildRequires: utvideo-devel}
-BuildRequires: yasm
 BuildRequires: vo-aacenc-devel
 BuildRequires: vo-amrwbenc-devel
+%{?with_ilbc:BuildRequires:    webrtc-libilbc-devel}
 BuildRequires: xavs-devel
 BuildRequires: xorg-lib-libXext-devel
 BuildRequires: xorg-lib-libXfixes-devel
 BuildRequires: xvid-devel >= 1:1.1.0
+BuildRequires: yasm
 BuildRequires: zlib-devel
 %{?with_autoreqdep:BuildConflicts:     libpostproc}
 # overflows maximum hash table size
 BuildConflicts:        pdksh < 5.2.14-57
 Requires:      %{name}-libs = %{version}-%{release}
+%{?with_ilbc:Requires: webrtc-libilbc}
 Requires:      xvid >= 1:1.1.0
 Obsoletes:     libpostproc
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -190,7 +190,6 @@ Requires:   libcdio-devel
 Requires:      libdc1394-devel >= 2
 Requires:      libgsm-devel
 Requires:      libiec61883-devel
-%{?with_ilbc:Requires: libilbc-devel}
 Requires:      libmodplug-devel
 Requires:      libnut-devel
 Requires:      libraw1394-devel >= 2
@@ -201,12 +200,14 @@ Requires: libvorbis-devel
 %{?with_vpx:Requires:  libvpx-devel >= 0.9.6}
 %{?with_x264:Requires: libx264-devel >= 0.1.3-1.20110625_2245}
 Requires:      opencore-amr-devel
+%{?with_opencv:Requires:       opencv-devel}
 Requires:      openjpeg-devel >= 1.5
 Requires:      schroedinger-devel
 Requires:      speex-devel >= 1:1.2-rc1
 Requires:      twolame-devel
 Requires:      vo-aacenc-devel
 Requires:      vo-amrwbenc-devel
+%{?with_ilbc:Requires: webrtc-libilbc-devel}
 Requires:      xavs-devel
 Requires:      xorg-lib-libXext-devel
 Requires:      xorg-lib-libXfixes-devel