diff options
author | wm4 <wm4@nowhere> | 2017-05-11 08:12:14 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2017-05-11 08:19:02 +0200 |
commit | f38bd0f25ad948d3428a82655655207723e3fbcf (patch) | |
tree | a513b2cc879338134e80d96470f159732d257c1d | |
parent | aac871deb40b4216ebb45e02a78d1b2c72f22211 (diff) | |
download | mpv-f38bd0f25ad948d3428a82655655207723e3fbcf.tar.bz2 mpv-f38bd0f25ad948d3428a82655655207723e3fbcf.tar.xz |
stream_smb: disable by default, mark as GPLv3
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.
-rw-r--r-- | Copyright | 5 | ||||
-rw-r--r-- | stream/stream_smb.c | 2 | ||||
-rw-r--r-- | wscript | 3 |
3 files changed, 7 insertions, 3 deletions
@@ -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+ @@ -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 diff --git a/stream/stream_smb.c b/stream/stream_smb.c index fd663106d5..79243a4c79 100644 --- a/stream/stream_smb.c +++ b/stream/stream_smb.c @@ -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, @@ -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', |