updates

2 files changed, 111 insertions, 110 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 07c5cf5cf86b..ab4d04294c54 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,92 +1,97 @@
 # Generated by mksrcinfo v8
-# Wed Mar  8 04:05:47 UTC 2017
+# Mon Mar 13 14:39:09 UTC 2017
 pkgbase = vlc-nightly
 	pkgdesc = A multi-platform MPEG, VCD/DVD, and DivX player - nightly snapshot
-	pkgver = 3.0.0v20170307
+	pkgver = 3.0.0v20170313
 	pkgrel = 1
 	url = http://www.videolan.org/vlc/
 	arch = i686
 	arch = x86_64
 	license = LGPL2.1
 	license = GPL2
-	makedepends = live-media
-	makedepends = libnotify
-	makedepends = libbluray
+	makedepends = aalib
 	makedepends = flac
-	makedepends = fluidsynth
-	makedepends = libdc1394
+	makedepends = git
 	makedepends = libavc1394
-	makedepends = lirc-utils
+	makedepends = libbluray
 	makedepends = libcaca
+	makedepends = libdc1394
+	makedepends = libdvdcss
+	makedepends = libgme
+	makedepends = libgoom2
+	makedepends = libmtp
+	makedepends = libnotify
 	makedepends = librsvg
+	makedepends = libssh2
+	makedepends = lirc
+	makedepends = live-media
+	makedepends = opus
 	makedepends = portaudio
-	makedepends = libgme
-	makedepends = xosd
 	makedepends = projectm
 	makedepends = twolame
-	makedepends = aalib
-	makedepends = libmtp
-	makedepends = libdvdcss
-	makedepends = libgoom2
-	makedepends = libtar
 	makedepends = vcdimager
-	makedepends = opus
-	makedepends = libssh2
-	makedepends = mesa
+	makedepends = xosd
+	makedepends = smbclient
 	depends = a52dec
-	depends = libdvbpsi
-	depends = libxpm
+	depends = faad2
+	depends = ffmpeg
 	depends = libdca
-	depends = qt5-base
-	depends = libproxy
-	depends = sdl_image
+	depends = libdvbpsi
 	depends = libdvdnav
-	depends = libtiger
-	depends = lua
+	depends = libmad
 	depends = libmatroska
-	depends = zvbi
-	depends = taglib
 	depends = libmpcdec
-	depends = ffmpeg
-	depends = faad2
-	depends = libupnp
-	depends = libshout
-	depends = libmad
-	depends = directfb
 	depends = libmpeg2
-	depends = libmodplug
-	depends = libass
+	depends = libproxy
+	depends = libshout
+	depends = libtar
+	depends = libtiger
+	depends = libupnp
+	depends = libxinerama
+	depends = libxpm
+	depends = lua
+	depends = sdl_image
+	depends = mesa
+	depends = wayland
+	depends = wayland-protocols
+	depends = taglib
 	depends = xcb-util-keysyms
+	depends = zvbi
+	depends = libsecret
+	depends = libarchive
+	depends = qt5-base
+	depends = libglvnd
+	depends = hicolor-icon-theme
+	depends = qt5-x11extras
+	optdepends = aalib: for ASCII art plugin
 	optdepends = avahi: for service discovery using bonjour protocol
-	optdepends = libnotify: for notification plugin
-	optdepends = ncurses: for ncurses interface support
-	optdepends = libdvdcss: for decoding encrypted DVDs
-	optdepends = lirc-utils: for lirc plugin
-	optdepends = libavc1394: for devices using the 1394ta AV/C
-	optdepends = libdc1394: for IEEE 1394 plugin
+	optdepends = flac: for Free Lossless Audio Codec plugin
 	optdepends = kdelibs: KDE Solid hardware integration
-	optdepends = libva-vdpau-driver: vdpau back-end for nvidia
-	optdepends = libva-intel-driver: back-end for intel cards
+	optdepends = libavc1394: for devices using the 1394ta AV/C
 	optdepends = libbluray: for Blu-Ray support
