Fri Dec 27 23:54:04 UTC 2013

1 files changed, 18 insertions, 19 deletions

diff --git a/extra/vlc/PKGBUILD b/extra/vlc/PKGBUILD
index 4de4e840a..65ed369da 100644
--- a/extra/vlc/PKGBUILD
+++ b/extra/vlc/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 198478 2013-10-30 15:06:33Z allan $
+# $Id: PKGBUILD 201400 2013-12-10 17:02:18Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
 # Contributor: Martin Sandsmark <martin.sandsmark@kde.org>
 
 pkgname=vlc
-pkgver=2.1.0
-pkgrel=5
+pkgver=2.1.2
+pkgrel=1
 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player"
 arch=('i686' 'x86_64')
 url="http://www.videolan.org/vlc/"
@@ -13,12 +13,13 @@ license=('LGPL2.1' 'GPL2')
 depends=('a52dec' 'libdvbpsi' 'libxpm' 'libdca' 'qt4' 'libproxy' 
          'sdl_image' 'libdvdnav' 'libtiger' 'lua' 'libmatroska' 
          'zvbi' 'taglib' 'libmpcdec' 'ffmpeg' 'faad2' 'libupnp' 
-         'libshout' 'libmad' 'libmpeg2' 'xcb-util-keysyms')
+         'libshout' 'libmad' 'libmpeg2' 'xcb-util-keysyms' 'libtar' 
+         'libxinerama')
 makedepends=('live-media' 'libnotify' 'libbluray' 'flac' 'kdelibs'
              'libdc1394' 'libavc1394' 'lirc-utils' 'libcaca' 
              'librsvg' 'portaudio' 'libgme' 'xosd' 'projectm' 
              'twolame' 'aalib' 'libmtp' 'libdvdcss' 'gnome-vfs' 
-             'libgoom2' 'libtar' 'vcdimager' 'opus' 'libssh2' 'mesa')
+             'libgoom2' 'vcdimager' 'opus' 'libssh2' 'mesa')
 optdepends=('avahi: for service discovery using bonjour protocol'
             'libnotify: for notification plugin'
             'ncurses: for ncurses interface support'
@@ -40,7 +41,6 @@ optdepends=('avahi: for service discovery using bonjour protocol'
             'gnome-vfs: for GNOME Virtual File System support'
             'libgoom2: for libgoom plugin'
             'vcdimager: navigate VCD with libvcdinfo'
-            'xosd: for xosd support'
             'aalib: for ASCII art plugin'
             'libmtp: for MTP devices support'
             'smbclient: for SMB access plugin'
@@ -48,29 +48,30 @@ optdepends=('avahi: for service discovery using bonjour protocol'
             'ttf-freefont: for subtitle font '
             'ttf-dejavu: for subtitle font'
             'opus: for opus support'
-            'libssh2: for sftp support')
+            'libssh2: for sftp support'
+            'lua-socket: for http interface')
 conflicts=('vlc-plugin')
 replaces=('vlc-plugin')
 backup=('usr/share/vlc/lua/http/.hosts'
         'usr/share/vlc/lua/http/dialogs/.hosts')
 options=('!emptydirs')
 install=vlc.install
-source=("http://download.videolan.org/pub/videolan/${pkgname}/${pkgver/.a}/${pkgname}-${pkgver/.a/a}.tar.xz"
-vlc-2.0.7-vaapi-compat.patch)
-md5sums=('8c77bda671821f5b9ede96b6816e2ade'
+source=("http://download.videolan.org/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.xz"
+        'vlc-2.0.7-vaapi-compat.patch')
+md5sums=('fb6787ad749aadcfaeab3471939b3426'
          '6df10774bb7acf20e09d6139e5c7839e')
 
 prepare() {
-  cd "${srcdir}/${pkgname}-${pkgver/.a}"
+  cd "${srcdir}/${pkgname}-${pkgver}"
 
-  patch -Np1 -i ../vlc-2.0.7-vaapi-compat.patch
+  patch -Np1 -i "${srcdir}/vlc-2.0.7-vaapi-compat.patch"
 
   sed -i -e 's:truetype/freefont:TTF:g' modules/text_renderer/freetype.c
   sed -i -e 's:truetype/ttf-dejavu:TTF:g' modules/visualization/projectm.cpp
 }
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver/.a}"
+  cd "${srcdir}/${pkgname}-${pkgver}"
 
   CFLAGS+="-I/usr/include/samba-4.0" CPPFLAGS+="-I/usr/include/samba-4.0" \
   ./configure --prefix=/usr \
@@ -79,28 +80,26 @@ build() {
               --enable-faad \
               --enable-nls \
               --enable-lirc \
-              --enable-pvr \
               --enable-ncurses \
               --enable-realrtsp \
-              --enable-xosd \
               --enable-aa \
               --enable-vcdx \
               --enable-upnp \
               --enable-opus \
               --enable-sftp \
-              LUAC=luac5.1 \
+              LUAC=/usr/bin/luac  LUA_LIBS="`pkg-config --libs lua`" \
               RCC=/usr/bin/rcc-qt4
 
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver/.a}"
+  cd "${srcdir}/${pkgname}-${pkgver}"
 
   make DESTDIR="${pkgdir}" install
 
   for res in 16 32 48 128; do
-    install -D -m644 "${srcdir}/vlc-${pkgver/.a}/share/icons/${res}x${res}/vlc.png" \
-        "${pkgdir}/usr/share/icons/hicolor/${res}x${res}/apps/vlc.png"
+    install -D -m644 "${srcdir}/vlc-${pkgver}/share/icons/${res}x${res}/vlc.png" \
+                     "${pkgdir}/usr/share/icons/hicolor/${res}x${res}/apps/vlc.png"
   done
 }