diff options
author | wm4 <wm4@nowhere> | 2015-07-24 23:53:31 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2015-07-24 23:54:51 +0200 |
commit | 95b930f8661c5967206739d3d5a6728191393817 (patch) | |
tree | e57b6e07b15c2e161a68d6dab79f40cbe1322c7e | |
parent | bdc60daffaaa71034684307606d0ec320649829c (diff) | |
download | mpv-95b930f8661c5967206739d3d5a6728191393817.tar.bz2 mpv-95b930f8661c5967206739d3d5a6728191393817.tar.xz |
Require contributions in LGPLv2.1+
As suggested in #2033.
Additionally, change "LGPLv2+" to "LGPLv2.1+". Since this was always
used with the "and later" phrase, this doesn't require any further
discussion.
Also clarify that the "+" means "or later". This should be clear to
anyone with a brain, but you never know with copyright.
-rw-r--r-- | Copyright | 12 | ||||
-rw-r--r-- | DOCS/contribute.md | 3 |
2 files changed, 13 insertions, 2 deletions
@@ -2,9 +2,15 @@ mpv is a fork of mplayer2, which is a fork of MPlayer. mpv as a whole is licensed as GPL version 2 or later (see LICENSE). Most source files are GPLv2+, but some files are available under a more liberal license, -such as LGPLv2+, BSD, MIT, ISC, and possibly others. Look at the copyright +such as LGPLv2.1+, BSD, MIT, ISC, and possibly others. Look at the copyright header of each source file, and grep the sources for "Copyright" if you need -to know details. Files without Copyright notice are licensed as LGPLv2+. +to know details. Files without Copyright notice are licensed as LGPLv2.1+. + +All new contributions must be LGPLv2.1+ licensed, or if the changes are done on +GPL code, must come with the implicit agreement that the project can relicense +the code to LGPLv2.1+ at a later point without asking the contributor. (This +is a safeguard for making potential relicensing of the project to LGPLv2.1+ +easier.) For information about authors and contributors, consult the git log, which contains the complete SVN and CVS history as well. @@ -17,3 +23,5 @@ MPlayer as a whole is licensed under GPLv2 (incompatible to GPLv3!), because some files are licensed to GPLv2 (and _not_ any later version of the license). In particular, this affects the file libmpdemux/demux_ty_osd.c. It is disabled under mplayer2, and has been removed from mpv. + +"v2.1+" in this context means "version 2.1 or later". diff --git a/DOCS/contribute.md b/DOCS/contribute.md index 19563e90c5..d3bf1d49a3 100644 --- a/DOCS/contribute.md +++ b/DOCS/contribute.md @@ -54,6 +54,9 @@ Sending patches change in the same commit. - If you add a new command line option, document it in options.rst. If you add a new input property, document it in input.rst. +- All new code must be LGPLv2.1+ licensed, or come with the implicit agreement + that it will be relicensed to LGPLv2.1+ later (see ``Copyright`` in the + repository root directory). Code formatting --------------- |