rpms/ffmpeg/devel sources, 1.24, 1.25 .cvsignore, 1.24, 1.25 ffmpeg.spec, 1.44, 1.45

Nicolas Chauvet kwizart at rpmfusion.org
Thu Jul 14 23:59:51 CEST 2011


Author: kwizart

Update of /cvs/free/rpms/ffmpeg/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv15737

Modified Files:
	sources .cvsignore ffmpeg.spec 
Log Message:
Update to 0.7.1



Index: sources
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	12 Jun 2011 21:29:58 -0000	1.24
+++ sources	14 Jul 2011 21:59:50 -0000	1.25
@@ -1 +1 @@
-881aca23a4e13a7eb3207d98a1e38643  ffmpeg-oldabi-20110612.tar.bz2
+8615815985a17ef6498620c715e63f5e  ffmpeg-0.7.1.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore	12 Jun 2011 21:29:58 -0000	1.24
+++ .cvsignore	14 Jul 2011 21:59:50 -0000	1.25
@@ -1 +1 @@
-ffmpeg-oldabi-20110612.tar.bz2
+ffmpeg-0.7.1.tar.bz2


Index: ffmpeg.spec
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/devel/ffmpeg.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- ffmpeg.spec	12 Jun 2011 21:29:58 -0000	1.44
+++ ffmpeg.spec	14 Jul 2011 21:59:50 -0000	1.45
@@ -1,13 +1,13 @@
 # TODO: add make test to %%check section
 
 %global branch  oldabi-
-%global date    20110612
+#global date    20110612
 #global rel     rc1
 
 Summary:        Digital VCR and streaming server
 Name:           ffmpeg
-Version:        0.7
-Release:        0.2.%{?date}%{?date:git}%{?rel}%{?dist}
+Version:        0.7.1
+Release:        1%{?date}%{?date:git}%{?rel}%{?dist}
 %if 0%{?_with_amr:1}
 License:        GPLv3+
 %else
@@ -18,7 +18,7 @@
 %if 0%{?date}
 Source0:        ffmpeg-%{?branch}%{date}.tar.bz2
 %else
-Source0:        http://ffmpeg.org/releases/ffmpeg-%{version}-%{rel}.tar.bz2
+Source0:        http://ffmpeg.org/releases/ffmpeg-%{version}.tar.bz2
 %endif
 Source1:        ffmpeg-snapshot-oldabi.sh
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -35,6 +35,9 @@
 BuildRequires:  libvdpau-devel
 BuildRequires:  libvorbis-devel
 BuildRequires:  libvpx-devel >= 0.9.1
+%ifarch %{ix86} x86_64
+BuildRequires:  libXvMC-devel
+%endif
 %{?_with_amr:BuildRequires: opencore-amr-devel}
 BuildRequires:  openjpeg-devel
 BuildRequires:  schroedinger-devel
@@ -42,7 +45,7 @@
 BuildRequires:  speex-devel
 BuildRequires:  subversion
 BuildRequires:  texi2html
-%{!?_without_x264:BuildRequires: x264-devel >= 0.0.0-0.29}
+%{!?_without_x264:BuildRequires: x264-devel >= 0.0.0-0.30}
 BuildRequires:  xvidcore-devel
 BuildRequires:  zlib-devel
 %ifarch %{ix86} x86_64
@@ -121,7 +124,7 @@
 %setup -q -n ffmpeg-%{?branch}%{date}
 echo "git-snapshot-%{?branch}%{date}-RPMFusion" > VERSION
 %else
-%setup -q -n ffmpeg-%{version}-%{rel}
+%setup -q -n ffmpeg-%{version}
 %endif
 
 %build
@@ -202,7 +205,7 @@
 %if 0%{!?ffmpegsuffix:1}
 %files
 %defattr(-,root,root,-)
-%doc COPYING.* CREDITS Changelog README doc/ffserver.conf
+%doc COPYING.* CREDITS README doc/ffserver.conf
 %{_bindir}/ffmpeg
 %{_bindir}/ffplay
 %{_bindir}/ffprobe
@@ -238,6 +241,12 @@
 
 
 %changelog
+* Thu Jul 14 2011 Nicolas Chauvet <kwizart at gmail.com> - 0.7.1-1
+- Update to 0.7.1
+
+* Fri Jul 01 2011 Nicolas Chauvet <kwizart at gmail.com> - 0.7-0.3.20110612git
+- Add XvMC in ffmpeg
+
 * Sun Jun 12 2011 Nicolas Chauvet <kwizart at gmail.com> - 0.7-0.2.20110612git
 - Update to 20110612git from oldabi branch
 



More information about the rpmfusion-commits mailing list