diff --git a/mplayer/.md5sum b/mplayer/.md5sum index b405b7fdb..a8b718851 100644 --- a/mplayer/.md5sum +++ b/mplayer/.md5sum @@ -1,3 +1,4 @@ 1ecd31d17b51f16332b1fcc7da36b312 font-arial-iso-8859-1.tar.bz2 -10c3d697b488354297b4553bfbadcd13 mplayer-1.0_rc2_p27458.tar.bz2 +a89d92b09b3d27ffa9f808383bb614dc mplayer-1.0_rc2_p28058.tar.bz2 +cf872f80e9bfdf046f1519623cdc1d3b mplayer-x264.patch c64631601912913f3e5dfbecc3b79d44 mplayer.conf diff --git a/mplayer/Pkgfile b/mplayer/Pkgfile index bf3f30543..61715e401 100644 --- a/mplayer/Pkgfile +++ b/mplayer/Pkgfile @@ -11,15 +11,18 @@ # http://www.mplayerhq.hu/DOCS/HTML/en/index.html name=mplayer -version=1.0_rc2_p27458 -release=3 +version=1.0_rc2_p28058 +release=1 source=(http://distfiles.gentoo.org/distfiles/$name-$version.tar.bz2 - http://www1.mplayerhq.hu/MPlayer/releases/fonts/font-arial-iso-8859-1.tar.bz2 \ + http://www1.mplayerhq.hu/MPlayer/releases/fonts/font-arial-iso-8859-1.tar.bz2 + $name-x264.patch mplayer.conf) build() { cd $name-$version + patch -p1 -i $SRC/$name-x264.patch + # 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" ./configure --prefix=/usr \ @@ -43,5 +46,6 @@ build() { cp etc/input.conf $PKG/usr/etc/mplayer/ # finish up + rmdir $PKG/usr/lib chown -R root:root $PKG } diff --git a/mplayer/mplayer-x264.patch b/mplayer/mplayer-x264.patch new file mode 100644 index 000000000..793b2fae5 --- /dev/null +++ b/mplayer/mplayer-x264.patch @@ -0,0 +1,12 @@ +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;