godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,066 Commits 15 Branches 59 Tags 2.2 GiB
Commit Graph

39 Commits

Author SHA1 Message Date
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
Rémi Verschelde 8263fca121 squish: Update to upstream 1.14 
Sources are untouched, tarball from https://sourceforge.net/projects/libsquish

(cherry picked from commit 249836e530)
 2016-10-30 14:51:33 +01:00
Rémi Verschelde 1022705707 squish: Move to a module and split thirdparty lib 
(cherry picked from commit 8311a78df5)
 2016-10-30 14:51:33 +01:00
Rémi Verschelde 4ff4177acc rtaudio: Split thirdparty files 
(cherry picked from commit 8981ff8a84)
 2016-10-30 14:51:33 +01:00
Rémi Verschelde c8a97c3678 mpc: Move to a module and split thirdparty libmpcdec 
(cherry picked from commit 5c12c9e69b)
 2016-10-30 14:51:33 +01:00
Rémi Verschelde 82e8721715 theora: Move to a module and split thirdparty lib 
Same rationale as the previous commits.

(cherry picked from commit cfcc8a20e8)
 2016-10-30 14:51:32 +01:00
Rémi Verschelde 4cd640f684 openssl: Move to a module and split thirdparty lib 
Same rationale as the previous commits.

(cherry picked from commit 422196759f)

Removed the winrt-specific parts.
 2016-10-30 14:51:32 +01:00
Rémi Verschelde 995dcb610c ogg/vorbis/opus/speex: Make them modules and unbundle thirdparty libs 
Took the opportunity to undo the Godot changed made to the
opus source. The opus module should eventually be built in its
own environment to avoid polluting others with too many include
dirs and defines.

TODO: Fix the platform/ stuff for opus.
(cherry picked from commit d9a291f641)

speex module was only added while cherry-picking, as speex is removed
in the master branch but we don't want to break compatibility in 2.1.x.
Unbundling wasn't done as the module uses the internal speex_free,
so it would require some more work.
 2016-10-30 14:51:31 +01:00
Rémi Verschelde 55414bc573 webp: Make it a module and unbundle libwebp thirdparty files 
Note that there are two Godot-specific changes made to libwebp
for the javascript/HTML5 platform. They are documented in the
README.md.

(cherry picked from commit ee3cf211c6)
 2016-10-30 14:51:30 +01:00
Rémi Verschelde 819ccdd340 dds/etc1/pbm/pvr: Make those modules and split thirdparty files 
They are not particularly packaged in Linux distros so we do not
facilitate unbundling via SCons. There could be done if/when there
is interest.

Also s/pnm/pbm/, long-lived typo :)

(cherry picked from commit b1e8889d96)
 2016-10-30 14:51:30 +01:00
Rémi Verschelde ea1e180e4a jpg: Make it a module and split jpgd thirdparty files 
Similar rationale as in previous commit.

(cherry picked from commit 16ba665db6)
 2016-10-30 14:51:30 +01:00
Rémi Verschelde 575e986bde png: Split library to thirdparty dir and allow unbundling 
Uses the new structure agreed upon in #6157, but the thirdparty/ folder
does not behave following a logic similar to that of modules/ yet.

The png driver can't be moved to a module as discussed in #6157, as it's
required by core together with a few other ImageLoader implementations
(see drivers/register_driver_types.cpp:register_core_driver_types())

Dropped the possibility to disable PNG support, it's a core component
of Godot.

(cherry picked from commit 5fef84a135)
 2016-10-30 14:51:30 +01:00