From 6c00a37ac7583196d6596842432f914298d715c7 Mon Sep 17 00:00:00 2001
From: Dominik Mierzejewski <dominik@greysector.net>
Date: Sat, 20 Mar 2010 15:11:18 +0000
Subject: [PATCH] * Sat Mar 20 2010 Dominik Mierzejewski <rpm at
 greysector.net> - 0.6-0.1.20100320svn - 20100320 snapshot - drop upstream'd
 patch - bumped version to pre-0.6 - added ffprobe to file list

---
 ffmpeg-textrel.patch | 41 -----------------------------------------
 ffmpeg.spec          | 17 +++++++++++------
 2 files changed, 11 insertions(+), 47 deletions(-)
 delete mode 100644 ffmpeg-textrel.patch

diff --git a/ffmpeg-textrel.patch b/ffmpeg-textrel.patch
deleted file mode 100644
index dccb046..0000000
--- a/ffmpeg-textrel.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-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
- 
-+%ifdef PIC
-+%define SECTION_REL - $$
-+%else
-+%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
- 
- %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
diff --git a/ffmpeg.spec b/ffmpeg.spec
index 247d971..60a61b3 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -1,12 +1,12 @@
 # TODO: add make test to %%check section
 
-%global svn     20100116
+%global svn     20100320
 %global faad2min 1:2.6.1
 
 Summary:        Digital VCR and streaming server
 Name:           ffmpeg
-Version:        0.5
-Release:        6.%{svn}svn%{?dist}
+Version:        0.6
+Release:        0.1.%{svn}svn%{?dist}
 %if 0%{?_with_opencore_amr:1}
 License:        GPLv3+
 %else
@@ -16,8 +16,6 @@ Group:          Applications/Multimedia
 URL:            http://ffmpeg.org/
 Source0:        http://rpms.kwizart.net/fedora/SOURCES/%{name}-%{svn}.tar.bz2
 Source1:        ffmpeg-snapshot.sh
-# get rid of textrels on x86_64 in yasm code
-Patch0:         %{name}-textrel.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  bzip2-devel
@@ -119,7 +117,6 @@ This package contains development files for %{name}
 
 %prep
 %setup -q -n %{name}-%{svn}
-%patch0 -p1 -b .textrel
 
 %build
 %ifarch ppc ppc64
@@ -199,9 +196,11 @@ rm -rf $RPM_BUILD_ROOT
 %doc COPYING.* CREDITS Changelog README doc/ffserver.conf
 %{_bindir}/ffmpeg
 %{_bindir}/ffplay
+%{_bindir}/ffprobe
 %{_bindir}/ffserver
 %{_mandir}/man1/ffmpeg.1*
 %{_mandir}/man1/ffplay.1*
+%{_mandir}/man1/ffprobe.1*
 %{_mandir}/man1/ffserver.1*
 %{_datadir}/ffmpeg
 
@@ -228,6 +227,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Mar 20 2010 Dominik Mierzejewski <rpm at greysector.net> - 0.6-0.1.20100320svn
+- 20100320 snapshot
+- drop upstream'd patch
+- bumped version to pre-0.6
+- added ffprobe to file list
+
 * 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)