[arch-commits] Commit in vlc/repos (3 files)
Giovanni Scafora
giovanni at archlinux.org
Mon Mar 30 02:05:39 UTC 2009
Date: Sunday, March 29, 2009 @ 22:05:39
Author: giovanni
Revision: 32287
Merged revisions 27480,32285 via svnmerge from
svn+ssh://archlinux.org/srv/svn-packages/vlc/trunk
........
r27480 | eric | 2009-02-21 19:00:40 -0800 (sab, 21 feb 2009) | 2 lines
upgpkg: vlc 0.9.8a-6
Rebuilt against faad2 2.7, Rebuilt against x264 20090216
........
r32285 | giovanni | 2009-03-29 18:47:00 -0700 (dom, 29 mar 2009) | 1 line
upgpkg: vlc 0.9.9-1
........
Added:
vlc/repos/extra-i686/vlc0.9.8a-x264.diff
(from rev 32285, vlc/trunk/vlc0.9.8a-x264.diff)
Modified:
vlc/repos/extra-i686/ (properties)
vlc/repos/extra-i686/PKGBUILD
---------------------+
PKGBUILD | 24 ++++++++----------------
vlc0.9.8a-x264.diff | 19 +++++++++++++++++++
2 files changed, 27 insertions(+), 16 deletions(-)
Property changes on: vlc/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
- /vlc/trunk:1-26026
+ /vlc/trunk:1-32286
Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2009-03-30 01:48:21 UTC (rev 32286)
+++ extra-i686/PKGBUILD 2009-03-30 02:05:39 UTC (rev 32287)
@@ -3,23 +3,23 @@
# Contributor: Sarah Hay <sarahhay at mb.sympatico.ca>
pkgname=vlc
-pkgver=0.9.8a
-pkgrel=5
+pkgver=0.9.9
+pkgrel=1
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' 'fluidsynth' \
'libdvbpsi' 'fribidi' 'sysfsutils' 'libdvdnav' \
'libmatroska' 'zvbi' 'libdvdread' 'libmpcdec' \
- 'libdca' 'libxml2' 'lirc-utils' 'libcddb' 'libraw1394' \
+ 'libdca' 'lirc-utils' 'libcddb' 'libraw1394' \
'smbclient' 'taglib' 'libmodplug' 'avahi' 'libv4l' \
- 'sdl_image' 'libshout' 'lua' 'qt' 'a52dec' 'libgcrypt')
-makedepends=('pkgconfig' 'live-media>=2008.09.02')
+ 'sdl_image' 'libshout' 'lua' 'qt' 'a52dec')
+makedepends=('pkgconfig' 'live-media>=2009.02.23')
optdepends=('libnotify')
-options=('!libtool' 'force')
+options=('!libtool')
source=(http://download.videolan.org/pub/videolan/vlc/${pkgver}/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('8ffa2ff763badd5de7592004d8d69a63')
+md5sums=('b7c2a75194ad5c73979c3d880aebbe38')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
@@ -30,20 +30,12 @@
./configure --prefix=/usr \
--enable-dvdread \
--enable-dvdnav \
- --enable-madi \
- --enable-ffmpeg \
--disable-rpath \
--enable-qt4 \
--enable-faad \
--enable-alsa \
--enable-skins2 \
--enable-dvb \
- --enable-dmo \
- --with-ffmpeg-faac \
- --with-ffmpeg-vorbis \
- --with-ffmpeg-dts \
- --with-ffmpeg-ogg \
- --with-ffmpeg-theora \
--enable-v4l \
--enable-theora \
--enable-flac \
Copied: vlc/repos/extra-i686/vlc0.9.8a-x264.diff (from rev 32285, vlc/trunk/vlc0.9.8a-x264.diff)
===================================================================
--- extra-i686/vlc0.9.8a-x264.diff (rev 0)
+++ extra-i686/vlc0.9.8a-x264.diff 2009-03-30 02:05:39 UTC (rev 32287)
@@ -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;
More information about the arch-commits
mailing list