git » vlc.git » commit 977918e

diff --git a/PKGBUILD b/PKGBUILD
index 30fd643..bbbb4fe 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,25 +3,26 @@
 
 pkgname=vlc
 pkgver=0.9.8a
-pkgrel=5
+pkgrel=6
 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player"
 arch=('i686' 'x86_64')
 url="http://www.videolan.org/vlc/"
 license=('GPL2')
-depends=('libmad' 'libmpeg2' 'ffmpeg>=20081220' 'x264>=20090108' 'fluidsynth' \
+depends=('libmad' 'libmpeg2' 'ffmpeg>=20081220' 'x264>=20090216' 'fluidsynth' \
          'libdvbpsi' 'fribidi' 'sysfsutils' 'libdvdnav' \
          'libmatroska' 'zvbi' 'libdvdread' 'libmpcdec' \
          'libdca' 'libxml2' 'lirc-utils' 'libcddb' 'libraw1394' \
          'smbclient' 'taglib'  'libmodplug' 'avahi' 'libv4l' \
-         'sdl_image' 'libshout' 'lua' 'qt' 'a52dec' 'libgcrypt')
+         'sdl_image' 'libshout' 'lua' 'qt' 'a52dec' 'libgcrypt' 'faad2>=2.7')
 makedepends=('pkgconfig' 'live-media>=2008.09.02')
 optdepends=('libnotify')
 options=('!libtool' 'force')
-source=(http://download.videolan.org/pub/videolan/vlc/${pkgver}/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('8ffa2ff763badd5de7592004d8d69a63')
+source=(http://download.videolan.org/pub/videolan/vlc/${pkgver}/${pkgname}-${pkgver}.tar.bz2 vlc0.9.8a-x264.diff)
+md5sums=('8ffa2ff763badd5de7592004d8d69a63' '61e1db4e1f2652be0a9e7f43cd743152')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
+  patch -p1 < ../vlc0.9.8a-x264.diff || return 1
   sed -i -e 's:#include <vlc\/vlc.h>:#include <vlc/vlc.h> \n #include <locale.h>: ' modules/misc/freetype.c
   sed -i -e 's:/usr/share/fonts/truetype/freefont/FreeSerifBold.ttf:/usr/share/fonts/TTF/VeraBd.ttf:' modules/misc/freetype.c
   [ "${CARCH}" = "i686" ] && EXTRAFEATURES="--enable-loader --enable-live555 --with-live555-tree=/usr/lib/live-media"
diff --git a/vlc0.9.8a-x264.diff b/vlc0.9.8a-x264.diff
new file mode 100644
index 0000000..0f1a557
--- /dev/null
+++ b/vlc0.9.8a-x264.diff
@@ -0,0 +1,19 @@
+X-Git-Url: http://git.videolan.org/?p=vlc.git;a=blobdiff_plain;f=modules%2Fcodec%2Fx264.c;fp=modules%2Fcodec%2Fx264.c;h=68508c940a82b14cbd7ac51fe616c3ae3edf61be;hp=d48bb0d6159d40eb629458c9307cd14e09879eec;hb=9b766c861fc3bea426aeb1ca57aaf1a0b87277e8;hpb=dd90abe6c6e2fa42392c5b2425803d44295ca7ee
+
+diff --git a/modules/codec/x264.c b/modules/codec/x264.c
+index d48bb0d..68508c9 100644
+--- a/modules/codec/x264.c
++++ b/modules/codec/x264.c
+@@ -1122,10 +1122,12 @@ static int  Open ( vlc_object_t *p_this )
+     if( val.i_int >= 0 && val.i_int <= 32 )
+         p_sys->param.analyse.i_luma_deadzone[1] = val.i_int;
+ 
++#if X264_BUILD <= 65
+     var_Get( p_enc, SOUT_CFG_PREFIX "direct-8x8", &val );
+     if( val.i_int >= -1 && val.i_int <= 1 )
+         p_sys->param.analyse.i_direct_8x8_inference = val.i_int;
+ #endif
++#endif
+ 
+     var_Get( p_enc, SOUT_CFG_PREFIX "asm", &val );
+     if( !val.b_bool ) p_sys->param.cpu = 0;