[arch-commits] Commit in mplayer/trunk (PKGBUILD mplayer-libx264.patch)

[Eric Bélanger]

    Date: Sunday, January 11, 2009 @ 18:17:30
  Author: eric
Revision: 24015

upgpkg: mplayer 1.0rc2-10
    rebuilt against x264 20090108

Added:
  mplayer/trunk/mplayer-libx264.patch
Modified:
  mplayer/trunk/PKGBUILD

-----------------------+
 PKGBUILD              |   14 +++++++++-----
 mplayer-libx264.patch |   36 ++++++++++++++++++++++++++++++++++++
 2 files changed, 45 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-01-11 23:11:54 UTC (rev 24014)
+++ PKGBUILD	2009-01-11 23:17:30 UTC (rev 24015)
@@ -2,13 +2,13 @@
 # Maintainer: Thomas Bächler <thomas at archlinux.org>
 pkgname=mplayer
 pkgver=1.0rc2
-pkgrel=9
+pkgrel=10
 pkgdesc="A movie player for linux"
 arch=(i686 x86_64)
 depends=('libxxf86dga' 'libxv' 'libmad' 'giflib' 'cdparanoia' 'gtk2'
          'sdl' 'lame' 'libtheora' 'xvidcore' 'zlib'
          'libgl' 'smbclient' 'aalib' 'jack-audio-connection-kit'
-         'x264>=20080625' 'faac' 'lirc-utils' 'ttf-dejavu' 'fribidi')
+         'x264>=20090108' 'faac' 'lirc-utils' 'ttf-dejavu' 'fribidi')
 license=('GPL')
 url="http://www.mplayerhq.hu/"
 makedepends=('libcaca' 'unzip' 'live-media' 'libdca' 'mesa')
@@ -19,11 +19,12 @@
         http://www.mplayerhq.hu/MPlayer/patches/demux_mov_fix_20080129.diff
         http://www.mplayerhq.hu/MPlayer/patches/url_fix_20080120.diff
         http://www.mplayerhq.hu/MPlayer/patches/stream_cddb_fix_20080120.diff
-	ivtv_2.6.24.patch mplayer_desktop.patch)
+	ivtv_2.6.24.patch mplayer_desktop.patch mplayer-libx264.patch)
 md5sums=('7e27e535c2d267637df34898f1b91707' 'e4e2020d11b681aac898103b3ba723c4'\
          '320af7daa1b248ee8e8c15d34d7923e3' 'ce999929155f509a3e6bee41d9d613ed'\
          '6a2c124586e1e6c44ae4ca1b4be9b6e4' 'c7d1bcdd61fcceb7598d61fe2213c587'\
-         '1ef35068587f6b6dbc99342567895236' '4c49195a4a1702f0cb321abdc3c07741')
+         '1ef35068587f6b6dbc99342567895236' '4c49195a4a1702f0cb321abdc3c07741'\
+         'aa30511c30af372205aef56498990010')
 
 build() {
   cd ${srcdir}/MPlayer-${pkgver}
@@ -44,7 +45,10 @@
   for p in demux_audio_fix_20080129.diff demux_mov_fix_20080129.diff url_fix_20080120.diff stream_cddb_fix_20080120.diff; do
     patch -p0 -i ../${p}
   done
-  
+
+  # Fix build issue with x264>=20090108
+  patch -p1 < ../mplayer-libx264.patch || return 1
+
   cd ${srcdir}/MPlayer-${pkgver}
 
   ./configure --prefix=/usr --enable-gui --disable-arts --enable-x11 \

Added: mplayer-libx264.patch
===================================================================
--- mplayer-libx264.patch	                        (rev 0)
+++ mplayer-libx264.patch	2009-01-11 23:17:30 UTC (rev 24015)
@@ -0,0 +1,36 @@
+diff -ur ffmpeg.orig/libavcodec/libx264.c ffmpeg/libavcodec/libx264.c
+--- ffmpeg.orig/libavcodec/libx264.c	2008-03-25 16:34:49.000000000 -0700
++++ ffmpeg/libavcodec/libx264.c	2008-10-07 22:01:13.293938864 -0700
+@@ -162,7 +162,11 @@
+ 
+     x4->params.i_bframe = avctx->max_b_frames;
+     x4->params.b_cabac = avctx->coder_type == FF_CODER_TYPE_AC;
++#if X264_BUILD > 62
++    x4->params.i_bframe_adaptive = avctx->b_frame_strategy;
++#else
+     x4->params.b_bframe_adaptive = avctx->b_frame_strategy;
++#endif
+     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;
+@@ -225,8 +229,10 @@
+     x4->params.analyse.i_me_range = avctx->me_range;
+     x4->params.analyse.i_subpel_refine = avctx->me_subpel_quality;
+ 
++#if X264_BUILD < 65
+     x4->params.analyse.b_bidir_me = (avctx->bidir_refine > 0);
+     x4->params.analyse.b_bframe_rdo = (avctx->flags2 & CODEC_FLAG2_BRDO);
++#endif
+     x4->params.analyse.b_mixed_references =
+         (avctx->flags2 & CODEC_FLAG2_MIXED_REFS);
+     x4->params.analyse.b_chroma_me = (avctx->me_cmp & FF_CMP_CHROMA);
+@@ -251,7 +257,9 @@
+     x4->params.rc.f_ip_factor = 1/fabs(avctx->i_quant_factor);
+     x4->params.rc.f_pb_factor = avctx->b_quant_factor;
+     x4->params.analyse.i_chroma_qp_offset = avctx->chromaoffset;
++#if X264_BUILD < 61
+     x4->params.rc.psz_rc_eq = avctx->rc_eq;
++#endif
+ 
+     x4->params.analyse.b_psnr = (avctx->flags & CODEC_FLAG_PSNR);
+     x4->params.i_log_level = X264_LOG_DEBUG;