maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
6758 commits 10 branches 35 tags 1.1 GiB
Commit graph

61 commits

Author SHA1 Message Date
Rémi Verschelde e5c2f88541
Merge pull request #18902 from volzhs/minizip-1.2.11-2.1 
Update minizip to 1.2.11 (2.1)
 2018-05-16 18:13:24 +02:00
volzhs 26e0dddb6c Update minizip to 1.2.11 2018-05-16 02:21:37 +09:00
volzhs cf4fdd70f1 Update libwebp to 1.0.0 2018-05-16 00:57:20 +09:00
George Marques 1738f5a600
Fix build for WinRT using VS2017 2018-02-18 20:16:53 -03:00
Rémi Verschelde 26474e34c6 Update CA certificates to latest Mozilla bundle 
Copied from an up-to-date Fedora 27 install (ca-certificates-2018.2.22-1.0.fc27).

(cherry picked from commit 294af5617a)
 2018-02-18 16:52:30 +01:00
volzhs d3d9cc474c Update libwebp to 0.6.1 2017-12-12 03:21:56 +09:00
Rémi Verschelde 290b32ee57 libpng: Cosmetic update to upstream 1.6.34 
No code change in the part we are using, it only affected contrib code.
[ci skip]

(cherry picked from commit e9d1d648cd)
 2017-10-29 17:07:13 +01:00
Indah Sylvia bda3683b05 updated libpng to version 1.6.33 (September 28, 2017) 2017-10-12 14:34:42 +07:00
volzhs 438175dd2b Update freetype to 2.8.1 2017-10-10 01:38:41 +09:00
Rémi Verschelde e59bb87fb6 Merge pull request #10690 from volzhs/editor-font 
Replace default editor font to NotoSansUI
 2017-08-31 11:50:44 +02:00
volzhs 30f4a16cdf Use Noto fonts for Arabic, Hebrew and Thai 2017-08-29 21:01:31 +09:00
volzhs 412afe42e7 Update source code pro font to 2.030 2017-08-29 17:48:41 +09:00
volzhs 110da7f816 Replace default editor font to NotoSansUI 2017-08-29 17:42:55 +09:00
Rémi Verschelde dde0e93af8 Copyright: Various fixes 2017-08-27 13:23:09 +02:00
Rémi Verschelde 23813b4179 stb: Update to upstream stb_truetype 1.17 
Also fix documented OpenSSL version, it was updated to 1.0.2l in
67305d1b0a.

(cherry picked from commit 560fc0f199)
 2017-08-27 13:05:52 +02:00
Rémi Verschelde 765b500c85 libpng: Update to upstream version 1.6.32 
Fixes security vulnerability in our 1.6.31rc01 snapshot.

(cherry picked from commit ee1d0179c5)
 2017-08-27 13:05:12 +02:00
Rémi Verschelde 8bbe893319 minizip: Fix compatibility with Gentoo's unique zlib API 
Fixes #10539 in a diplomatic way (as opposed to telling Gentoo users
to just change their distro or rebuild zlib from upstream...).

(cherry picked from commit 67e6c1b735)
 2017-08-27 12:41:52 +02:00
Rémi Verschelde 67a093e844 minizip: Reapply Godot-specific changes for seek support 
I have not assessed whether they are still all relevant.

(cherry picked from commit 53fffa12f1)
 2017-08-27 12:41:00 +02:00
Rémi Verschelde 487684921c minizip: Sync with pristine contrib/minizip from zlib 1.2.4 
Godot-specific changes are undone in this commit, they will be readded
and properly documented in the following commit.

(cherry picked from commit 5681b7b60a)
 2017-08-27 12:40:46 +02:00
Rémi Verschelde 39f0dcc17d libpng: Update to upstream version 1.6.31rc01 
Fixes various issues with 1.6.30, especially ARM build.
Supersedes change in #9722.

Fixes #9769.

(cherry picked from commit 492999a33b)
 2017-07-22 18:43:13 +02:00
Rémi Verschelde cf52c63034 libpng: Update to upstream version 1.6.30 
(cherry picked from commit b1ca62af52)
 2017-07-14 22:36:34 +02:00
volzhs 05443bd5a8 Update freetype to 2.8 2017-06-25 11:16:45 +09:00
Rémi Verschelde 75a6e0f65a opus: Update to upstream version 1.1.5 
(cherry picked from commit 47e0e530a9)
 2017-06-17 11:53:19 +02:00
Rémi Verschelde 1fea09bfeb openssl: Sync with upstream 1.0.2l 
(cherry picked from commit 67305d1b0a)
 2017-06-17 11:51:29 +02:00
Rémi Verschelde 22e1512638 openssl: Reapply necessary WinRT changes from patch 
(cherry picked from commit 996f1ae29e)
 2017-06-17 11:51:28 +02:00
Rémi Verschelde b5d200898e openssl: Define WIN32_LEAN_AND_MEAN on Windows 
This avoids namespace collisions with things such as X509_NAME.
Also force include of necessary definitions in `crypto/o_str.c`
which seem missing on MSVC (but work on MinGW).

(cherry picked from commit c1b0662b40)
 2017-06-17 11:51:28 +02:00
