summaryrefslogtreecommitdiff
path: root/source/n/samba
diff options
context:
space:
mode:
Diffstat (limited to 'source/n/samba')
-rwxr-xr-xsource/n/samba/samba.SlackBuild5
-rw-r--r--source/n/samba/samba.libsmbclient.h.ffmpeg.compat.diff10
2 files changed, 14 insertions, 1 deletions
diff --git a/source/n/samba/samba.SlackBuild b/source/n/samba/samba.SlackBuild
index d6eb5557..034f7764 100755
--- a/source/n/samba/samba.SlackBuild
+++ b/source/n/samba/samba.SlackBuild
@@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=samba
VERSION=${VERSION:-$(echo samba-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
if [ -e $CWD/machine.conf ]; then
. $CWD/machine.conf ]
@@ -83,6 +83,9 @@ rm -rf samba-$VERSION
tar xvf $CWD/samba-$VERSION.tar.?z || exit 1
cd samba-$VERSION || exit 1
+# Add time.h to libsmbclient.h for ffmpeg compatibility:
+zcat $CWD/samba.libsmbclient.h.ffmpeg.compat.diff.gz | patch -p1 --verbose || exit 1
+
if [ ! -d source3/lib/cmdline ]; then
( cd source3/lib
mkdir cmdline
diff --git a/source/n/samba/samba.libsmbclient.h.ffmpeg.compat.diff b/source/n/samba/samba.libsmbclient.h.ffmpeg.compat.diff
new file mode 100644
index 00000000..11a4411f
--- /dev/null
+++ b/source/n/samba/samba.libsmbclient.h.ffmpeg.compat.diff
@@ -0,0 +1,10 @@
+--- ./source3/include/libsmbclient.h.orig 2018-07-12 03:23:36.000000000 -0500
++++ ./source3/include/libsmbclient.h 2019-02-06 14:36:16.499779599 -0600
+@@ -79,6 +79,7 @@
+ #include <stdint.h>
+ #include <fcntl.h>
+ #include <utime.h>
++#include <time.h>
+
+ #define SMBC_BASE_FD 10000 /* smallest file descriptor returned */
+