From b1a3d0f793107ddbcf9861c35a64ea4653f76d77 Mon Sep 17 00:00:00 2001 From: Alberto Sottile Date: Mon, 27 May 2019 00:31:40 +0200 Subject: [PATCH] Release some files under the MIT license. The freedesktop project requires that the AppStream metadata are released under a subset of licenses that does not include Apache 2.0. For this reason, we decided to change the license of the README file and release it under the MIT license (after obtaining explicit permission from all the contributors to that file). With the same goal, the script that generates the AppImage and the AppStreams metadata is also released under the MIT license. The README file now clearly states the project license and that some files are released under a different license, as declared in their header or in our third-party notices file. --- README.md | 27 ++++++++++++++++++++++ syncplay/resources/third-party-notices.rtf | 18 +++++++++++++++ travis/appimage-script.sh | 20 +++++++++++++++- 3 files changed, 64 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index a873676..383d097 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,26 @@ + + # Syncplay Solution to synchronize video playback across multiple instances of mpv, VLC, MPC-HC, MPC-BE and mplayer2 over the Internet. @@ -18,6 +41,10 @@ When a new person joins they will also be synchronised. Syncplay also includes t Syncplay is not a file sharing service. +## License + +This project, the Syncplay released binaries, and all the files included in this repository unless stated otherwise in the header of the file, are licensed under the [Apache License, version 2.0](https://www.apache.org/licenses/LICENSE-2.0.html). A copy of this license is included in the LICENSE file of this repository. Licenses and attribution notices for third-party media are set out in [third-party-notices.rtf](syncplay/resources/third-party-notices.rtf). + ## Authors * *Initial concept and core internals developer* - Uriziel. * *GUI design and current lead developer* - Et0h. diff --git a/syncplay/resources/third-party-notices.rtf b/syncplay/resources/third-party-notices.rtf index 207ed83..bd2c722 100644 --- a/syncplay/resources/third-party-notices.rtf +++ b/syncplay/resources/third-party-notices.rtf @@ -303,6 +303,24 @@ TIONS OF ANY KIND, either express or implied. See the License for the specific l uage governing permissions and limitations under the License.\ \ +\b mpv-repl +\b0 \ +\ +Copyright 2016, James Ross-Gowan\ +\ +Permission to use, copy, modify, and/or distribute this software for any\ +purpose with or without fee is hereby granted, provided that the above\ +copyright notice and this permission notice appear in all copies.\ +\ +THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH\ +REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND\ +FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,\ +INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM\ +LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR\ +OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR\ +PERFORMANCE OF THIS SOFTWARE.\ +\ + \b python-certifi \b0 \ \ diff --git a/travis/appimage-script.sh b/travis/appimage-script.sh index 66d0676..0e71716 100755 --- a/travis/appimage-script.sh +++ b/travis/appimage-script.sh @@ -1,7 +1,25 @@ #! /bin/bash # Copyright (C) 2019 Syncplay -# Licensed under the MIT license - http://opensource.org/licenses/MIT +# This file is licensed under the MIT license - http://opensource.org/licenses/MIT + +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: + +# The above copyright notice and this permission notice shall be included in all +# copies or substantial portions of the Software. + +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +# SOFTWARE. set -x set -e