Skip to content

Commit

Permalink
stream_smb: remove this
Browse files Browse the repository at this point in the history
This required libsmbclient, which is a heavy dependency, and as a
library, has all kinds of problems. For one, the API requires completely
unacceptable global state (in particular, leaks auth state), and is not
thread-safe (meaning concurrent reads to multiple files block each
other).

There are better replacements: you can use the Linux kernel's builtin
CIFS support, fusesmb, or contribute supoport for libdsm.
  • Loading branch information
wm4 committed Mar 5, 2020
1 parent fc8c1fc commit 3b8b7cb
Show file tree
Hide file tree
Showing 5 changed files with 0 additions and 168 deletions.
1 change: 0 additions & 1 deletion Copyright
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ The following files are still GPL only (--enable-lgpl disables them):
stream/stream_cdda.c unknown
stream/stream_dvb.* must stay GPL
stream/stream_dvdnav.c unknown
stream/stream_smb.c will stay GPLv3
video/out/vo_caca.c unknown
video/out/vo_direct3d.c unknown
video/out/vo_vaapi.c probably impossible (some company's code)
Expand Down
4 changes: 0 additions & 4 deletions stream/stream.c
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@

extern const stream_info_t stream_info_cdda;
extern const stream_info_t stream_info_dvb;
extern const stream_info_t stream_info_smb;
extern const stream_info_t stream_info_null;
extern const stream_info_t stream_info_memory;
extern const stream_info_t stream_info_mf;
Expand All @@ -71,9 +70,6 @@ static const stream_info_t *const stream_list[] = {
#if HAVE_DVBIN
&stream_info_dvb,
#endif
#if HAVE_LIBSMBCLIENT
&stream_info_smb,
#endif
#if HAVE_DVDNAV
&stream_info_ifo_dvdnav,
&stream_info_dvdnav,
Expand Down
155 changes: 0 additions & 155 deletions stream/stream_smb.c

This file was deleted.

7 changes: 0 additions & 7 deletions wscript
Original file line number Diff line number Diff line change
Expand Up @@ -326,13 +326,6 @@ iconv support use --disable-iconv.",
'deps': 'os-linux',
'func': check_statement('sys/mman.h',
'memfd_create("mpv", MFD_CLOEXEC | MFD_ALLOW_SEALING)')
}, {
'name': '--libsmbclient',
'desc': 'Samba support (makes mpv GPLv3)',
'deps': 'libdl && gpl',
'func': check_pkg_config('smbclient'),
'default': 'disable',
'module': 'input',
}, {
'name' : '--lua',
'desc' : 'Lua',
Expand Down
1 change: 0 additions & 1 deletion wscript_build.py
Original file line number Diff line number Diff line change
Expand Up @@ -383,7 +383,6 @@ def swift(task):
( "stream/stream_memory.c" ),
( "stream/stream_mf.c" ),
( "stream/stream_null.c" ),
( "stream/stream_smb.c", "libsmbclient" ),

## Subtitles
( "sub/ass_mp.c", "libass"),
Expand Down

0 comments on commit 3b8b7cb

Please sign in to comment.