packages: ffmpeg/ffmpeg.spec - va, vpx, doc bconds

[glen]

Author: glen                         Date: Fri Oct 22 13:37:35 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- va, vpx, doc bconds

---- Files affected:
packages/ffmpeg:
   ffmpeg.spec (1.205 -> 1.206) 

---- Diffs:

================================================================
Index: packages/ffmpeg/ffmpeg.spec
diff -u packages/ffmpeg/ffmpeg.spec:1.205 packages/ffmpeg/ffmpeg.spec:1.206
--- packages/ffmpeg/ffmpeg.spec:1.205	Tue Oct 19 13:55:13 2010
+++ packages/ffmpeg/ffmpeg.spec	Fri Oct 22 15:37:29 2010
@@ -6,6 +6,9 @@
 %bcond_with	nonfree		# non free options of package
 %bcond_without	autoreqdep	# don't care about package name deps generated by rpm
 %bcond_without	imlib2		# don't build imlib2 vhook module
+%bcond_without	va			# VAAPI (Video Acceleration API)
+%bcond_without	vpx			# VP8, a high-quality video codec
+%bcond_without	doc			# don't build docs
 
 Summary:	FFmpeg is a very fast video and audio converter
 Summary(pl.UTF-8):	Koder audio/wideo czasu rzeczywistego oraz serwer strumieni
@@ -45,10 +48,10 @@
 BuildRequires:	libraw1394-devel
 BuildRequires:	libtheora-devel >= 1.0-0.beta3
 BuildRequires:	libtool >= 2:1.4d-3
-BuildRequires:	libva-devel >= 1.0.3
+%{?with_va:BuildRequires:	libva-devel >= 1.0.3}
 BuildRequires:	libvdpau-devel
 BuildRequires:	libvorbis-devel
-BuildRequires:	libvpx-devel >= 0.9.1
+%{?with_vpx:BuildRequires:	libvpx-devel >= 0.9.1}
 # X264_BUILD >= 83
 BuildRequires:	libx264-devel >= 0.1.3-1.20100424_2245.1
 BuildRequires:	opencore-amr-devel
@@ -64,9 +67,9 @@
 BuildRequires:	pkgconfig
 BuildRequires:	rpmbuild(macros) >= 1.470
 BuildRequires:	schroedinger-devel
-BuildRequires:	tetex
-BuildRequires:	texi2html
-BuildRequires:	texinfo
+%{?with_doc:BuildRequires:	tetex}
+%{?with_doc:BuildRequires:	texi2html}
+%{?with_doc:BuildRequires:	texinfo}
 BuildRequires:	xvid-devel >= 1:1.1.0
 BuildRequires:	zlib-devel
 %{?with_autoreqdep:BuildConflicts:	libpostproc}
@@ -280,7 +283,7 @@
 	--enable-libspeex \
 	--enable-libtheora \
 	--enable-libvorbis \
-	--enable-libvpx \
+	%{?with_vpx:--enable-libvpx} \
 	--enable-libx264 \
 	--enable-libxvid \
 	--enable-libopencore-amrnb \
@@ -367,13 +370,13 @@
 
 %files
 %defattr(644,root,root,755)
-%doc Changelog README doc/*.html doc/TODO
+%doc Changelog README %{?with_doc:doc/*.html} doc/TODO
 %attr(755,root,root) %{_bindir}/ffmpeg
 %attr(755,root,root) %{_bindir}/ffprobe
 %dir %{_datadir}/ffmpeg
 %{_datadir}/ffmpeg/*.ffpreset
-%{_mandir}/man1/ffmpeg.1*
-%{_mandir}/man1/ffprobe.1*
+%{?with_doc:%{_mandir}/man1/ffmpeg.1*}
+%{?with_doc:%{_mandir}/man1/ffprobe.1*}
 
 %files libs
 %defattr(644,root,root,755)
@@ -420,7 +423,7 @@
 %files ffplay
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/ffplay
-%{_mandir}/man1/ffplay.1*
+%{?with_doc:%{_mandir}/man1/ffplay.1*}
 
 %files ffserver
 %defattr(644,root,root,755)
@@ -428,7 +431,7 @@
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/ffserver
 %attr(755,root,root) %{_sbindir}/ffserver
 %attr(754,root,root) /etc/rc.d/init.d/ffserver
-%{_mandir}/man1/ffserver.1*
+%{?with_doc:%{_mandir}/man1/ffserver.1*}
 %dir %attr(770,root,ffserver) /var/cache/ffserver
 %dir %attr(770,root,ffserver) /var/log/ffserver
 
@@ -438,6 +441,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.206  2010/10/22 13:37:29  glen
+- va, vpx, doc bconds
+
 Revision 1.205  2010/10/19 11:55:13  glen
 - up to 0.6.1
 
================================================================

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