COPYRIGHT: Update with recently added thirdparty libraries

Also various updates to thirdparty/README.md.
2018-01-13 14:44:16 +01:00 · 2018-01-13 14:44:16 +01:00 · af9c2f8b9c
parent a3ee252993
commit af9c2f8b9c
2 changed files with 103 additions and 50 deletions
--- a/COPYRIGHT.txt
+++ b/COPYRIGHT.txt
@ -152,8 +152,9 @@ License: OFL-1.1

 Files: ./thirdparty/fonts/Hack_Regular.ttf
 Comment: Hack font
-Copyright: 2015-2017, Christopher Simpkins (with Reserved Font Name Hack).
-License: Hack Open Font License v2.0
+Copyright: 2017, Source Foundry Authors
+  2003, Bitstream Inc.
+License: Expat and Bitstream Vera Fonts Copyright

 Files: ./thirdparty/freetype/
 Comment: The FreeType Project
@ -292,9 +293,14 @@ Comment: YUV2RGB
 Copyright: 2008-2011, Robin Watts
 License: BSD-2-clause

+Files: ./thirdparty/nanosvg/
+Comment: NanoSVG
+Copyright: 2013-2014, Mikko Mononen
+License: Zlib
+
 Files: ./thirdparty/openssl/
 Comment: The OpenSSL Project
-Copyright: 1998-2016, The OpenSSL Project.
+Copyright: 1998-2017, The OpenSSL Project.
 License: OpenSSL

 Files: ./thirdparty/opus/
@ -305,10 +311,11 @@ Copyright: 2001-2011, Xiph.Org, Skype Limited, Octasic,
 Erik de Castro Lopo
 License: BSD-3-clause

-Files: ./thirdparty/nanosvg/
-Comment: NanoSVG
-Copyright: 2013-2014, Mikko Mononen
-License: Zlib
+Files: ./thirdparty/pcre2/
+Comment: PCRE2
+Copyright: 1997-2017, University of Cambridge,
+ 2009-2017, Zoltan Herczeg
+License: BSD-3-clause

 Files: ./thirdparty/pvrtccompressor/
 Comment: PvrTcCompressor
@ -330,6 +337,11 @@ Comment: libSquish
 Copyright: 2006, Simon Brown
 License: Expat

+Files: ./thirdparty/thekla_atlas/
+Comment: Thekla Atlas
+Copyright: 2013, Thekla, Inc
+License: Expat
+
 Files: ./thirdparty/tinyexr/
 Comment: TinyEXR
 Copyright: 2014-2017, Syoyo Fujita
@ -343,7 +355,7 @@ License: Zlib

 Files: ./thirdparty/zstd/
 Comment: Zstandard
-Copyright: 2016-2017, Facebook, Inc.
+Copyright: 2016-2018, Facebook, Inc.
 License: BSD-3-Clause


@ -385,6 +397,48 @@ License: BSD-2-clause
 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.

+License: Bitstream Vera Fonts Copyright
+ Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. Bitstream Vera is a
+ trademark of Bitstream, Inc.
+ .
+ Permission is hereby granted, free of charge, to any person obtaining a copy of
+ the fonts accompanying this license ("Fonts") and associated documentation
+ files (the "Font Software"), to reproduce and distribute the Font Software,
+ including without limitation the rights to use, copy, merge, publish,
+ distribute, and/or sell copies of the Font Software, and to permit persons to
+ whom the Font Software is furnished to do so, subject to the following
+ conditions:
+ .
+ The above copyright and trademark notices and this permission notice shall be
+ included in all copies of one or more of the Font Software typefaces.
+ .
+ The Font Software may be modified, altered, or added to, and in particular the
+ designs of glyphs or characters in the Fonts may be modified and additional
+ glyphs or characters may be added to the Fonts, only if the fonts are renamed
+ to names not containing either the words "Bitstream" or the word "Vera".
+ .
+ This License becomes null and void to the extent applicable to Fonts or Font
+ Software that has been modified and is distributed under the "Bitstream Vera"
+ names.
+ .
+ The Font Software may be sold as part of a larger software package but no copy
+ of one or more of the Font Software typefaces may be sold by itself.
+ .
+ THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT,
+ TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL BITSTREAM OR THE GNOME FOUNDATION
+ BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING ANY GENERAL,
+ SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION
+ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF THE USE OR INABILITY TO
+ USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFTWARE.
+ .
+ Except as contained in this notice, the names of GNOME, the GNOME Foundation,
+ and Bitstream Inc., shall not be used in advertising or otherwise to promote
+ the sale, use or other dealings in this Font Software without prior written
+ authorization from the GNOME Foundation or Bitstream Inc., respectively. For
+ further information, contact: fonts at gnome dot org.
+
 License: BSD-3-clause
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions
--- a/thirdparty/README.md
+++ b/thirdparty/README.md
@ -3,10 +3,14 @@

 ## b2d_convexdecomp

- Upstream: https://github.com/erincatto/Box2D (Contributions/Utilities/ConvexDecomposition)
- Version: TBD
+- Upstream: https://github.com/erincatto/Box2D/tree/master/Contributions/Utilities/ConvexDecomposition
+- Version: git (25615e0, 2015) with modifications
 - License: zlib

+The files were adapted to Godot by removing the dependency on b2Math (replacing
+it by b2Glue.h) and commenting out some verbose printf calls.
+Upstream code has not changed in 10 years, no need to keep track of changes.
+

 ## bullet

