From b05b70cabca30149e03e0654496ad46b5515b48b Mon Sep 17 00:00:00 2001 From: Sree Harsha Totakura Date: Sun, 17 Aug 2014 16:35:25 +0200 Subject: [PATCH] Enable smbclient correctly to support streaming from Samba shares. --- mplayer-vaapi/trunk/PKGBUILD | 10 +++++++--- mplayer-vaapi/trunk/include-samba-4.0.patch | 26 ++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 3 deletions(-) create mode 100644 mplayer-vaapi/trunk/include-samba-4.0.patch diff --git a/mplayer-vaapi/trunk/PKGBUILD b/mplayer-vaapi/trunk/PKGBUILD index 452ce5c..413be1e 100644 --- a/mplayer-vaapi/trunk/PKGBUILD +++ b/mplayer-vaapi/trunk/PKGBUILD @@ -1,4 +1,4 @@ -# $Id$ +# $Id: PKGBUILD 116989 2014-08-07 14:13:56Z bpiotrowski $ # Maintainer: Evangelos Foutras # Contributor: Ionut Biru # Contributor: Hugo Doria @@ -23,14 +23,16 @@ backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf') source=(http://pkgbuild.com/~foutrelis/sources/$pkgname/$pkgname-$pkgver.tar.xz{,.sig} cdio-includes.patch tweak-desktop-file.patch - subreader-fix-srt-parsing.patch) + subreader-fix-srt-parsing.patch + include-samba-4.0.patch) options=('!buildflags' '!emptydirs') install=mplayer-vaapi.install sha256sums=('5747c28c30c15d1000fb655a8abaa4b22483746d0e82775b27466948ae0c549a' 'SKIP' '72e6c654f9733953ad2466d0ea1a52f23e753791d8232d90f13293eb1b358720' '5a09fb462729a4e573568f9e8c1f57dbe7f69c0b68cfa4f6d70b3e52c450d93b' - '8b6cd325d89ff8bce3662c6aaa9b61b8e6163c6574e09b575426a1eed02b8ad3') + '8b6cd325d89ff8bce3662c6aaa9b61b8e6163c6574e09b575426a1eed02b8ad3' + '88aec493eae485f74729d49e5e0d47b73e8abe77ac032add5ed491a47fe43374') prepare() { @@ -41,6 +43,8 @@ prepare() { # http://bugzilla.mplayerhq.hu/show_bug.cgi?id=2139 patch -Np0 -i "$srcdir/subreader-fix-srt-parsing.patch" + + patch -p1 -i "$srcdir/include-samba-4.0.patch" } build() { diff --git a/mplayer-vaapi/trunk/include-samba-4.0.patch b/mplayer-vaapi/trunk/include-samba-4.0.patch new file mode 100644 index 0000000..65b85bf --- /dev/null +++ b/mplayer-vaapi/trunk/include-samba-4.0.patch @@ -0,0 +1,26 @@ +diff --git a/configure b/configure +index 1e45e27..ceff7ab 100755 +--- a/configure ++++ b/configure +@@ -4215,7 +4215,7 @@ fi + if test "$_smb" = auto; then + _smb=no + for ld_tmp in "-lsmbclient" "-lsmbclient $ld_dl" "-lsmbclient $ld_dl -lnsl" "-lsmbclient $ld_dl -lssl -lnsl" ; do +- statement_check libsmbclient.h 'smbc_opendir("smb://")' $ld_tmp && ++ statement_check samba-4.0/libsmbclient.h 'smbc_opendir("smb://")' $ld_tmp && + extra_ldflags="$extra_ldflags $ld_tmp" && _smb=yes && break + done + fi +diff --git a/stream/stream_smb.c b/stream/stream_smb.c +index 3cea001..623a37f 100644 +--- a/stream/stream_smb.c ++++ b/stream/stream_smb.c +@@ -18,7 +18,7 @@ + + #include "config.h" + +-#include ++#include + #include + + #include "mp_msg.h" -- 2.0.4