From 83564bab767d0fb7b867b6d126c04807738c808f Mon Sep 17 00:00:00 2001 From: Dominik Mierzejewski Date: Tue, 27 Oct 2009 00:38:30 +0000 Subject: [PATCH] upload new sources drop separate SIMDified libs ppc(64) --- .gitignore | 2 +- ffmpeg.spec | 42 ++++++++++-------------------------------- sources | 2 +- 3 files changed, 12 insertions(+), 34 deletions(-) diff --git a/.gitignore b/.gitignore index 600265d..14bc52e 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -ffmpeg-20091007.tar.bz2 +ffmpeg-20091026.tar.bz2 diff --git a/ffmpeg.spec b/ffmpeg.spec index 7eea75f..1f90476 100644 --- a/ffmpeg.spec +++ b/ffmpeg.spec @@ -135,8 +135,13 @@ pushd generic %ifarch %{ix86} x86_64 --enable-runtime-cpudetect \ %endif -%ifarch ppc ppc64 - --disable-altivec \ +%ifarch ppc + --cpu=g3 \ + --enable-runtime-cpudetect \ +%endif +%ifarch ppc64 + --cpu=g5 \ + --enable-runtime-cpudetect \ %endif %ifarch sparc sparc64 --disable-vis \ @@ -150,28 +155,6 @@ popd %if 1%{?ffmpegsuffix:0} mkdir simd pushd simd -%ifarch ppc ppc64 -%{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 \ @@ -193,7 +176,7 @@ make install DESTDIR=$RPM_BUILD_ROOT popd %if 1%{?ffmpegsuffix:0} pushd simd -%ifarch ppc ppc64 sparc sparc64 +%ifarch sparc sparc64 make install DESTDIR=$RPM_BUILD_ROOT %endif popd @@ -222,9 +205,6 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root,-) %{_libdir}/lib*.so.* %if 1%{?ffmpegsuffix:0} -%ifarch ppc ppc64 -%{_libdir}/altivec/lib*.so.* -%endif %ifarch sparc sparc64 %{_libdir}/v9/lib*.so.* %endif @@ -237,9 +217,6 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/lib*.pc %{_libdir}/lib*.so %if 1%{?ffmpegsuffix:0} -%ifarch ppc ppc64 -%{_libdir}/altivec/lib*.so -%endif %ifarch sparc sparc64 %{_libdir}/v9/lib*.so %endif @@ -253,7 +230,8 @@ rm -rf $RPM_BUILD_ROOT - don't disable yasm for generic builds - fixed opencore amr support - dropped workaround for non-standard openjpeg headers location -- dropped separate SIMDified libs for x86, runtime CPU detection should be enough +- dropped separate SIMDified libs for x86 and ppc(64), + runtime CPU detection should be enough * Thu Oct 15 2009 kwizart - 0.5-3.svn20091007 - Update to svn snapshot 20091007 diff --git a/sources b/sources index fd63950..00e81d9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6a8939377b60a1e730dc7cce9af88d82 ffmpeg-20091007.tar.bz2 +d58be64ecdae72a659344133c50b7c1d ffmpeg-20091026.tar.bz2