[packages/ffmpeg] - flite 1.4 is enough for ffmpeg, so enable it

qboosh qboosh at pld-linux.org
Sun Oct 7 10:22:05 CEST 2012


commit a584ded4843c1cf6b1a24160f7bbdd6297d934ad
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Oct 7 10:23:36 2012 +0200

    - flite 1.4 is enough for ffmpeg, so enable it

 ffmpeg.spec | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index d8581f5..5070fdb 100644
--- 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
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/ffmpeg.git/commitdiff/a584ded4843c1cf6b1a24160f7bbdd6297d934ad



More information about the pld-cvs-commit mailing list