Author: rathann Update of /cvs/free/rpms/ffmpeg/F-11 In directory se02.es.rpmfusion.net:/tmp/cvs-serv12188 Modified Files: .cvsignore ffmpeg-textrel.patch ffmpeg.spec sources Removed Files: ffmpeg-ppc.patch Log Message: * Fri Mar 05 2010 Dominik Mierzejewski <rpm at greysector.net> - 0.5.1-1 - updated to latest point release - fix textrels on x86_64 in a different way (patch by Reimar Döffinger) - use -mlongcall instead of -fPIC to fix rfbz#804, it's faster - replaced amr.b with opencore-amr - dropped separate SIMDified libs for x86 and ppc(64), runtime CPU detection should be enough Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/ffmpeg/F-11/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 10 Mar 2009 23:24:14 -0000 1.10 +++ .cvsignore 7 May 2010 17:11:54 -0000 1.11 @@ -1 +1 @@ -ffmpeg-0.5.tar.bz2 +ffmpeg-0.5.1.tar.bz2 ffmpeg-textrel.patch: fft_mmx.asm | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) Index: ffmpeg-textrel.patch =================================================================== RCS file: /cvs/free/rpms/ffmpeg/F-11/ffmpeg-textrel.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ffmpeg-textrel.patch 10 Mar 2009 23:25:59 -0000 1.1 +++ ffmpeg-textrel.patch 7 May 2010 17:11:56 -0000 1.2 @@ -1,12 +1,41 @@ -diff -up ffmpeg-0.5/libavcodec/x86/fft_mmx.asm.textrel ffmpeg-0.5/libavcodec/x86/fft_mmx.asm ---- ffmpeg-0.5/libavcodec/x86/fft_mmx.asm.textrel 2009-02-13 01:57:22.000000000 +0100 -+++ ffmpeg-0.5/libavcodec/x86/fft_mmx.asm 2009-03-10 22:09:16.000000000 +0100 -@@ -448,6 +448,8 @@ fft %+ n %+ %3%2: +diff -up ffmpeg-0.5.1/libavcodec/x86/fft_mmx.asm.textrel ffmpeg-0.5.1/libavcodec/x86/fft_mmx.asm +--- ffmpeg-0.5.1/libavcodec/x86/fft_mmx.asm.textrel 2009-02-13 01:57:22.000000000 +0100 ++++ ffmpeg-0.5.1/libavcodec/x86/fft_mmx.asm 2010-03-05 21:40:24.000000000 +0100 +@@ -417,18 +417,23 @@ DECL_PASS pass_interleave_3dn, PASS_BIG + %define pass_3dn2 pass_3dn + %define pass_interleave_3dn2 pass_interleave_3dn - %ifidn __OUTPUT_FORMAT__,macho64 - section .rodata ++%ifdef PIC ++%define SECTION_REL - $$ +%else -+section .data ++%define SECTION_REL ++%endif + + %macro DECL_FFT 2-3 ; nbits, cpu, suffix +-%xdefine list_of_fft fft4%2, fft8%2 ++%xdefine list_of_fft fft4%2 SECTION_REL, fft8%2 SECTION_REL + %if %1==5 +-%xdefine list_of_fft list_of_fft, fft16%2 ++%xdefine list_of_fft list_of_fft, fft16%2 SECTION_REL %endif - align 8 + %assign n 1<<%1 + %rep 17-%1 + %assign n2 n/2 + %assign n4 n/4 +-%xdefine list_of_fft list_of_fft, fft %+ n %+ %3%2 ++%xdefine list_of_fft list_of_fft, fft %+ n %+ %3%2 SECTION_REL + + align 16 + fft %+ n %+ %3%2: +@@ -460,6 +465,10 @@ section .text + cglobal fft_dispatch%3%2, 2,5,0, z, nbits + lea r2, [dispatch_tab%3%2 GLOBAL] + mov r2, [r2 + (nbitsq-2)*gprsize] ++%ifdef PIC ++ lea r3, [$$ GLOBAL] ++ add r2, r3 ++%endif + call r2 + RET + %endmacro ; DECL_FFT Index: ffmpeg.spec =================================================================== RCS file: /cvs/free/rpms/ffmpeg/F-11/ffmpeg.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- ffmpeg.spec 26 Oct 2009 01:26:55 -0000 1.17 +++ ffmpeg.spec 7 May 2010 17:11:56 -0000 1.18 @@ -4,19 +4,24 @@ Summary: Digital VCR and streaming server Name: ffmpeg -Version: 0.5 -Release: 3%{?dist} +Version: 0.5.1 +Release: 1%{?dist} +%if 0%{?_with_opencore_amr:1} +License: GPLv3+ +%else +%if 0%{?_with_amr:1} || 0%{?_with_faac:1} +License: Non-distributable +%else License: GPLv2+ +%endif +%endif Group: Applications/Multimedia URL: http://ffmpeg.org/ Source0: http://ffmpeg.org/releases/%{name}-%{version}.tar.bz2 # get rid of textrels on x86_64 in yasm code Patch0: %{name}-textrel.patch -# fix ppc builds -Patch1: %{name}-ppc.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -%{?_with_amr:BuildRequires: amrnb-devel amrwb-devel} BuildRequires: bzip2-devel BuildRequires: dirac-devel %{?_with_faac:BuildRequires: faac-devel} @@ -29,6 +34,7 @@ %{?_with_vaapi:BuildRequires:libva-devel >= 0.31.0} BuildRequires: libvdpau-devel BuildRequires: libvorbis-devel +%{?_with_opencore_amr:BuildRequires: opencore-amr-devel} BuildRequires: openjpeg-devel BuildRequires: schroedinger-devel BuildRequires: SDL-devel @@ -87,6 +93,7 @@ --extra-cflags="$RPM_OPT_FLAGS" \\\ --extra-version=rpmfusion \\\ %{?_with_amr:--enable-libamr-nb --enable-libamr-wb --enable-nonfree} \\\ + %{?_with_opencore_amr:--enable-libopencore-amrnb --enable-libopencore-amrwb --enable-version3} \\\ --enable-bzlib \\\ --enable-libdc1394 \\\ --enable-libdirac \\\ @@ -118,22 +125,29 @@ %prep %setup -q %patch0 -p1 -b .textrel -%patch1 -p1 -b .ppc %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}\ --shlibdir=%{_libdir} \ %ifarch %{ix86} --cpu=%{_target_cpu} \ - --disable-mmx2 \ - --disable-sse \ - --disable-ssse3 \ - --disable-yasm \ %endif -%ifarch ppc ppc64 - --disable-altivec \ +%ifarch %{ix86} x86_64 + --enable-runtime-cpudetect \ +%endif +%ifarch ppc + --cpu=g3 \ + --enable-runtime-cpudetect \ +%endif +%ifarch ppc64 + --cpu=g5 \ + --enable-runtime-cpudetect \ %endif %ifarch sparc sparc64 --disable-vis \ @@ -145,38 +159,6 @@ mkdir simd pushd simd -%ifarch %{ix86} -%{ff_configure}\ - --shlibdir=%{_libdir}/i686 \ - --cpu=i686 \ - --disable-ffmpeg \ - --disable-ffserver \ - --disable-ffplay \ - -make %{?_smp_mflags} -%endif -%ifarch ppc -%{ff_configure}\ - --shlibdir=%{_libdir}/altivec \ - --cpu=g4 \ - --enable-altivec \ - --disable-ffmpeg \ - --disable-ffserver \ - --disable-ffplay \ - -make %{?_smp_mflags} -%endif -%ifarch ppc64 -%{ff_configure}\ - --shlibdir=%{_libdir}/altivec \ - --cpu=g5 \ - --enable-altivec \ - --disable-ffmpeg \ - --disable-ffserver \ - --disable-ffplay \ - -make %{?_smp_mflags} -%endif %ifarch sparc sparc64 %{ff_configure}\ --shlibdir=%{_libdir}/v9 \ @@ -196,7 +178,7 @@ make install DESTDIR=$RPM_BUILD_ROOT popd pushd simd -%ifarch %{ix86} ppc ppc64 sparc sparc64 +%ifarch sparc sparc64 make install DESTDIR=$RPM_BUILD_ROOT %endif popd @@ -211,7 +193,7 @@ %files %defattr(-,root,root,-) -%doc COPYING.GPL CREDITS Changelog README RELEASE doc/ffserver.conf +%doc COPYING.GPL* CREDITS Changelog README RELEASE doc/ffserver.conf %{_bindir}/ffmpeg %{_bindir}/ffplay %{_bindir}/ffserver @@ -224,14 +206,6 @@ %defattr(-,root,root,-) %{_libdir}/lib*.so.* %{_libdir}/vhook/ -%ifarch %{ix86} -%{_libdir}/i686/lib*.so.* -%{_libdir}/i686/vhook/ -%endif -%ifarch ppc ppc64 -%{_libdir}/altivec/lib*.so.* -%{_libdir}/altivec/vhook/ -%endif %ifarch sparc sparc64 %{_libdir}/v9/lib*.so.* %{_libdir}/v9/vhook/ @@ -243,18 +217,20 @@ %{_includedir}/ffmpeg %{_libdir}/pkgconfig/lib*.pc %{_libdir}/lib*.so -%ifarch %{ix86} -%{_libdir}/i686/lib*.so -%endif -%ifarch ppc ppc64 -%{_libdir}/altivec/lib*.so -%endif %ifarch sparc sparc64 %{_libdir}/v9/lib*.so %endif %changelog +* Fri Mar 05 2010 Dominik Mierzejewski <rpm at greysector.net> - 0.5.1-1 +- updated to latest point release +- fix textrels on x86_64 in a different way (patch by Reimar Döffinger) +- use -mlongcall instead of -fPIC to fix rfbz#804, it's faster +- replaced amr.b with opencore-amr +- dropped separate SIMDified libs for x86 and ppc(64), + runtime CPU detection should be enough + * Thu Oct 22 2009 Dominik Mierzejewski <rpm at greysector.net> - 0.5-3 - dropped workaround for non-standard openjpeg headers location - Add BR dirac vdpau. (kwizart) Index: sources =================================================================== RCS file: /cvs/free/rpms/ffmpeg/F-11/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 10 Mar 2009 23:24:14 -0000 1.10 +++ sources 7 May 2010 17:11:56 -0000 1.11 @@ -1 +1 @@ -be8503f15c3b81ba00eb8379ca8dcf33 ffmpeg-0.5.tar.bz2 +c7b0e1729f7aafb10496d79bb963bb26 ffmpeg-0.5.1.tar.bz2 --- ffmpeg-ppc.patch DELETED ---