Browse Source

Updates to thirdparty README and COPYRIGHT

Notably, we now track stable Bullet 2.88, so distros can
unbundle it again.
Rémi Verschelde 6 years ago
parent
commit
a9e48b981d
3 changed files with 51 additions and 28 deletions
  1. 25 23
      COPYRIGHT.txt
  2. 6 5
      thirdparty/README.md
  3. 20 0
      thirdparty/glad/LICENSE

+ 25 - 23
COPYRIGHT.txt

@@ -44,7 +44,7 @@ Source: https://github.com/godotengine/godot
 Files: *
 Files: *
 Comment: Godot Engine
 Comment: Godot Engine
 Copyright: 2007-2019, Juan Linietsky, Ariel Manzur.
 Copyright: 2007-2019, Juan Linietsky, Ariel Manzur.
-  2014-2019, Godot Engine contributors.
+ 2014-2019, Godot Engine contributors.
 License: Expat
 License: Expat
 
 
 Files: ./icon.png
 Files: ./icon.png
@@ -77,8 +77,8 @@ Files: ./platform/android/power_android.cpp
  ./platform/x11/power_x11.cpp
  ./platform/x11/power_x11.cpp
 Comment: Simple DirectMedia Layer
 Comment: Simple DirectMedia Layer
 Copyright: 1997-2017, Sam Lantinga
 Copyright: 1997-2017, Sam Lantinga
-  2007-2019, Juan Linietsky, Ariel Manzur.
-  2014-2019, Godot Engine contributors.
+ 2007-2019, Juan Linietsky, Ariel Manzur.
+ 2014-2019, Godot Engine contributors.
 License: Expat and Zlib
 License: Expat and Zlib
 
 
 Files: ./scene/animation/tween_interpolaters.cpp
 Files: ./scene/animation/tween_interpolaters.cpp
@@ -98,27 +98,27 @@ Files: ./servers/physics/gjk_epa.cpp
  ./servers/physics/joints/slider_joint_sw.h
  ./servers/physics/joints/slider_joint_sw.h
 Comment: Bullet Continuous Collision Detection and Physics Library
 Comment: Bullet Continuous Collision Detection and Physics Library
 Copyright: 2003-2008, Erwin Coumans
 Copyright: 2003-2008, Erwin Coumans
-  2007-2019, Juan Linietsky, Ariel Manzur.
-  2014-2019, Godot Engine contributors.
+ 2007-2019, Juan Linietsky, Ariel Manzur.
+ 2014-2019, Godot Engine contributors.
 License: Expat and Zlib
 License: Expat and Zlib
 
 
 Files: ./servers/physics/joints/cone_twist_joint_sw.cpp
 Files: ./servers/physics/joints/cone_twist_joint_sw.cpp
  ./servers/physics/joints/cone_twist_joint_sw.h
  ./servers/physics/joints/cone_twist_joint_sw.h
 Comment: Bullet Continuous Collision Detection and Physics Library
 Comment: Bullet Continuous Collision Detection and Physics Library
 Copyright: 2007, Starbreeze Studios
 Copyright: 2007, Starbreeze Studios
-  2007-2019, Juan Linietsky, Ariel Manzur.
-  2014-2019, Godot Engine contributors.
+ 2007-2019, Juan Linietsky, Ariel Manzur.
+ 2014-2019, Godot Engine contributors.
 License: Expat and Zlib
 License: Expat and Zlib
 
 
 Files: ./thirdparty/b2d_convexdecomp/
 Files: ./thirdparty/b2d_convexdecomp/
 Comment: Box2D (ConvexDecomp)
 Comment: Box2D (ConvexDecomp)
 Copyright: 2007, Eric Jordan
 Copyright: 2007, Eric Jordan
-  2006-2009, Erin Catto
+ 2006-2009, Erin Catto
 License: Zlib
 License: Zlib
 
 
 Files: ./thirdparty/bullet/
 Files: ./thirdparty/bullet/
 Comment: Bullet Continuous Collision Detection and Physics Library
 Comment: Bullet Continuous Collision Detection and Physics Library
