SPECS: ffmpeg.spec - added x264 patch (fixes build with libx264 20...

[grzegol]

Author: grzegol                      Date: Mon Sep 11 21:21:35 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- added x264 patch (fixes build with libx264 20060828 snapshot)
- rel. .14

---- Files affected:
SPECS:
   ffmpeg.spec (1.102 -> 1.103) 

---- Diffs:

================================================================
Index: SPECS/ffmpeg.spec
diff -u SPECS/ffmpeg.spec:1.102 SPECS/ffmpeg.spec:1.103
--- SPECS/ffmpeg.spec:1.102	Thu Jul 13 10:34:17 2006
+++ SPECS/ffmpeg.spec	Mon Sep 11 23:21:30 2006
@@ -13,7 +13,7 @@
 Name:		ffmpeg
 Version:	0.4.9
 %define		snap	20060129
-%define		_rel 13
+%define		_rel 14
 Release:	3.%{snap}.%{_rel}
 # LGPL or GPL, chosen at configure time (GPL version is more featured)
 # (postprocessing, a52, xvid, x264, dts, faad)
@@ -30,6 +30,7 @@
 Patch1:		%{name}-libdir.patch
 Patch2:		%{name}-gcc4.patch
 Patch3:		%{name}-system-amr.patch
+Patch4:		%{name}-x264.patch
 URL:		http://ffmpeg.mplayerhq.hu/
 BuildRequires:	SDL-devel
 %if %{with amr}
@@ -50,7 +51,7 @@
 BuildRequires:	libtheora-devel
 BuildRequires:	libtool >= 2:1.4d-3
 BuildRequires:	libvorbis-devel
-BuildRequires:	libx264-devel >= 0.1.2-1.20060430_2245.1
+BuildRequires:	libx264-devel >= 0.1.2-1.20060828_2245.1
 %{?with_lzo:BuildRequires:	lzo-devel < 2.0}
 %ifarch %{ix86}
 %ifnarch i386 i486
@@ -124,7 +125,7 @@
 Requires:	libtheora-devel
 Requires:	libvorbis-devel
 %{?with_lzo:Requires:	lzo-devel < 2.0}
-Requires:	libx264-devel >= 0.1.2-1.20060430_2245.1
+Requires:	libx264-devel >= 0.1.2-1.20060828_2245.1
 Requires:	xvid-devel >= 1:1.1.0
 Requires:	zlib-devel
 Obsoletes:	libpostproc-devel
@@ -208,6 +209,7 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
 # notes:
@@ -358,6 +360,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.103  2006/09/11 21:21:30  grzegol
+- added x264 patch (fixes build with libx264 20060828 snapshot)
+- rel. .14
+
 Revision 1.102  2006/07/13 08:34:17  glen
 - rel 13
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/ffmpeg.spec?r1=1.102&r2=1.103&f=u