Author: belegdol Update of /cvs/free/rpms/mplayer/devel In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv25686 Modified Files: .cvsignore mplayer-ffmpeg.patch mplayer-snapshot.sh mplayer.spec sources Log Message: * Thu Aug 01 2013 Julian Sikorski <belegdol(a)fedoraproject.org&gt; - 1.1-12.20130801svn - 20130801 snapshot - Updated the ffmpeg patch - Re-numbered the patches Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/mplayer/devel/.cvsignore,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- .cvsignore 21 Apr 2013 19:57:42 -0000 1.33 +++ .cvsignore 1 Aug 2013 11:14:30 -0000 1.34 @@ -1,2 +1,2 @@ Blue-1.8.tar.bz2 -mplayer-export-2013-04-16.tar.bz2 +mplayer-export-2013-08-01.tar.bz2 mplayer-ffmpeg.patch: Makefile | 2 configure | 4 - ffmpeg/libavformat/internal.h | 32 ++++++++++++ ffmpeg/libavutil/x86/asm.h | 112 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 147 insertions(+), 3 deletions(-) Index: mplayer-ffmpeg.patch =================================================================== RCS file: /cvs/free/rpms/mplayer/devel/mplayer-ffmpeg.patch,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- mplayer-ffmpeg.patch 28 Mar 2013 07:59:34 -0000 1.9 +++ mplayer-ffmpeg.patch 1 Aug 2013 11:14:30 -0000 1.10 @@ -1,7 +1,7 @@ -diff -up mplayer-export-2013-03-24/configure.ffmpeg mplayer-export-2013-03-24/configure ---- mplayer-export-2013-03-24/configure.ffmpeg 2013-03-23 08:28:55.993725707 +0100 -+++ mplayer-export-2013-03-24/configure 2013-03-23 08:28:56.003725776 +0100 -@@ -6973,7 +6973,7 @@ elif test "$ffmpeg_so" = auto ; then +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 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,7 +10,7 @@ elif header_check libavutil/avutil.h -lswscale -lavformat -lavcodec -lavutil ; then extra_ldflags="$extra_ldflags -lswscale -lavformat -lavcodec -lavutil" ffmpeg_so=yes -@@ -7682,7 +7682,7 @@ if test "$_gui" = yes ; then +@@ -7696,7 +7696,7 @@ if test "$_gui" = yes ; then # Required libraries if test "$ffmpeg" != yes || @@ -19,9 +19,9 @@ die "The GUI requires libavcodec with PNG support (needs zlib)." fi test "$_freetype" = no && test "$_bitmap_font" = no && -diff -up mplayer-export-2013-03-24/ffmpeg/libavformat/internal.h.ffmpeg mplayer-export-2013-03-24/ffmpeg/libavformat/internal.h ---- mplayer-export-2013-03-24/ffmpeg/libavformat/internal.h.ffmpeg 2013-03-23 08:28:56.004725783 +0100 -+++ mplayer-export-2013-03-24/ffmpeg/libavformat/internal.h 2013-03-23 08:28:56.004725783 +0100 +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 @@ -0,0 +1,32 @@ +/* + * copyright (c) 2001 Fabrice Bellard @@ -50,15 +50,15 @@ +#include <libavformat/avformat.h> + +typedef struct AVCodecTag { -+ enum CodecID id; ++ enum AVCodecID id; + unsigned int tag; +} AVCodecTag; + +#endif /* AVFORMAT_INTERNAL_H */ -diff -up mplayer-export-2013-03-24/ffmpeg/libavutil/x86/asm.h.ffmpeg mplayer-export-2013-03-24/ffmpeg/libavutil/x86/asm.h ---- mplayer-export-2013-03-24/ffmpeg/libavutil/x86/asm.h.ffmpeg 2013-03-23 08:28:56.005725790 +0100 -+++ mplayer-export-2013-03-24/ffmpeg/libavutil/x86/asm.h 2013-03-23 08:28:56.005725790 +0100 -@@ -0,0 +1,110 @@ +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 +@@ -0,0 +1,112 @@ +/* + * copyright (c) 2006 Michael Niedermayer <michaelni(a)gmx.at&gt; + * @@ -85,6 +85,8 @@ +#include <stdint.h> +#include "config.h" + ++typedef struct xmm_reg { uint64_t a, b; } xmm_reg; ++ +#if ARCH_X86_64 +# define OPSIZE "q" +# define REG_a "rax" @@ -169,10 +171,10 @@ +#define MANGLE(a) EXTERN_PREFIX LOCAL_MANGLE(a) + +#endif /* AVUTIL_X86_ASM_H */ -diff -up mplayer-export-2013-03-24/Makefile.ffmpeg mplayer-export-2013-03-24/Makefile ---- mplayer-export-2013-03-24/Makefile.ffmpeg 2013-03-23 08:28:55.000000000 +0100 -+++ mplayer-export-2013-03-24/Makefile 2013-03-23 08:29:01.000760529 +0100 -@@ -773,7 +773,7 @@ mencoder$(EXESUF) mplayer$(EXESUF): +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): 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/devel/mplayer-snapshot.sh,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- mplayer-snapshot.sh 21 Apr 2013 19:57:43 -0000 1.16 +++ mplayer-snapshot.sh 1 Aug 2013 11:14:30 -0000 1.17 @@ -13,7 +13,7 @@ unset CDPATH pwd=$(pwd) svn=$(date +%Y-%m-%d) -svn=2013-04-16 +svn=2013-08-01 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.72 retrieving revision 1.73 diff -u -r1.72 -r1.73 --- mplayer.spec 20 Jul 2013 09:58:30 -0000 1.72 +++ mplayer.spec 1 Aug 2013 11:14:30 -0000 1.73 @@ -1,12 +1,12 @@ %define codecdir %{_libdir}/codecs -%define pre 20130416svn +%define pre 20130801svn %define svn 1 -%define svnbuild 2013-04-16 +%define svnbuild 2013-08-01 %define faad2min 1:2.6.1 Name: mplayer Version: 1.1 -Release: 11.%{?pre}%{?dist} +Release: 12.%{?pre}%{?dist} Summary: Movie player playing most video formats and DVDs %if 0%{!?_without_amr:1} @@ -23,16 +23,14 @@ %endif Source1: http://www.mplayerhq.hu/MPlayer/skins/Blue-1.8.tar.bz2 Source10: mplayer-snapshot.sh -Patch0: mplayer-asx-parser.patch -Patch1: mplayer-cpudetect.patch # set defaults for Fedora -Patch2: %{name}-config.patch +Patch0: %{name}-config.patch # use roff include statements instead of symlinks -Patch8: %{name}-manlinks.patch +Patch1: %{name}-manlinks.patch # erase any trace of libdvdcss -Patch14: %{name}-nodvdcss.patch +Patch2: %{name}-nodvdcss.patch # use system FFmpeg libraries -Patch18: %{name}-ffmpeg.patch +Patch3: %{name}-ffmpeg.patch BuildRequires: SDL-devel BuildRequires: a52dec-devel @@ -223,12 +221,10 @@ %setup -q -n MPlayer-%{version}%{?pre} rm -rf ffmpeg libdvdcss libdvdnav libdvdread4 %endif -%patch0 -p0 -b .asx-parser -%patch1 -p0 -b .cpudetect -%patch2 -p1 -b .config -%patch8 -p1 -b .manlinks -%patch14 -p1 -b .nodvdcss -%patch18 -p1 -b .ffmpeg +%patch0 -p1 -b .config +%patch1 -p1 -b .manlinks +%patch2 -p1 -b .nodvdcss +%patch3 -p1 -b .ffmpeg mkdir GUI cp -a `ls -1|grep -v GUI` GUI/ @@ -384,6 +380,11 @@ %{_datadir}/mplayer/*.fp %changelog +* Thu Aug 01 2013 Julian Sikorski <belegdol(a)fedoraproject.org&gt; - 1.1-12.20130801svn +- 20130801 snapshot +- Updated the ffmpeg patch +- Re-numbered the patches + * Sat Jul 20 2013 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 1.1-11.20130416svn - Rebuilt for x264 Index: sources =================================================================== RCS file: /cvs/free/rpms/mplayer/devel/sources,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- sources 21 Apr 2013 19:57:43 -0000 1.34 +++ sources 1 Aug 2013 11:14:30 -0000 1.35 @@ -1,2 +1,2 @@ 340368f4e33f767d9df109990fb29c02 Blue-1.8.tar.bz2 -58b49829c9d0e04eece48bcc24912581 mplayer-export-2013-04-16.tar.bz2 +7703d611322a84f7fb9fca4691a78869 mplayer-export-2013-08-01.tar.bz2