Author: belegdol Update of /cvs/free/rpms/mplayer/devel In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv19180 Modified Files: .cvsignore mplayer-ffmpeg.patch mplayer-snapshot.sh mplayer.spec sources Log Message: * Thu Mar 27 2014 Julian Sikorski <belegdol(a)fedoraproject.org&gt; - 1.1-24.20140327svn - 20140327 snapshot Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/mplayer/devel/.cvsignore,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- .cvsignore 1 Mar 2014 07:19:49 -0000 1.41 +++ .cvsignore 27 Mar 2014 02:54:47 -0000 1.42 @@ -1,2 +1,2 @@ Blue-1.8.tar.bz2 -mplayer-export-2014-03-01.tar.bz2 +mplayer-export-2014-03-27.tar.bz2 mplayer-ffmpeg.patch: Makefile | 2 ffmpeg/libavformat/internal.h | 32 ++++++++++++ ffmpeg/libavutil/x86/asm.h | 112 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 145 insertions(+), 1 deletion(-) Index: mplayer-ffmpeg.patch =================================================================== RCS file: /cvs/free/rpms/mplayer/devel/mplayer-ffmpeg.patch,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- mplayer-ffmpeg.patch 1 Mar 2014 07:19:49 -0000 1.11 +++ mplayer-ffmpeg.patch 27 Mar 2014 02:54:47 -0000 1.12 @@ -1,18 +1,6 @@ -diff -up mplayer-export-2014-03-01/configure.ffmpeg mplayer-export-2014-03-01/configure ---- mplayer-export-2014-03-01/configure.ffmpeg 2014-03-01 11:25:45.356757774 +0100 -+++ mplayer-export-2014-03-01/configure 2014-03-01 11:25:45.359757607 +0100 -@@ -7082,7 +7082,7 @@ if test "$ffmpeg_so" = auto ; then - inc_ffmpeg=$($_pkg_config --cflags libswscale libavformat libavcodec libavutil) - ld_tmp=$($_pkg_config --libs libswscale libavformat libavcodec libavutil) - header_check libavutil/avutil.h $inc_ffmpeg $ld_tmp && -- extra_ldflags="$extra_ldflags $ld_tmp" && ffmpeg_so=yes && ffmpeg=yes -+ extra_ldflags="$extra_ldflags $ld_tmp" && ffmpeg_so=yes && ffmpeg=yes && extra_cflags="$extra_cflags $inc_ffmpeg" - elif header_check libavutil/avutil.h -lswscale -lavformat -lavcodec -lavutil ; then - extra_ldflags="$extra_ldflags -lswscale -lavformat -lavcodec -lavutil" - ffmpeg_so=yes -diff -up mplayer-export-2014-03-01/ffmpeg/libavformat/internal.h.ffmpeg mplayer-export-2014-03-01/ffmpeg/libavformat/internal.h ---- mplayer-export-2014-03-01/ffmpeg/libavformat/internal.h.ffmpeg 2014-03-01 11:25:45.359757607 +0100 -+++ mplayer-export-2014-03-01/ffmpeg/libavformat/internal.h 2014-03-01 11:25:45.359757607 +0100 +diff -up mplayer-export-2014-03-27/ffmpeg/libavformat/internal.h.ffmpeg mplayer-export-2014-03-27/ffmpeg/libavformat/internal.h +--- mplayer-export-2014-03-27/ffmpeg/libavformat/internal.h.ffmpeg 2014-03-27 07:31:02.816463722 +0100 ++++ mplayer-export-2014-03-27/ffmpeg/libavformat/internal.h 2014-03-27 07:31:02.816463722 +0100 @@ -0,0 +1,32 @@ +/* + * copyright (c) 2001 Fabrice Bellard @@ -46,9 +34,9 @@ +} AVCodecTag; + +#endif /* AVFORMAT_INTERNAL_H */ -diff -up mplayer-export-2014-03-01/ffmpeg/libavutil/x86/asm.h.ffmpeg mplayer-export-2014-03-01/ffmpeg/libavutil/x86/asm.h ---- mplayer-export-2014-03-01/ffmpeg/libavutil/x86/asm.h.ffmpeg 2014-03-01 11:25:45.359757607 +0100 -+++ mplayer-export-2014-03-01/ffmpeg/libavutil/x86/asm.h 2014-03-01 11:25:45.359757607 +0100 +diff -up mplayer-export-2014-03-27/ffmpeg/libavutil/x86/asm.h.ffmpeg mplayer-export-2014-03-27/ffmpeg/libavutil/x86/asm.h +--- mplayer-export-2014-03-27/ffmpeg/libavutil/x86/asm.h.ffmpeg 2014-03-27 07:31:02.816463722 +0100 ++++ mplayer-export-2014-03-27/ffmpeg/libavutil/x86/asm.h 2014-03-27 07:31:02.816463722 +0100 @@ -0,0 +1,112 @@ +/* + * copyright (c) 2006 Michael Niedermayer <michaelni(a)gmx.at&gt; @@ -162,9 +150,9 @@ +#define MANGLE(a) EXTERN_PREFIX LOCAL_MANGLE(a) + +#endif /* AVUTIL_X86_ASM_H */ -diff -up mplayer-export-2014-03-01/Makefile.ffmpeg mplayer-export-2014-03-01/Makefile ---- mplayer-export-2014-03-01/Makefile.ffmpeg 2014-03-01 11:25:45.357757718 +0100 -+++ mplayer-export-2014-03-01/Makefile 2014-03-01 11:25:45.360757551 +0100 +diff -up mplayer-export-2014-03-27/Makefile.ffmpeg mplayer-export-2014-03-27/Makefile +--- mplayer-export-2014-03-27/Makefile.ffmpeg 2014-03-27 07:31:02.814463712 +0100 ++++ mplayer-export-2014-03-27/Makefile 2014-03-27 07:31:02.816463722 +0100 @@ -776,7 +776,7 @@ mencoder$(EXESUF) mplayer$(EXESUF): codec-cfg-test$(EXESUF): HOSTCFLAGS := $(HOSTCFLAGS) -DTESTING codec-cfg$(EXESUF) codecs2html$(EXESUF): HOSTCFLAGS := $(HOSTCFLAGS) -DCODECS2HTML Index: mplayer-snapshot.sh =================================================================== RCS file: /cvs/free/rpms/mplayer/devel/mplayer-snapshot.sh,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- mplayer-snapshot.sh 1 Mar 2014 07:19:49 -0000 1.23 +++ mplayer-snapshot.sh 27 Mar 2014 02:54:48 -0000 1.24 @@ -13,7 +13,7 @@ unset CDPATH pwd=$(pwd) svn=$(date +%Y-%m-%d) -svn=2014-03-01 +svn=2014-03-27 dirname=mplayer-export-$svn mplayer_rev={$svn} #mplayer_rev=HEAD Index: mplayer.spec =================================================================== RCS file: /cvs/free/rpms/mplayer/devel/mplayer.spec,v retrieving revision 1.85 retrieving revision 1.86 diff -u -r1.85 -r1.86 --- mplayer.spec 21 Mar 2014 02:29:03 -0000 1.85 +++ mplayer.spec 27 Mar 2014 02:54:48 -0000 1.86 @@ -1,12 +1,12 @@ %define codecdir %{_libdir}/codecs -%define pre 20140301svn +%define pre 20140327svn %define svn 1 -%define svnbuild 2014-03-01 +%define svnbuild 2014-03-27 %define faad2min 1:2.6.1 Name: mplayer Version: 1.1 -Release: 23.%{?pre}%{?dist} +Release: 24.%{?pre}%{?dist} Summary: Movie player playing most video formats and DVDs %if 0%{!?_without_amr:1} @@ -380,6 +380,9 @@ %{_datadir}/mplayer/*.fp %changelog +* Thu Mar 27 2014 Julian Sikorski <belegdol(a)fedoraproject.org&gt; - 1.1-24.20140327svn +- 20140327 snapshot + * Fri Mar 21 2014 Julian Sikorski <belegdol(a)fedoraproject.org&gt; - 1.1-23.20140301svn - Rebuilt for libass-0.10.2 Index: sources =================================================================== RCS file: /cvs/free/rpms/mplayer/devel/sources,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- sources 1 Mar 2014 07:19:49 -0000 1.42 +++ sources 27 Mar 2014 02:54:48 -0000 1.43 @@ -1,2 +1,2 @@ 340368f4e33f767d9df109990fb29c02 Blue-1.8.tar.bz2 -5048b11765630664508888bdce26244f mplayer-export-2014-03-01.tar.bz2 +1e1f961f11ad329edfd9ebd6420eee4c mplayer-export-2014-03-27.tar.bz2