mirror/mpv
0
0
Fork 0
mirror of https://github.com/mpv-player/mpv.git synced 2024-09-20 03:52:22 +02:00
Code

stream_smb: disable by default, mark as GPLv3

Browse Source 
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.
This commit is contained in:
wm4 2017-05-11 08:12:14 +02:00
parent aac871deb4
commit f38bd0f25a
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Copyright
View File

@ -28,6 +28,9 @@ under mplayer2, and has been removed from mpv.
"v2.1+" in this context means "version 2.1 or later". "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: Source files with specific licenses:
- everything under etc/ is unknown - everything under etc/ is unknown
- everything under DOCS/man/ is GPLv2+ - everything under DOCS/man/ is GPLv2+
@ -243,7 +246,7 @@ LGPL relicensing status:
stream/stream_mf.c unknown stream/stream_mf.c unknown
stream/stream_null.c LGPL stream/stream_null.c LGPL
stream/stream_rar.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/stream_tv.c will stay GPL
stream/tv* will stay GPL stream/tv* will stay GPL
sub/* LGPL sub/* LGPL

2
stream/stream_smb.c
View File

@ -5,7 +5,7 @@
* *
* mpv is free software; you can redistribute it and/or modify * mpv is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * 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. * (at your option) any later version.
* *
* mpv is distributed in the hope that it will be useful, * mpv is distributed in the hope that it will be useful,

3
wscript
View File

@ -288,9 +288,10 @@ iconv support use --disable-iconv.",
'struct statfs fs; fstatfs(0, &fs); fs.f_namelen') 'struct statfs fs; fstatfs(0, &fs); fs.f_namelen')
}, { }, {
'name': '--libsmbclient', 'name': '--libsmbclient',
'desc': 'Samba support', 'desc': 'Samba support (makes mpv GPLv3)',
'deps': [ 'libdl' ], 'deps': [ 'libdl' ],
'func': check_pkg_config('smbclient'), 'func': check_pkg_config('smbclient'),
'default': 'disable',
'module': 'input', 'module': 'input',
}, { }, {
'name' : '--lua', 'name' : '--lua',