Author: glen Date: Fri Mar 25 12:56:55 2011 GMT Module: packages Tag: HEAD ---- Log message: - up to 0.6.2, package qt-faststart
---- Files affected: packages/ffmpeg: ffmpeg.spec (1.209 -> 1.210) ---- Diffs: ================================================================ Index: packages/ffmpeg/ffmpeg.spec diff -u packages/ffmpeg/ffmpeg.spec:1.209 packages/ffmpeg/ffmpeg.spec:1.210 --- packages/ffmpeg/ffmpeg.spec:1.209 Mon Nov 1 19:06:10 2010 +++ packages/ffmpeg/ffmpeg.spec Fri Mar 25 13:56:50 2011 @@ -12,14 +12,14 @@ Summary: FFmpeg is a very fast video and audio converter Summary(pl.UTF-8): Koder audio/wideo czasu rzeczywistego oraz serwer strumieni Name: ffmpeg -Version: 0.6.1 +Version: 0.6.2 Release: 1 # LGPL or GPL, chosen at configure time (GPL version is more featured) # (postprocessing, ac3, xvid, x264, faad) License: GPL v3+ with LGPL v3+ parts Group: Applications/Multimedia Source0: http://ffmpeg.org/releases/%{name}-%{version}.tar.bz2 -# Source0-md5: 4f5d732d25eedfb072251b5314ba2093 +# Source0-md5: f7819307dad55aa0d6b40ac0e862884d Source1: ffserver.init Source2: ffserver.sysconfig Source3: ffserver.conf @@ -306,11 +306,14 @@ --enable-runtime-cpudetect # force oldscaler build -sed -i -e 's|#define.*CONFIG_OLDSCALER.*0|#define CONFIG_OLDSCALER 1|g' config.h +%{__sed} -i -e 's|#define.*CONFIG_OLDSCALER.*0|#define CONFIG_OLDSCALER 1|g' config.h %{__make} \ V=1 +# CC_O to add -c to commandline. makefile should be patched +%{__make} tools/qt-faststart V=1 CC_O='-c -o $@' + %install rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_sbindir},/etc/{sysconfig,rc.d/init.d}} \ @@ -332,15 +335,16 @@ cp -a libavformat/riff.h $RPM_BUILD_ROOT%{_includedir}/libavformat cp -a libavformat/avio.h $RPM_BUILD_ROOT%{_includedir}/libavformat -install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/ffserver -install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/ffserver -install %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/ffserver.conf +install -p %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/ffserver +cp -a %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/ffserver +cp -a %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/ffserver.conf mv -f $RPM_BUILD_ROOT{%{_bindir},%{_sbindir}}/ffserver +install -p tools/qt-faststart $RPM_BUILD_ROOT%{_bindir} # install as ffmpeg-avconfig to avoid with possible programs looking for # ffmpeg-config and expecting --libs output from it which is not implemented # simple to do (by querying pkgconfig), but why? -install ffmpeg-avconfig $RPM_BUILD_ROOT%{_bindir}/ffmpeg-avconfig +install -p ffmpeg-avconfig $RPM_BUILD_ROOT%{_bindir}/ffmpeg-avconfig %clean rm -rf $RPM_BUILD_ROOT @@ -372,6 +376,7 @@ %defattr(644,root,root,755) %doc Changelog LICENSE README %{?with_doc:doc/*.html} doc/TODO %attr(755,root,root) %{_bindir}/ffmpeg +%attr(755,root,root) %{_bindir}/qt-faststart %attr(755,root,root) %{_bindir}/ffprobe %dir %{_datadir}/ffmpeg %{_datadir}/ffmpeg/*.ffpreset @@ -453,6 +458,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.210 2011/03/25 12:56:50 glen +- up to 0.6.2, package qt-faststart + Revision 1.209 2010/11/01 18:06:10 glen - more changes came with r1.207 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ffmpeg/ffmpeg.spec?r1=1.209&r2=1.210&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
