diff --git a/Copyright b/Copyright
index 47d57db01d..c8fde524c4 100644
--- a/Copyright
+++ b/Copyright
@@ -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
diff --git a/demux/demux_mf.c b/demux/demux_mf.c
index 04d37f4aef..c4995a66c5 100644
--- a/demux/demux_mf.c
+++ b/demux/demux_mf.c
@@ -4,7 +4,7 @@
* mpv is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* mpv is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -13,12 +13,6 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with mpv. If not, see .
- *
- * The parts making this file LGPL v3 (instead of v2.1 or later) are:
- * 0aa37a0db23c allow autodetection of pictures type when using mf://@fil...
- * (iive agreed to LGPL v3+ only.)
- * Once these changes are not relevant to for copyright anymore (e.g. because
- * they have been removed), this file will change to LGPLv2.1+.
*/
#include
diff --git a/stream/cache.c b/stream/cache.c
index a458dd14a7..ab94c8734e 100644
--- a/stream/cache.c
+++ b/stream/cache.c
@@ -4,7 +4,7 @@
* mpv is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* mpv is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -13,13 +13,6 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with mpv. If not, see .
- *
- * The parts making this file LGPL v3 (instead of v2.1 or later) are:
- * 84ec57750883 remove unused cache-prefill and create cache-seek-min that...
- * 9b0d8c680f63 cache min fill adjustment, based on patch by Jeremy Huddleston
- * (iive agreed to LGPL v3+ only. Jeremy agreed to LGPL v2.1 or later.)
- * Once these changes are not relevant to for copyright anymore (e.g. because
- * they have been removed), this file will change to LGPLv2.1+.
*/
// Time in seconds the main thread waits for the cache thread. On wakeups, the
diff --git a/video/decode/vd_lavc.c b/video/decode/vd_lavc.c
index ae79554edd..67b9cd4e17 100644
--- a/video/decode/vd_lavc.c
+++ b/video/decode/vd_lavc.c
@@ -4,7 +4,7 @@
* mpv is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* mpv is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -13,14 +13,6 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with mpv. If not, see .
- *
- * The parts potentially making this file LGPL v3 (instead of v2.1 or later) are:
- * 376e3abf5c7d2 xvmc use get_format for IDCT/MC recognition
- * c73f0e18bd1d6 Return PIX_FMT_NONE if the video system refuses all other formats.
- * (iive agreed to LGPL v3+ only. Jeremy agreed to LGPL v2.1 or later.)
- * Once these changes are not relevant to for copyright anymore (e.g. because
- * they have been removed), and the core is LGPL, this file will change to
- * LGPLv2.1+.
*/
#include
diff --git a/wscript b/wscript
index 941131cf4c..107db6ca50 100644
--- a/wscript
+++ b/wscript
@@ -27,14 +27,14 @@ Dependency identifiers (for win32 vs. Unix):
build_options = [
{
- 'name': '--preliminary-lgpl3',
- 'desc': 'Preliminary LGPLv3+ license',
+ 'name': '--preliminary-lgpl2',
+ 'desc': 'Preliminary LGPLv2.1+ license',
'default': 'disable',
'func': check_true,
}, {
'name': 'gpl',
'desc': 'GPL build',
- 'deps': '!preliminary-lgpl3',
+ 'deps': '!preliminary-lgpl2',
'func': check_true,
}, {
'name': 'libaf',