From dd81c5c818d6223dd76cb22c89d809fd5016cb6b Mon Sep 17 00:00:00 2001
From: Lucas Hazel <lucas@die.net.au>
Date: Sat, 25 Jul 2009 22:17:42 +1000
Subject: [PATCH] mplayer: update snapshot, playing with CFLAGS breaks playback
 for some media

---
 mplayer/.md5sum            |  2 +-
 mplayer/Pkgfile            | 15 +++++++--------
 mplayer/mplayer-x264.patch | 12 ------------
 3 files changed, 8 insertions(+), 21 deletions(-)
 delete mode 100644 mplayer/mplayer-x264.patch

diff --git a/mplayer/.md5sum b/mplayer/.md5sum
index ae56c8a49..1b1ad9013 100644
--- a/mplayer/.md5sum
+++ b/mplayer/.md5sum
@@ -1,3 +1,3 @@
 1ecd31d17b51f16332b1fcc7da36b312  font-arial-iso-8859-1.tar.bz2
-4b981f3fa303dada80df34bed6b0cdd0  mplayer-20090226.28734.tar.bz2
+7fc628ed82eb919a76cfab1a8a3f950c  mplayer-export-2009-07-25.tar.bz2
 c64631601912913f3e5dfbecc3b79d44  mplayer.conf
diff --git a/mplayer/Pkgfile b/mplayer/Pkgfile
index 2c2679618..007e146ce 100644
--- a/mplayer/Pkgfile
+++ b/mplayer/Pkgfile
@@ -6,9 +6,9 @@
 # Nice to have: libsdl, libjpeg, libpng, lame, zlib, libogg, libvorbis, cdparanoia, win32-essential-codecs, faac, x264, libdvdnav
 
 name=mplayer
-version=20090226.28734
+version=export-2009-07-25
 release=1
-source=(http://distfiles.gentoo.org/distfiles/$name-$version.tar.bz2
+source=(http://crux.nu/~lucas/files/$name-$version.tar.bz2
 	http://www1.mplayerhq.hu/MPlayer/releases/fonts/font-arial-iso-8859-1.tar.bz2
 	mplayer.conf)
 
@@ -16,12 +16,11 @@ build() {
 	cd $name-$version
 
 	# Keep in line with mplayer CFLAGS, but allow people to set their own march/mtune values.
-	export CFLAGS="$(echo $CFLAGS | sed -e 's/-O[s0-3]/-O3/') -ffast-math -fomit-frame-pointer"
+	#export CFLAGS="$(echo $CFLAGS | sed -e 's/-O[s0-3]/-O3/') -ffast-math -fomit-frame-pointer"
 	./configure --prefix=/usr \
-		--mandir=/usr/man \
-		--win32codecsdir=/usr/lib/win32 \
-		--enable-largefiles
-
+	    --mandir=/usr/man \
+	    --codecsdir=/usr/lib/amd64 \
+	    --enable-largefiles
 	make
 	make DESTDIR=$PKG install
 
@@ -39,5 +38,5 @@ build() {
 
 	# finish up
 	rmdir $PKG/usr/lib
-	chown -R root:root $PKG
+	find $PKG -name '*.desc' | xargs chmod g-w
 }
diff --git a/mplayer/mplayer-x264.patch b/mplayer/mplayer-x264.patch
deleted file mode 100644
index 793b2fae5..000000000
--- a/mplayer/mplayer-x264.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN mplayer-1.0_rc2_p28058/libavcodec/libx264.c mplayer-1.0_rc2_p28058-new/libavcodec/libx264.c
---- mplayer-1.0_rc2_p28058/libavcodec/libx264.c	2008-12-02 13:56:20.000000000 +1100
-+++ mplayer-1.0_rc2_p28058-new/libavcodec/libx264.c	2008-12-03 00:54:35.824823293 +1100
-@@ -164,7 +164,7 @@
- 
-     x4->params.i_bframe = avctx->max_b_frames;
-     x4->params.b_cabac = avctx->coder_type == FF_CODER_TYPE_AC;
--    x4->params.i_bframe_adaptive = avctx->b_frame_strategy;
-+    x4->params.b_bframe_adaptive = avctx->b_frame_strategy;
-     x4->params.i_bframe_bias = avctx->bframebias;
-     x4->params.b_bframe_pyramid = avctx->flags2 & CODEC_FLAG2_BPYRAMID;
-     avctx->has_b_frames= avctx->flags2 & CODEC_FLAG2_BPYRAMID ? 2 : !!avctx->max_b_frames;