SPECS: ffmpeg.spec - rel 4; img_convert is really back

[arekm]

Author: arekm                        Date: Sat Aug 23 11:28:17 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- rel 4; img_convert is really back

---- Files affected:
SPECS:
   ffmpeg.spec (1.161 -> 1.162) 

---- Diffs:

================================================================
Index: SPECS/ffmpeg.spec
diff -u SPECS/ffmpeg.spec:1.161 SPECS/ffmpeg.spec:1.162
--- SPECS/ffmpeg.spec:1.161	Sat Aug 23 12:49:51 2008
+++ SPECS/ffmpeg.spec	Sat Aug 23 13:28:12 2008
@@ -9,7 +9,7 @@
 #
 %define		_snap	2008-08-22
 %define		snap	%(echo %{_snap} | tr -d -)
-%define		_rel 3
+%define		_rel 4
 Summary:	Realtime audio/video encoder and streaming server
 Summary(pl.UTF-8):	Koder audio/wideo czasu rzeczywistego oraz serwer strumieni
 Name:		ffmpeg
@@ -25,6 +25,7 @@
 Source1:	ffserver.init
 Source2:	ffserver.sysconfig
 Source3:	ffserver.conf
+Patch0:		%{name}-img_convert_symbol.patch
 URL:		http://ffmpeg.mplayerhq.hu/
 BuildRequires:	SDL-devel
 %if %{with amr}
@@ -39,11 +40,11 @@
 # require version with altivec support fixed
 BuildRequires:	gcc >= 5:3.3.2-3
 %endif
+BuildRequires:	a52dec-libs-devel
 %{?with_imlib2:BuildRequires:	imlib2-devel >= 1.3.0}
 BuildRequires:	lame-libs-devel
-BuildRequires:	a52dec-libs-devel
-BuildRequires:	libgsm-devel
 BuildRequires:	libdc1394-devel
+BuildRequires:	libgsm-devel
 BuildRequires:	libraw1394-devel
 BuildRequires:	libtheora-devel >= 1.0-0.alpha7
 BuildRequires:	libtool >= 2:1.4d-3
@@ -199,6 +200,7 @@
 
 %prep
 %setup -q -n %{name}-export-%{_snap}
+%patch0 -p1
 
 # package the grep result for mplayer, the result formatted as mplayer/configure
 cat <<EOF > ffmpeg-config
@@ -425,6 +427,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.162  2008/08/23 11:28:12  arekm
+- rel 4; img_convert is really back
+
 Revision 1.161  2008/08/23 10:49:51  arekm
 - rel 3; fix -devel subpackage
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/ffmpeg.spec?r1=1.161&r2=1.162&f=u