9:52 p.m.
Author: rathann
Update of /cvs/free/rpms/mplayer/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv27932
Modified Files:
.cvsignore mplayer-ffmpeg.patch mplayer.spec sources
Log Message:
* Sun Mar 27 2011 Dominik Mierzejewski <rpm at greysector.net> -
1.0-0.122.20110227svn
- 20110227 snapshot
- rebuilt for new ffmpeg and x264
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/mplayer/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore 10 Jan 2011 18:48:43 -0000 1.21
+++ .cvsignore 27 Mar 2011 21:52:45 -0000 1.22
@@ -1,2 +1,3 @@
Blue-1.7.tar.bz2
mplayer-export-2011-01-10.tar.bz2
+mplayer-export-2011-02-27.tar.bz2
mplayer-ffmpeg.patch:
Makefile | 2
configure | 5 +-
ffmpeg/libavformat/riff.h | 41 ++++++++++++++++++
ffmpeg/libavutil/aes.h | 47 +++++++++++++++++++++
ffmpeg/libavutil/sha.h | 56 +++++++++++++++++++++++++
ffmpeg/libavutil/x86_cpu.h | 98 +++++++++++++++++++++++++++++++++++++++++++++
libmpcodecs/vf_pp.c | 2
7 files changed, 247 insertions(+), 4 deletions(-)
Index: mplayer-ffmpeg.patch
===================================================================
RCS file: /cvs/free/rpms/mplayer/devel/mplayer-ffmpeg.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mplayer-ffmpeg.patch 10 Jan 2011 18:48:43 -0000 1.1
+++ mplayer-ffmpeg.patch 27 Mar 2011 21:52:45 -0000 1.2
@@ -1,28 +1,28 @@
-diff -up mplayer-export-2011-01-10/configure.ffmpeg mplayer-export-2011-01-10/configure
---- mplayer-export-2011-01-10/configure.ffmpeg 2011-01-10 19:04:02.000000000 +0100
-+++ mplayer-export-2011-01-10/configure 2011-01-10 19:05:23.000000000 +0100
-@@ -6866,7 +6866,8 @@ elif test "$ffmpeg_so" = auto ; then
- inc_ffmpeg=$($_pkg_config --cflags libpostproc libswscale libavformat libavcodec
libavutil libavcore)
- _ld_tmp=$($_pkg_config --libs libpostproc libswscale libavformat libavcodec
libavutil libavcore)
- header_check libavcore/avcore.h $inc_ffmpeg $_ld_tmp &&
+diff -up mplayer-export-2011-02-27/configure.ffmpeg mplayer-export-2011-02-27/configure
+--- mplayer-export-2011-02-27/configure.ffmpeg 2011-03-23 19:39:17.000000000 +0100
++++ mplayer-export-2011-02-27/configure 2011-03-23 19:42:40.000000000 +0100
+@@ -6887,7 +6887,8 @@ elif test "$ffmpeg_so" = auto ; then
+ inc_ffmpeg=$($_pkg_config --cflags libpostproc libswscale libavformat libavcodec
libavutil)
+ _ld_tmp=$($_pkg_config --libs libpostproc 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 libavcore/avcore.h -lpostproc -lswscale -lavformat -lavcodec
-lavutil -lavcore $_ld_lm ; then
- extra_ldflags="$extra_ldflags -lpostproc -lswscale -lavformat -lavcodec
-lavutil -lavcore"
+ elif header_check libavutil/avutil.h -lpostproc -lswscale -lavformat -lavcodec
-lavutil $_ld_lm ; then
+ extra_ldflags="$extra_ldflags -lpostproc -lswscale -lavformat -lavcodec
-lavutil"
ffmpeg_so=yes
-@@ -7553,7 +7554,7 @@ if test "$_gui" = yes ; then
+@@ -7574,7 +7575,7 @@ if test "$_gui" = yes ; then
# Required libraries
if test "$ffmpeg" != yes ||
- ! echo $libavdecoders | grep -q PNG_DECODER ; then
-+ ! objdump -T $_libdir/libavcodec.so | grep -q png_decoder ; then
++ ! objdump -T $_libdir/libavcodec.so | grep -q ff_png ; then
die "The GUI requires libavcodec with PNG support (needs zlib)."
fi
test "$_freetype" = no && test "$_bitmap_font" = no
&&
-diff -up mplayer-export-2011-01-10/ffmpeg/libavformat/riff.h.ffmpeg
mplayer-export-2011-01-10/ffmpeg/libavformat/riff.h
---- mplayer-export-2011-01-10/ffmpeg/libavformat/riff.h.ffmpeg 2011-01-10
19:04:02.000000000 +0100
-+++ mplayer-export-2011-01-10/ffmpeg/libavformat/riff.h 2011-01-10 19:05:57.000000000
+0100
+diff -up mplayer-export-2011-02-27/ffmpeg/libavformat/riff.h.ffmpeg
mplayer-export-2011-02-27/ffmpeg/libavformat/riff.h
+--- mplayer-export-2011-02-27/ffmpeg/libavformat/riff.h.ffmpeg 2011-03-23
19:39:17.000000000 +0100
++++ mplayer-export-2011-02-27/ffmpeg/libavformat/riff.h 2011-03-23 19:39:17.000000000
+0100
@@ -0,0 +1,41 @@
+/*
+ * RIFF codec tags
@@ -65,9 +65,9 @@
+extern const AVCodecTag ff_codec_wav_tags[];
+
+#endif /* AVFORMAT_RIFF_H */
-diff -up mplayer-export-2011-01-10/ffmpeg/libavutil/aes.h.ffmpeg
mplayer-export-2011-01-10/ffmpeg/libavutil/aes.h
---- mplayer-export-2011-01-10/ffmpeg/libavutil/aes.h.ffmpeg 2011-01-10 19:04:02.000000000
+0100
-+++ mplayer-export-2011-01-10/ffmpeg/libavutil/aes.h 2011-01-10 19:04:02.000000000 +0100
+diff -up mplayer-export-2011-02-27/ffmpeg/libavutil/aes.h.ffmpeg
mplayer-export-2011-02-27/ffmpeg/libavutil/aes.h
+--- mplayer-export-2011-02-27/ffmpeg/libavutil/aes.h.ffmpeg 2011-03-23 19:39:17.000000000
+0100
++++ mplayer-export-2011-02-27/ffmpeg/libavutil/aes.h 2011-03-23 19:39:17.000000000 +0100
@@ -0,0 +1,47 @@
+/*
+ * copyright (c) 2007 Michael Niedermayer <michaelni(a)gmx.at>
@@ -116,9 +116,9 @@
+void av_aes_crypt(struct AVAES *a, uint8_t *dst, const uint8_t *src, int count, uint8_t
*iv, int decrypt);
+
+#endif /* AVUTIL_AES_H */
-diff -up mplayer-export-2011-01-10/ffmpeg/libavutil/sha.h.ffmpeg
mplayer-export-2011-01-10/ffmpeg/libavutil/sha.h
---- mplayer-export-2011-01-10/ffmpeg/libavutil/sha.h.ffmpeg 2011-01-10 19:04:02.000000000
+0100
-+++ mplayer-export-2011-01-10/ffmpeg/libavutil/sha.h 2011-01-10 19:04:02.000000000 +0100
+diff -up mplayer-export-2011-02-27/ffmpeg/libavutil/sha.h.ffmpeg
mplayer-export-2011-02-27/ffmpeg/libavutil/sha.h
+--- mplayer-export-2011-02-27/ffmpeg/libavutil/sha.h.ffmpeg 2011-03-23 19:39:17.000000000
+0100
++++ mplayer-export-2011-02-27/ffmpeg/libavutil/sha.h 2011-03-23 19:39:17.000000000 +0100
@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) 2007 Michael Niedermayer <michaelni(a)gmx.at>
@@ -176,9 +176,9 @@
+void av_sha_final(struct AVSHA* context, uint8_t *digest);
+
+#endif /* AVUTIL_SHA_H */
-diff -up mplayer-export-2011-01-10/ffmpeg/libavutil/x86_cpu.h.ffmpeg
mplayer-export-2011-01-10/ffmpeg/libavutil/x86_cpu.h
---- mplayer-export-2011-01-10/ffmpeg/libavutil/x86_cpu.h.ffmpeg 2011-01-10
19:04:02.000000000 +0100
-+++ mplayer-export-2011-01-10/ffmpeg/libavutil/x86_cpu.h 2011-01-10 19:04:02.000000000
+0100
+diff -up mplayer-export-2011-02-27/ffmpeg/libavutil/x86_cpu.h.ffmpeg
mplayer-export-2011-02-27/ffmpeg/libavutil/x86_cpu.h
+--- mplayer-export-2011-02-27/ffmpeg/libavutil/x86_cpu.h.ffmpeg 2011-03-23
19:39:17.000000000 +0100
++++ mplayer-export-2011-02-27/ffmpeg/libavutil/x86_cpu.h 2011-03-23 19:39:17.000000000
+0100
@@ -0,0 +1,98 @@
+/*
+ * copyright (c) 2006 Michael Niedermayer <michaelni(a)gmx.at>
@@ -278,9 +278,9 @@
+#endif
+
+#endif /* AVUTIL_X86_CPU_H */
-diff -up mplayer-export-2011-01-10/libmpcodecs/vf_pp.c.ffmpeg
mplayer-export-2011-01-10/libmpcodecs/vf_pp.c
---- mplayer-export-2011-01-10/libmpcodecs/vf_pp.c.ffmpeg 2010-09-13 20:19:25.000000000
+0200
-+++ mplayer-export-2011-01-10/libmpcodecs/vf_pp.c 2011-01-10 19:04:02.000000000 +0100
+diff -up mplayer-export-2011-02-27/libmpcodecs/vf_pp.c.ffmpeg
mplayer-export-2011-02-27/libmpcodecs/vf_pp.c
+--- mplayer-export-2011-02-27/libmpcodecs/vf_pp.c.ffmpeg 2011-02-04 11:01:46.000000000
+0100
++++ mplayer-export-2011-02-27/libmpcodecs/vf_pp.c 2011-03-23 19:39:17.000000000 +0100
@@ -34,10 +34,10 @@
#include "img_format.h"
#include "mp_image.h"
@@ -293,10 +293,10 @@
#define EMU_OLD
#include "libpostproc/postprocess_internal.h"
#endif
-diff -up mplayer-export-2011-01-10/Makefile.ffmpeg mplayer-export-2011-01-10/Makefile
---- mplayer-export-2011-01-10/Makefile.ffmpeg 2011-01-10 19:04:02.000000000 +0100
-+++ mplayer-export-2011-01-10/Makefile 2011-01-10 19:04:02.000000000 +0100
-@@ -810,7 +810,7 @@ mencoder$(EXESUF) mplayer$(EXESUF):
+diff -up mplayer-export-2011-02-27/Makefile.ffmpeg mplayer-export-2011-02-27/Makefile
+--- mplayer-export-2011-02-27/Makefile.ffmpeg 2011-03-23 19:39:17.000000000 +0100
++++ mplayer-export-2011-02-27/Makefile 2011-03-23 19:39:17.000000000 +0100
+@@ -808,7 +808,7 @@ mencoder$(EXESUF) mplayer$(EXESUF):
$(CC) -o $@ $^ $(EXTRALIBS)
codec-cfg$(EXESUF): codec-cfg.c codec-cfg.h help_mp.h
Index: mplayer.spec
===================================================================
RCS file: /cvs/free/rpms/mplayer/devel/mplayer.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- mplayer.spec 27 Mar 2011 16:58:17 -0000 1.35
+++ mplayer.spec 27 Mar 2011 21:52:45 -0000 1.36
@@ -1,12 +1,12 @@
%define codecdir %{_libdir}/codecs
-%define pre 20110110svn
+%define pre 20110227svn
%define svn 1
-%define svnbuild 2011-01-10
+%define svnbuild 2011-02-27
%define faad2min 1:2.6.1
Name: mplayer
Version: 1.0
-Release: 0.121.%{pre}%{?dist}
+Release: 0.122.%{pre}%{?dist}
Summary: Movie player playing most video formats and DVDs
Group: Applications/Multimedia
@@ -399,6 +399,10 @@
%{_datadir}/mplayer/*.fp
%changelog
+* Sun Mar 27 2011 Dominik Mierzejewski <rpm at greysector.net> -
1.0-0.122.20110227svn
+- 20110227 snapshot
+- rebuilt for new ffmpeg and x264
+
* Sun Mar 27 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 1.0-0.121.20110110svn
- Rebuild for x264
Index: sources
===================================================================
RCS file: /cvs/free/rpms/mplayer/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources 10 Jan 2011 18:48:43 -0000 1.22
+++ sources 27 Mar 2011 21:52:45 -0000 1.23
@@ -1,2 +1,3 @@
e4e2020d11b681aac898103b3ba723c4 Blue-1.7.tar.bz2
d1c8316979ec850a8b345a08775739e7 mplayer-export-2011-01-10.tar.bz2
+98d92317fbadd65a404c1a1524fa6ad3 mplayer-export-2011-02-27.tar.bz2