-	optdepends = flac: for Free Lossless Audio Codec plugin
-	optdepends = portaudio: for portaudio support
-	optdepends = twolame: for TwoLAME mpeg2 encoder plugin
-	optdepends = projectm: for ProjectM visualisation plugin
 	optdepends = libcaca: for colored ASCII art video output
+	optdepends = libcdio: for audio CD playback support
+	optdepends = libdc1394: for IEEE 1394 plugin
+	optdepends = libdvdcss: for decoding encrypted DVDs
 	optdepends = libgme: for libgme plugin
-	optdepends = librsvg: for SVG plugin
 	optdepends = libgoom2: for libgoom plugin
-	optdepends = vcdimager: navigate VCD with libvcdinfo
-	optdepends = xosd: for xosd support
-	optdepends = aalib: for ASCII art plugin
 	optdepends = libmtp: for MTP devices support
-	optdepends = fluidsynth: for synthesizer MIDI FluidSynth
+	optdepends = libnotify: for notification plugin
+	optdepends = librsvg: for SVG plugin
+	optdepends = libssh2: for sftp support
+	optdepends = libva-intel-driver: back-end for intel cards
+	optdepends = libva-vdpau-driver: vdpau back-end for nvidia
+	optdepends = lirc: for lirc plugin
+	optdepends = lua-socket: for http interface
+	optdepends = ncurses: for ncurses interface support
+	optdepends = opus: for opus support
+	optdepends = portaudio: for portaudio support
+	optdepends = projectm: for ProjectM visualisation plugin
 	optdepends = smbclient: for SMB access plugin
-	optdepends = libcdio: for audio CD playback support
-	optdepends = ttf-freefont: for subtitle font
 	optdepends = ttf-dejavu: for subtitle font
-	optdepends = opus: for opus support
-	optdepends = libssh2: for sftp support
+	optdepends = ttf-freefont: for subtitle font
+	optdepends = twolame: for TwoLAME mpeg2 encoder plugin
+	optdepends = vcdimager: navigate VCD with libvcdinfo
 	provides = vlc
 	conflicts = vlc-plugin
 	conflicts = vlc
@@ -94,10 +99,10 @@ pkgbase = vlc-nightly
 	options = !libtool
 	options = !emptydirs
 	options = !debug
-	source = http://nightlies.videolan.org/build/source/vlc-3.0.0-20170307-0243-git.tar.xz
+	source = http://nightlies.videolan.org/build/source/vlc-3.0.0-20170313-0240-git.tar.xz
 	source = update-vlc-plugin-cache.hook
 	source = https://git.archlinux.org/svntogit/packages.git/plain/trunk/lua53_compat.patch?h=packages/vlc
-	sha256sums = 1774d1d22d89b0d6fb13cc67c231a85a279841d5788f5edbbc3e8f6719c8c22e
+	sha256sums = 846504ce9e74ef99dc0bdf5c78fa7b23dbb5ea2772b0c8b14f9ba482d9fa6dc1
 	sha256sums = c6f60c50375ae688755557dbfc5bd4a90a8998f8cf4d356c10d872a1a0b44f3a
 	sha256sums = d1cb88a1037120ea83ef75b2a13039a16825516b776d71597d0e2eae5df2d8fa
 
diff --git a/PKGBUILD b/PKGBUILD
index ea0e9992d0c5..2e1a7557ec42 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,61 +4,59 @@
 
 _appname_=vlc
 pkgname=${_appname_}-nightly
-pkgver=3.0.0v20170307
+pkgver=3.0.0v20170313
 _pkgver=3.0.0
-_snapshot_=20170307
-_snapver_=0243
+_snapshot_=20170313
+_snapver_=0240
 _nightly_=${_snapshot_}-${_snapver_}
 pkgrel=1
 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player - nightly snapshot"
 arch=("i686" "x86_64")
 url="http://www.videolan.org/vlc/"
 license=("LGPL2.1" "GPL2")
