Author: belegdol Update of /cvs/free/rpms/mplayer/devel In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv17987 Modified Files: .cvsignore mplayer-ffmpeg.patch mplayer-snapshot.sh mplayer.spec sources Log Message: * Wed May 06 2015 Julian Sikorski <belegdol(a)fedoraproject.org&gt; - 1.1-33.20150211svn - 20150211 snapshot - Updated the ffmpeg patch Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/mplayer/devel/.cvsignore,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- .cvsignore 31 Jan 2015 08:45:06 -0000 1.47 +++ .cvsignore 6 May 2015 06:02:12 -0000 1.48 @@ -1,2 +1,2 @@ Blue-1.10.tar.bz2 -mplayer-export-2015-01-23.tar.bz2 +mplayer-export-2015-02-11.tar.bz2 mplayer-ffmpeg.patch: Makefile | 2 ffmpeg/libavformat/internal.h | 32 ++++++++ ffmpeg/libavutil/x86/asm.h | 153 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 186 insertions(+), 1 deletion(-) Index: mplayer-ffmpeg.patch =================================================================== RCS file: /cvs/free/rpms/mplayer/devel/mplayer-ffmpeg.patch,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- mplayer-ffmpeg.patch 27 Mar 2014 02:54:47 -0000 1.12 +++ mplayer-ffmpeg.patch 6 May 2015 06:02:12 -0000 1.13 @@ -1,6 +1,6 @@ -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 +diff -up mplayer-export-2015-02-11/ffmpeg/libavformat/internal.h.ffmpeg mplayer-export-2015-02-11/ffmpeg/libavformat/internal.h +--- mplayer-export-2015-02-11/ffmpeg/libavformat/internal.h.ffmpeg 2015-05-06 07:44:45.149716539 +0200 ++++ mplayer-export-2015-02-11/ffmpeg/libavformat/internal.h 2015-05-06 07:44:45.149716539 +0200 @@ -0,0 +1,32 @@ +/* + * copyright (c) 2001 Fabrice Bellard @@ -34,10 +34,10 @@ +} AVCodecTag; + +#endif /* AVFORMAT_INTERNAL_H */ -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 @@ +diff -up mplayer-export-2015-02-11/ffmpeg/libavutil/x86/asm.h.ffmpeg mplayer-export-2015-02-11/ffmpeg/libavutil/x86/asm.h +--- mplayer-export-2015-02-11/ffmpeg/libavutil/x86/asm.h.ffmpeg 2015-05-06 07:44:45.149716539 +0200 ++++ mplayer-export-2015-02-11/ffmpeg/libavutil/x86/asm.h 2015-04-19 12:41:39.000000000 +0200 +@@ -0,0 +1,153 @@ +/* + * copyright (c) 2006 Michael Niedermayer <michaelni(a)gmx.at&gt; + * @@ -65,6 +65,7 @@ +#include "config.h" + +typedef struct xmm_reg { uint64_t a, b; } xmm_reg; ++typedef struct ymm_reg { uint64_t a, b, c, d; } ymm_reg; + +#if ARCH_X86_64 +# define OPSIZE "q" @@ -147,13 +148,53 @@ +# define LOCAL_MANGLE(a) #a +#endif + -+#define MANGLE(a) EXTERN_PREFIX LOCAL_MANGLE(a) ++#if HAVE_INLINE_ASM_DIRECT_SYMBOL_REFS ++# define MANGLE(a) EXTERN_PREFIX LOCAL_MANGLE(a) ++# define NAMED_CONSTRAINTS_ADD(...) ++# define NAMED_CONSTRAINTS(...) ++# define NAMED_CONSTRAINTS_ARRAY_ADD(...) ++# define NAMED_CONSTRAINTS_ARRAY(...) ++#else ++ /* When direct symbol references are used in code passed to a compiler that does not support them ++ * then these references need to be converted to named asm constraints instead. ++ * Instead of returning a direct symbol MANGLE now returns a named constraint for that specific symbol. ++ * In order for this to work there must also be a corresponding entry in the asm-interface. To add this ++ * entry use the macro NAMED_CONSTRAINTS() and pass in a list of each symbol reference used in the ++ * corresponding block of code. (e.g. NAMED_CONSTRAINTS(var1,var2,var3) where var1 is the first symbol etc. ). ++ * If there are already existing constraints then use NAMED_CONSTRAINTS_ADD to add to the existing constraint list. ++ */ ++# define MANGLE(a) "%["#a"]" ++ // Intel/MSVC does not correctly expand va-args so we need a rather ugly hack in order to get it to work ++# define FE_0(P,X) P(X) ++# define FE_1(P,X,X1) P(X), FE_0(P,X1) ++# define FE_2(P,X,X1,X2) P(X), FE_1(P,X1,X2) ++# define FE_3(P,X,X1,X2,X3) P(X), FE_2(P,X1,X2,X3) ++# define FE_4(P,X,X1,X2,X3,X4) P(X), FE_3(P,X1,X2,X3,X4) ++# define FE_5(P,X,X1,X2,X3,X4,X5) P(X), FE_4(P,X1,X2,X3,X4,X5) ++# define FE_6(P,X,X1,X2,X3,X4,X5,X6) P(X), FE_5(P,X1,X2,X3,X4,X5,X6) ++# define FE_7(P,X,X1,X2,X3,X4,X5,X6,X7) P(X), FE_6(P,X1,X2,X3,X4,X5,X6,X7) ++# define FE_8(P,X,X1,X2,X3,X4,X5,X6,X7,X8) P(X), FE_7(P,X1,X2,X3,X4,X5,X6,X7,X8) ++# define FE_9(P,X,X1,X2,X3,X4,X5,X6,X7,X8,X9) P(X), FE_8(P,X1,X2,X3,X4,X5,X6,X7,X8,X9) ++# define GET_FE_IMPL(_0,_1,_2,_3,_4,_5,_6,_7,_8,_9,NAME,...) NAME ++# define GET_FE(A) GET_FE_IMPL A ++# define GET_FE_GLUE(x, y) x y ++# define FOR_EACH_VA(P,...) GET_FE_GLUE(GET_FE((__VA_ARGS__,FE_9,FE_8,FE_7,FE_6,FE_5,FE_4,FE_3,FE_2,FE_1,FE_0)), (P,__VA_ARGS__)) ++# define NAME_CONSTRAINT(x) [x] "m"(x) ++ // Parameters are a list of each symbol reference required ++# define NAMED_CONSTRAINTS_ADD(...) , FOR_EACH_VA(NAME_CONSTRAINT,__VA_ARGS__) ++ // Same but without comma for when there are no previously defined constraints ++# define NAMED_CONSTRAINTS(...) FOR_EACH_VA(NAME_CONSTRAINT,__VA_ARGS__) ++ // Same as above NAMED_CONSTRAINTS except used for passing arrays/pointers instead of normal variables ++# define NAME_CONSTRAINT_ARRAY(x) [x] "m"(*x) ++# define NAMED_CONSTRAINTS_ARRAY_ADD(...) , FOR_EACH_VA(NAME_CONSTRAINT_ARRAY,__VA_ARGS__) ++# define NAMED_CONSTRAINTS_ARRAY(...) FOR_EACH_VA(NAME_CONSTRAINT_ARRAY,__VA_ARGS__) ++#endif + +#endif /* AVUTIL_X86_ASM_H */ -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): +diff -up mplayer-export-2015-02-11/Makefile.ffmpeg mplayer-export-2015-02-11/Makefile +--- mplayer-export-2015-02-11/Makefile.ffmpeg 2015-05-06 07:44:45.147716519 +0200 ++++ mplayer-export-2015-02-11/Makefile 2015-05-06 07:44:45.149716539 +0200 +@@ -754,7 +754,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.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- mplayer-snapshot.sh 31 Jan 2015 08:45:06 -0000 1.29 +++ mplayer-snapshot.sh 6 May 2015 06:02:12 -0000 1.30 @@ -13,7 +13,7 @@ unset CDPATH pwd=$(pwd) svn=$(date +%Y-%m-%d) -svn=2015-01-23 +svn=2015-02-11 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.94 retrieving revision 1.95 diff -u -r1.94 -r1.95 --- mplayer.spec 31 Jan 2015 08:45:06 -0000 1.94 +++ mplayer.spec 6 May 2015 06:02:12 -0000 1.95 @@ -1,12 +1,12 @@ %define codecdir %{_libdir}/codecs -%define pre 20150123svn +%define pre 20150211svn %define svn 1 -%define svnbuild 2015-01-23 +%define svnbuild 2015-02-11 %define faad2min 1:2.6.1 Name: mplayer Version: 1.1 -Release: 32.%{?pre}%{?dist} +Release: 33.%{?pre}%{?dist} Summary: Movie player playing most video formats and DVDs %if 0%{!?_without_amr:1} @@ -374,6 +374,10 @@ %{_datadir}/mplayer/*.fp %changelog +* Wed May 06 2015 Julian Sikorski <belegdol(a)fedoraproject.org&gt; - 1.1-33.20150211svn +- 20150211 snapshot +- Updated the ffmpeg patch + * Sat Jan 31 2015 Julian Sikorski <belegdol(a)fedoraproject.org&gt; - 1.1-32.20150123svn - 20150123 snapshot - Internal libdvd* are no more, cleaned up the spec accordingly Index: sources =================================================================== RCS file: /cvs/free/rpms/mplayer/devel/sources,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- sources 31 Jan 2015 08:45:07 -0000 1.48 +++ sources 6 May 2015 06:02:12 -0000 1.49 @@ -1,2 +1,2 @@ d0d7baf1e84ba95f4456c51b50d99b14 Blue-1.10.tar.bz2 -c0f5e1b9847812b76fb107563fda93c5 mplayer-export-2015-01-23.tar.bz2 +7ac27953bb8e71f4698843548b123405 mplayer-export-2015-02-11.tar.bz2