packages: ffmpeg/ffmpeg.spec - utvideo enabled by default - fixed BR typo

[qboosh]

Author: qboosh                       Date: Sat Dec 17 08:01:14 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- utvideo enabled by default
- fixed BR typo

---- Files affected:
packages/ffmpeg:
   ffmpeg.spec (1.238 -> 1.239) 

---- Diffs:

================================================================
Index: packages/ffmpeg/ffmpeg.spec
diff -u packages/ffmpeg/ffmpeg.spec:1.238 packages/ffmpeg/ffmpeg.spec:1.239
--- packages/ffmpeg/ffmpeg.spec:1.238	Sat Dec 17 07:27:40 2011
+++ packages/ffmpeg/ffmpeg.spec	Sat Dec 17 09:01:08 2011
@@ -1,6 +1,5 @@
 # $Revision$, $Date$
 # TODO
-# - consider: libutvideo
 # - is bug803 patch still needed? the code changed somehow
 #
 # Workaround ffmpeg.spec & opencv.spec updating:
@@ -19,6 +18,7 @@
 %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	va		# VAAPI (Video Acceleration API)
 %bcond_without	vpx		# VP8, a high-quality video codec
 %bcond_without	doc		# don't build docs
@@ -68,7 +68,7 @@
 BuildRequires:	librtmp-devel
 BuildRequires:	libtheora-devel >= 1.0-0.beta3
 BuildRequires:	libtool >= 2:1.4d-3
-BuildRequires:	libv4l2-devel
+BuildRequires:	libv4l-devel
 %{?with_va:BuildRequires:	libva-devel >= 1.0.3}
 BuildRequires:	libvdpau-devel
 BuildRequires:	libvorbis-devel
@@ -93,6 +93,7 @@
 %{?with_doc:BuildRequires:	tetex}
 %{?with_doc:BuildRequires:	texi2html}
 %{?with_doc:BuildRequires:	texinfo}
+%{?with_utvideo:BuildRequires:	utvideo-devel}
 BuildRequires:	vo-aacenc-devel
 BuildRequires:	vo-amrwbenc-devel
 BuildRequires:	xavs-devel
@@ -341,6 +342,7 @@
 	--enable-libschroedinger \
 	--enable-libspeex \
 	--enable-libtheora \
+	%{?with_utvideo:--enable-libutvideo} \
 	--enable-libv4l2 \
 	--enable-libvo-aacenc \
 	--enable-libvo-amrwbenc \
@@ -531,6 +533,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.239  2011/12/17 08:01:08  qboosh
+- utvideo enabled by default
+- fixed BR typo
+
 Revision 1.238  2011/12/17 06:27:40  qboosh
 - stagefright is Android-specific
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ffmpeg/ffmpeg.spec?r1=1.238&r2=1.239&f=u