-depends=("a52dec" "libdvbpsi" "libxpm" "libdca" "qt5-base" "libproxy"
-         "sdl_image" "libdvdnav" "libtiger" "lua" "libmatroska"
-         "zvbi" "taglib" "libmpcdec" "ffmpeg" "faad2" "libupnp"
-         "libshout" "libmad" "directfb" "libmpeg2" "libmodplug" "libass"
-         "xcb-util-keysyms")
-makedepends=("live-media" "libnotify" "libbluray" "flac" "fluidsynth" "libdc1394" "libavc1394" "lirc-utils"
-             "libcaca" "librsvg" "portaudio" "libgme" "xosd"
-             "projectm" "twolame" "aalib" "libmtp" "libdvdcss"
-             "libgoom2" "libtar" "vcdimager" "opus" "libssh2"
-             "mesa")
-optdepends=("avahi: for service discovery using bonjour protocol"
-            "libnotify: for notification plugin"
-            "ncurses: for ncurses interface support"
-            "libdvdcss: for decoding encrypted DVDs"
-            "lirc-utils: for lirc plugin"
-            "libavc1394: for devices using the 1394ta AV/C"
-            "libdc1394: for IEEE 1394 plugin"
-            "kdelibs: KDE Solid hardware integration"
-            "libva-vdpau-driver: vdpau back-end for nvidia"
-            "libva-intel-driver: back-end for intel cards"
-            "libbluray: for Blu-Ray support"
-            "flac: for Free Lossless Audio Codec plugin"
-            "portaudio: for portaudio support"
-            "twolame: for TwoLAME mpeg2 encoder plugin"
-            "projectm: for ProjectM visualisation plugin"
-            "libcaca: for colored ASCII art video output"
-            "libgme: for libgme plugin"
-            "librsvg: for SVG plugin"
-            "libgoom2: for libgoom plugin"
-            "vcdimager: navigate VCD with libvcdinfo"
-            "xosd: for xosd support"
-            "aalib: for ASCII art plugin"
-            "libmtp: for MTP devices support"
-            "fluidsynth: for synthesizer MIDI FluidSynth"
-            "smbclient: for SMB access plugin"
-            "libcdio: for audio CD playback support"
-            "ttf-freefont: for subtitle font "
-            "ttf-dejavu: for subtitle font"
-            "opus: for opus support"
-            "libssh2: for sftp support")
+depends=('a52dec' 'faad2' 'ffmpeg' 'libdca' 'libdvbpsi'
+         'libdvdnav' 'libmad' 'libmatroska' 'libmpcdec' 'libmpeg2'
+         'libproxy' 'libshout' 'libtar' 'libtiger' 'libupnp'
+         'libxinerama' 'libxpm' 'lua' 'sdl_image' 'mesa' 'wayland' 'wayland-protocols'
+         'taglib' 'xcb-util-keysyms' 'zvbi' 'libsecret' 'libarchive' 'qt5-base' 'libglvnd'
+         'hicolor-icon-theme' 'qt5-x11extras')
+makedepends=('aalib' 'flac' 'git'
+             'libavc1394' 'libbluray' 'libcaca' 'libdc1394' 'libdvdcss'
+             'libgme' 'libgoom2' 'libmtp' 'libnotify' 'librsvg'
+             'libssh2' 'lirc' 'live-media'  'opus'
+             'portaudio' 'projectm' 'twolame' 'vcdimager' 'xosd' 'smbclient')
+optdepends=('aalib: for ASCII art plugin'
+            'avahi: for service discovery using bonjour protocol'
+            'flac: for Free Lossless Audio Codec plugin'
+            'kdelibs: KDE Solid hardware integration'
+            'libavc1394: for devices using the 1394ta AV/C'
+            'libbluray: for Blu-Ray support'
+            'libcaca: for colored ASCII art video output'
+            'libcdio: for audio CD playback support'
+            'libdc1394: for IEEE 1394 plugin'
+            'libdvdcss: for decoding encrypted DVDs'
+            'libgme: for libgme plugin'
+            'libgoom2: for libgoom plugin'
+            'libmtp: for MTP devices support'
+            'libnotify: for notification plugin'
+            'librsvg: for SVG plugin'
+            'libssh2: for sftp support'
+            'libva-intel-driver: back-end for intel cards'
+            'libva-vdpau-driver: vdpau back-end for nvidia'
+            'lirc: for lirc plugin'
+            'lua-socket: for http interface'
+            'ncurses: for ncurses interface support'
+            'opus: for opus support'
+            'portaudio: for portaudio support'
+            'projectm: for ProjectM visualisation plugin'
+            'smbclient: for SMB access plugin'
+            'ttf-dejavu: for subtitle font'
+            'ttf-freefont: for subtitle font'
+            'twolame: for TwoLAME mpeg2 encoder plugin'
+            'vcdimager: navigate VCD with libvcdinfo')
 conflicts=("${_appname_}-plugin" "${_appname_}")
 provides=("${_appname_}")
 replaces=("${_appname_}-plugin")