-Copyright: 2003-2008, Erwin Coumans
+Copyright: 2003-2013, Erwin Coumans
 License: Zlib
 License: Zlib
 
 
 Files: ./thirdparty/certs/ca-certificates.crt
 Files: ./thirdparty/certs/ca-certificates.crt
@@ -129,7 +129,7 @@ License: MPL-2.0
 Files: ./thirdparty/cvtt/
 Files: ./thirdparty/cvtt/
 Comment: Convection Texture Tools Stand-Alone Kernels
 Comment: Convection Texture Tools Stand-Alone Kernels
 Copyright: 2018, Eric Lasota
 Copyright: 2018, Eric Lasota
-  2018, Microsoft Corp.
+ 2018, Microsoft Corp.
 License: Expat
 License: Expat
 
 
 Files: ./thirdparty/enet/
 Files: ./thirdparty/enet/
@@ -160,12 +160,12 @@ License: Expat and Bitstream Vera Fonts Copyright
 
 
 Files: ./thirdparty/freetype/
 Files: ./thirdparty/freetype/
 Comment: The FreeType Project
 Comment: The FreeType Project
-Copyright: 1996-2017, David Turner, Robert Wilhelm, and Werner Lemberg.
+Copyright: 1996-2018, David Turner, Robert Wilhelm, and Werner Lemberg.
 License: FTL
 License: FTL
 
 
 Files: ./thirdparty/glad/
 Files: ./thirdparty/glad/
 Comment: glad
 Comment: glad
-Copyright: 2013, David Herberth
+Copyright: 2013-2018, David Herberth
 License: Expat
 License: Expat
 
 
 Files: ./thirdparty/jpeg_compressor/
 Files: ./thirdparty/jpeg_compressor/
@@ -180,9 +180,11 @@ License: BSD-3-clause
 
 
 Files: ./thirdparty/libpng/
 Files: ./thirdparty/libpng/
 Comment: libpng
 Comment: libpng
-Copyright: 1995-1996, Guy Eric Schalnat, Group 42, Inc.
- 1996-1997, Andreas Dilger
- 1998-2018, Glenn Randers-Pehrson
+Copyright: 1995-2018, The PNG Reference Library Authors.
+ 2018, Cosmin Truta.
+ 2000-2002, 2004, 2006-2018 Glenn Randers-Pehrson.
+ 1996-1997, Andreas Dilger.
+ 1995-1996, Guy Eric Schalnat, Group 42, Inc.
 License: Zlib
 License: Zlib
 
 
 Files: ./thirdparty/libsimplewebm/
 Files: ./thirdparty/libsimplewebm/
@@ -223,24 +225,24 @@ License: BSD-3-clause
 
 
 Files: ./thirdparty/libwebsockets/
 Files: ./thirdparty/libwebsockets/
 Comment: libwebsockets
 Comment: libwebsockets
-Copyright: 2010-2017, Andy Green
+Copyright: 2010-2018, Andy Green
 License: LGPL-2.1+SLE (libwebsockets)
 License: LGPL-2.1+SLE (libwebsockets)
 
 
 Files: ./thirdparty/mbedtls/
 Files: ./thirdparty/mbedtls/
 Comment: Mbed TLS
 Comment: Mbed TLS
-Copyright: 2006-2015, ARM Limited
+Copyright: 2006-2018, Arm Limited (or its affiliates)
 License: Apache-2.0
 License: Apache-2.0
 
 
 Files: ./thirdparty/miniupnpc/
 Files: ./thirdparty/miniupnpc/
 Comment: MiniUPnPc
 Comment: MiniUPnPc
-Copyright: 2005-2016, Thomas Bernard
+Copyright: 2005-2018, Thomas Bernard
 License: BSD-3-clause
 License: BSD-3-clause
 
 
 Files: ./thirdparty/minizip/
 Files: ./thirdparty/minizip/
 Comment: MiniZip
 Comment: MiniZip
 Copyright: 1998-2010, Gilles Vollant
 Copyright: 1998-2010, Gilles Vollant
