[SCM] mplayer2/master: Compile against samba-4.0 (Closes: #743604)

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 091e73b4ec0e47a5ac6dea20e3f9dd651101ed32
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun May 11 15:22:25 2014 -0400

    Compile against samba-4.0 (Closes: #743604)

diff --git a/debian/control b/debian/control
index 9682452..edcfcab 100644
--- a/debian/control
+++ b/debian/control
@@ -58,7 +58,7 @@ Build-Depends:
  libquvi-dev,
  libschroedinger-dev,
  libsdl1.2-dev | libsdl1.1-dev,
- libsmbclient-dev,
+ libsmbclient-dev (>= 2:4~),
  libspeex-dev,
  libswscale-dev (>= 6:10~),
  libtheora-dev (>= 1.0~beta1),
diff --git a/debian/patches/samba4.patch b/debian/patches/samba4.patch
new file mode 100644
index 0000000..3482d87
--- /dev/null
+++ b/debian/patches/samba4.patch
@@ -0,0 +1,28 @@
+From: Xiangyu LIU <u122334 at gmail.com>
+To: Debian Bug Tracking System <submit at bugs.debian.org>
+Subject: mplayer2: Missing Samba (4.0) dependency in experimental
+Date: Fri, 04 Apr 2014 14:19:04 +0800
+Bug-Debian: http://bugs.debian.org/743604
+
+--- a/configure
++++ b/configure
+@@ -3166,7 +3166,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
+--- a/stream/stream_smb.c
++++ b/stream/stream_smb.c
+@@ -18,7 +18,7 @@
+ 
+ #include "config.h"
+ 
+-#include <libsmbclient.h>
++#include <samba-4.0/libsmbclient.h>
+ #include <unistd.h>
+ 
+ #include "mp_msg.h"
diff --git a/debian/patches/series b/debian/patches/series
index d6505d7..bb73a73 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 ftbfs-libav10.patch
+samba4.patch

-- 
mplayer2 packaging