vlc-decklink: standard upgrade

3 files changed, 9 insertions, 31 deletions

diff --git a/.SRCINFO b/.SRCINFO
index afaee7d489c3..f14fea2ad772 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = vlc-decklink
 	pkgdesc = A multi-platform MPEG, VCD/DVD, and DivX player (with decklink module)
-	pkgver = 2.0.0
-	pkgrel = 8
+	pkgver = 2.0.1
+	pkgrel = 1
 	url = http://www.videolan.org/vlc/
 	install = vlc.install
 	arch = i686
@@ -92,10 +92,8 @@ 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.0/vlc-2.0.0.tar.xz
-	source = access_smb_link_to_smbclient.patch
-	md5sums = 8806bff2ea9c76791123d444a92f708c
-	md5sums = 5f510fdea99cdb7941423eb40045968a
+	source = http://download.videolan.org/pub/videolan/vlc/2.0.1/vlc-2.0.1.tar.xz
+	md5sums = 5ad114755670e4881a2b35354e2f79bc
 
 pkgname = vlc-decklink
 
diff --git a/PKGBUILD b/PKGBUILD
index d94ad7e77157..432838f61245 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,8 +4,8 @@
 
 _pkgname=vlc
 pkgname=vlc-decklink
-pkgver=2.0.0
-pkgrel=8
+pkgver=2.0.1
+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/"
@@ -20,7 +20,7 @@ makedepends=('live-media' 'libnotify' 'libbluray' 'flac' 'kdelibs'
              'libcaca' 'librsvg' 'portaudio' 'oss' 'libgme' 'xosd'
              'projectm' 'twolame' 'aalib' 'libmtp' 'libdvdcss'
              'gnome-vfs' 'libgoom2' 'libtar' 'vcdimager'
-			 'decklink-sdk')
+             'decklink-sdk')
 optdepends=('avahi: for service discovery using bonjour protocol'
             'libnotify: for notification plugin'
             'ncurses: for ncurses interface support'
@@ -55,10 +55,8 @@ backup=('usr/share/vlc/lua/http/.hosts'
         'usr/share/vlc/lua/http/dialogs/.hosts')
 options=('!libtool' '!emptydirs')
 install=vlc.install
-source=("http://download.videolan.org/pub/videolan/${_pkgname}/${pkgver}/${_pkgname}-${pkgver}.tar.xz"
-        'access_smb_link_to_smbclient.patch')
-md5sums=('8806bff2ea9c76791123d444a92f708c'
-         '5f510fdea99cdb7941423eb40045968a')
+source=("http://download.videolan.org/pub/videolan/${_pkgname}/${pkgver}/${_pkgname}-${pkgver}.tar.xz")
+md5sums=('5ad114755670e4881a2b35354e2f79bc')
 
 build() {
   cd "${srcdir}/${_pkgname}-${pkgver}"
@@ -69,9 +67,6 @@ build() {
 
   sed -i -e 's:truetype/freefont:TTF:g' modules/text_renderer/freetype.c
 
-  patch -Np1 -i "${srcdir}/access_smb_link_to_smbclient.patch"
-  autoreconf -fi
-
   ./configure --prefix=/usr \
               --disable-rpath \
               --enable-oss \
diff --git a/access_smb_link_to_smbclient.patch b/access_smb_link_to_smbclient.patch
deleted file mode 100644
index 3891108d4dfa..000000000000
--- a/access_smb_link_to_smbclient.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-X-Git-Url: http://git.videolan.org/?p=vlc.git;a=blobdiff_plain;f=modules%2Faccess%2FModules.am;h=be8c47b8fee03e5f4fc42c61b8e13f2d6ad587df;hp=81d8e78edc214026ceff3b17996b7bdbc47b3c26;hb=718b1f9901e5077b50c2189604afba883ca87bf7;hpb=84a1a3461adf901ff134a09eb4341cc301fdc6dd
-
-diff --git a/modules/access/Modules.am b/modules/access/Modules.am
-index 81d8e78..be8c47b 100644
---- a/modules/access/Modules.am
-+++ b/modules/access/Modules.am
-@@ -36,7 +36,7 @@ libsdp_plugin_la_DEPENDENCIES =
- 
- libaccess_smb_plugin_la_SOURCES = smb.c
- libaccess_smb_plugin_la_CFLAGS = $(AM_CFLAGS)
--libaccess_smb_plugin_la_LIBADD = $(AM_LIBADD)
-+libaccess_smb_plugin_la_LIBADD = $(AM_LIBADD) $(LIBS_access_smb)
- if HAVE_WIN32
- libaccess_smb_plugin_la_LIBADD += -lmpr
- endif