- added x264 bcond

[packages/ffmpeg.git] / ffmpeg.spec

diff --git a/ffmpeg.spec b/ffmpeg.spec
index 18c0a1c956e4b4c2c1a6ad0177831c7e07de60bc..032fa61c7922c2845da56692fa0a5934bde58ea0 100644 (file)
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -4,6 +4,8 @@
 # Conditional build:
 %bcond_with    nonfree         # non free options of package (currently: faac)
 %bcond_without autoreqdep      # don't care about package name deps generated by rpm
+%bcond_without frei0r          # build without frei0r video filtering
+%bcond_without x264            # build without x264 encoder
 %bcond_without va              # VAAPI (Video Acceleration API)
 %bcond_without vpx             # VP8, a high-quality video codec
 %bcond_without doc             # don't build docs
@@ -11,7 +13,7 @@
 Summary:       FFmpeg - a very fast video and audio converter
 Summary(pl.UTF-8):     FFmpeg - szybki konwerter audio/wideo
 Name:          ffmpeg
-Version:       0.8.2
+Version:       0.8.3
 Release:       1
 # LGPL or GPL, chosen at configure time (GPL version is more featured)
 # (postprocessing, some filters, x264, xavs, xvid, x11grab)
@@ -19,7 +21,7 @@ Release:      1
 License:       GPL v3+ with LGPL v3+ parts
 Group:         Applications/Multimedia
 Source0:       http://ffmpeg.org/releases/%{name}-%{version}.tar.bz2
-# Source0-md5: 967d481c98161582d149aced6e3b2f31
+# Source0-md5: 556870ccfd6c9c0426c7dd86dd5beb62
 Source1:       ffserver.init
 Source2:       ffserver.sysconfig
 Source3:       ffserver.conf
@@ -33,7 +35,7 @@ BuildRequires:        celt-devel
 BuildRequires: dirac-devel >= 1.0.0
 %{?with_nonfree:BuildRequires: faac-devel}
 BuildRequires: freetype-devel
-BuildRequires: frei0r-devel
+%{?with_frei0r:BuildRequires:  frei0r-devel}
 %ifarch ppc
 # require version with altivec support fixed
 BuildRequires: gcc >= 5:3.3.2-3
@@ -52,7 +54,7 @@ BuildRequires:        libvdpau-devel
 BuildRequires: libvorbis-devel
 %{?with_vpx:BuildRequires:     libvpx-devel >= 0.9.6}
 # X264_BUILD >= 83
-BuildRequires: libx264-devel >= 0.1.3-1.20110625_2245
+%{?with_x264:BuildRequires:    libx264-devel >= 0.1.3-1.20110625_2245}
 BuildRequires: opencore-amr-devel
 BuildRequires: openjpeg-devel >= 1.3-2
 BuildRequires: speex-devel >= 1:1.2-rc1
@@ -150,7 +152,7 @@ Requires:   libtheora-devel >= 1.0-0.beta3
 %{?with_va:Requires:   libva-devel >= 1.0.3}
 Requires:      libvorbis-devel
 %{?with_vpx:Requires:  libvpx-devel >= 0.9.6}
-Requires:      libx264-devel >= 0.1.3-1.20110625_2245
+%{?with_x264:Requires: libx264-devel >= 0.1.3-1.20110625_2245}
 Requires:      opencore-amr-devel
 Requires:      openjpeg-devel >= 1.3-2
 Requires:      schroedinger-devel
@@ -296,7 +298,7 @@ EOF
        --enable-avfilter \
        --enable-gpl \
        --enable-version3 \
-       --enable-frei0r \
+       %{?with_frei0r:--enable-frei0r} \
        --enable-libdc1394 \
        --enable-libcelt \
        --enable-libdirac \
@@ -314,7 +316,7 @@ EOF
        --enable-libvo-amrwbenc \
        --enable-libvorbis \
        %{?with_vpx:--enable-libvpx} \
-       --enable-libx264 \
+       %{?with_x264:--enable-libx264} \
        --enable-libxavs \
        --enable-libxvid \
        --enable-postproc \