From 2398eb6ed4832fd7b8eec778981cbd974b89634f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Fri, 28 Apr 2017 18:29:15 +0200 Subject: Move core thirdparty files to thirdparty/{minizip,misc} --- thirdparty/README.md | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) (limited to 'thirdparty/README.md') diff --git a/thirdparty/README.md b/thirdparty/README.md index f6edff490f..67732743df 100644 --- a/thirdparty/README.md +++ b/thirdparty/README.md @@ -142,6 +142,58 @@ changes to ensure they build for Javascript/HTML5. Those changes are marked with `// -- GODOT --` comments. +## minizip + +- Upstream: http://www.zlib.net +- Version: 1.2.4 (zlib contrib) +- License: zlib + +Files extracted from the upstream source: + +- contrib/minizip/{crypt.h,ioapi.{c,h},zip.{c,h},unzip.{c,h}} + +Important: Some files have Godot-made changes for use in core/io. +TODO: Properly sync with version 1.2.4 and document changes. + + +## misc + +Collection of single-file libraries used in Godot. + +- `aes256.{cpp,h}` + * Upstream: http://www.literatecode.com/aes256 + * Version: latest, as of April 2017 + * License: ISC +- `base64.{c,h}` + * Upstream: http://episec.com/people/edelkind/c.html + * Version: latest, as of April 2017 + * License: Public Domain +- `fastlz.{c,h}` + * Upstream: https://code.google.com/archive/p/fastlz + * Version: svn (r12) + * License: MIT +- `hq2x.{cpp,h}` + * Upstream: https://github.com/brunexgeek/hqx + * Version: TBD, file structure differs + * License: Apache 2.0 +- `md5.{cpp,h}` + * Upstream: http://www.efgh.com/software/md5.htm + * Version: TBD, might not be latest from above URL + * License: RSA Message-Digest License +- `pcg.{cpp,h}` + * Upstream: http://www.pcg-random.org + * Version: minimal C implemention, http://www.pcg-random.org/download.html + * License: Apache 2.0 +- `sha256.{c,h}` + * Upstream: https://github.com/ilvn/SHA256 + * Version: git (35ff823, 2015) + * License: ISC +- `triangulator.{cpp,h}` + * Upstream: https://github.com/ivanfratric/polypartition (`src/polypartition.cpp`) + * Version: TBD, class was renamed + * License: MIT + + ## openssl - Upstream: https://www.openssl.org -- cgit v1.2.3 From c5f830d6b90574ef1e34fd2c35a0ebfa1ad92fe6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Fri, 28 Apr 2017 19:00:11 +0200 Subject: Split thirdparty smaz.c out of compressed_translation.cpp Code comes from https://github.com/antirez/smaz/blob/150e125cbae2e8fd20dd332432776ce13395d4d4/smaz.c With a small modification to match Godot expectations: ``` diff --git a/thirdparty/core/smaz.c b/thirdparty/core/smaz.c index 9b1ebc2..555dfea 100644 --- a/thirdparty/core/smaz.c +++ b/thirdparty/core/smaz.c @@ -14,7 +14,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND #include /* Our compression codebook, used for compression */ -static char *Smaz_cb[241] = { +static const char *Smaz_cb[241] = { "\002s,\266", "\003had\232\002leW", "\003on \216", "", "\001yS", "\002ma\255\002li\227", "\003or \260", "", "\002ll\230\003s t\277", "\004fromg\002mel", "", "\003its\332", "\001z\333", "\003ingF", "\001>\336", @@ -89,7 +89,7 @@ static char *Smaz_rcb[254] = { "e, ", " it", "whi", " ma", "ge", "x", "e c", "men", ".com" }; -int smaz_compress(char *in, int inlen, char *out, int outlen) { +int smaz_compress(const char *in, int inlen, char *out, int outlen) { unsigned int h1,h2,h3=0; int verblen = 0, _outlen = outlen; char verb[256], *_out = out; @@ -167,7 +167,7 @@ out: return out-_out; } -int smaz_decompress(char *in, int inlen, char *out, int outlen) { +int smaz_decompress(const char *in, int inlen, char *out, int outlen) { unsigned char *c = (unsigned char*) in; char *_out = out; int _outlen = outlen; @@ -192,7 +192,7 @@ int smaz_decompress(char *in, int inlen, char *out, int outlen) { inlen -= 2+len; } else { /* Codebook entry */ - char *s = Smaz_rcb[*c]; + const char *s = Smaz_rcb[*c]; int len = strlen(s); if (outlen < len) return _outlen+1; diff --git a/thirdparty/core/smaz.h b/thirdparty/core/smaz.h index a547d89..a9d8a33 100644 --- a/thirdparty/core/smaz.h +++ b/thirdparty/core/smaz.h @@ -14,7 +14,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND #ifndef _SMAZ_H #define _SMAZ_H -int smaz_compress(char *in, int inlen, char *out, int outlen); -int smaz_decompress(char *in, int inlen, char *out, int outlen); +int smaz_compress(const char *in, int inlen, char *out, int outlen); +int smaz_decompress(const char *in, int inlen, char *out, int outlen); #endif ``` --- thirdparty/README.md | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'thirdparty/README.md') diff --git a/thirdparty/README.md b/thirdparty/README.md index 67732743df..ea731282ef 100644 --- a/thirdparty/README.md +++ b/thirdparty/README.md @@ -188,6 +188,11 @@ Collection of single-file libraries used in Godot. * Upstream: https://github.com/ilvn/SHA256 * Version: git (35ff823, 2015) * License: ISC +- `smaz.{c,h}` + * Upstream: https://github.com/antirez/smaz + * Version: git (150e125, 2009) + * 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`) * Version: TBD, class was renamed -- cgit v1.2.3 From d4029aa51a0f0bce5dc73885af74b592e3aa33b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Fri, 28 Apr 2017 19:28:21 +0200 Subject: Move other lone thirdparty files to thirdparty/misc Also move Box2D ConvexDecomposition contrib code to thirdparty/b2d_convexdecomp. --- thirdparty/README.md | 37 ++++++++++++++++++++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) (limited to 'thirdparty/README.md') diff --git a/thirdparty/README.md b/thirdparty/README.md index ea731282ef..1c4bad4836 100644 --- a/thirdparty/README.md +++ b/thirdparty/README.md @@ -1,6 +1,13 @@ # Third party libraries +## b2d_convexdecomp + +- Upstream: https://github.com/erincatto/Box2D (Contributions/Utilities/ConvexDecomposition) +- Version: TBD +- License: zlib + + ## certs - Upstream: ? @@ -158,7 +165,9 @@ TODO: Properly sync with version 1.2.4 and document changes. ## misc -Collection of single-file libraries used in Godot. +Collection of single-file libraries used in Godot components. + +### core - `aes256.{cpp,h}` * Upstream: http://www.literatecode.com/aes256 @@ -198,6 +207,32 @@ Collection of single-file libraries used in Godot. * Version: TBD, class was renamed * License: MIT +### modules + +- `curl_hostcheck.{c,h}` + * Upstream: https://curl.haxx.se/ + * Version: ? (2013) + * License: MIT +- `yuv2rgb.h` + * Upstream: http://wss.co.uk/pinknoise/yuv2rgb/ (to check) + * Version: ? + * License: BSD + +### scene + +- `mikktspace.{c,h}` + * Upstream: https://wiki.blender.org/index.php/Dev:Shading/Tangent_Space_Normal_Maps + * Version: 1.0 + * License: zlib +- `stb_truetype.h` + * Upstream: https://github.com/nothings/stb + * Version: 1.11 + * License: Public Domain (Unlicense) or MIT +- `stb_vorbis.c` + * Upstream: https://github.com/nothings/stb + * Version: 1.09 + * License: Public Domain (Unlicense) or MIT + ## openssl -- cgit v1.2.3