From 8a717bc0d2bd7d93cddace3b91ae0524bc07261a Mon Sep 17 00:00:00 2001
From: Dominik Mierzejewski <dominik@greysector.net>
Date: Sun, 27 Mar 2011 21:52:45 +0000
Subject: [PATCH] * Sun Mar 27 2011 Dominik Mierzejewski <rpm at
 greysector.net> - 1.0-0.122.20110227svn - 20110227 snapshot - rebuilt for new
 ffmpeg and x264

---
 .gitignore           |  1 +
 mplayer-ffmpeg.patch | 60 ++++++++++++++++++++++----------------------
 mplayer.spec         | 10 +++++---
 sources              |  1 +
 4 files changed, 39 insertions(+), 33 deletions(-)

diff --git a/.gitignore b/.gitignore
index dba4b85..2eee0eb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 Blue-1.7.tar.bz2
 mplayer-export-2011-01-10.tar.bz2
+mplayer-export-2011-02-27.tar.bz2
diff --git a/mplayer-ffmpeg.patch b/mplayer-ffmpeg.patch
index 001b6af..8d2539d 100644
--- a/mplayer-ffmpeg.patch
+++ b/mplayer-ffmpeg.patch
@@ -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 @@ diff -up mplayer-export-2011-01-10/ffmpeg/libavformat/riff.h.ffmpeg mplayer-expo
 +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@gmx.at>
@@ -116,9 +116,9 @@ diff -up mplayer-export-2011-01-10/ffmpeg/libavutil/aes.h.ffmpeg mplayer-export-
 +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@gmx.at>
@@ -176,9 +176,9 @@ diff -up mplayer-export-2011-01-10/ffmpeg/libavutil/sha.h.ffmpeg mplayer-export-
 +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@gmx.at>
@@ -278,9 +278,9 @@ diff -up mplayer-export-2011-01-10/ffmpeg/libavutil/x86_cpu.h.ffmpeg mplayer-exp
 +#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 @@ diff -up mplayer-export-2011-01-10/libmpcodecs/vf_pp.c.ffmpeg mplayer-export-201
  #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
diff --git a/mplayer.spec b/mplayer.spec
index 8dbf412..dbbca82 100644
--- a/mplayer.spec
+++ b/mplayer.spec
@@ -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 @@ rm -rf $RPM_BUILD_ROOT
 %{_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@gmail.com> - 1.0-0.121.20110110svn
 - Rebuild for x264
 
diff --git a/sources b/sources
index 357fa2a..90f1e66 100644
--- a/sources
+++ b/sources
@@ -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