diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2014-08-22 01:37:45 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2014-08-22 01:37:45 -0400 |
| commit | 50c3a5ea8e1dd04641da3a27f98170157621f74e (patch) | |
| tree | 013d885cd1ef17432517fe85743f0b5aa385df14 /libre/mplayer-libre-vaapi/include-samba-4.0.patch | |
| parent | 156c9dd23d8ce1cf4aeaec2040b1cf3c47309094 (diff) | |
| parent | dd992ab45849fcef37f98d28fbd87c899262e4f5 (diff) | |
Merge branch 'master' into lukeshu/kernels
Also update linux-libre-grsec because I couldn't verify the checksum of the
now 6-hour obsolete patch.
Conflicts:
libre/linux-libre-grsec/PKGBUILD
libre/lirc-parabola/PKGBUILD
Diffstat (limited to 'libre/mplayer-libre-vaapi/include-samba-4.0.patch')
| -rw-r--r-- | libre/mplayer-libre-vaapi/include-samba-4.0.patch | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/libre/mplayer-libre-vaapi/include-samba-4.0.patch b/libre/mplayer-libre-vaapi/include-samba-4.0.patch new file mode 100644 index 000000000..2ed272b6a --- /dev/null +++ b/libre/mplayer-libre-vaapi/include-samba-4.0.patch @@ -0,0 +1,12 @@ +diff -rupN a/stream/stream_smb.c b/stream/stream_smb.c +--- a/stream/stream_smb.c 2013-03-16 13:38:34.000000000 +0000 ++++ b/stream/stream_smb.c 2013-10-31 20:05:32.473947926 +0000 +@@ -18,7 +18,7 @@ + + #include "config.h" + +-#include <libsmbclient.h> ++#include <samba-4.0/libsmbclient.h> + #include <unistd.h> + + #include "mp_msg.h" |