[arch-commits] Commit in vlc/repos (3 files)

[Giovanni Scafora]

    Date: Wednesday, April 1, 2009 @ 11:06:15
  Author: giovanni
Revision: 32841

Merged revisions 32467,32840 via svnmerge from 
svn+ssh://archlinux.org/srv/svn-packages/vlc/trunk

........
  r32467 | eric | 2009-03-31 12:27:51 -0700 (mar, 31 mar 2009) | 2 lines
  
  upgpkg: vlc 0.9.9-2
      Rebuild against x264, Removed old patch
........
  r32840 | giovanni | 2009-04-01 08:04:49 -0700 (mer, 01 apr 2009) | 2 lines
  
  upgpkg: vlc 0.9.9-3
      Fixed depends and makedepends fields
........

Modified:
  vlc/repos/extra-x86_64/	(properties)
  vlc/repos/extra-x86_64/PKGBUILD
Deleted:
  vlc/repos/extra-x86_64/vlc0.9.8a-x264.diff

---------------------+
 PKGBUILD            |   11 +++++------
 vlc0.9.8a-x264.diff |   19 -------------------
 2 files changed, 5 insertions(+), 25 deletions(-)


Property changes on: vlc/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /vlc/trunk:1-32285
   + /vlc/trunk:1-32840

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-04-01 15:04:49 UTC (rev 32840)
+++ extra-x86_64/PKGBUILD	2009-04-01 15:06:15 UTC (rev 32841)
@@ -4,7 +4,7 @@
 
 pkgname=vlc
 pkgver=0.9.9
-pkgrel=1
+pkgrel=3
 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player"
 arch=('i686' 'x86_64')
 url="http://www.videolan.org/vlc/"
@@ -14,17 +14,16 @@
          'libmatroska' 'zvbi' 'libdvdread' 'libmpcdec' \
          'libdca' 'lirc-utils' 'libcddb' 'libraw1394' \
          'smbclient' 'taglib'  'libmodplug' 'avahi' 'libv4l' \
-         'sdl_image' 'libshout' 'lua' 'qt' 'a52dec')
-makedepends=('pkgconfig' 'live-media>=2009.02.23')
+         'sdl_image' 'libshout' 'lua' 'qt' 'a52dec' 'ttf-dejavu')
+makedepends=('pkgconfig' 'live-media>=2009.02.23' 'ttf-dejavu')
 optdepends=('libnotify')
 options=('!libtool')
-source=(http://download.videolan.org/pub/videolan/vlc/${pkgver}/${pkgname}-${pkgver}.tar.bz2)
+source=(http://download.videolan.org/pub/videolan/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2)
 md5sums=('b7c2a75194ad5c73979c3d880aebbe38')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  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
+  sed -i -e 's:/usr/share/fonts/truetype/freefont/FreeSerifBold.ttf:/usr/share/fonts/TTF/DejaVuSerif-Bold.ttf:' modules/misc/freetype.c
   [ "${CARCH}" = "i686" ] && EXTRAFEATURES="--enable-loader --enable-live555 --with-live555-tree=/usr/lib/live-media"
   [ "${CARCH}" = "x86_64" ] && EXTRAFEATURES="--enable-fast-install --enable-live555 --with-live555-tree=/usr/lib/live-media"
   ./configure --prefix=/usr \

Deleted: extra-x86_64/vlc0.9.8a-x264.diff
===================================================================
--- extra-x86_64/vlc0.9.8a-x264.diff	2009-04-01 15:04:49 UTC (rev 32840)
+++ extra-x86_64/vlc0.9.8a-x264.diff	2009-04-01 15:06:15 UTC (rev 32841)
@@ -1,19 +0,0 @@
-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;