summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Copyright11
-rw-r--r--common/msg.c2
-rw-r--r--common/msg.h14
3 files changed, 20 insertions, 7 deletions
diff --git a/Copyright b/Copyright
index 65e8f87d76..0a0cbd9e69 100644
--- a/Copyright
+++ b/Copyright
@@ -34,3 +34,14 @@ Source files with specific licenses:
- sub/osd_font.otf is LGPLv2.1+
- some tests under waftools/fragments/ might be GPLv2+
- version.sh is GPLv2+
+
+Some files are marked with "Almost LGPL." These files are GPL, but all authors
+have agreed to relicense them to LGPL. the problem is that one of the authors is
+Michael Niedermayer, who cited the following conditions for relicensing:
+
+ http://lists.mplayerhq.hu/pipermail/mplayer-dev-eng/2016-September/073535.html
+
+We assume the first 3 conditions are fulfilled. The last condition can be
+interpreted as that his code can be changed to LGPL only as soon as the "core"
+of mpv changes to LGPL. We interpret "core" as something minimal, that can
+actually be built and run, with all GPL code disabled.
diff --git a/common/msg.c b/common/msg.c
index 6d70f88db3..875d933822 100644
--- a/common/msg.c
+++ b/common/msg.c
@@ -13,6 +13,8 @@
*
* You should have received a copy of the GNU General Public License along
* with mpv. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Almost LGPL.
*/
#include <stdio.h>
diff --git a/common/msg.h b/common/msg.h
index 9789ba988c..21228870f4 100644
--- a/common/msg.h
+++ b/common/msg.h
@@ -1,18 +1,18 @@
/*
* This file is part of mpv.
*
- * 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
- * (at your option) any later version.
+ * 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 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
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * GNU Lesser General Public License for more details.
*
- * You should have received a copy of the GNU General Public License along
- * with mpv. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with mpv. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef MPLAYER_MP_MSG_H