From cf0bce19bbb659d5eb09be0467b762c6637d114b Mon Sep 17 00:00:00 2001 From: wm4 Date: Fri, 5 May 2017 12:34:56 +0200 Subject: osdep/timer*: change license to LGPL All authors have agreed, with the following exceptions: e68d7f6858: wight wasn't asked (I think...), but even if he modified the patch he applied, all code added by it was removed again later. cb7768f9bb: nick could not be reached, but the declarations he added as well as the full timer.c file were deleted again in cff81fe498 and f800a42e45 (did it really take 6 years to remove unused declarations?). ffaf4af230: it looks like this person wasn't contacted, but the code added was removed again in f544bcf105. --- Copyright | 6 +++--- osdep/timer-linux.c | 14 +++++++------- osdep/timer-win2.c | 16 +++++++--------- osdep/timer.h | 14 +++++++------- 4 files changed, 24 insertions(+), 26 deletions(-) diff --git a/Copyright b/Copyright index 92badcb5c2..fbc86b3cef 100644 --- a/Copyright +++ b/Copyright @@ -190,10 +190,10 @@ LGPL relicensing status: osdep/terminal-win.c medium osdep/threads.* LGPL osdep/timer.c LGPL - osdep/timer.h unknown + osdep/timer.h LGPL osdep/timer-darwin.c LGPL (MIT) - osdep/timer-linux.c unknown - osdep/timer-win2.c unknown + osdep/timer-linux.c LGPL + osdep/timer-win2.c LGPL osdep/w32_keyboard.c unknown osdep/w32_keyboard.h unknown osdep/win32-console-wrapper.c LGPL (BSD) diff --git a/osdep/timer-linux.c b/osdep/timer-linux.c index a3433819be..1d52db279c 100644 --- a/osdep/timer-linux.c +++ b/osdep/timer-linux.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 diff --git a/osdep/timer-win2.c b/osdep/timer-win2.c index b198395e56..6527adc0cd 100644 --- a/osdep/timer-win2.c +++ b/osdep/timer-win2.c @@ -1,20 +1,18 @@ /* - * precise timer routines for Windows - * * 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 diff --git a/osdep/timer.h b/osdep/timer.h index 427bcc3ccb..b4a64c7820 100644 --- a/osdep/timer.h +++ b/osdep/timer.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_TIMER_H -- cgit v1.2.3