From 6b303d5c3cca0e36a33c048b2c2ab4bc2cb1e069 Mon Sep 17 00:00:00 2001 From: wm4 Date: Sat, 24 Jun 2017 16:08:17 +0200 Subject: osx: change license of OSX and cocoa files to LGPL All authors of the current code have agreed. --- Copyright | 18 +++++++++--------- osdep/macosx_application.h | 14 +++++++------- osdep/macosx_application.m | 14 +++++++------- osdep/macosx_application_objc.h | 14 +++++++------- osdep/macosx_compat.h | 16 ++++++++-------- osdep/macosx_events.h | 14 +++++++------- osdep/macosx_events.m | 14 +++++++------- osdep/macosx_events_objc.h | 14 +++++++------- osdep/macosx_touchbar.h | 14 +++++++------- osdep/macosx_touchbar.m | 14 +++++++------- osdep/macosx_versions.h | 14 +++++++------- video/out/cocoa_common.h | 16 ++++++++-------- video/out/cocoa_common.m | 14 +++++++------- 13 files changed, 95 insertions(+), 95 deletions(-) diff --git a/Copyright b/Copyright index be6241a6bb..b4fa74e028 100644 --- a/Copyright +++ b/Copyright @@ -180,14 +180,14 @@ x audio/audio.* very hard (mp_audio based of anders' af_audi osdep/endian.h LGPL osdep/glob-win.c LGPL osdep/io.* LGPL - osdep/macosx_application.h unknown - osdep/macosx_application.m unknown - osdep/macosx_application_objc.h unknown - osdep/macosx_compat.h unknown - osdep/macosx_events.* unknown - osdep/macosx_events_objc.h unknown - osdep/macosx_touchbar.* unknown - osdep/macosx_versions.h unknown + osdep/macosx_application.h LGPL + osdep/macosx_application.m LGPL + osdep/macosx_application_objc.h LGPL + osdep/macosx_compat.h LGPL + osdep/macosx_events.* LGPL + osdep/macosx_events_objc.h LGPL + osdep/macosx_touchbar.* LGPL + osdep/macosx_versions.h LGPL osdep/main-fn-cocoa.c LGPL osdep/main-fn.h LGPL osdep/main-fn-unix.c LGPL @@ -309,7 +309,7 @@ x player/audio.c LGPL (dysfunctional due to libaf) video/mp_image_pool.* LGPL video/out/aspect.* LGPL video/out/bitmap_packer.* LGPL - video/out/cocoa* unknown + video/out/cocoa* LGPL video/out/d3d_shader_420p.h LGPL video/out/d3d_shader_nv12.h LGPL video/out/d3d_shader_yuv.hlsl LGPL diff --git a/osdep/macosx_application.h b/osdep/macosx_application.h index fea34a3705..82d18b0058 100644 --- a/osdep/macosx_application.h +++ b/osdep/macosx_application.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 MPV_MACOSX_APPLICATION diff --git a/osdep/macosx_application.m b/osdep/macosx_application.m index 52dacb098a..ae04ae2975 100644 --- a/osdep/macosx_application.m +++ b/osdep/macosx_application.m @@ -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 . */ #include diff --git a/osdep/macosx_application_objc.h b/osdep/macosx_application_objc.h index 8bbe26d359..6fc6d61a55 100644 --- a/osdep/macosx_application_objc.h +++ b/osdep/macosx_application_objc.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 . */ #import diff --git a/osdep/macosx_compat.h b/osdep/macosx_compat.h index 1cb5018382..e448fe6213 100644 --- a/osdep/macosx_compat.h +++ b/osdep/macosx_compat.h @@ -1,20 +1,20 @@ /* - * Application Event Handling + * Application Event Handling * * 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 . */ diff --git a/osdep/macosx_events.h b/osdep/macosx_events.h index 9da3cb27bc..216df8238c 100644 --- a/osdep/macosx_events.h +++ b/osdep/macosx_events.h @@ -3,18 +3,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 MACOSX_EVENTS_H diff --git a/osdep/macosx_events.m b/osdep/macosx_events.m index dbdef2f255..cffbfa9587 100644 --- a/osdep/macosx_events.m +++ b/osdep/macosx_events.m @@ -3,18 +3,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 . */ // Carbon header is included but Carbon is NOT linked to mpv's binary. This diff --git a/osdep/macosx_events_objc.h b/osdep/macosx_events_objc.h index ff5db938c9..36de66dc88 100644 --- a/osdep/macosx_events_objc.h +++ b/osdep/macosx_events_objc.h @@ -3,18 +3,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 . */ #import diff --git a/osdep/macosx_touchbar.h b/osdep/macosx_touchbar.h index 9a5611859b..0aa5a052bb 100644 --- a/osdep/macosx_touchbar.h +++ b/osdep/macosx_touchbar.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 . */ #import diff --git a/osdep/macosx_touchbar.m b/osdep/macosx_touchbar.m index 846ce6a933..c189e32354 100644 --- a/osdep/macosx_touchbar.m +++ b/osdep/macosx_touchbar.m @@ -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 . */ #include "player/client.h" diff --git a/osdep/macosx_versions.h b/osdep/macosx_versions.h index 0a03a35820..29ab01eb5a 100644 --- a/osdep/macosx_versions.h +++ b/osdep/macosx_versions.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 MPV_MACOSX_VERSIONS diff --git a/video/out/cocoa_common.h b/video/out/cocoa_common.h index e7e1949541..076136dabe 100644 --- a/video/out/cocoa_common.h +++ b/video/out/cocoa_common.h @@ -3,18 +3,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. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * 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_COCOA_COMMON_H diff --git a/video/out/cocoa_common.m b/video/out/cocoa_common.m index 5b922e1a3a..56cfd221d8 100644 --- a/video/out/cocoa_common.m +++ b/video/out/cocoa_common.m @@ -3,18 +3,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 . */ #import -- cgit v1.2.3