- va, vpx, doc bconds

Changed files:
    ffmpeg.spec -> 1.206

diff --git a/ffmpeg.spec b/ffmpeg.spec
index fb56e55ef4494ccab391c825c096b86280ae7bff..c3b4f38b3061fc53376e0b9681f7bed210d7b643 100644 (file)
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -5,6 +5,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
@@ -44,10 +47,10 @@ BuildRequires:      libgsm-devel
 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
@@ -63,9 +66,9 @@ BuildRequires:        perl-tools-pod
 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}
@@ -279,7 +282,7 @@ EOF
        --enable-libspeex \
        --enable-libtheora \
        --enable-libvorbis \
-       --enable-libvpx \
+       %{?with_vpx:--enable-libvpx} \
        --enable-libx264 \
        --enable-libxvid \
        --enable-libopencore-amrnb \
@@ -366,13 +369,13 @@ fi
 
 %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)
@@ -419,7 +422,7 @@ fi
 %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)
@@ -427,6 +430,6 @@ fi
 %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