vlc-decklink: 2.0.8a -> 2.1.0

3 files changed, 14 insertions, 53 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3744df0186e5..c0a8019a803f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = vlc-decklink
 	pkgdesc = A multi-platform MPEG, VCD/DVD, and DivX player (with decklink module)
-	pkgver = 2.0.8.a
+	pkgver = 2.1.0
 	pkgrel = 1
 	url = http://www.videolan.org/vlc/
 	install = vlc.install
@@ -17,10 +17,8 @@ pkgbase = vlc-decklink
 	makedepends = libavc1394
 	makedepends = lirc-utils
 	makedepends = libcaca
-	makedepends = oss
 	makedepends = librsvg
 	makedepends = portaudio
-	makedepends = oss
 	makedepends = libgme
 	makedepends = xosd
 	makedepends = projectm
@@ -45,12 +43,12 @@ pkgbase = vlc-decklink
 	depends = sdl_image
 	depends = libdvdnav
 	depends = libtiger
-	depends = lua51
+	depends = lua
 	depends = libmatroska
 	depends = zvbi
 	depends = taglib
 	depends = libmpcdec
-	depends = ffmpeg-compat
+	depends = ffmpeg
 	depends = faad2
 	depends = libupnp
 	depends = libshout
@@ -69,7 +67,6 @@ pkgbase = vlc-decklink
 	optdepends = libva-intel-driver: back-end for intel cards
 	optdepends = libbluray: for Blu-Ray support
 	optdepends = flac: for Free Lossless Audio Codec plugin
-	optdepends = oss: for OSS audio support
 	optdepends = portaudio: for portaudio support
 	optdepends = twolame: for TwoLAME mpeg2 encoder plugin
 	optdepends = projectm: for ProjectM visualisation plugin
@@ -97,12 +94,10 @@ pkgbase = vlc-decklink
 	options = !emptydirs
 	backup = usr/share/vlc/lua/http/.hosts
 	backup = usr/share/vlc/lua/http/dialogs/.hosts
-	source = http://download.videolan.org/pub/videolan/vlc/2.0.8/vlc-2.0.8a.tar.xz
+	source = http://download.videolan.org/pub/videolan/vlc/2.1.0/vlc-2.1.0.tar.xz
 	source = vlc-2.0.7-vaapi-compat.patch
-	source = vlc-2.0.8-Fix-live555-breakage-in-last-update.patch
-	md5sums = e5000677181406d026ffe448633d1ca0
+	md5sums = 8c77bda671821f5b9ede96b6816e2ade
 	md5sums = 6df10774bb7acf20e09d6139e5c7839e
-	md5sums = e592efe7bb65291a84f99cfaa3a9f8a2
 
 pkgname = vlc-decklink
 
diff --git a/PKGBUILD b/PKGBUILD
index 15d7c5a51dfc..4ce9aa128aac 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,23 +1,23 @@
-# $Id: PKGBUILD 191972 2013-08-02 09:52:35Z bpiotrowski $
+# $Id$
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
 # Contributor: Martin Sandsmark <martin.sandsmark@kde.org>
 
 _pkgname=vlc
 pkgname=vlc-decklink
-pkgver=2.0.8.a
+pkgver=2.1.0
 pkgrel=1
 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player (with decklink module)"
 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'
              'decklink-sdk')
@@ -33,7 +33,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'
@@ -61,17 +60,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
 
   # dirty hack because of VLC's configure
   [ -d decklink-sdk ] || mkdir decklink-sdk
@@ -89,7 +85,6 @@ build() {
   ./configure --prefix=/usr \
               --sysconfdir=/etc \
               --disable-rpath \
-              --enable-oss \
               --enable-faad \
               --enable-nls \
               --enable-lirc \
diff --git a/vlc-2.0.8-Fix-live555-breakage-in-last-update.patch b/vlc-2.0.8-Fix-live555-breakage-in-last-update.patch
deleted file mode 100644
index 3006cbc8d32d..000000000000
--- a/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
-