diff --git a/.gitignore b/.gitignore index 6c50a1a..b44f716 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -ffmpeg-20080825.tar.bz2 +ffmpeg-20080905.tar.bz2 diff --git a/ffmpeg-snapshot.sh b/ffmpeg-snapshot.sh index 3346c8c..7a7befd 100644 --- a/ffmpeg-snapshot.sh +++ b/ffmpeg-snapshot.sh @@ -17,7 +17,7 @@ svn=$(date +%Y%m%d) 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 .. diff --git a/ffmpeg.spec b/ffmpeg.spec index 505bde7..9ef192c 100644 --- a/ffmpeg.spec +++ b/ffmpeg.spec @@ -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 @@ Source1: %{name}-snapshot.sh 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 @@ This package contains development files for %{name} --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 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Sep 05 2008 Dominik Mierzejewski - 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 - 0.4.9-0.48.20080825 - 20080825 snapshot - use CFLAGS more similar to upstream diff --git a/sources b/sources index c17bfd0..e7c1441 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c6cbe2517152ad3b47bf44bbc07586ec ffmpeg-20080825.tar.bz2 +29802605e4d20aef1b6b02916877541b ffmpeg-20080905.tar.bz2