rebuild for ffmpeg git updating

3 files changed, 43 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1b9e5886c94a..43884fee36ce 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Fri Feb  3 18:13:40 UTC 2017
+# Tue Feb 21 12:26:40 UTC 2017
 pkgbase = vlc-nightly
 	pkgdesc = A multi-platform MPEG, VCD/DVD, and DivX player - nightly snapshot
-	pkgver = 3.0.0v20170203
+	pkgver = 3.0.0v20170221
 	pkgrel = 1
 	url = http://www.videolan.org/vlc/
 	arch = i686
@@ -27,7 +27,6 @@ pkgbase = vlc-nightly
 	makedepends = aalib
 	makedepends = libmtp
 	makedepends = libdvdcss
-	makedepends = gnome-vfs
 	makedepends = libgoom2
 	makedepends = libtar
 	makedepends = vcdimager
@@ -58,7 +57,6 @@ pkgbase = vlc-nightly
 	depends = libmodplug
 	depends = libass
 	depends = xcb-util-keysyms
-	depends = libpthread-stubs
 	optdepends = avahi: for service discovery using bonjour protocol
 	optdepends = libnotify: for notification plugin
 	optdepends = ncurses: for ncurses interface support
@@ -77,7 +75,6 @@ pkgbase = vlc-nightly
 	optdepends = libcaca: for colored ASCII art video output
 	optdepends = libgme: for libgme plugin
 	optdepends = librsvg: for SVG plugin
-	optdepends = gnome-vfs: for GNOME Virtual File System support
 	optdepends = libgoom2: for libgoom plugin
 	optdepends = vcdimager: navigate VCD with libvcdinfo
 	optdepends = xosd: for xosd support
@@ -96,11 +93,11 @@ pkgbase = vlc-nightly
 	replaces = vlc-plugin
 	options = !libtool
 	options = !emptydirs
-	options = debug
-	source = http://nightlies.videolan.org/build/source/vlc-3.0.0-20170203-0245-git.tar.xz
+	options = !debug
+	source = http://nightlies.videolan.org/build/source/vlc-3.0.0-20170221-0236-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
-	sha1sums = e0453ed5de2263acba030315fb918805fbdbae94
+	sha1sums = 26c93b44f2cd6acb4eb8beded3e35c6729ac7681
 	sha1sums = c3a35ba4dbd6c8e4e5b032664f50b9f0dcf579ee
 	sha1sums = 5d7dba23756ff577a90b8631b187fbeac1f94e17
 
diff --git a/PKGBUILD b/PKGBUILD
index ace201b90a26..66c84667fe74 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,10 +4,10 @@
 
 _appname_=vlc
 pkgname=${_appname_}-nightly
-pkgver=3.0.0v20170203
+pkgver=3.0.0v20170221
 _pkgver=3.0.0
-_snapshot_=20170203
-_snapver_=0245
+_snapshot_=20170221
+_snapver_=0236
 _nightly_=${_snapshot_}-${_snapver_}
 pkgrel=1
 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player - nightly snapshot"
@@ -18,11 +18,11 @@ 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" "libpthread-stubs")
+         "xcb-util-keysyms")
 makedepends=("live-media" "libnotify" "libbluray" "flac" "fluidsynth" "libdc1394" "libavc1394" "lirc-utils"
              "libcaca" "librsvg" "portaudio" "libgme" "xosd"
              "projectm" "twolame" "aalib" "libmtp" "libdvdcss"
-             "gnome-vfs" "libgoom2" "libtar" "vcdimager" "opus" "libssh2"
+             "libgoom2" "libtar" "vcdimager" "opus" "libssh2"
              "mesa")
 optdepends=("avahi: for service discovery using bonjour protocol"
             "libnotify: for notification plugin"
@@ -42,7 +42,6 @@ optdepends=("avahi: for service discovery using bonjour protocol"
             "libcaca: for colored ASCII art video output"
             "libgme: for libgme plugin"
             "librsvg: for SVG plugin"
-            "gnome-vfs: for GNOME Virtual File System support"
             "libgoom2: for libgoom plugin"
             "vcdimager: navigate VCD with libvcdinfo"
             "xosd: for xosd support"
@@ -60,7 +59,7 @@ provides=("${_appname_}")
 replaces=("${_appname_}-plugin")
 #backup=("usr/share/${_appname_}/lua/http/.hosts"
 #        "usr/share/${_appname_}/lua/http/dialogs/.hosts")
-options=("!libtool" "!emptydirs" "debug")
+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")
 
 pkgver() {
@@ -77,7 +76,7 @@ build() {
   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++98" \
 	./configure --prefix=/usr \
 				--sysconfdir=/etc \
         --enable-qt \
@@ -111,6 +110,6 @@ package() {
   install -Dm644 "$srcdir"/update-vlc-plugin-cache.hook "$pkgdir"/usr/share/libalpm/hooks/update-vlc-plugin-cache.hook
 }
 
-sha1sums=('e0453ed5de2263acba030315fb918805fbdbae94'
+sha1sums=('26c93b44f2cd6acb4eb8beded3e35c6729ac7681'
           'c3a35ba4dbd6c8e4e5b032664f50b9f0dcf579ee'
           '5d7dba23756ff577a90b8631b187fbeac1f94e17')
diff --git a/vlc b/vlc
new file mode 100644
index 000000000000..aeff7b2fd778
--- /dev/null
+++ b/vlc
@@ -0,0 +1,30 @@
+commit 41caaa08cde60c4fec4bf2e5f9610e2a1b9e6a23
+Author: Vinson Lee <vlee@freedesktop.org>
+Date:   Thu Feb 5 14:48:53 2015 -0800
+
+    lua: Define LUA_COMPAT_APIINTCASTS for Lua >= 5.3.0 compatibility.
+    
+    In Lua 5.3.0, luaL_checkint was deprecated.
+    
+    This patch fixes this build error with Lua 5.3.0.
+    
+    lua/demux.c: In function ‘vlclua_demux_peek’:
+    lua/demux.c:55:5: error: implicit declaration of function ‘luaL_checkint’ [-Werror=implicit-function-declaration]
+         int n = luaL_checkint( L, 1 );
+         ^
+    
+    Signed-off-by: Vinson Lee <vlee@freedesktop.org>
+    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
+
+diff --git a/modules/lua/vlc.h b/modules/lua/vlc.h
+index efd94f1..85c7fc1 100644
+--- a/modules/lua/vlc.h
++++ b/modules/lua/vlc.h
+@@ -38,6 +38,7 @@
+ #include <vlc_stream.h>
+ #include <vlc_demux.h>
+ 
++#define LUA_COMPAT_APIINTCASTS
+ #define LUA_COMPAT_MODULE
+ #include <lua.h>        /* Low level lua C API */
+ #include <lauxlib.h>    /* Higher level C API */