diff options
Diffstat (limited to 'thirdparty/README.md')
| -rw-r--r-- | thirdparty/README.md | 45 |
1 files changed, 13 insertions, 32 deletions
diff --git a/thirdparty/README.md b/thirdparty/README.md index 2957842f9c..dacc870103 100644 --- a/thirdparty/README.md +++ b/thirdparty/README.md @@ -224,16 +224,28 @@ changes are marked with `// -- GODOT --` comments. - License: LGPLv2.1 + static linking exception File extracted from upstream source: -- Everything in `lib/` except `mbedtls_wrapper/`, `http2/`, `event-libs/`. +- Everything in `lib/` except `http2/`, `event-libs/`. - From `misc/` exclude `lws-genhash.c`, `lws-ring.c`, `romfs.{c,h}`, `smtp.c`. - From `plat/` exclude `lws-plat-{esp*,optee}.c`. - From `server/` exclude `access-log.c`, `cgi.c`, `daemonize.c`, `lws-spa.c`, `peer-limits.c`, `rewrite.c` - Also copy `win32helpers/` from `win32port/` +- `mbedtls_wrapper/include/platform/ssl_port.h` has a small change to check for OSX (missing `malloc.h`). + The bug is fixed in upstream master via `LWS_HAVE_MALLOC_H`, but not in the 2.4.1 branch (as the file structure has changed). Important: `lws_config.h` and `lws_config_private.h` contains custom Godot build configurations, check them out when updating. +## mbedTLS + +- Upstream: https://tls.mbed.org/ +- Version: 2.7.0 +- License: Apache 2.0 + +File extracted from upstream release tarball `mbedtls-2.7.0-apache.tgz`: +- All `*.h` from `include/mbedtls/` to `thirdparty/include/mbedtls/` +- All `*.c` from `library/` to `thirdparty/library/` + ## minizip - Upstream: http://www.zlib.net @@ -331,37 +343,6 @@ Files extracted from the upstream source: - All .h files in `src/` - LICENSE.txt - -## openssl - -- Upstream: https://www.openssl.org -- Version: 1.0.2n -- License: OpenSSL license / BSD-like - -Files extracted from the upstream source: - -- Our `openssl/`: contains the headers installed in /usr/include/openssl; - gather them in the source tarball with `make links` and - `cp -f include/openssl/*.h ../openssl/openssl/` -- Our `crypto/`: copy of upstream `crypto/`, with some cleanup (see below). -- Our `ssl/`: copy of upstream `ssl/`, with some cleanup (see below). -- Cleanup: - ``` - find \( -name "Makefile" -o -name "*.S" -o -name "*.bat" -o -name "*.bc" \ - -o -name "*.com" -o -name "*.cnf" -o -name "*.ec" -o -name "*.fre" \ - -o -name "*.gcc" -o -name "*.in" -o -name "*.lnx" -o -name "*.m4" \ - -o -name "*.pl" -o -name "*.pod" -o -name "*.s" -o -name "*.sh" \ - -o -name "*.sol" -o -name "*test*" \) -delete - cd openssl; for file in *.h; do find ../{crypto,ssl} -name "$file" -delete; done; cd .. - ``` - For the rest check the `git status` and decide. -- e_os.h -- MacOS/buildinf.h -- LICENSE -- Apply the Godot-specific patches in the `patches/` folder - (make sure not to commit .orig/.rej files generated by `patch`). - - ## opus - Upstream: https://opus-codec.org |