Skip to content

Commit

Permalink
stream_smb: disable by default, mark as GPLv3
Browse files Browse the repository at this point in the history
It seems libsmbclient has been GPLv3 for years. Also, it's certainly not
LGPL (unlike some of its support libs like talloc). Thus, mpv built with
Samba support is GPLv3.

Disable it by default, so we don't have to go through the trouble to
indicate the correct license in our output, and we don't trick people
into distributing stuff under the wrong license.
  • Loading branch information
wm4 committed May 11, 2017
1 parent aac871d commit f38bd0f
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 3 deletions.
5 changes: 4 additions & 1 deletion Copyright
Expand Up @@ -28,6 +28,9 @@ under mplayer2, and has been removed from mpv.

"v2.1+" in this context means "version 2.1 or later".

Some libraries are GPLv2+ or GPLv3+ only. Building mpv with Samba support makes
it GPLv3+.

Source files with specific licenses:
- everything under etc/ is unknown
- everything under DOCS/man/ is GPLv2+
Expand Down Expand Up @@ -243,7 +246,7 @@ LGPL relicensing status:
stream/stream_mf.c unknown
stream/stream_null.c LGPL
stream/stream_rar.c LGPL
stream/stream_smb.c unknown
stream/stream_smb.c will stay GPLv3
stream/stream_tv.c will stay GPL
stream/tv* will stay GPL
sub/* LGPL
Expand Down
2 changes: 1 addition & 1 deletion stream/stream_smb.c
Expand Up @@ -5,7 +5,7 @@
*
* mpv is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* mpv is distributed in the hope that it will be useful,
Expand Down
3 changes: 2 additions & 1 deletion wscript
Expand Up @@ -288,9 +288,10 @@ iconv support use --disable-iconv.",
'struct statfs fs; fstatfs(0, &fs); fs.f_namelen')
}, {
'name': '--libsmbclient',
'desc': 'Samba support',
'desc': 'Samba support (makes mpv GPLv3)',
'deps': [ 'libdl' ],
'func': check_pkg_config('smbclient'),
'default': 'disable',
'module': 'input',
}, {
'name' : '--lua',
Expand Down

0 comments on commit f38bd0f

Please sign in to comment.