@ -52,8 +56,8 @@ tarball before the next update.
 ## etc2comp

 - Upstream: https://github.com/google/etc2comp
- Version: 9cd0f9c (git)
- License: Apache
+- Version: git (9cd0f9c, 2017)
+- License: Apache 2.0

 Files extracted from upstream source:

@ -69,7 +73,7 @@ Files extracted from upstream source:
 - Version: 1.06
 - License: OFL-1.1

-Use UI font if exists, because it has tight vertical metrics and good for UI.
+Use UI font variant if available, because it has tight vertical metrics and good for UI.

 ### Hack Regular

@ -79,7 +83,9 @@ Use UI font if exists, because it has tight vertical metrics and good for UI.

 ### DroidSans*.ttf

- Upstream: ?
+- Upstream: https://android.googlesource.com/platform/frameworks/base/+/master/data/fonts/
+- Version: ? (pre-2014 commit when DroidSansJapanese.ttf was obsoleted)
+- License: Apache 2.0


 ## freetype
@ -147,7 +153,7 @@ Files extracted from upstream source:
 ## libsimplewebm

 - Upstream: https://github.com/zaps166/libsimplewebm
- Version: 05cfdc2 (git)
+- Version: git (05cfdc2, 2016)
 - License: MIT, BSD-3-Clause

 Files extracted from upstream source:
@ -183,7 +189,7 @@ Files extracted from upstream source:

 ## libvpx

- Upstream: http://www.webmproject.org/code/
+- Upstream: https://chromium.googlesource.com/webm/libvpx/
 - Version: 1.6.0
 - License: BSD-3-Clause

@ -241,8 +247,8 @@ Collection of single-file libraries used in Godot components.
  * Version: latest, as of April 2017
  * License: Public Domain
 - `fastlz.{c,h}`
-  * Upstream: https://code.google.com/archive/p/fastlz
-  * Version: svn (r12)
+  * Upstream: https://github.com/ariya/FastLZ
+  * Version: git (f121734, 2007)
  * License: MIT
 - `hq2x.{cpp,h}`
  * Upstream: https://github.com/brunexgeek/hqx
@ -263,7 +269,7 @@ Collection of single-file libraries used in Godot components.
 - `smaz.{c,h}`
  * Upstream: https://github.com/antirez/smaz
  * Version: git (150e125, 2009)
-  * License: BSD 3-clause
+  * License: BSD-3-Clause
  * Modifications: use `const char*` instead of `char*` for input string
 - `triangulator.{cpp,h}`
  * Upstream: https://github.com/ivanfratric/polypartition (`src/polypartition.cpp`)
@ -281,19 +287,6 @@ Collection of single-file libraries used in Godot components.
  * Version: ?
  * License: BSD

-### poshlib
-
- Upstream: http://poshlib.hookatooka.com/poshlib/trac.cgi (username guest, password guest123)
- Version: 1.3.002
- License: MIT
-
-Files extracted from the upstream source:
-
- posh.c
- posh.h
-
-(no license file was included with the upstream distribution)
-
 ### scene

 - `mikktspace.{c,h}`
@ -309,20 +302,6 @@ Files extracted from the upstream source:
  * Version: 1.11
  * License: Public Domain (Unlicense) or MIT

-## thekla_atlas
-
- Upstream: https://github.com/Thekla/thekla_atlas
- Version: 80a1430 (git)
- License: zlib
-
-Files extracted from the upstream source:
-
- Relevant sources from src/
- License.txt
-
-Important: Some files have Godot-made changes, those
-changes are marked with `// -- GODOT --` comments.
-

 ## nanosvg

@ -363,7 +342,7 @@ Files extracted from the upstream source:
 - MacOS/buildinf.h
 - LICENSE
 - Apply the Godot-specific patches in the `patches/` folder
-  (make sure not to commit .orig/.rej files generated by `patch`)
+  (make sure not to commit .orig/.rej files generated by `patch`).


 ## opus
@ -398,7 +377,7 @@ Files extracted from upstream source:
 ## pvrtccompressor

 - Upstream: https://bitbucket.org/jthlim/pvrtccompressor
- Version: hg commit cf71777 - 2015-01-08
+- Version: hg (cf71777, 2015)
 - License: BSD-3-Clause

 Files extracted from upstream source:
@ -410,9 +389,14 @@ Files extracted from upstream source:
 ## recastnavigation

 - Upstream: https://github.com/recastnavigation/recastnavigation
- version: git commit ef3ea40f - 2016-02-06
+- version: git (ef3ea40f, 2017)
 - License: zlib

+Files extracted from upstream source:
+
+- `Recast/` folder
+- License.txt
+

 ## rtaudio

@ -440,6 +424,21 @@ They are marked with `// -- GODOT start --` and `// -- GODOT end --`
 comments and a patch is provided in the squish/ folder.


+## thekla_atlas
+
+- Upstream: https://github.com/Thekla/thekla_atlas
+- Version: git (80a1430, 2017)
+- License: MIT
+
+Files extracted from the upstream source:
+
+- Relevant sources from src/
+- License.txt
+
+Important: Some files have Godot-made changes, those
+changes are marked with `// -- GODOT --` comments.
+
+
 ## tinyexr

 - Upstream: https://github.com/syoyo/tinyexr
@ -453,7 +452,7 @@ Files extracted from upstream source:

 ## zlib

- Upstream: http://www.zlib.net/
+- Upstream: http://www.zlib.net
 - Version: 1.2.11
 - License: zlib