From b537b59e65720d55f09d1c4da17150dcbd8b0715 Mon Sep 17 00:00:00 2001 From: wm4 Date: Fri, 5 May 2017 06:53:23 +0200 Subject: msg.c/h: partially change license to LGPL msg.c is "partial" due to "michael", whose work can be changed to LGPL only once the core is LGPL. It's explained in the Copyright file. I prefer to do the relicensing incrementally (due to the overwhelming workload). Changing the license before that happens would be legally questionable, but nothing can stop us from essentially marking it as "will be LGPL". All authors have agreed to LGPL, with the following exceptions: 9df11ee8bf: the author (probably) didn't agree, but the line that is added is later fully removed. 35e90f1556: was not asked, but all iconv code was 100% removed from the mp_msg mechanism (we alwas require UTF-8 now). 4e4f3f806e: the change by michael. 50a86fcc34: the identify variable was move, and completely removed the latest in commit 48bd03dd91232. 1f6c494641: did not agree, but due to a major mp_msg change the added line became unnecessary and was removed. da63498bf9: was not reachable, but the MPlayer GUI is gone from mpv anyway (also commit fc4d6e617d8d removed these specific additions a long time ago). --- Copyright | 11 +++++++++++ common/msg.c | 2 ++ common/msg.h | 14 +++++++------- 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 . + * + * Almost LGPL. */ #include 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 . + * You should have received a copy of the GNU Lesser General Public + * License along with mpv. If not, see . */ #ifndef MPLAYER_MP_MSG_H -- cgit v1.2.3