Author: rathann
Update of /cvs/free/rpms/ffmpeg/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv30491
Modified Files:
.cvsignore ffmpeg.spec sources
Removed Files:
ffmpeg-asmreg.patch ffmpeg-cmov.patch ffmpeg-cpu.patch
Log Message:
* Thu Dec 04 2008 Dominik Mierzejewski <rpm at greysector.net> -
0.4.9-0.53.20081202
- 20081202 snapshot
- drop upstreamed/obsolete patches
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore 17 Sep 2008 22:55:34 -0000 1.5
+++ .cvsignore 4 Dec 2008 20:15:31 -0000 1.6
@@ -1 +1 @@
-ffmpeg-20080908.tar.bz2
+ffmpeg-20081202.tar.bz2
Index: ffmpeg.spec
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/devel/ffmpeg.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ffmpeg.spec 20 Nov 2008 18:40:26 -0000 1.7
+++ ffmpeg.spec 4 Dec 2008 20:15:31 -0000 1.8
@@ -1,20 +1,17 @@
# TODO: add make test to %%check section
-%define svn 20080908
+%define svn 20081202
%define faad2min 1:2.6.1
Summary: Digital VCR and streaming server
Name: ffmpeg
Version: 0.4.9
-Release: 0.52.%{svn}%{?dist}
+Release: 0.53.%{svn}%{?dist}
License: GPLv2+
Group: Applications/Multimedia
URL:
http://ffmpeg.org/
Source0:
http://rpm.greysector.net/livna/%{name}-%{svn}.tar.bz2
Source1: %{name}-snapshot.sh
-Patch0: %{name}-cpu.patch
-Patch1: %{name}-cmov.patch
-Patch4: %{name}-asmreg.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%{?_with_amr:BuildRequires: amrnb-devel amrwb-devel}
@@ -103,9 +100,6 @@
%prep
%setup -q -n %{name}-%{svn}
-%patch0 -p1 -b .cpu
-%patch1 -p1 -b .cmov
-%patch4 -p1 -b .asmreg
%build
mkdir generic
@@ -114,9 +108,7 @@
--shlibdir=%{_libdir} \
%ifarch %{ix86}
--cpu=%{_target_cpu} \
- --disable-amd3dnow \
--disable-mmx \
- --disable-sse \
%endif
%ifarch ppc ppc64
--disable-altivec \
@@ -124,9 +116,6 @@
%ifarch sparc sparc64
--disable-vis \
%endif
-%ifarch x86_64
- --disable-amd3dnow \
-%endif
make %{?_smp_mflags}
popd
@@ -137,8 +126,6 @@
%{ff_configure}\
--shlibdir=%{_libdir}/sse2 \
--cpu=i686 \
- --disable-amd3dnow \
- --disable-ssse3 \
--disable-ffmpeg \
--disable-ffserver \
--disable-ffplay \
@@ -263,6 +250,10 @@
%changelog
+* Thu Dec 04 2008 Dominik Mierzejewski <rpm at greysector.net> -
0.4.9-0.53.20081202
+- 20081202 snapshot
+- drop upstreamed/obsolete patches
+
* Thu Nov 20 2008 Dominik Mierzejewski <rpm at greysector.net> -
0.4.9-0.52.20080908
- add obsoletes for -compat package (RPMFusion bug #173)
Index: sources
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources 17 Sep 2008 22:55:34 -0000 1.5
+++ sources 4 Dec 2008 20:15:31 -0000 1.6
@@ -1 +1 @@
-0165b69b8e5bfc7a82fcf2247269b84b ffmpeg-20080908.tar.bz2
+231d71e5cc6101ac8fb8403b76758877 ffmpeg-20081202.tar.bz2
--- ffmpeg-asmreg.patch DELETED ---
--- ffmpeg-cmov.patch DELETED ---
--- ffmpeg-cpu.patch DELETED ---