- flite 1.4 is enough for ffmpeg, so enable it

diff --git a/ffmpeg.spec b/ffmpeg.spec
index d8581f586e8e35aa00348d38b67631bb20e236d1..5070fdbf51b4940189bd0859b763c74c467c2f51 100644 (file)
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -1,4 +1,4 @@
-# TODO: libilbc (requires webrtc.org version), flite (some additional voices required)
+# TODO: libilbc (requires webrtc.org version)
 #
 # How to deal with ffmpeg/opencv checken-egg problem:
 #      1. make-request -r --without opencv ffmpeg.spec
@@ -10,16 +10,15 @@
 %bcond_with    nonfree         # non free options of package (currently: faac)
 %bcond_with    aacplus         # AAC+ encoding via libaacplus (requires nonfree)
 %bcond_with    fdk_aac         # AAC encoding via libfdk_aac (requires nonfree)
-%bcond_without autoreqdep      # don't care about package name deps generated by rpm
 %bcond_without caca            # textual display using libcaca
-%bcond_with    flite           # flite voice synthesis support [ffmpeg expects more voices]
-%bcond_without frei0r          # build without frei0r video filtering
+%bcond_without flite           # flite voice synthesis support
+%bcond_without frei0r          # frei0r video filtering
 %bcond_with    ilbc            # iLBC de/encoding via libilbc
-%bcond_without openal          # build without OpenAL 1.1 capture support
-%bcond_without opencv          # build without opencv video filtering
-%bcond_without pulseaudio      # build without PulseAudio input support
-%bcond_without x264            # build without x264 encoder
-%bcond_without utvideo         # build without Ut Video decoder
+%bcond_without openal          # OpenAL 1.1 capture support
+%bcond_without opencv          # OpenCV video filtering
+%bcond_without pulseaudio      # PulseAudio input support
+%bcond_without x264            # x264 encoder
+%bcond_without utvideo         # Ut Video decoder
 %bcond_without va              # VAAPI (Video Acceleration API)
 %bcond_without vpx             # VP8, a high-quality video codec
 %bcond_without doc             # don't build docs
@@ -50,7 +49,7 @@ BuildRequires:        bzip2-devel
 BuildRequires: celt-devel >= 0.11.0
 %{?with_nonfree:BuildRequires: faac-devel}
 %{?with_fdk_aac:BuildRequires: fdk-aac-devel}
-%{?with_flite:BuildRequires:   flite-devel}
+%{?with_flite:BuildRequires:   flite-devel >= 1.4}
 BuildRequires: fontconfig-devel
 BuildRequires: freetype-devel
 %{?with_frei0r:BuildRequires:  frei0r-devel}
@@ -181,7 +180,7 @@ Requires:   celt-devel >= 0.11.0
 Requires:      fontconfig-devel
 Requires:      freetype-devel
 Requires:      jack-audio-connection-kit-devel
-%{?with_flite:Requires:        flite-devel}
+%{?with_flite:Requires:        flite-devel >= 1.4}
 Requires:      lame-libs-devel >= 3.98.3
 %{?with_aacplus:Requires:      libaacplus-devel >= 2.0.0}
 Requires:      libass-devel