From ec6a9617bbea4c2cbacf96688ae1c27de6d29eee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Sun, 27 Aug 2017 12:16:36 +0200 Subject: [PATCH] Copyright: Add etc2comp and small fixes --- COPYRIGHT.txt | 19 ++++++++++++------- thirdparty/README.md | 26 +++++++++++++------------- 2 files changed, 25 insertions(+), 20 deletions(-) diff --git a/COPYRIGHT.txt b/COPYRIGHT.txt index 3e9610e0a3..ef3fd6024e 100644 --- a/COPYRIGHT.txt +++ b/COPYRIGHT.txt @@ -43,7 +43,7 @@ Source: https://github.com/godotengine/godot Files: * Comment: Godot Engine Copyright: 2007-2017, Juan Linietsky, Ariel Manzur. - 2014-2017, Godot Engine contributors (cf. AUTHORS.md) + 2014-2017, Godot Engine contributors. License: Expat Files: ./icon.png @@ -51,7 +51,7 @@ Files: ./icon.png ./logo.png ./logo.svg Comment: Godot Engine logo -Copyright: Andrea Calabró +Copyright: 2017, Andrea Calabró License: CC-BY-3.0 Files: ./platform/android/android_native_app_glue.c @@ -92,7 +92,7 @@ Files: ./platform/android/power_android.cpp Comment: Simple DirectMedia Layer Copyright: 1997-2017, Sam Lantinga 2007-2017, Juan Linietsky, Ariel Manzur. - 2014-2017, Godot Engine contributors (cf. AUTHORS.md) + 2014-2017, Godot Engine contributors. License: Expat and Zlib Files: ./servers/physics/gjk_epa.cpp @@ -108,7 +108,7 @@ Files: ./servers/physics/gjk_epa.cpp Comment: Bullet Continuous Collision Detection and Physics Library Copyright: 2003-2008, Erwin Coumans 2007-2017, Juan Linietsky, Ariel Manzur. - 2014-2017, Godot Engine contributors (cf. AUTHORS.md) + 2014-2017, Godot Engine contributors. License: Expat and Zlib Files: ./servers/physics/joints/cone_twist_joint_sw.cpp @@ -116,7 +116,7 @@ Files: ./servers/physics/joints/cone_twist_joint_sw.cpp Comment: Bullet Continuous Collision Detection and Physics Library Copyright: 2007, Starbreeze Studios 2007-2017, Juan Linietsky, Ariel Manzur. - 2014-2017, Godot Engine contributors (cf. AUTHORS.md) + 2014-2017, Godot Engine contributors. License: Expat and Zlib Files: ./thirdparty/b2d_convexdecomp/ @@ -135,6 +135,11 @@ Comment: ENet Copyright: 2002-2016, Lee Salzman License: Expat +Files: ./thirdparty/etc2comp/ +Comment: Etc2Comp +Copyright: 2015, Etc2Comp Authors +License: Apache-2.0 + Files: ./thirdparty/fonts/DroidSans*.ttf Comment: DroidSans font Copyright: 2008, The Android Open Source Project @@ -147,7 +152,7 @@ License: OFL-1.1 Files: ./thirdparty/freetype/ Comment: The FreeType Project -Copyright: 1996-2016, David Turner, Robert Wilhelm, and Werner Lemberg. +Copyright: 1996-2017, David Turner, Robert Wilhelm, and Werner Lemberg. License: FTL Files: ./thirdparty/glad/ @@ -268,7 +273,7 @@ License: BSD-3-clause Files: ./thirdparty/misc/stb_truetype.h ./thirdparty/misc/stb_vorbis.c Comment: stb libraries -Copyright: 2007-2015, Sean Barrett +Copyright: 2007-2017, Sean Barrett License: public-domain Files: ./thirdparty/misc/triangulator.cpp diff --git a/thirdparty/README.md b/thirdparty/README.md index c6674da69c..ebcd424a54 100644 --- a/thirdparty/README.md +++ b/thirdparty/README.md @@ -129,6 +129,19 @@ Files extracted from upstream source: TODO. +## libtheora + +- Upstream: https://www.theora.org +- Version: 1.1.1 +- License: BSD-3-Clause + +Files extracted from upstream source: + +- all .c, .h in lib/ +- all .h files in include/theora/ as theora/ +- COPYING and LICENSE + + ## libvorbis - Upstream: https://www.xiph.org/vorbis @@ -331,19 +344,6 @@ Files extracted from upstream source: - all .cpp, .h and .inl files -## theora - -- Upstream: https://www.theora.org -- Version: 1.1.1 -- License: BSD-3-Clause - -Files extracted from upstream source: - -- all .c, .h in lib/ -- all .h files in include/theora/ as theora/ -- COPYING and LICENSE - - ## tinyexr - Upstream: https://github.com/syoyo/tinyexr