-  2007-2008, Even Rouault
-  2009-2010, Mathias Svensson
+ 2007-2008, Even Rouault
+ 2009-2010, Mathias Svensson
 License: Zlib
 License: Zlib
 
 
 Files: ./thirdparty/misc/aes256.cpp
 Files: ./thirdparty/misc/aes256.cpp
@@ -348,8 +350,8 @@ License: BSD-3-clause
 
 
 Files: ./thirdparty/pcre2/
 Files: ./thirdparty/pcre2/
 Comment: PCRE2
 Comment: PCRE2
-Copyright: 1997-2017, University of Cambridge,
- 2009-2017, Zoltan Herczeg
+Copyright: 1997-2018, University of Cambridge,
+ 2009-2018, Zoltan Herczeg
 License: BSD-3-clause
 License: BSD-3-clause
 
 
 Files: ./thirdparty/pvrtccompressor/
 Files: ./thirdparty/pvrtccompressor/
@@ -385,7 +387,7 @@ License: Zlib
 
 
 Files: ./thirdparty/zstd/
 Files: ./thirdparty/zstd/
 Comment: Zstandard
 Comment: Zstandard
-Copyright: 2016-2018, Facebook, Inc.
+Copyright: 2016-2019, Facebook, Inc.
 License: BSD-3-clause
 License: BSD-3-clause
 
 
 
 

+ 6 - 5
thirdparty/README.md

@@ -19,7 +19,7 @@ comments.
 ## bullet
 ## bullet
 
 
 - Upstream: https://github.com/bulletphysics/bullet3
 - Upstream: https://github.com/bulletphysics/bullet3
-- Version: git (126b676, 2018-12-31)
+- Version: 2.88
 - License: zlib
 - License: zlib
 
 
 Files extracted from upstream source:
 Files extracted from upstream source:
@@ -255,7 +255,7 @@ changes are marked with `// -- GODOT --` comments.
 ## libwebsockets
 ## libwebsockets
 
 
 - Upstream: https://github.com/warmcat/libwebsockets
 - Upstream: https://github.com/warmcat/libwebsockets
-- Version: 3.0.0
+- Version: 3.0.1
 - License: LGPLv2.1 + static linking exception
 - License: LGPLv2.1 + static linking exception
 
 
 File extracted from upstream source:
 File extracted from upstream source:
@@ -292,10 +292,11 @@ File extracted from upstream release tarball `mbedtls-2.16.0-apache.tgz`:
 ## miniupnpc
 ## miniupnpc
 
 
 - Upstream: https://github.com/miniupnp/miniupnp/tree/master/miniupnpc
 - Upstream: https://github.com/miniupnp/miniupnp/tree/master/miniupnpc
-- Version: 2.1 (git 25615e0, 2018-05-08) with modifications
+- Version: git (25615e0, 2018)
 - License: BSD-3-Clause
 - License: BSD-3-Clause
 
 
-The only modified file is miniupnpcstrings.h, which was created for Godot (is usually autogenerated by cmake).
+The only modified file is miniupnpcstrings.h, which was created for Godot
+(it is usually autogenerated by cmake).
 
 
 
 
 ## minizip
 ## minizip
@@ -380,7 +381,7 @@ Collection of single-file libraries used in Godot components.
 
 
 - `ifaddrs-android.{cc,h}`
 - `ifaddrs-android.{cc,h}`
   * Upstream: https://chromium.googlesource.com/external/webrtc/stable/talk/+/master/base/ifaddrs-android.h
   * Upstream: https://chromium.googlesource.com/external/webrtc/stable/talk/+/master/base/ifaddrs-android.h
-  * Version: 5976650 (2013)
+  * Version: git (5976650, 2013)
   * License: BSD-3-Clause
   * License: BSD-3-Clause
 
 
 ### scene
 ### scene

+ 20 - 0
thirdparty/glad/LICENSE

@@ -0,0 +1,20 @@
+The MIT License (MIT)
+
+Copyright (c) 2013-2018 David Herberth
+
+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.