Author: rathann Update of /cvs/free/rpms/ffmpeg/F-14 In directory se02.es.rpmfusion.net:/tmp/cvs-serv22034 Modified Files: .cvsignore ffmpeg.spec sources Added Files: ffmpeg-celt.patch Log Message: * Fri Aug 12 2011 Dominik Mierzejewski <rpm at greysector.net> - 0.7.3 - update to 0.7.3 - build PIC objects on PPC (bug #1457) - restore mistakenly dropped qt-faststart tool - enable CELT decoding via libcelt - support AMR WB encoding via libvo-amrwbenc (optional) - enable FreeType support - fix build with old celt - Changelog seems to be missing from the tarball, don't include it for now ffmpeg-celt.patch: libcelt_dec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- NEW FILE ffmpeg-celt.patch --- diff -up ffmpeg-0.7.3/libavcodec/libcelt_dec.c.celt ffmpeg-0.7.3/libavcodec/libcelt_dec.c --- ffmpeg-0.7.3/libavcodec/libcelt_dec.c.celt 2011-08-10 14:15:51.000000000 +0200 +++ ffmpeg-0.7.3/libavcodec/libcelt_dec.c 2011-08-12 02:31:20.000000000 +0200 @@ -52,7 +52,7 @@ static int ff_celt_error_to_averror(int static int ff_celt_bitstream_version_hack(CELTMode *mode) { CELTHeader header = { .version_id = 0 }; - celt_header_init(&header, mode, 960, 2); + celt_header_init(&header, mode, 2); return header.version_id; } @@ -68,7 +68,7 @@ static av_cold int libcelt_dec_init(AVCo celt->mode = celt_mode_create(c->sample_rate, c->frame_size, &err); if (!celt->mode) return ff_celt_error_to_averror(err); - celt->dec = celt_decoder_create_custom(celt->mode, c->channels, &err); + celt->dec = celt_decoder_create(celt->mode, c->channels, &err); if (!celt->dec) { celt_mode_destroy(celt->mode); return ff_celt_error_to_averror(err); Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/ffmpeg/F-14/.cvsignore,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- .cvsignore 5 May 2011 21:46:21 -0000 1.19 +++ .cvsignore 14 Aug 2011 11:36:13 -0000 1.20 @@ -1 +1 @@ -ffmpeg-0.6.3.tar.bz2 +ffmpeg-0.7.3.tar.bz2 Index: ffmpeg.spec =================================================================== RCS file: /cvs/free/rpms/ffmpeg/F-14/ffmpeg.spec,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- ffmpeg.spec 5 May 2011 21:46:21 -0000 1.37 +++ ffmpeg.spec 14 Aug 2011 11:36:13 -0000 1.38 @@ -4,7 +4,7 @@ Summary: Digital VCR and streaming server Name: ffmpeg -Version: 0.6.3 +Version: 0.7.3 Release: 1%{?dist} %if 0%{?_with_amr:1} License: GPLv3+ @@ -13,13 +13,16 @@ %endif Group: Applications/Multimedia URL: http://ffmpeg.org/ -Source0: ffmpeg-%{version}.tar.bz2 +Source0: http://ffmpeg.org/releases/ffmpeg-%{version}.tar.bz2 Source1: ffmpeg-snapshot.sh +Patch0: ffmpeg-celt.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: bzip2-devel +BuildRequires: celt-devel BuildRequires: dirac-devel %{?_with_faac:BuildRequires: faac-devel} +BuildRequires: freetype-devel BuildRequires: gsm-devel BuildRequires: lame-devel BuildRequires: libdc1394-devel @@ -29,14 +32,14 @@ BuildRequires: libvdpau-devel BuildRequires: libvorbis-devel BuildRequires: libvpx-devel >= 0.9.1 -%{?_with_amr:BuildRequires: opencore-amr-devel} +%{?_with_amr:BuildRequires: opencore-amr-devel vo-amrwbenc-devel} BuildRequires: openjpeg-devel BuildRequires: schroedinger-devel BuildRequires: SDL-devel BuildRequires: speex-devel BuildRequires: subversion BuildRequires: texi2html -BuildRequires: x264-devel >= 0.0.0-0.28 +BuildRequires: x264-devel >= 0.0.0-0.30 BuildRequires: xvidcore-devel BuildRequires: zlib-devel %ifarch %{ix86} x86_64 @@ -84,11 +87,13 @@ --arch=%{_target_cpu} \\\ --extra-cflags="$RPM_OPT_FLAGS" \\\ --extra-version=rpmfusion \\\ - %{?_with_amr:--enable-libopencore-amrnb --enable-libopencore-amrwb --enable-version3} \\\ + %{?_with_amr:--enable-libopencore-amrnb --enable-libopencore-amrwb --enable-libvo-amrwbenc --enable-version3} \\\ --enable-bzlib \\\ + --enable-libcelt \\\ --enable-libdc1394 \\\ --enable-libdirac \\\ %{?_with_faac:--enable-libfaac --enable-nonfree} \\\ + --enable-libfreetype \\\ --enable-libgsm \\\ --enable-libmp3lame \\\ --enable-libopenjpeg \\\ @@ -112,13 +117,10 @@ %prep -%setup -q -n ffmpeg-%{version} +%setup -q +%patch0 -p1 -b .celt %build -%ifarch ppc ppc64 -# compile with -mlongcall on ppc/ppc64 (rf804) -export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -mlongcall" -%endif mkdir generic pushd generic %{ff_configure}\ @@ -137,10 +139,12 @@ %ifarch ppc --cpu=g3 \ --enable-runtime-cpudetect \ + --enable-pic \ %endif %ifarch ppc64 --cpu=g5 \ --enable-runtime-cpudetect \ + --enable-pic \ %endif %ifarch sparc sparc64 --disable-vis \ @@ -150,6 +154,8 @@ make %{?_smp_mflags} popd +gcc -o qt-faststart $RPM_OPT_FLAGS tools/qt-faststart.c + %if 0%{!?ffmpegsuffix:1} mkdir simd pushd simd @@ -171,8 +177,8 @@ rm -rf $RPM_BUILD_ROOT pushd generic make install DESTDIR=$RPM_BUILD_ROOT -#install -pm755 tools/qt-faststart $RPM_BUILD_ROOT%{_bindir} popd +install -pm755 qt-faststart $RPM_BUILD_ROOT%{_bindir} %if 0%{!?ffmpegsuffix:1} pushd simd %ifarch sparc sparc64 @@ -192,12 +198,13 @@ %if 0%{!?ffmpegsuffix:1} %files %defattr(-,root,root,-) -%doc COPYING.* CREDITS Changelog README doc/ffserver.conf +%doc COPYING.* CREDITS README doc/ffserver.conf +#doc Changelog %{_bindir}/ffmpeg %{_bindir}/ffplay %{_bindir}/ffprobe %{_bindir}/ffserver -#{_bindir}/qt-faststart +%{_bindir}/qt-faststart %{_mandir}/man1/ffmpeg.1* %{_mandir}/man1/ffplay.1* %{_mandir}/man1/ffprobe.1* @@ -228,6 +235,16 @@ %changelog +* Fri Aug 12 2011 Dominik Mierzejewski <rpm at greysector.net> - 0.7.3 +- update to 0.7.3 +- build PIC objects on PPC (bug #1457) +- restore mistakenly dropped qt-faststart tool +- enable CELT decoding via libcelt +- support AMR WB encoding via libvo-amrwbenc (optional) +- enable FreeType support +- fix build with old celt +- Changelog seems to be missing from the tarball, don't include it for now + * Wed May 04 2011 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 0.6.3-1 - Update to 0.6.3 Index: sources =================================================================== RCS file: /cvs/free/rpms/ffmpeg/F-14/sources,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- sources 5 May 2011 21:46:21 -0000 1.20 +++ sources 14 Aug 2011 11:36:13 -0000 1.21 @@ -1 +1 @@ -cdf4ad9b2a4d195b5ca874494bc7b0b0 ffmpeg-0.6.3.tar.bz2 +c9e455dc8f555028d551556798347abf ffmpeg-0.7.3.tar.bz2