5:20 p.m.
Author: rathann
Update of /cvs/free/rpms/ffmpeg/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv22680
Modified Files:
.cvsignore ffmpeg-snapshot.sh ffmpeg-textrel.patch ffmpeg.spec
sources
Removed Files:
ffmpeg-ppc-pic.patch
Log Message:
* Sat Jan 16 2010 Dominik Mierzejewski <rpm at greysector.net> - 0.5-6.20100116svn
- 20100116 snapshot, requires recent x264
- 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
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore 27 Oct 2009 00:38:30 -0000 1.12
+++ .cvsignore 16 Jan 2010 17:20:07 -0000 1.13
@@ -1 +1 @@
-ffmpeg-20091026.tar.bz2
+ffmpeg-20100116.tar.bz2
Index: ffmpeg-snapshot.sh
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/devel/ffmpeg-snapshot.sh,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ffmpeg-snapshot.sh 22 Oct 2009 15:14:52 -0000 1.5
+++ ffmpeg-snapshot.sh 16 Jan 2010 17:20:07 -0000 1.6
@@ -12,18 +12,19 @@
unset CDPATH
pwd=$(pwd)
-svn=$(date +%Y%m%d)
-svn=20091019
+date=$(date +%Y%m%d)
+svn={$date}
+svn=HEAD
cd "$tmp"
-svn checkout -r {$svn} svn://svn.mplayerhq.hu/ffmpeg/trunk ffmpeg-$svn
-cd ffmpeg-$svn
+svn checkout -r $svn svn://svn.mplayerhq.hu/ffmpeg/trunk ffmpeg-$date
+cd ffmpeg-$date
pushd libswscale
-svn update -r {$svn} libswscale
+svn update -r $svn libswscale
popd
./version.sh . version.h
find . -type d -name .svn -print0 | xargs -0r rm -rf
sed -i -e '/^\.PHONY: version\.h$/d' Makefile
cd ..
-tar jcf "$pwd"/ffmpeg-$svn.tar.bz2 ffmpeg-$svn
+tar jcf "$pwd"/ffmpeg-$date.tar.bz2 ffmpeg-$date
cd - >/dev/null
ffmpeg-textrel.patch:
fft_mmx.asm | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
Index: ffmpeg-textrel.patch
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/devel/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 16 Jan 2010 17:20:07 -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-20100116/libavcodec/x86/fft_mmx.asm.textrel
ffmpeg-20100116/libavcodec/x86/fft_mmx.asm
+--- ffmpeg-20100116/libavcodec/x86/fft_mmx.asm.textrel 2010-01-16 14:24:37.000000000
+0100
++++ ffmpeg-20100116/libavcodec/x86/fft_mmx.asm 2010-01-16 15:36:17.000000000 +0100
+@@ -419,18 +419,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:
+@@ -462,6 +467,10 @@ section .text
+ cglobal fft_dispatch%3%2, 2,5,8, 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/devel/ffmpeg.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- ffmpeg.spec 7 Nov 2009 15:34:58 -0000 1.24
+++ ffmpeg.spec 16 Jan 2010 17:20:07 -0000 1.25
@@ -1,12 +1,12 @@
# TODO: add make test to %%check section
-%global svn 20091026
+%global svn 20100116
%global faad2min 1:2.6.1
Summary: Digital VCR and streaming server
Name: ffmpeg
Version: 0.5
-Release: 5.%{svn}svn%{?dist}
+Release: 6.%{svn}svn%{?dist}
%if 0%{?_with_opencore_amr:1}
License: GPLv3+
%else
@@ -18,8 +18,6 @@
Source1: ffmpeg-snapshot.sh
# get rid of textrels on x86_64 in yasm code
Patch0: %{name}-textrel.patch
-# compile with -fPIC on ppc/ppc64 (rf804)
-Patch1: %{name}-ppc-pic.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: bzip2-devel
@@ -40,7 +38,7 @@
BuildRequires: SDL-devel
BuildRequires: speex-devel
BuildRequires: texi2html
-BuildRequires: x264-devel >= 0.0.0-0.26.20091026
+BuildRequires: x264-devel >= 0.0.0-0.27
BuildRequires: xvidcore-devel
BuildRequires: zlib-devel
%ifarch %{ix86} x86_64
@@ -122,9 +120,12 @@
%prep
%setup -q -n %{name}-%{svn}
%patch0 -p1 -b .textrel
-%patch1 -p1 -b .ppc-pic
%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}\
@@ -227,6 +228,11 @@
%changelog
+* Sat Jan 16 2010 Dominik Mierzejewski <rpm at greysector.net> - 0.5-6.20100116svn
+- 20100116 snapshot, requires recent x264
+- 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
+
* Sat Nov 7 2009 Hans de Goede <j.w.r.degoede(a)hhs.nl> - 0.5-5.20091026svn
- Add -fPIC -dPIC when compiling on ppc (rf804)
Index: sources
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources 27 Oct 2009 00:38:30 -0000 1.12
+++ sources 16 Jan 2010 17:20:07 -0000 1.13
@@ -1 +1 @@
-d58be64ecdae72a659344133c50b7c1d ffmpeg-20091026.tar.bz2
+97e2c04175c6613810399ce65c4c3914 ffmpeg-20100116.tar.bz2
--- ffmpeg-ppc-pic.patch DELETED ---