11:38 p.m.
Author: rathann
Update of /cvs/free/rpms/ffmpeg/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv967
Modified Files:
.cvsignore ffmpeg-snapshot.sh ffmpeg.spec sources
Log Message:
- 20110227 snapshot
- build PIC objects on PPC (bug #1457)
- provide custom version string
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore 21 Jan 2011 11:26:03 -0000 1.20
+++ .cvsignore 27 Feb 2011 23:38:24 -0000 1.21
@@ -1 +1 @@
-ffmpeg-20110110.tar.bz2
+ffmpeg-20110227.tar.bz2
Index: ffmpeg-snapshot.sh
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/devel/ffmpeg-snapshot.sh,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ffmpeg-snapshot.sh 21 Jan 2011 11:26:03 -0000 1.9
+++ ffmpeg-snapshot.sh 27 Feb 2011 23:38:24 -0000 1.10
@@ -13,15 +13,9 @@
unset CDPATH
pwd=$(pwd)
date=$(date +%Y%m%d)
-svn={$date}
-svn=HEAD
-cd "$tmp"
-svn checkout -r $svn svn://svn.mplayerhq.hu/ffmpeg/trunk ffmpeg-$date
-cd ffmpeg-$date
-pushd libswscale
-svn update -r $svn libswscale
+pushd "$tmp"
+git clone git://git.videolan.org/ffmpeg.git
+cd ffmpeg
+git archive --prefix="ffmpeg-${date}/" --format=tar master | bzip2 >
"$pwd"/ffmpeg-${date}.tar.bz2
popd
-cd ..
-tar jcf "$pwd"/ffmpeg-$date.tar.bz2 ffmpeg-$date
-cd - >/dev/null
Index: ffmpeg.spec
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/devel/ffmpeg.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- ffmpeg.spec 21 Jan 2011 11:26:03 -0000 1.38
+++ ffmpeg.spec 27 Feb 2011 23:38:24 -0000 1.39
@@ -1,11 +1,11 @@
# TODO: add make test to %%check section
-%global svn 20110110
+%global date 20110227
Summary: Digital VCR and streaming server
Name: ffmpeg
Version: 0.6.1
-Release: 1.%{svn}svn%{?dist}
+Release: 1.%{date}git%{?dist}
%if 0%{?_with_amr:1}
License: GPLv3+
%else
@@ -13,7 +13,7 @@
%endif
Group: Applications/Multimedia
URL: http://ffmpeg.org/
-Source0: ffmpeg-%{svn}.tar.bz2
+Source0: ffmpeg-%{date}.tar.bz2
Source1: ffmpeg-snapshot.sh
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -83,7 +83,6 @@
--mandir=%{_mandir} \\\
--arch=%{_target_cpu} \\\
--extra-cflags="$RPM_OPT_FLAGS" \\\
- --extra-version=rpmfusion \\\
%{?_with_amr:--enable-libopencore-amrnb --enable-libopencore-amrwb --enable-version3}
\\\
--enable-bzlib \\\
--enable-libdc1394 \\\
@@ -112,13 +111,10 @@
%prep
-%setup -q -n ffmpeg-%{svn}
+%setup -q -n ffmpeg-%{date}
+echo "git-snapshot-%{date}-RPMFusion" > VERSION
%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}\
@@ -137,10 +133,12 @@
%ifarch ppc
--cpu=g3 \
--enable-runtime-cpudetect \
+ --enable-pic \
%endif
%ifarch ppc64
--cpu=g5 \
--enable-runtime-cpudetect \
+ --enable-pic \
%endif
%ifarch sparc sparc64
--disable-vis \
@@ -230,11 +228,13 @@
%changelog
-* Mon Jan 10 2011 Dominik Mierzejewski <rpm at greysector.net> -
0.6.1-1.20110110svn
-- 20110110 snapshot
+* Sun Feb 27 2011 Dominik Mierzejewski <rpm at greysector.net> -
0.6.1-1.20110227git
+- 20110227 snapshot
- bump version to post-0.6.1 to allow stable 0.6.1 update in older branches
- drop --with amr->opencore_amr indirection
- add qt-faststart tool (bug #1259)
+- build PIC objects on PPC (bug #1457)
+- provide custom version string
* Fri Jan 21 2011 Hans de Goede <j.w.r.degoede(a)hhs.nl> - 0.6-5.20100704svn
- Rebuild for new openjpeg
Index: sources
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources 21 Jan 2011 11:26:03 -0000 1.20
+++ sources 27 Feb 2011 23:38:24 -0000 1.21
@@ -1 +1 @@
-fccd69057e331c2541bb024b1e92e864 ffmpeg-20110110.tar.bz2
+97a4485c7373faaa7df70f218867d20d ffmpeg-20110227.tar.bz2