From 5b3ca8ed419a95316719cad5cf3eca8bf86f2eae Mon Sep 17 00:00:00 2001 From: wm4 Date: Wed, 14 Jun 2017 14:28:05 +0200 Subject: terminal: change license to LGPL All authors of the current code have agreed. The code probably originates from a software named GySmail (as the copyright header indicates). As far as I can tell, it was written by Arpi (who has agreed), possibly with unknown co-authors. This is most likely OK, as none of the original code is around anymore anyway. I could not find a working download of GySmail, that actually contained the original getch2.c code. This also has a wild history of random people adding ifdef guards to control ioctl() vs. tcgetattr() calls. (See for example 2b1310abba4c1.) Later, the ioctl() was removed in favor of the POSIX tcgetattr(), and the ifdeffery was removed. So these people were not contacted. --- Copyright | 6 +++--- osdep/terminal-unix.c | 24 ++++++++++-------------- osdep/terminal-win.c | 14 +++++++------- osdep/terminal.h | 19 ++++++++----------- 4 files changed, 28 insertions(+), 35 deletions(-) diff --git a/Copyright b/Copyright index 0205bb4864..297d37e92c 100644 --- a/Copyright +++ b/Copyright @@ -195,9 +195,9 @@ LGPL relicensing status: osdep/subprocess.* LGPL osdep/subprocess-posix.c LGPL osdep/subprocess-win.c LGPL - osdep/terminal.h unknown - osdep/terminal-unix.c hard - osdep/terminal-win.c medium + osdep/terminal.h LGPL + osdep/terminal-unix.c LGPL + osdep/terminal-win.c LGPL osdep/threads.* LGPL osdep/timer.c LGPL osdep/timer.h LGPL diff --git a/osdep/terminal-unix.c b/osdep/terminal-unix.c index 9b4e5709cc..9d30acfdd1 100644 --- a/osdep/terminal-unix.c +++ b/osdep/terminal-unix.c @@ -1,24 +1,20 @@ /* - * GyS-TermIO v2.0 (for GySmail v3) - * a very small replacement of ncurses library + * Based on GyS-TermIO v2.0 (for GySmail v3) (copyright (C) 1999 A'rpi/ESP-team) * - * copyright (C) 1999 A'rpi/ESP-team + * This file is part of mpv. * - * This file is part of MPlayer. + * 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. * - * MPlayer 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. - * - * MPlayer is distributed in the hope that it will be useful, + * 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 MPlayer; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * You should have received a copy of the GNU Lesser General Public + * License along with mpv. If not, see . */ #include "config.h" diff --git a/osdep/terminal-win.c b/osdep/terminal-win.c index c75fe68761..5ec3f8b0d2 100644 --- a/osdep/terminal-win.c +++ b/osdep/terminal-win.c @@ -4,18 +4,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 . */ #include "config.h" diff --git a/osdep/terminal.h b/osdep/terminal.h index ebe4cc7ee8..b584508895 100644 --- a/osdep/terminal.h +++ b/osdep/terminal.h @@ -1,23 +1,20 @@ /* - * GyS-TermIO v2.0 (for GySmail v3) - * a very small replacement of ncurses library - * - * copyright (C) 1999 A'rpi/ESP-team + * Based on GyS-TermIO v2.0 (for GySmail v3) (copyright (C) 1999 A'rpi/ESP-team) * * 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_GETCH2_H -- cgit v1.2.3