Author: rathann Update of /cvs/free/rpms/ffmpeg/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv15138 Modified Files: .cvsignore ffmpeg.spec sources Removed Files: ffmpeg-pkgconfig.patch Log Message: * Sun Dec 14 2008 Dominik Mierzejewski <rpm at greysector.net> - 0.4.9-0.55.20081214 - 20081214 snapshot - change the lib split on x86, it doesn't work right for P3/AthlonXP - specfile cleanups - enable bzlib, dirac and speex support via external libs - sort BR list alphabetically - drop upstream'd patch Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/ffmpeg/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 4 Dec 2008 20:15:31 -0000 1.6 +++ .cvsignore 14 Dec 2008 19:03:09 -0000 1.7 @@ -1 +1 @@ -ffmpeg-20081202.tar.bz2 +ffmpeg-20081214.tar.bz2 Index: ffmpeg.spec =================================================================== RCS file: /cvs/free/rpms/ffmpeg/devel/ffmpeg.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- ffmpeg.spec 12 Dec 2008 20:24:25 -0000 1.9 +++ ffmpeg.spec 14 Dec 2008 19:03:09 -0000 1.10 @@ -1,12 +1,12 @@ # TODO: add make test to %%check section -%define svn 20081202 +%define svn 20081214 %define faad2min 1:2.6.1 Summary: Digital VCR and streaming server Name: ffmpeg Version: 0.4.9 -Release: 0.54.%{svn}%{?dist} +Release: 0.55.%{svn}%{?dist} License: GPLv2+ Group: Applications/Multimedia URL: http://ffmpeg.org/ @@ -16,19 +16,23 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %{?_with_amr:BuildRequires: amrnb-devel amrwb-devel} -BuildRequires: zlib-devel +BuildRequires: bzip2-devel +BuildRequires: dirac-devel +BuildRequires: faac-devel +BuildRequires: faad2-devel >= %{faad2min} +BuildRequires: gsm-devel +BuildRequires: imlib2-devel BuildRequires: lame-devel BuildRequires: libdc1394-devel -BuildRequires: libvorbis-devel BuildRequires: libtheora-devel -BuildRequires: faad2-devel >= %{faad2min} -BuildRequires: xvidcore-devel +BuildRequires: libvorbis-devel +BuildRequires: schroedinger-devel BuildRequires: SDL-devel -BuildRequires: gsm-devel -BuildRequires: imlib2-devel +BuildRequires: speex-devel BuildRequires: texi2html -BuildRequires: faac-devel BuildRequires: x264-devel >= 0.0.0-0.14.20080613 +BuildRequires: xvidcore-devel +BuildRequires: zlib-devel #don't enable on x86_64 until PIC issues on are fixed (in libavcodec/i386/fft_mmx.asm) %ifarch %{ix86} BuildRequires: yasm @@ -76,11 +80,15 @@ --arch=%{_target_cpu} \\\ --extra-cflags="$RPM_OPT_FLAGS" \\\ %{?_with_amr:--enable-libamr-nb --enable-libamr-wb --enable-nonfree} \\\ + --enable-bzlib \\\ --enable-libdc1394 \\\ + --enable-libdirac \\\ --enable-libfaac \\\ --enable-libfaad \\\ --enable-libgsm \\\ --enable-libmp3lame \\\ + --enable-libschroedinger \\\ + --enable-libspeex \\\ --enable-libtheora \\\ --enable-libvorbis \\\ --enable-libx264 \\\ @@ -110,7 +118,6 @@ --shlibdir=%{_libdir} \ %ifarch %{ix86} --cpu=%{_target_cpu} \ - --disable-mmx \ %endif %ifarch ppc ppc64 --disable-altivec \ @@ -122,22 +129,19 @@ make %{?_smp_mflags} popd +mkdir simd +pushd simd %ifarch %{ix86} -mkdir sse2 -pushd sse2 %{ff_configure}\ - --shlibdir=%{_libdir}/sse2 \ + --shlibdir=%{_libdir}/i686 \ --cpu=i686 \ --disable-ffmpeg \ --disable-ffserver \ --disable-ffplay \ make %{?_smp_mflags} -popd %endif %ifarch ppc -mkdir altivec -pushd altivec %{ff_configure}\ --shlibdir=%{_libdir}/altivec \ --cpu=g4 \ @@ -146,11 +150,9 @@ --disable-ffserver \ --disable-ffplay \ -popd +make %{?_smp_mflags} %endif %ifarch ppc64 -mkdir altivec -pushd altivec %{ff_configure}\ --shlibdir=%{_libdir}/altivec \ --cpu=g5 \ @@ -159,11 +161,9 @@ --disable-ffserver \ --disable-ffplay \ -popd +make %{?_smp_mflags} %endif %ifarch sparc sparc64 -mkdir vis -pushd vis %{ff_configure}\ --shlibdir=%{_libdir}/v9 \ --cpu=v9 \ @@ -172,29 +172,26 @@ --disable-ffserver \ --disable-ffplay \ -popd +make %{?_smp_mflags} %endif +popd %install rm -rf $RPM_BUILD_ROOT __doc pushd generic make install DESTDIR=$RPM_BUILD_ROOT popd +pushd simd %ifarch %{ix86} -pushd sse2 make install DESTDIR=$RPM_BUILD_ROOT -popd %endif %ifarch ppc ppc64 -pushd altivec make install DESTDIR=$RPM_BUILD_ROOT -popd %endif %ifarch sparc sparc64 -pushd vis make install DESTDIR=$RPM_BUILD_ROOT -popd %endif +popd cp -a doc __doc rm -f __doc/{Makefile,*.{1,pl,texi}} @@ -223,8 +220,8 @@ %{_libdir}/lib*.so.* %{_libdir}/vhook/ %ifarch %{ix86} -%{_libdir}/sse2/lib*.so.* -%{_libdir}/sse2/vhook/ +%{_libdir}/i686/lib*.so.* +%{_libdir}/i686/vhook/ %endif %ifarch ppc ppc64 %{_libdir}/altivec/lib*.so.* @@ -241,7 +238,7 @@ %{_libdir}/pkgconfig/lib*.pc %{_libdir}/lib*.so %ifarch %{ix86} -%{_libdir}/sse2/lib*.so +%{_libdir}/i686/lib*.so %endif %ifarch ppc ppc64 %{_libdir}/altivec/lib*.so @@ -252,6 +249,14 @@ %changelog +* Sun Dec 14 2008 Dominik Mierzejewski <rpm at greysector.net> - 0.4.9-0.55.20081214 +- 20081214 snapshot +- change the lib split on x86, it doesn't work right for P3/AthlonXP +- specfile cleanups +- enable bzlib, dirac and speex support via external libs +- sort BR list alphabetically +- drop upstream'd patch + * Thu Dec 11 2008 Dominik Mierzejewski <rpm at greysector.net> - 0.4.9-0.54.20081202 - fix pkgconfig file generation Index: sources =================================================================== RCS file: /cvs/free/rpms/ffmpeg/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 4 Dec 2008 20:15:31 -0000 1.6 +++ sources 14 Dec 2008 19:03:09 -0000 1.7 @@ -1 +1 @@ -231d71e5cc6101ac8fb8403b76758877 ffmpeg-20081202.tar.bz2 +eb90bfeda4ea39ff3c6b92806909a5be ffmpeg-20081214.tar.bz2 --- ffmpeg-pkgconfig.patch DELETED ---