SPECS: ffmpeg.spec - dropped libtool patch, updated system-amr patch

[qboosh]

Author: qboosh                       Date: Sat Dec  9 17:26:40 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- dropped libtool patch, updated system-amr patch

---- Files affected:
SPECS:
   ffmpeg.spec (1.120 -> 1.121) 

---- Diffs:

================================================================
Index: SPECS/ffmpeg.spec
diff -u SPECS/ffmpeg.spec:1.120 SPECS/ffmpeg.spec:1.121
--- SPECS/ffmpeg.spec:1.120	Sat Dec  9 16:42:14 2006
+++ SPECS/ffmpeg.spec	Sat Dec  9 18:26:34 2006
@@ -1,6 +1,5 @@
 # $Revision$, $Date$
 # TODO
-# - libtool patch breaks linked libs (-Wl,as-needed inside configure and Makefiles broken)
 # - libnut enabled   no
 #
 # Conditional build:
@@ -21,14 +20,11 @@
 License:	GPL with LGPL parts
 Group:		Applications/Multimedia
 #Source0:	http://dl.sourceforge.net/ffmpeg/%{name}-%{version}-pre1.tar.gz
-#Source0:	ftp://ftp2.mplayerhq.hu/MPlayer/cvs/FFMpeg-%{snap}.tar.bz2
-#Source0:	%{name}-%{snap}.tar.bz2
 Source0:	http://ffmpeg.mplayerhq.hu/%{name}-export-snapshot.tar.bz2
 # Source0-md5:	5be2e4d1e326bb7809205a3401204621
 Source1:	ffserver.init
 Source2:	ffserver.sysconfig
 Source3:	ffserver.conf
-#PatchX:		%{name}-libtool.patch
 Patch0:		%{name}-link.patch
 Patch1:		%{name}-libdir.patch
 Patch2:		%{name}-gcc4.patch
@@ -212,7 +208,7 @@
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-#%patch3 -p1 NEEDS UPDATE
+%patch3 -p1
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
@@ -260,10 +256,8 @@
 	--disable-debug \
 	--disable-opts \
 
-# GONE?
-#	--enable-theora \
-
 # one jobserver as it otherwise manages to create truncated .lo files ... :/
+# XXX: recheck, libtool is not used now so there are no *.lo
 %{__make} -j1
 
 %install
@@ -336,7 +330,6 @@
 %attr(755,root,root) %{_libdir}/libavutil.so
 %attr(755,root,root) %{_libdir}/libpostproc.so
 %attr(755,root,root) %{_libdir}/libswscale.so
-#%{_libdir}/lib*.la
 %{_includedir}/ffmpeg
 %{_includedir}/postproc
 %{_pkgconfigdir}/*.pc
@@ -372,6 +365,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.121  2006/12/09 17:26:34  qboosh
+- dropped libtool patch, updated system-amr patch
+
 Revision 1.120  2006/12/09 15:42:14  glen
 - rel 2
 
================================================================

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