From ab9954d5f59ed1a4f024f0560e17e125b238ce29 Mon Sep 17 00:00:00 2001
From: Julian Sikorski <belegdol@gmail.com>
Date: Thu, 27 Mar 2014 03:03:28 +0000
Subject: [PATCH] * Thu Mar 27 2014 Julian Sikorski
 <belegdol@fedoraproject.org> - 1.1-21.20140327svn - 20140327 snapshot

---
 .gitignore           |  2 +-
 mplayer-ffmpeg.patch | 30 +++++++++---------------------
 mplayer-snapshot.sh  |  2 +-
 mplayer.spec         |  9 ++++++---
 sources              |  2 +-
 5 files changed, 18 insertions(+), 27 deletions(-)

diff --git a/.gitignore b/.gitignore
index 1eebdd4..93af61e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
 Blue-1.8.tar.bz2
-mplayer-export-2014-03-01.tar.bz2
+mplayer-export-2014-03-27.tar.bz2
diff --git a/mplayer-ffmpeg.patch b/mplayer-ffmpeg.patch
index 8e7520c..27c6228 100644
--- a/mplayer-ffmpeg.patch
+++ b/mplayer-ffmpeg.patch
@@ -1,18 +1,6 @@
-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 &&
--      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 libavutil/avutil.h -lswscale -lavformat -lavcodec -lavutil ; then
-     extra_ldflags="$extra_ldflags -lswscale -lavformat -lavcodec -lavutil"
-     ffmpeg_so=yes
-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
+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
 @@ -0,0 +1,32 @@
 +/*
 + * copyright (c) 2001 Fabrice Bellard
@@ -46,9 +34,9 @@ diff -up mplayer-export-2014-03-01/ffmpeg/libavformat/internal.h.ffmpeg mplayer-
 +} AVCodecTag;
 +
 +#endif /* AVFORMAT_INTERNAL_H */
-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
+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 @@
 +/*
 + * copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at>
@@ -162,9 +150,9 @@ diff -up mplayer-export-2014-03-01/ffmpeg/libavutil/x86/asm.h.ffmpeg mplayer-exp
 +#define MANGLE(a) EXTERN_PREFIX LOCAL_MANGLE(a)
 +
 +#endif /* AVUTIL_X86_ASM_H */
-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
+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):
  codec-cfg-test$(EXESUF): HOSTCFLAGS := $(HOSTCFLAGS) -DTESTING
  codec-cfg$(EXESUF) codecs2html$(EXESUF):  HOSTCFLAGS := $(HOSTCFLAGS) -DCODECS2HTML
diff --git a/mplayer-snapshot.sh b/mplayer-snapshot.sh
index 43fce60..84cddd3 100755
--- a/mplayer-snapshot.sh
+++ b/mplayer-snapshot.sh
@@ -13,7 +13,7 @@ cleanup() {
 unset CDPATH
 pwd=$(pwd)
 svn=$(date +%Y-%m-%d)
-svn=2014-03-01
+svn=2014-03-27
 dirname=mplayer-export-$svn
 mplayer_rev={$svn}
 #mplayer_rev=HEAD
diff --git a/mplayer.spec b/mplayer.spec
index 636a477..fcec9d9 100644
--- a/mplayer.spec
+++ b/mplayer.spec
@@ -1,12 +1,12 @@
 %define         codecdir %{_libdir}/codecs
-%define         pre 20140301svn
+%define         pre 20140327svn
 %define         svn 1
-%define         svnbuild 2014-03-01
+%define         svnbuild 2014-03-27
 %define         faad2min 1:2.6.1
 
 Name:           mplayer
 Version:        1.1
-Release:        20.%{?pre}%{?dist}
+Release:        21.%{?pre}%{?dist}
 Summary:        Movie player playing most video formats and DVDs
 
 %if 0%{!?_without_amr:1}
@@ -380,6 +380,9 @@ update-desktop-database &>/dev/null || :
 %{_datadir}/mplayer/*.fp
 
 %changelog
+* Thu Mar 27 2014 Julian Sikorski <belegdol@fedoraproject.org> - 1.1-21.20140327svn
+- 20140327 snapshot
+
 * Sat Mar 01 2014 Julian Sikorski <belegdol@fedoraproject.org> - 1.1-20.20140301svn
 - 20140301 snapshot
 
diff --git a/sources b/sources
index 3ce531c..8578323 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 340368f4e33f767d9df109990fb29c02  Blue-1.8.tar.bz2
-5048b11765630664508888bdce26244f  mplayer-export-2014-03-01.tar.bz2
+1e1f961f11ad329edfd9ebd6420eee4c  mplayer-export-2014-03-27.tar.bz2