- added cdio-paranoia patch: adjust for separate libcdio-paranoia

[packages/ffmpeg.git] / ffmpeg.spec

diff --git a/ffmpeg.spec b/ffmpeg.spec
index 4717e5e68eed734f5747d9dea404cae6c7b3451d..4ceee0ea0099cf056dc0136fe7c1abc0813d50c6 100644 (file)
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -25,21 +25,22 @@
 Summary:       FFmpeg - a very fast video and audio converter
 Summary(pl.UTF-8):     FFmpeg - szybki konwerter audio/wideo
 Name:          ffmpeg
-Version:       1.0
-Release:       3
+Version:       1.0.1
+Release:       1
 # LGPL or GPL, chosen at configure time (GPL version is more featured)
 # (postprocessing, some filters, x264, xavs, xvid, x11grab)
 # using v3 allows Apache-licensed libs (opencore-amr, libvo-*enc)
 License:       GPL v3+ with LGPL v3+ parts
 Group:         Applications/Multimedia
 Source0:       http://ffmpeg.org/releases/%{name}-%{version}.tar.bz2
-# Source0-md5: 3ed526cea20c1bffb5a37f7730f710bd
+# Source0-md5: dbbb88ce5525dea22b24aaa098a9bcc2
 Source1:       ffserver.init
 Source2:       ffserver.sysconfig
 Source3:       ffserver.conf
 Patch0:                %{name}-gsm.patch
 Patch1:                %{name}-opencv24.patch
 Patch2:                %{name}-openjpeg.patch
+Patch3:                %{name}-cdio-paranoia.patch
 URL:           http://www.ffmpeg.org/
 %{?with_openal:BuildRequires:  OpenAL-devel}
 BuildRequires: SDL-devel >= 1.2.1
@@ -64,7 +65,7 @@ BuildRequires:        libass-devel
 BuildRequires: libavc1394-devel
 BuildRequires: libbluray-devel
 %{?with_caca:BuildRequires:    libcaca-devel}
-BuildRequires: libcdio-devel
+BuildRequires: libcdio-paranoia-devel >= 0.90-2
 BuildRequires: libdc1394-devel >= 2
 BuildRequires: libgsm-devel
 BuildRequires: libiec61883-devel
@@ -115,6 +116,7 @@ BuildRequires:      zlib-devel
 # overflows maximum hash table size
 BuildConflicts:        pdksh < 5.2.14-57
 Requires:      %{name}-libs = %{version}-%{release}
+%{?with_ilbc:Requires: webrtc-libilbc}
 Requires:      xvid >= 1:1.1.0
 Obsoletes:     libpostproc
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -185,7 +187,7 @@ Requires:   lame-libs-devel >= 3.98.3
 Requires:      libass-devel
 Requires:      libavc1394-devel
 Requires:      libbluray-devel
-Requires:      libcdio-devel
+Requires:      libcdio-paranoia-devel >= 0.90-2
 Requires:      libdc1394-devel >= 2
 Requires:      libgsm-devel
 Requires:      libiec61883-devel
@@ -274,6 +276,7 @@ dużej przestrzeni na dane skonfigurowanej w ffserver.conf).
 %patch0 -p1
 %patch1 -p0
 %patch2 -p1
+%patch3 -p1
 
 # package the grep result for mplayer, the result formatted as ./mplayer/configure
 cat <<EOF > ffmpeg-avconfig