SPECS: ffmpeg.spec - merged from DEVEL

[qboosh]

Author: qboosh                       Date: Sun Oct 30 21:08:34 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- merged from DEVEL

---- Files affected:
SPECS:
   ffmpeg.spec (1.50 -> 1.51) 

---- Diffs:

================================================================
Index: SPECS/ffmpeg.spec
diff -u SPECS/ffmpeg.spec:1.50 SPECS/ffmpeg.spec:1.51
--- SPECS/ffmpeg.spec:1.50	Sat Aug 27 10:22:52 2005
+++ SPECS/ffmpeg.spec	Sun Oct 30 22:08:29 2005
@@ -8,15 +8,16 @@
 Summary(pl):	Koder audio/wideo czasu rzeczywistego oraz serwer strumieni
 Name:		ffmpeg
 Version:	0.4.9
-Release:	0.pre1.1
+%define	snap	20050806
+Release:	1.%{snap}.1
 # LGPL or GPL, chosen at configure time (GPL version is more featured)
 License:	GPL
 Group:		Daemons
-Source0:	http://dl.sourceforge.net/ffmpeg/%{name}-%{version}-pre1.tar.gz
-# Source0-md5:	ea5587e3c66d50b1503b82ac4179c303
-Patch0:		%{name}-imlib2.patch
-Patch1:		%{name}-libtool.patch
-Patch2:		%{name}-gcc4.patch
+#Source0:	http://dl.sourceforge.net/ffmpeg/%{name}-%{version}-pre1.tar.gz
+Source0:	ftp://ftp2.mplayerhq.hu/MPlayer/cvs/FFMpeg-%{snap}.tar.bz2
+# Source0-md5:	f5ea3dd877c5df5b60356053642cf542
+Patch0:		%{name}-libtool.patch
+Patch1:		%{name}-libdir.patch
 URL:		http://ffmpeg.sourceforge.net/
 BuildRequires:	SDL-devel
 BuildRequires:	faac-devel
@@ -27,6 +28,7 @@
 %endif
 %{?with_imlib2:BuildRequires:	imlib2-devel >= 1.1.0-2}
 BuildRequires:	lame-libs-devel
+BuildRequires:	libtheora-devel
 BuildRequires:	libtool >= 2:1.4d-3
 BuildRequires:	libvorbis-devel
 %ifarch %{ix86}
@@ -125,10 +127,9 @@
 obrazie.
 
 %prep
-%setup -q -n ffmpeg-0.4.9-pre1
+%setup -q -n FFMpeg-%{snap}
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 %build
 # notes:
@@ -140,15 +141,18 @@
 	--prefix=%{_prefix} \
 	--libdir=%{_libdir} \
 	--mandir=%{_mandir} \
+	--disable-strip \
 	--enable-a52bin \
 	--enable-faac \
 	--enable-faadbin \
-	--enable-pthreads \
 	--enable-gpl \
+	--enable-libogg \
+	--enable-mp3lame \
 	--enable-pp \
+	--enable-pthreads \
 	--enable-shared \
 	--enable-shared-pp \
-	--enable-mp3lame \
+	--enable-theora \
 	--enable-vorbis \
 %ifnarch %{ix86}
 	--disable-mmx \
@@ -189,13 +193,15 @@
 %attr(755,root,root) %{_sbindir}/ffserver
 %attr(755,root,root) %{_libdir}/libavcodec-*.so
 %attr(755,root,root) %{_libdir}/libavformat-*.so
-%attr(755,root,root) %{_libdir}/libpostproc.so.*
+%attr(755,root,root) %{_libdir}/libavutil-*.so
+%attr(755,root,root) %{_libdir}/libpostproc.so.*.*.*
 %dir %{_libdir}/vhook
 %attr(755,root,root) %{_libdir}/vhook/drawtext.so
 %attr(755,root,root) %{_libdir}/vhook/fish.so
 %attr(755,root,root) %{_libdir}/vhook/null.so
 %attr(755,root,root) %{_libdir}/vhook/ppm.so
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/ffserver.conf
+%attr(755,root,root) %{_libdir}/vhook/watermark.so
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ffserver.conf
 %{_mandir}/man1/ffmpeg.1*
 %{_mandir}/man1/ffserver.1*
 
@@ -203,10 +209,12 @@
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libavcodec.so
 %attr(755,root,root) %{_libdir}/libavformat.so
+%attr(755,root,root) %{_libdir}/libavutil.so
 %attr(755,root,root) %{_libdir}/libpostproc.so
 %{_libdir}/lib*.la
 %{_includedir}/ffmpeg
 %{_includedir}/postproc
+%{_pkgconfigdir}/*.pc
 
 %files static
 %defattr(644,root,root,755)
@@ -229,6 +237,17 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.51  2005/10/30 21:08:29  qboosh
+- merged from DEVEL
+
+Revision 1.50.2.2  2005/10/24 16:58:27  qboosh
+- fixed libtool patch, added libdir patch
+
+Revision 1.50.2.1  2005/10/13 15:33:01  qboosh
+- updated to 20050806 snapshot
+- removed obsolete imlib2 patch, gcc4 patch needs recheck
+- enabled ogg/vorbis/theora
+
 Revision 1.50  2005/08/27 08:22:52  qboosh
 - sorted BRs
 
================================================================

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