Author: rathann Update of /cvs/free/rpms/ffmpeg/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv21371 Modified Files: .cvsignore ffmpeg-snapshot.sh ffmpeg.spec sources Log Message: * Fri Sep 05 2008 Dominik Mierzejewski <rpm at greysector.net> - 0.4.9-0.49.20080905 - 20080905 snapshot - fix build --with amr - update snapshot.sh - drop liba52 support, native ac3 decoder is better in every way Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/ffmpeg/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 26 Aug 2008 00:49:17 -0000 1.3 +++ .cvsignore 5 Sep 2008 15:17:52 -0000 1.4 @@ -1 +1 @@ -ffmpeg-20080825.tar.bz2 +ffmpeg-20080905.tar.bz2 Index: ffmpeg-snapshot.sh =================================================================== RCS file: /cvs/free/rpms/ffmpeg/devel/ffmpeg-snapshot.sh,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ffmpeg-snapshot.sh 3 Aug 2008 14:25:41 -0000 1.1 +++ ffmpeg-snapshot.sh 5 Sep 2008 15:17:52 -0000 1.2 @@ -17,7 +17,7 @@ cd "$tmp" svn checkout -r {$svn} svn://svn.mplayerhq.hu/ffmpeg/trunk ffmpeg-$svn cd ffmpeg-$svn -./version.sh . +./version.sh . version.h find . -type d -name .svn -print0 | xargs -0r rm -rf sed -i -e '/^\.PHONY: version\.h$/d' Makefile cd .. Index: ffmpeg.spec =================================================================== RCS file: /cvs/free/rpms/ffmpeg/devel/ffmpeg.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ffmpeg.spec 26 Aug 2008 00:49:17 -0000 1.2 +++ ffmpeg.spec 5 Sep 2008 15:17:52 -0000 1.3 @@ -1,12 +1,12 @@ # TODO: add make test to %%check section -%define svn 20080825 +%define svn 20080905 %define faad2min 1:2.6.1 Summary: Digital VCR and streaming server Name: ffmpeg Version: 0.4.9 -Release: 0.48.%{svn}%{?dist} +Release: 0.49.%{svn}%{?dist} License: GPLv2+ Group: Applications/Multimedia URL: http://ffmpeg.org/ @@ -15,7 +15,6 @@ Patch4: %{name}-asmreg.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: a52dec-devel %{?_with_amr:BuildRequires: amrnb-devel amrwb-devel} BuildRequires: zlib-devel BuildRequires: lame-devel @@ -79,9 +78,8 @@ --mandir=%{_mandir} \ --arch=%{_target_cpu} \ --extra-cflags="$RPM_OPT_FLAGS -D_ISOC99_SOURCE -D_POSIX_C_SOURCE=200112 -fasm -std=c99 -fno-math-errno" \ - %{?_with_amr:--enable-libamr-nb --enable-libamr-wb} \ + %{?_with_amr:--enable-libamr-nb --enable-libamr-wb --enable-nonfree} \ --enable-libdc1394 \ - --enable-liba52 \ --enable-libfaac \ --enable-libfaad \ --enable-libgsm \ @@ -165,6 +163,12 @@ %changelog +* Fri Sep 05 2008 Dominik Mierzejewski <rpm at greysector.net> - 0.4.9-0.49.20080905 +- 20080905 snapshot +- fix build --with amr +- update snapshot.sh +- drop liba52 support, native ac3 decoder is better in every way + * Mon Aug 25 2008 Dominik Mierzejewski <rpm at greysector.net> - 0.4.9-0.48.20080825 - 20080825 snapshot - use CFLAGS more similar to upstream Index: sources =================================================================== RCS file: /cvs/free/rpms/ffmpeg/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 26 Aug 2008 00:49:17 -0000 1.3 +++ sources 5 Sep 2008 15:17:52 -0000 1.4 @@ -1 +1 @@ -c6cbe2517152ad3b47bf44bbc07586ec ffmpeg-20080825.tar.bz2 +29802605e4d20aef1b6b02916877541b ffmpeg-20080905.tar.bz2