Author: belegdol Update of /cvs/free/rpms/mplayer/F-20 In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv6673 Modified Files: .cvsignore mplayer-ffmpeg.patch mplayer-snapshot.sh mplayer.spec sources Log Message: * Sat Mar 01 2014 Julian Sikorski <belegdol(a)fedoraproject.org&gt; - 1.1-20.20140301svn - 20140301 snapshot Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/mplayer/F-20/.cvsignore,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- .cvsignore 11 Feb 2014 17:34:29 -0000 1.40 +++ .cvsignore 1 Mar 2014 07:21:32 -0000 1.41 @@ -1,2 +1,2 @@ Blue-1.8.tar.bz2 -mplayer-export-2014-02-11.tar.bz2 +mplayer-export-2014-03-01.tar.bz2 mplayer-ffmpeg.patch: Makefile | 2 configure | 2 ffmpeg/libavformat/internal.h | 32 ++++++++++++ ffmpeg/libavutil/x86/asm.h | 112 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 146 insertions(+), 2 deletions(-) Index: mplayer-ffmpeg.patch =================================================================== RCS file: /cvs/free/rpms/mplayer/F-20/mplayer-ffmpeg.patch,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- mplayer-ffmpeg.patch 1 Aug 2013 11:14:30 -0000 1.10 +++ mplayer-ffmpeg.patch 1 Mar 2014 07:21:32 -0000 1.11 @@ -1,7 +1,7 @@ -diff -up mplayer-export-2013-08-01/configure.ffmpeg mplayer-export-2013-08-01/configure ---- mplayer-export-2013-08-01/configure.ffmpeg 2013-08-01 12:37:20.815714081 +0200 -+++ mplayer-export-2013-08-01/configure 2013-08-01 12:37:20.817714096 +0200 -@@ -6987,7 +6987,7 @@ elif test "$ffmpeg_so" = auto ; then +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 && @@ -10,18 +10,9 @@ elif header_check libavutil/avutil.h -lswscale -lavformat -lavcodec -lavutil ; then extra_ldflags="$extra_ldflags -lswscale -lavformat -lavcodec -lavutil" ffmpeg_so=yes -@@ -7696,7 +7696,7 @@ if test "$_gui" = yes ; then - - # Required libraries - if test "$ffmpeg" != yes || -- ! echo $libavdecoders | grep -q PNG_DECODER ; then -+ ! cat $_libdir/pkgconfig/libavcodec.pc | grep -q lz ; then - die "The GUI requires libavcodec with PNG support (needs zlib)." - fi - test "$_freetype" = no && test "$_bitmap_font" = no && -diff -up mplayer-export-2013-08-01/ffmpeg/libavformat/internal.h.ffmpeg mplayer-export-2013-08-01/ffmpeg/libavformat/internal.h ---- mplayer-export-2013-08-01/ffmpeg/libavformat/internal.h.ffmpeg 2013-08-01 12:37:20.818714103 +0200 -+++ mplayer-export-2013-08-01/ffmpeg/libavformat/internal.h 2013-08-01 12:37:20.818714103 +0200 +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 @@ -0,0 +1,32 @@ +/* + * copyright (c) 2001 Fabrice Bellard @@ -55,9 +46,9 @@ +} AVCodecTag; + +#endif /* AVFORMAT_INTERNAL_H */ -diff -up mplayer-export-2013-08-01/ffmpeg/libavutil/x86/asm.h.ffmpeg mplayer-export-2013-08-01/ffmpeg/libavutil/x86/asm.h ---- mplayer-export-2013-08-01/ffmpeg/libavutil/x86/asm.h.ffmpeg 2013-08-01 12:37:20.818714103 +0200 -+++ mplayer-export-2013-08-01/ffmpeg/libavutil/x86/asm.h 2013-08-01 12:39:29.232657100 +0200 +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 @@ -0,0 +1,112 @@ +/* + * copyright (c) 2006 Michael Niedermayer <michaelni(a)gmx.at&gt; @@ -171,10 +162,10 @@ +#define MANGLE(a) EXTERN_PREFIX LOCAL_MANGLE(a) + +#endif /* AVUTIL_X86_ASM_H */ -diff -up mplayer-export-2013-08-01/Makefile.ffmpeg mplayer-export-2013-08-01/Makefile ---- mplayer-export-2013-08-01/Makefile.ffmpeg 2013-08-01 12:37:20.815714081 +0200 -+++ mplayer-export-2013-08-01/Makefile 2013-08-01 12:37:20.818714103 +0200 -@@ -775,7 +775,7 @@ mencoder$(EXESUF) mplayer$(EXESUF): +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 +@@ -776,7 +776,7 @@ mencoder$(EXESUF) mplayer$(EXESUF): codec-cfg-test$(EXESUF): HOSTCFLAGS := $(HOSTCFLAGS) -DTESTING codec-cfg$(EXESUF) codecs2html$(EXESUF): HOSTCFLAGS := $(HOSTCFLAGS) -DCODECS2HTML codec-cfg$(EXESUF) codec-cfg-test$(EXESUF) codecs2html$(EXESUF): codec-cfg.c codec-cfg.h help_mp.h Index: mplayer-snapshot.sh =================================================================== RCS file: /cvs/free/rpms/mplayer/F-20/mplayer-snapshot.sh,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- mplayer-snapshot.sh 11 Feb 2014 17:34:29 -0000 1.22 +++ mplayer-snapshot.sh 1 Mar 2014 07:21:32 -0000 1.23 @@ -13,7 +13,7 @@ unset CDPATH pwd=$(pwd) svn=$(date +%Y-%m-%d) -svn=2014-02-11 +svn=2014-03-01 dirname=mplayer-export-$svn mplayer_rev={$svn} #mplayer_rev=HEAD Index: mplayer.spec =================================================================== RCS file: /cvs/free/rpms/mplayer/F-20/mplayer.spec,v retrieving revision 1.80 retrieving revision 1.81 diff -u -r1.80 -r1.81 --- mplayer.spec 11 Feb 2014 17:34:29 -0000 1.80 +++ mplayer.spec 1 Mar 2014 07:21:32 -0000 1.81 @@ -1,12 +1,12 @@ %define codecdir %{_libdir}/codecs -%define pre 20140211svn +%define pre 20140301svn %define svn 1 -%define svnbuild 2014-02-11 +%define svnbuild 2014-03-01 %define faad2min 1:2.6.1 Name: mplayer Version: 1.1 -Release: 19.%{?pre}%{?dist} +Release: 20.%{?pre}%{?dist} Summary: Movie player playing most video formats and DVDs %if 0%{!?_without_amr:1} @@ -380,6 +380,9 @@ %{_datadir}/mplayer/*.fp %changelog +* Sat Mar 01 2014 Julian Sikorski <belegdol(a)fedoraproject.org&gt; - 1.1-20.20140301svn +- 20140301 snapshot + * Tue Feb 11 2014 Julian Sikorski <belegdol(a)fedoraproject.org&gt; - 1.1-19.20140211svn - 20140211 snapshot Index: sources =================================================================== RCS file: /cvs/free/rpms/mplayer/F-20/sources,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- sources 11 Feb 2014 17:34:29 -0000 1.41 +++ sources 1 Mar 2014 07:21:32 -0000 1.42 @@ -1,2 +1,2 @@ 340368f4e33f767d9df109990fb29c02 Blue-1.8.tar.bz2 -6888d412884a24084118e82d78814420 mplayer-export-2014-02-11.tar.bz2 +5048b11765630664508888bdce26244f mplayer-export-2014-03-01.tar.bz2