Author: rathann Update of /cvs/free/rpms/ffmpeg/F-12 In directory se02.es.rpmfusion.net:/tmp/cvs-serv25787 Modified Files: .cvsignore ffmpeg-snapshot.sh ffmpeg.spec sources Removed Files: ffmpeg-ppc-pic.patch ffmpeg-textrel.patch Log Message: * Sun Apr 25 2010 Dominik Mierzejewski <rpm at greysector.net> - 0.6-0.1.20100425svn - 20100425 snapshot - drop upstream'd patch - bumped version to pre-0.6 - added ffprobe to file list - dropped unnecessary imlib2-devel BR - patch to build with old x264 in F-12 - use -mlongcall instead of -fPIC to fix rfbz#804, it's faster Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/ffmpeg/F-12/.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 26 Apr 2010 22:44:21 -0000 1.13 @@ -1 +1 @@ -ffmpeg-20091026.tar.bz2 +ffmpeg-20100425.tar.bz2 Index: ffmpeg-snapshot.sh =================================================================== RCS file: /cvs/free/rpms/ffmpeg/F-12/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 26 Apr 2010 22:44:21 -0000 1.6 @@ -12,18 +12,19 @@ unset CDPATH pwd=$(pwd) -svn=$(date +%Y%m%d) -svn=20091019 +date=$(date +%Y%m%d) +date=20100425 +svn={$date} 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 Index: ffmpeg.spec =================================================================== RCS file: /cvs/free/rpms/ffmpeg/F-12/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 26 Apr 2010 22:44:21 -0000 1.25 @@ -1,12 +1,12 @@ # TODO: add make test to %%check section -%global svn 20091026 +%global svn 20100425 %global faad2min 1:2.6.1 Summary: Digital VCR and streaming server Name: ffmpeg -Version: 0.5 -Release: 5.%{svn}svn%{?dist} +Version: 0.6 +Release: 0.1.%{svn}svn%{?dist} %if 0%{?_with_opencore_amr:1} License: GPLv3+ %else @@ -16,10 +16,8 @@ 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 -# compile with -fPIC on ppc/ppc64 (rf804) -Patch1: %{name}-ppc-pic.patch +# allow build with libx264.so.78 +Patch0: ffmpeg-x264.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: bzip2-devel @@ -27,7 +25,6 @@ %{?_with_faac:BuildRequires: faac-devel} BuildRequires: faad2-devel >= %{faad2min} BuildRequires: gsm-devel -BuildRequires: imlib2-devel BuildRequires: lame-devel BuildRequires: libdc1394-devel BuildRequires: libtheora-devel @@ -121,10 +118,14 @@ %prep %setup -q -n %{name}-%{svn} -%patch0 -p1 -b .textrel -%patch1 -p1 -b .ppc-pic +%patch0 -p1 -b .x264 +find ffpresets -type f -size 0 | xargs rm %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}\ @@ -198,9 +199,11 @@ %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 @@ -227,6 +230,15 @@ %changelog +* Sun Apr 25 2010 Dominik Mierzejewski <rpm at greysector.net> - 0.6-0.1.20100425svn +- 20100425 snapshot +- drop upstream'd patch +- bumped version to pre-0.6 +- added ffprobe to file list +- dropped unnecessary imlib2-devel BR +- patch to build with old x264 in F-12 +- 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&gt; - 0.5-5.20091026svn - Add -fPIC -dPIC when compiling on ppc (rf804) Index: sources =================================================================== RCS file: /cvs/free/rpms/ffmpeg/F-12/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 26 Apr 2010 22:44:21 -0000 1.13 @@ -1 +1 @@ -d58be64ecdae72a659344133c50b7c1d ffmpeg-20091026.tar.bz2 +760f683cfca2cd527bda41ca644c8d8d ffmpeg-20100425.tar.bz2 --- ffmpeg-ppc-pic.patch DELETED --- --- ffmpeg-textrel.patch DELETED ---