Fri Sep 27 02:16:46 PDT 2013

2 files changed, 10 insertions, 44 deletions

diff --git a/extra/vlc/PKGBUILD b/extra/vlc/PKGBUILD
index 3e636d515..ca7fdea37 100644
--- a/extra/vlc/PKGBUILD
+++ b/extra/vlc/PKGBUILD
@@ -1,22 +1,22 @@
-# $Id: PKGBUILD 191972 2013-08-02 09:52:35Z bpiotrowski $
+# $Id: PKGBUILD 195175 2013-09-26 15:49:07Z foutrelis $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
 # Contributor: Martin Sandsmark <martin.sandsmark@kde.org>
 
 pkgname=vlc
-pkgver=2.0.8.a
-pkgrel=1
+pkgver=2.1.0
+pkgrel=2
 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player"
 arch=('i686' 'x86_64')
 url="http://www.videolan.org/vlc/"
 license=('LGPL2.1' 'GPL2')
 depends=('a52dec' 'libdvbpsi' 'libxpm' 'libdca' 'qt4' 'libproxy' 
-         'sdl_image' 'libdvdnav' 'libtiger' 'lua51' 'libmatroska' 
-         'zvbi' 'taglib' 'libmpcdec' 'ffmpeg-compat' 'faad2' 'libupnp' 
+         'sdl_image' 'libdvdnav' 'libtiger' 'lua' 'libmatroska' 
+         'zvbi' 'taglib' 'libmpcdec' 'ffmpeg' 'faad2' 'libupnp' 
          'libshout' 'libmad' 'libmpeg2' 'xcb-util-keysyms')
 makedepends=('live-media' 'libnotify' 'libbluray' 'flac' 'kdelibs'
-             'libdc1394' 'libavc1394' 'lirc-utils' 'libcaca' 'oss' 
-             'librsvg' 'portaudio' 'oss' 'libgme' 'xosd' 'projectm' 
+             'libdc1394' 'libavc1394' 'lirc-utils' 'libcaca' 
+             'librsvg' 'portaudio' 'libgme' 'xosd' 'projectm' 
              'twolame' 'aalib' 'libmtp' 'libdvdcss' 'gnome-vfs' 
              'libgoom2' 'libtar' 'vcdimager' 'opus' 'libssh2' 'mesa')
 optdepends=('avahi: for service discovery using bonjour protocol'
@@ -31,7 +31,6 @@ optdepends=('avahi: for service discovery using bonjour protocol'
             'libva-intel-driver: back-end for intel cards'
             'libbluray: for Blu-Ray support'
             'flac: for Free Lossless Audio Codec plugin'
-            'oss: for OSS audio support'
             'portaudio: for portaudio support'
             'twolame: for TwoLAME mpeg2 encoder plugin'
             'projectm: for ProjectM visualisation plugin'
@@ -57,17 +56,14 @@ backup=('usr/share/vlc/lua/http/.hosts'
 options=('!libtool' '!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
-        vlc-2.0.8-Fix-live555-breakage-in-last-update.patch)
-md5sums=('e5000677181406d026ffe448633d1ca0'
-         '6df10774bb7acf20e09d6139e5c7839e'
-         'e592efe7bb65291a84f99cfaa3a9f8a2')
+vlc-2.0.7-vaapi-compat.patch)
+md5sums=('8c77bda671821f5b9ede96b6816e2ade'
+         '6df10774bb7acf20e09d6139e5c7839e')
 
 prepare() {
   cd "${srcdir}/${pkgname}-${pkgver/.a}"
 
   patch -Np1 -i ../vlc-2.0.7-vaapi-compat.patch
-  patch -Np1 -i ../vlc-2.0.8-Fix-live555-breakage-in-last-update.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
@@ -81,7 +77,6 @@ build() {
   ./configure --prefix=/usr \
               --sysconfdir=/etc \
               --disable-rpath \
-              --enable-oss \
               --enable-faad \
               --enable-nls \
               --enable-lirc \
diff --git a/extra/vlc/vlc-2.0.8-Fix-live555-breakage-in-last-update.patch b/extra/vlc/vlc-2.0.8-Fix-live555-breakage-in-last-update.patch
deleted file mode 100644
index 3006cbc8d..000000000
--- a/extra/vlc/vlc-2.0.8-Fix-live555-breakage-in-last-update.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From ea444abae1d09b751314b24f6352e55be335621d Mon Sep 17 00:00:00 2001
-From: Jean-Baptiste Kempf <jb@videolan.org>
-Date: Thu, 25 Jul 2013 01:14:32 +0200
-Subject: [PATCH] Fix live555 breakage in last update
-
----
- modules/demux/live555.cpp | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/modules/demux/live555.cpp b/modules/demux/live555.cpp
-index 9e02630..7a1ab16 100644
---- a/modules/demux/live555.cpp
-+++ b/modules/demux/live555.cpp
-@@ -243,7 +243,11 @@ public:
-                    char const* applicationName, portNumBits tunnelOverHTTPPortNum,
-                    demux_sys_t *p_sys) :
-                    RTSPClient( env, rtspURL, verbosityLevel, applicationName,
--                   tunnelOverHTTPPortNum )
-+                   tunnelOverHTTPPortNum
-+#if LIVEMEDIA_LIBRARY_VERSION_INT >= 1373932800
-+                   , -1
-+#endif
-+                   )
-     {
-         this->p_sys = p_sys;
-     }
--- 
-1.8.3.4
-