Rémi Verschelde c2e022c7c9 openssl: Sync with pristine upstream 1.0.2h 
Our necessary custom changes will be reapplied in later commits for clarity,
and saved as patches for future updates.

(cherry picked from commit cb0f771aaa)
 2017-06-17 11:51:28 +02:00
Rémi Verschelde 8301137b38 openssl: Document update process and delete unused files 
(cherry picked from commit 022541d917)
 2017-06-17 11:51:28 +02:00
George Marques b2f8a365f2
Fix cherry-picking issues caused by code updates 2017-06-07 12:59:42 -03:00
George Marques 1cb77c3684
Patch thirdy-party libraries to build for WinRT 
- Patch enet code.
- Patch OpenSSL code and add shims for unavailable API.
- Add extra definition header for Freetype.
 2017-06-07 11:36:00 -03:00
Rémi Verschelde d432ad1e17 Improve documentation of thirdparty code snippets 
(cherry picked from commit c8aea60324)
 2017-05-26 23:53:14 +02:00
Rémi Verschelde 6cf507f004 Move other lone thirdparty files to thirdparty/misc 
Also move Box2D ConvexDecomposition contrib code to
thirdparty/b2d_convexdecomp.

(cherry picked from commit d4029aa51a)
 2017-05-26 23:39:47 +02:00
Rémi Verschelde 86724ba1c6 Split thirdparty smaz.c out of compressed_translation.cpp 
Code comes from 150e125cba/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 <string.h>

 /* 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
```

(cherry picked from commit c5f830d6b9)
 2017-05-26 23:35:15 +02:00
Rémi Verschelde 8312d421c6 Move core thirdparty files to thirdparty/{minizip,misc} 
(cherry picked from commit 2398eb6ed4)
 2017-05-26 23:29:26 +02:00
Rémi Verschelde b7e3ef5f6f libpng: Update to upstream version 1.6.29 
(cherry picked from commit d463b6e3d0)
 2017-04-09 15:52:14 +02:00
Rémi Verschelde 2bc0208b2c opus: Update to upstream version 1.1.4 
(cherry picked from commit dd8655aac9)
 2017-04-09 15:51:48 +02:00
Rémi Verschelde 20d1a28341 squish: Update to upstream version 1.15 
Also fix clang-format pre-commit hook to ignore thirdparty files.

(cherry picked from commit fa2d5b91dc)
 2017-04-09 15:51:41 +02:00
Rémi Verschelde 6e5246e312 Reorder the folders in tools to prepare moving tools/editor 
- `certs` and `editor_fonts` go to `thirdparty`
- `dist` and `scripts` go to a new `misc` folder
- `collada` and `doc` go to `tools/editor`

The next step will be to rename `tools/editor` to `editor` directly,
but this will be done at the right time to avoid breaking too many PRs.

(cherry picked from commit b87a232668)
 2017-03-18 23:29:43 +01:00
volzhs f7ef78c998 Update libwebp to 0.6.0 2017-02-18 00:05:06 +09:00
Rémi Verschelde b351d4cbc1 zlib: Update to upstream version 1.2.11 
(cherry picked from commit 6a3dae5be9)
 2017-01-16 17:58:43 +01:00
Rémi Verschelde af7fd899f4 opus: Update to upstream opusfile 0.8 
Had missed it in the previous commit as the upstream website is outdated.

(cherry picked from commit c2310b41fa)
 2017-01-12 19:15:30 +01:00
Rémi Verschelde 3cd976366e opus: Update to upstream libopus 1.1.3 
(cherry picked from commit 9845bdde8d)
 2017-01-12 19:15:30 +01:00
Rémi Verschelde 6e9584e0c5 zlib: Update to upstream 1.2.10 
(cherry picked from commit 2ca0337f5f)
 2017-01-12 19:15:30 +01:00
Rémi Verschelde c24c2ca17b libpng: Update to upstream 1.6.28 
Fixes a NULL pointer dereference bug (CVE-2016-10087).

(cherry picked from commit a0141fa823)
 2017-01-12 19:15:30 +01:00
volzhs 5698571235 Update libwebp to 0.5.2 
(cherry picked from commit e04c7e11ec)
 2017-01-12 19:15:28 +01:00
Rémi Verschelde da4a870bc4 opus: Move public headers to match system install 
(cherry picked from commit 611a94e3a6)
 2016-11-03 21:22:56 +01:00
Rémi Verschelde 5ee9a9962f libpng: Update to upstream 1.6.26 
(cherry picked from commit 7504a85e5a)
 2016-11-03 08:34:19 +01:00
Rémi Verschelde d96842b80e freetype: Make it a module and split thirdparty library 
Comment out the weird workaround for building on Windows at it might
not be needed anymore. Testing needed to confirm.

(cherry picked from commit edbc0c0d0b)
 2016-10-30 14:51:33 +01:00
Rémi Verschelde f1bd2f6f56 zlib: Split thirdparty files, simplify scons option 
(cherry picked from commit cbf52606f4)
 2016-10-30 14:51:33 +01:00
Rémi Verschelde e04ec9565b glew: Split thirdparty files and isolate env 
Not fully happy about the way this one interacts with the various
platforms. Maybe the platform_config.h should be generated by the
SCsub instead of passing a define just to know where is the header.

(cherry picked from commit 36738ddda4)
 2016-10-30 14:51:33 +01:00