-#backup=("usr/share/${_appname_}/lua/http/.hosts"
-#        "usr/share/${_appname_}/lua/http/dialogs/.hosts")
 options=("!libtool" "!emptydirs" "!debug")
 source=("http://nightlies.videolan.org/build/source/vlc-${_pkgver}-${_nightly_}-git.tar.xz"  "update-vlc-plugin-cache.hook" "https://git.archlinux.org/svntogit/packages.git/plain/trunk/lua53_compat.patch?h=packages/vlc")
 
@@ -68,12 +66,11 @@ pkgver() {
 
 build() {
 	cd "${_appname_}-3.0.0-git"
-  RCC=/usr/bin/rcc-qt5
-	./bootstrap
+   ./bootstrap
   patch -Np1 -i "${srcdir}/vlc"
 	# Patch
 	sed -i -e 's:truetype/ttf-dejavu:TTF:g' modules/visualization/projectm.cpp
-  sed -i -e 's:truetype/freefont:TTF:g' modules/text_renderer/freetype/freetype.c
+    sed -i -e 's:truetype/freefont:TTF:g' modules/text_renderer/freetype/freetype.c
 	# Config
 	[ ${CARCH} = 'x86_64' ] && CXXFLAGS="$CXXFLAGS -fPIC"
   CFLAGS+=" -I/usr/include/samba-4.0" CPPFLAGS+=" -I/usr/include/samba-4.0" CXXFLAGS+=" -std=gnu++11" \
@@ -94,9 +91,8 @@ build() {
 				--enable-sftp \
         --enable-fdkaac \
         --enable-merge-ffmpeg \
-
-
-
+                LUAC=/usr/bin/luac  LUA_LIBS="`pkg-config --libs lua`" \
+              RCC=/usr/bin/rcc-qt5    
 	make -i
 }
 
@@ -113,6 +109,6 @@ package() {
   install -Dm644 "$srcdir"/update-vlc-plugin-cache.hook "$pkgdir"/usr/share/libalpm/hooks/update-vlc-plugin-cache.hook
 }
 
-sha256sums=('1774d1d22d89b0d6fb13cc67c231a85a279841d5788f5edbbc3e8f6719c8c22e'
+sha256sums=('846504ce9e74ef99dc0bdf5c78fa7b23dbb5ea2772b0c8b14f9ba482d9fa6dc1'
             'c6f60c50375ae688755557dbfc5bd4a90a8998f8cf4d356c10d872a1a0b44f3a'
             'd1cb88a1037120ea83ef75b2a13039a16825516b776d71597d0e2eae5df2d8fa')