Author: arekm Date: Fri Jun 18 06:19:48 2010 GMT Module: packages Tag: HEAD ---- Log message: - up to 0.6 (vhook system deprecated).
---- Files affected: packages/ffmpeg: ffmpeg.spec (1.193 -> 1.194) , ffmpeg-gsm.patch (NONE -> 1.1) (NEW), imagewidth.patch (1.2 -> NONE) (REMOVED) ---- Diffs: ================================================================ Index: packages/ffmpeg/ffmpeg.spec diff -u packages/ffmpeg/ffmpeg.spec:1.193 packages/ffmpeg/ffmpeg.spec:1.194 --- packages/ffmpeg/ffmpeg.spec:1.193 Wed May 26 09:56:10 2010 +++ packages/ffmpeg/ffmpeg.spec Fri Jun 18 08:19:42 2010 @@ -10,19 +10,19 @@ 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.5.2 +Version: 0.6 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.mplayerhq.hu/releases/%{name}-%{version}.tar.bz2 -# Source0-md5: 451eb428ca97a72c00555d50944cdb24 +# Source0-md5: d6142a9a5821d6a6262a6edb903faa24 Source1: ffserver.init Source2: ffserver.sysconfig Source3: ffserver.conf Patch0: %{name}-bug-803.patch -Patch1: imagewidth.patch +Patch1: %{name}-gsm.patch URL: http://www.ffmpeg.org/ BuildRequires: SDL-devel BuildRequires: dirac-devel >= 1.0.0 @@ -40,8 +40,10 @@ BuildRequires: libraw1394-devel BuildRequires: libtheora-devel >= 1.0-0.beta3 BuildRequires: libtool >= 2:1.4d-3 +BuildRequires: libva-devel >= 1.0.3 BuildRequires: libvdpau-devel BuildRequires: libvorbis-devel +BuildRequires: libvpx-devel BuildRequires: libx264-devel >= 0.1.3 BuildRequires: opencore-amr-devel BuildRequires: openjpeg-devel >= 1.3-2 @@ -162,24 +164,6 @@ bibliotek FFmpeg oraz biblioteki SDL. Jest używany głównie do testowania różnych API FFmpeg. -%package vhook-imlib2 -Summary: imlib2 based hook -Summary(pl.UTF-8): Moduł przejściowy oparty o imlib2 -Group: Libraries -Requires: %{name}-libs = %{version}-%{release} - -%description vhook-imlib2 -This module implements a text overlay for a video image. Currently it -supports a fixed overlay or reading the text from a file. The string -is passed through strftime so that it is easy to imprint the date and -time onto the image. - -%description vhook-imlib2 -l pl.UTF-8 -Ten moduł implementuje tekstową nakładkę dla obrazu. Aktualnie -obsługuje stałą nakładkę lub wczytywanie tekstu z pliku. Łańcuch jest -przepuszczany przez strftime, więc łatwo umieścić datę i czas na -obrazie. - %package ffserver Summary: FFserver video server Summary(pl.UTF-8): FFserver - serwer strumieni obrazu @@ -204,7 +188,7 @@ %prep %setup -q %patch0 -p1 -%patch1 -p1 +%patch1 -p0 # package the grep result for mplayer, the result formatted as ./mplayer/configure cat <<EOF > ffmpeg-avconfig @@ -288,6 +272,7 @@ --enable-libspeex \ --enable-libtheora \ --enable-libvorbis \ + --enable-libvpx \ --enable-libx264 \ --enable-libxvid \ --enable-libopencore-amrnb \ @@ -375,9 +360,11 @@ %defattr(644,root,root,755) %doc Changelog README doc/*.html doc/TODO %attr(755,root,root) %{_bindir}/ffmpeg +%attr(755,root,root) %{_bindir}/ffprobe %dir %{_datadir}/ffmpeg %{_datadir}/ffmpeg/*.ffpreset %{_mandir}/man1/ffmpeg.1* +%{_mandir}/man1/ffprobe.1* %files libs %defattr(644,root,root,755) @@ -386,23 +373,16 @@ %attr(755,root,root) %{_libdir}/libavdevice.so.*.*.* %attr(755,root,root) %ghost %{_libdir}/libavdevice.so.52 %attr(755,root,root) %{_libdir}/libavfilter.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libavfilter.so.0 +%attr(755,root,root) %ghost %{_libdir}/libavfilter.so.1 %attr(755,root,root) %{_libdir}/libavformat.so.*.*.* %attr(755,root,root) %ghost %{_libdir}/libavformat.so.52 %attr(755,root,root) %{_libdir}/libavutil.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libavutil.so.49 +%attr(755,root,root) %ghost %{_libdir}/libavutil.so.50 %attr(755,root,root) %{_libdir}/libpostproc.so.*.*.* %attr(755,root,root) %ghost %{_libdir}/libpostproc.so.51 %attr(755,root,root) %{_libdir}/libswscale.so.*.*.* %attr(755,root,root) %ghost %{_libdir}/libswscale.so.0 -%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 -%attr(755,root,root) %{_libdir}/vhook/watermark.so - %files devel %defattr(644,root,root,755) %doc doc/optimization.txt @@ -433,12 +413,6 @@ %attr(755,root,root) %{_bindir}/ffplay %{_mandir}/man1/ffplay.1* -%if %{with imlib2} -%files vhook-imlib2 -%defattr(644,root,root,755) -%attr(755,root,root) %{_libdir}/vhook/imlib2.so -%endif - %files ffserver %defattr(644,root,root,755) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ffserver.conf @@ -455,6 +429,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.194 2010/06/18 06:19:42 arekm +- up to 0.6 (vhook system deprecated). + Revision 1.193 2010/05/26 07:56:10 arekm - up to 0.5.2 ================================================================ Index: packages/ffmpeg/ffmpeg-gsm.patch diff -u /dev/null packages/ffmpeg/ffmpeg-gsm.patch:1.1 --- /dev/null Fri Jun 18 08:19:48 2010 +++ packages/ffmpeg/ffmpeg-gsm.patch Fri Jun 18 08:19:42 2010 @@ -0,0 +1,22 @@ +--- configure~ 2010-06-15 21:44:30.000000000 +0200 ++++ configure 2010-06-18 07:51:49.083904825 +0200 +@@ -2611,7 +2611,7 @@ + require libdirac libdirac_encoder/dirac_encoder.h dirac_encoder_init $(pkg-config --libs dirac) + enabled libfaac && require2 libfaac "stdint.h faac.h" faacEncGetVersion -lfaac + enabled libfaad && require2 libfaad faad.h faacDecOpen -lfaad +-enabled libgsm && require libgsm gsm/gsm.h gsm_create -lgsm ++enabled libgsm && require libgsm gsm.h gsm_create -lgsm + enabled libmp3lame && require libmp3lame lame/lame.h lame_init -lmp3lame -lm + enabled libnut && require libnut libnut.h nut_demuxer_init -lnut + enabled libopencore_amrnb && require libopencore_amrnb opencore-amrnb/interf_dec.h Decoder_Interface_init -lopencore-amrnb -lm +--- libavcodec/libgsm.c~ 2010-04-20 16:45:34.000000000 +0200 ++++ libavcodec/libgsm.c 2010-06-18 08:05:19.692574999 +0200 +@@ -28,7 +28,7 @@ + // The idiosyncrasies of GSM-in-WAV are explained at http://kbs.cs.tu-berlin.de/~jutta/toast.html + + #include "avcodec.h" +-#include <gsm/gsm.h> ++#include <gsm.h> + + // gsm.h misses some essential constants + #define GSM_BLOCK_SIZE 33 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ffmpeg/ffmpeg.spec?r1=1.193&r2=1.194&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
