[arch-commits] Commit in vlc/trunk (PKGBUILD)

[Giovanni Scafora]

    Date: Sunday, February 27, 2011 @ 15:48:01
  Author: giovanni
Revision: 111615

upgpkg: vlc 1.1.7-4
Fixed FS23037

Modified:
  vlc/trunk/PKGBUILD

----------+
 PKGBUILD |   17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-02-27 20:42:15 UTC (rev 111614)
+++ PKGBUILD	2011-02-27 20:48:01 UTC (rev 111615)
@@ -3,20 +3,16 @@
 # Contributor: Sarah Hay <sarahhay at mb.sympatico.ca>
 # Contributor: Martin Sandsmark <martin.sandsmark at kde.org>
 
-# Warning: VLC 1.1.7 cannot be compiled with the new versions 
-# of matroska: libebml-1.2.0, libmatroska-1.1.0, mkvtoolnix-4.5.0
-# For more look at http://forum.videolan.org/viewtopic.php?f=13&t=87044
-
 pkgbase=vlc
 pkgname=('vlc' 'vlc-plugin')
 pkgver=1.1.7
-pkgrel=3
+pkgrel=4
 arch=('i686' 'x86_64')
 url="http://www.videolan.org/vlc/"
 license=('GPL')
 makedepends=('a52dec' 'fluidsynth' 'libmtp' 'libdvbpsi' 'lirc-utils'
              'libdca' 'qt' 'libproxy' 'sdl_image' 'libdvdnav' 'mesa'
-             'lua' 'v4l-utils' 'libcddb' 'smbclient' 'zvbi'
+             'lua' 'v4l-utils' 'libcddb' 'smbclient' 'libmatroska' 'zvbi'
              'taglib' 'sysfsutils' 'libmpcdec' 'ffmpeg' 'faad2'
              'libshout' 'libmad' 'fribidi' 'libmpeg2' 'libmodplug'
              'avahi' 'ttf-freefont' 'libxv' 'libass' 'xdg-utils' 'libxpm'
@@ -24,12 +20,15 @@
              'flac' 'libtheora' 'alsa-lib' 'jack' 'kdelibs' 'udev'
              'libraw1394' 'libdc1394' 'libavc1394' 'libva' 'libpulse')
 options=('!libtool')
-source=("http://download.videolan.org/pub/videolan/${pkgbase}/${pkgver}/${pkgbase}-${pkgver}.tar.bz2")
-md5sums=('932ce1fa4afa54b56ac0ccc0655667b6')
+source=("http://download.videolan.org/pub/videolan/${pkgbase}/${pkgver}/${pkgbase}-${pkgver}.tar.bz2"
+        vlc-1.1.7-libmatroska.patch)
+md5sums=('932ce1fa4afa54b56ac0ccc0655667b6'
+         'd03b0a4f3d2a0ece5c0a9e1a2919dec0')
 
 build() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
 
+  patch -Np1 -i ${srcdir}/vlc-1.1.7-libmatroska.patch
   sed -i -e 's:truetype/freefont:TTF:g' modules/misc/freetype.c
   ./configure --prefix=/usr \
               --disable-rpath \
@@ -51,7 +50,7 @@
   pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player"
   depends=('a52dec' 'fluidsynth' 'libmtp' 'libdvbpsi' 'libcdio'
            'libdca' 'qt' 'libproxy' 'sdl_image' 'libdvdnav' 'mesa'
-           'lua' 'v4l-utils' 'libcddb' 'smbclient' 'zvbi'
+           'lua' 'v4l-utils' 'libcddb' 'smbclient' 'libmatroska' 'zvbi'
            'taglib' 'sysfsutils' 'libmpcdec' 'ffmpeg' 'faad2'
            'libshout' 'libmad' 'fribidi' 'libmpeg2' 'libmodplug'
            'ttf-freefont' 'libxv' 'libass' 'xdg-utils' 'desktop-file-utils')