diff options
author | Kai Koehne <kai.koehne@qt.io> | 2020-08-27 15:27:33 +0200 |
---|---|---|
committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2020-08-27 15:50:05 +0000 |
commit | 122d45862df0f086601f63659b9bb0936ea58c09 (patch) | |
tree | 6c7677da0d286c8c55b58eaf1166274893f3cfee | |
parent | ee12e0ffda521ea85c5ed26c8665b9b36c179baa (diff) | |
download | qt3d-122d45862df0f086601f63659b9bb0936ea58c09.tar.gz |
Improve third-party license information about assimp
Assimp actually bundles a whole lot of other libs and tools. Document
them properly.
[ChangeLog][Third-Party Code] Also document sub-projects that are part
of the Assimp project: Clipper, irrXML, Open3DGC, OpenDLL-Parser, Poly2Tri,
RapidJSON, Unzip, Utf8Cpp, and Zip.
Change-Id: I3ae696f081a6c7cee89e5901b2036da2f41a7417
Reviewed-by: Mike Krus <mike.krus@kdab.com>
(cherry picked from commit d8b98b3e236bb2dcec0b8082d9a59c54efc63bca)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r-- | src/3rdparty/assimp/LICENSE_Open3DGC.txt | 45 | ||||
-rw-r--r-- | src/3rdparty/assimp/LICENSE_irrxml.txt | 9 | ||||
-rw-r--r-- | src/3rdparty/assimp/LICENSE_unzip.txt | 15 | ||||
-rw-r--r-- | src/3rdparty/assimp/LICENSE_utf8cpp.txt | 23 | ||||
-rw-r--r-- | src/3rdparty/assimp/LICENSE_zip.txt | 24 | ||||
-rw-r--r-- | src/3rdparty/assimp/qt_attribution.json | 153 |
6 files changed, 255 insertions, 14 deletions
diff --git a/src/3rdparty/assimp/LICENSE_Open3DGC.txt b/src/3rdparty/assimp/LICENSE_Open3DGC.txt new file mode 100644 index 000000000..15fdce548 --- /dev/null +++ b/src/3rdparty/assimp/LICENSE_Open3DGC.txt @@ -0,0 +1,45 @@ +Copyright (c) 2013 Khaled Mammou - Advanced Micro Devices, Inc. + +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. + + + +Copyright (c) 2004 Amir Said (said@ieee.org) & William A. Pearlman (pearlw@ecse.rpi.edu) +All rights reserved. + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + +- Redistributions of source code must retain the above copyright notice, this list + of conditions and the following disclaimer. + +- Redistributions in binary form must reproduce the above copyright notice, this list of + conditions and the following disclaimer in the documentation and/or other materials + provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY +EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL +THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER +IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING +IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY +OF SUCH DAMAGE. diff --git a/src/3rdparty/assimp/LICENSE_irrxml.txt b/src/3rdparty/assimp/LICENSE_irrxml.txt new file mode 100644 index 000000000..5071c2c35 --- /dev/null +++ b/src/3rdparty/assimp/LICENSE_irrxml.txt @@ -0,0 +1,9 @@ +Copyright (C) 2002-2005 Nikolaus Gebhardt + +This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. + +Permission is granted to anyone to use this software for any purpose, including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions: + +The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. +Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. +This notice may not be removed or altered from any source distribution. diff --git a/src/3rdparty/assimp/LICENSE_unzip.txt b/src/3rdparty/assimp/LICENSE_unzip.txt new file mode 100644 index 000000000..480c61edc --- /dev/null +++ b/src/3rdparty/assimp/LICENSE_unzip.txt @@ -0,0 +1,15 @@ +This software is provided 'as-is', without any express or implied +warranty. In no event will the authors be held liable for any damages +arising from the use of this software. + +Permission is granted to anyone to use this software for any purpose, +including commercial applications, and to alter it and redistribute it +freely, subject to the following restrictions: + +1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. +2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. +3. This notice may not be removed or altered from any source distribution. diff --git a/src/3rdparty/assimp/LICENSE_utf8cpp.txt b/src/3rdparty/assimp/LICENSE_utf8cpp.txt new file mode 100644 index 000000000..1751a003b --- /dev/null +++ b/src/3rdparty/assimp/LICENSE_utf8cpp.txt @@ -0,0 +1,23 @@ +Copyright 2006 Nemanja Trifunovic + +Permission is hereby granted, free of charge, to any person or organization +obtaining a copy of the software and accompanying documentation covered by +this license (the "Software") to use, reproduce, display, distribute, +execute, and transmit the Software, and to prepare derivative works of the +Software, and to permit third-parties to whom the Software is furnished to +do so, all subject to the following: + +The copyright notices in the Software and this entire statement, including +the above license grant, this restriction and the following disclaimer, +must be included in all copies of the Software, in whole or in part, and +all derivative works of the Software, unless such copies or derivative +works are solely in the form of machine-executable object code generated by +a source language processor. + +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, TITLE AND NON-INFRINGEMENT. IN NO EVENT +SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE +FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, +ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +DEALINGS IN THE SOFTWARE. diff --git a/src/3rdparty/assimp/LICENSE_zip.txt b/src/3rdparty/assimp/LICENSE_zip.txt new file mode 100644 index 000000000..68a49daad --- /dev/null +++ b/src/3rdparty/assimp/LICENSE_zip.txt @@ -0,0 +1,24 @@ +This is free and unencumbered software released into the public domain. + +Anyone is free to copy, modify, publish, use, compile, sell, or +distribute this software, either in source code form or as a compiled +binary, for any purpose, commercial or non-commercial, and by any +means. + +In jurisdictions that recognize copyright laws, the author or authors +of this software dedicate any and all copyright interest in the +software to the public domain. We make this dedication for the benefit +of the public at large and to the detriment of our heirs and +successors. We intend this dedication to be an overt act of +relinquishment in perpetuity of all present and future rights to this +software under copyright law. + +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 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. + +For more information, please refer to <http://unlicense.org/> diff --git a/src/3rdparty/assimp/qt_attribution.json b/src/3rdparty/assimp/qt_attribution.json index 3855b1cf3..e9a47c184 100644 --- a/src/3rdparty/assimp/qt_attribution.json +++ b/src/3rdparty/assimp/qt_attribution.json @@ -1,14 +1,139 @@ -{ - "Id": "assimp", - "Name": "Open Asset Import Library", - "QDocModule": "qt3d", - "Description": "assimp (Open Asset Import Library) is a portable open source library to import various well-known 3D model formats in a uniform manner.", - "QtUsage": "Used in Qt 3D.", - - "Homepage": "http://www.assimp.org/", - "Version": "4.1.0", - "License": "BSD 3-clause \"New\" or \"Revised\" Licensee", - "LicenseId": "BSD-3-Clause", - "LicenseFile": "LICENSE", - "Copyright": "Copyright (c) 2006-2018, assimp team" -} +[ + { + "Id": "assimp", + "Name": "Assimp - Open Asset Import Library", + "QDocModule": "qt3d", + "Description": "assimp (Open Asset Import Library) is a portable open source library to import various well-known 3D model formats in a uniform manner.", + "QtUsage": "Used in Qt 3D.", + + "Homepage": "http://www.assimp.org/", + "Version": "4.1.0", + "License": "BSD 3-Clause \"New\" or \"Revised\" License", + "LicenseId": "BSD-3-Clause", + "LicenseFile": "LICENSE", + "Copyright": "Copyright (c) 2006-2018, assimp team" + }, + { + "Id": "assimp-clipper", + "Name": "Assimp - Clipper", + "QDocModule": "qt3d", + "Description": "", + "QtUsage": "Used in Qt 3D.", + "Files": "contrib/clipper", + + "Homepage": "http://www.angusj.com/delphi/clipper.php", + "Version": "4.8.8", + "License": "Boost Software License 1.0", + "LicenseId": "BSL-1.0", + "LicenseFile": "contrib/clipper/License.txt", + "Copyright": "Copyright Angus Johnson 2010-2012" + }, + { + "Id": "assimp-irrXML", + "Name": "Assimp - irrXML", + "QDocModule": "qt3d", + "Description": "Simple and fast open source xml parser for C++", + "QtUsage": "Used in Qt 3D.", + "Files": "contrib/irrXML", + + "Homepage": "https://www.ambiera.com/irrxml/", + "License": "zlib License", + "LicenseId": "Zlib", + "LicenseFile": "contrib/clipper/License.txt", + "Copyright": "Copyright (C) 2002-2005 Nikolaus Gebhardt" + }, + { + "Id": "assimp-Open3DGC", + "Name": "Assimp - Open3DGC", + "QDocModule": "qt3d", + "Description": "Open 3D Graphics Compression", + "QtUsage": "Used in Qt 3D.", + "Files": "contrib/Open3DGC", + + "License": "MIT License and BSD 2-Clause \"Simplified\" License", + "LicenseId": "MIT AND BSD-2-Clause", + "LicenseFile": "LICENSE_Open3DGC.txt", + "Copyright": "Copyright (c) 2013 Khaled Mammou - Advanced Micro Devices, Inc\nCopyright (c) 2004 Amir Said (said@ieee.org) & William A. Pearlman (pearlw@ecse.rpi.edu)" + }, + { + "Id": "assimp-openddlparser", + "Name": "Assimp - The OpenDDL-Parser", + "QDocModule": "qt3d", + "Description": "The OpenDDL-Parser is a small and easy to use library for OpenDDL-file-format-parsing.", + "QtUsage": "Used in Qt 3D.", + "Files": "contrib/openddlparser", + + "License": "MIT License", + "LicenseId": "MIT", + "LicenseFile": "contrib/openddlparser/LICENSE", + "Copyright": "Copyright (c) 2014-2015 Kim Kulling" + }, + { + "Id": "assimp-poly2tri", + "Name": "Assimp - Poly2Tri Polygon Triangulation Library", + "QDocModule": "qt3d", + "Description": "Poly2Tri is a sweepline constrained Delaunay Polygon Triangulation Library.", + "QtUsage": "Used in Qt 3D.", + "Files": "contrib/poly2tri", + + "Homepage": "https://github.com/greenm01/poly2tri", + "LicenseId": "BSD-3-Clause", + "License": "BSD 3-clause \"New\" or \"Revised\" License", + "LicenseFile": "contrib/poly2tri/LICENSE", + "Copyright": "Poly2Tri Copyright (c) 2009-2010, Poly2Tri Contributors" + }, + { + "Id": "assimp-rapidjson", + "Name": "Assimp - RapidJSON", + "QDocModule": "qt3d", + "Description": "RapidJSON is a JSON parser and generator for C++. Note that the bin/jsonchecker/ directory mentioned in the license is not included.", + "QtUsage": "Used in Qt 3D.", + "Files": "contrib/openddlparser", + + "License": "MIT License and BSD 3-Clause \"New\" or \"Revised\" License", + "LicenseId": "MIT AND BSD-3-Clause", + "LicenseFile": "contrib/rapidjson/license.txt", + "Copyright": "Copyright (c) 2006-2013 Alexander Chemeris\nCopyright (C) 2015 THL A29 Limited\nCopyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip" + }, + { + "Id": "assimp-unzip", + "Name": "Assimp - Unzip", + "QDocModule": "qt3d", + "Description": "IO for uncompress .zip files using zlib", + "QtUsage": "Used in Qt 3D.", + "Files": "contrib/unzip", + + "Homepage": "http://www.winimage.com/zLibDll/", + "Version": "1.01e", + "License": "zlib License", + "LicenseId": "Zlib", + "LicenseFile": "LICENSE_unzip.txt", + "Copyright": "Copyright 1998-2004 Gilles Vollant" + }, + { + "Id": "assimp-utf8cpp", + "Name": "Assimp - Utf8Cpp", + "QDocModule": "qt3d", + "Description": "UTF-8 with C++ in a Portable Way", + "QtUsage": "Used in Qt 3D.", + "Files": "contrib/utf8cpp", + + "Homepage": "https://sourceforge.net/projects/utfcpp/", + "License": "Boost Software License 1.0", + "LicenseId": "BSL-1.0", + "LicenseFile": "LICENSE_utf8cpp.txt", + "Copyright": "Copyright 2006 Nemanja Trifunovic" + }, + { + "Id": "assimp-zip", + "Name": "Assimp - Zip", + "QDocModule": "qt3d", + "Description": "A portable (OSX/Linux/Windows), simple zip library written in C", + "QtUsage": "Used in Qt 3D.", + "Files": "contrib/zip", + + "License": "Public Domain", + "LicenseFile": "LICENSE_zip.txt", + "Copyright": "" + } +] |