diff options
| author | wm4 <wm4@nowhere> | 2017-10-05 15:54:10 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2017-10-05 15:57:30 +0200 |
| commit | 158b69f04cac6685eadd1a96c36f5d1f644c5b0b (patch) | |
| tree | 9b80b39cc79aff33f51a018d869ca2862a027dd6 /Copyright | |
| parent | 4eb8623945909e712eea7002b26773b4b8ab9e87 (diff) | |
| download | mpv-158b69f04cac6685eadd1a96c36f5d1f644c5b0b.tar.bz2 mpv-158b69f04cac6685eadd1a96c36f5d1f644c5b0b.tar.xz | |
build: switch preliminary LGPL mode from v3 to v2.1
iive agreed to relicense things that are still in mpv to LGPLv2.1. So
change the licenses of the affected files, and rename the configure
switch for LGPL mode to --enable-preliminary-lgpl2.
(The "preliminary" part will probably be removed from the configure
switch soon as well.)
Also player/main.c hasn't had GPL parts since a few commits ago.
Diffstat (limited to 'Copyright')
| -rw-r--r-- | Copyright | 18 |
1 files changed, 2 insertions, 16 deletions
@@ -31,7 +31,7 @@ under mplayer2, and has been removed from mpv. Some libraries are GPLv2+ or GPLv3+ only. Building mpv with Samba support makes it GPLv3+. -mpv can be built as LGPLv3+ with the --enable-preliminary-lgpl3 configure +mpv can be built as LGPLv2.1+ with the --enable-preliminary-lgpl2 configure option. This is a very new switch and it hasn't been confirmed yet whether really all GPL code is excluded (thus preliminary). In addition, it disables a number of useful features, some of them quite central: @@ -65,12 +65,6 @@ Source files with specific licenses: - bootstrap.py is unknown (probably GPLv2+ or LGPLv2+) - the build system (wscript, waftools/*) is LGPLv2+, some parts BSD -Some files are LGPLv3+. This is due to the contributions of a single developer -going by the SVN username "iive". The chosen license of this project is -LGPLv2.1+. The affected files will be changed to LGPLv2.1+ at the earliest -opportunity, for example if his contributions disappear by being replaced -or removed. All new contributions to these files are implied to be LGPLv2.1+. - The following files are still GPL: audio/filter/* will be replaced with new filter chain @@ -131,12 +125,4 @@ The following files contain some optional GPL code: player/audio.c libaf glue code player/loadfile.c --frames option (minor but probably fatal) player/osd.c OSD level 3 - player/command.c add/cycle command, possible sub-add command - player/main.c configuration output - -The following files are partially LGPLv3+ (otherwise LGPL): - - demux/demux_mf.c minor autodetection thing - stream/cache.c minor cache option changes - video/decode/lavc.h split from vd_lavc.c - video/decode/vd_lavc.c XvMC influences in get_format() + player/command.c add/cycle command, possibly sub-add command |