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

[Eric Bélanger]

    Date: Tuesday, March 31, 2009 @ 16:11:26
  Author: eric
Revision: 32469

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

........
  r32285 | giovanni | 2009-03-29 21:47:00 -0400 (Sun, 29 Mar 2009) | 1 line
  
  upgpkg: vlc 0.9.9-1
........
  r32467 | eric | 2009-03-31 15:27:51 -0400 (Tue, 31 Mar 2009) | 2 lines
  
  upgpkg: vlc 0.9.9-2
      Rebuild against x264, Removed old patch
........

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

---------------------+
 PKGBUILD            |   27 +++++++++------------------
 vlc0.9.8a-x264.diff |   19 -------------------
 2 files changed, 9 insertions(+), 37 deletions(-)


Property changes on: vlc/repos/testing-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /vlc/trunk:1-27553
   + /vlc/trunk:1-32468

Modified: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD	2009-03-31 19:28:10 UTC (rev 32468)
+++ testing-i686/PKGBUILD	2009-03-31 20:11:26 UTC (rev 32469)
@@ -3,27 +3,26 @@
 # Contributor: Sarah Hay <sarahhay at mb.sympatico.ca>
 
 pkgname=vlc
-pkgver=0.9.8a
-pkgrel=6
+pkgver=0.9.9
+pkgrel=2
 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>=20090216' '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' 'faad2>=2.7')
-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')
-source=(http://download.videolan.org/pub/videolan/vlc/${pkgver}/${pkgname}-${pkgver}.tar.bz2 vlc0.9.8a-x264.diff)
-md5sums=('8ffa2ff763badd5de7592004d8d69a63' '61e1db4e1f2652be0a9e7f43cd743152')
+options=('!libtool')
+source=(http://download.videolan.org/pub/videolan/vlc/${pkgver}/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('b7c2a75194ad5c73979c3d880aebbe38')
 
 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"
@@ -31,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 \

Deleted: testing-i686/vlc0.9.8a-x264.diff
===================================================================
--- testing-i686/vlc0.9.8a-x264.diff	2009-03-31 19:28:10 UTC (rev 32468)
+++ testing-i686/vlc0.9.8a-x264.diff	2009-03-31 20:11:26 UTC (rev 32469)
@@ -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;