diff --git a/CMakeLists.txt b/CMakeLists.txt index 361a2650..f931e6f2 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -167,7 +167,7 @@ endif() set(MEGA_ZLIB_VER "1.2.11") set(MEGA_LUA51_VER "5.1.5") -set(MEGA_LUAJIT_VER "2.1.0-0bee44c") +set(MEGA_LUAJIT_VER "2.1.0-1d8b747") set(MEGA_LIBOGG_VER "1.3.2") set(MEGA_LIBVORBIS_VER "1.3.5") set(MEGA_LIBTHEORA_VER "1.1.1") diff --git a/libs/LuaJIT/COPYRIGHT b/libs/LuaJIT/COPYRIGHT index 6ed40025..e2f2cef8 100644 --- a/libs/LuaJIT/COPYRIGHT +++ b/libs/LuaJIT/COPYRIGHT @@ -1,7 +1,7 @@ =============================================================================== -LuaJIT -- a Just-In-Time Compiler for Lua. http://luajit.org/ +LuaJIT -- a Just-In-Time Compiler for Lua. https://luajit.org/ -Copyright (C) 2005-2017 Mike Pall. All rights reserved. +Copyright (C) 2005-2020 Mike Pall. All rights reserved. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -21,7 +21,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -[ MIT license: http://www.opensource.org/licenses/mit-license.php ] +[ MIT license: https://www.opensource.org/licenses/mit-license.php ] =============================================================================== [ LuaJIT includes code from Lua 5.1/5.2, which has this license statement: ] @@ -51,6 +51,6 @@ THE SOFTWARE. This is a version (aka dlmalloc) of malloc/free/realloc written by Doug Lea and released to the public domain, as explained at -http://creativecommons.org/licenses/publicdomain +https://creativecommons.org/licenses/publicdomain =============================================================================== diff --git a/libs/LuaJIT/Makefile b/libs/LuaJIT/Makefile index 0f933089..45d9f968 100644 --- a/libs/LuaJIT/Makefile +++ b/libs/LuaJIT/Makefile @@ -10,7 +10,7 @@ # For MSVC, please follow the instructions given in src/msvcbuild.bat. # For MinGW and Cygwin, cd to src and run make with the Makefile there. # -# Copyright (C) 2005-2017 Mike Pall. See Copyright Notice in luajit.h +# Copyright (C) 2005-2020 Mike Pall. See Copyright Notice in luajit.h ############################################################################## MAJVER= 2 @@ -75,7 +75,7 @@ SYMLINK= ln -sf INSTALL_X= install -m 0755 INSTALL_F= install -m 0644 UNINSTALL= $(RM) -LDCONFIG= ldconfig -n +LDCONFIG= ldconfig -n 2>/dev/null SED_PC= sed -e "s|^prefix=.*|prefix=$(PREFIX)|" \ -e "s|^multilib=.*|multilib=$(MULTILIB)|" @@ -121,7 +121,7 @@ install: $(INSTALL_DEP) $(RM) $(INSTALL_DYN) $(INSTALL_SHORT1) $(INSTALL_SHORT2) cd src && test -f $(FILE_SO) && \ $(INSTALL_X) $(FILE_SO) $(INSTALL_DYN) && \ - $(LDCONFIG) $(INSTALL_LIB) && \ + ( $(LDCONFIG) $(INSTALL_LIB) || : ) && \ $(SYMLINK) $(INSTALL_SONAME) $(INSTALL_SHORT1) && \ $(SYMLINK) $(INSTALL_SONAME) $(INSTALL_SHORT2) || : cd etc && $(INSTALL_F) $(FILE_MAN) $(INSTALL_MAN) diff --git a/libs/LuaJIT/README b/libs/LuaJIT/README index 2b9ae9d2..5bf36b6d 100644 --- a/libs/LuaJIT/README +++ b/libs/LuaJIT/README @@ -3,9 +3,9 @@ README for LuaJIT 2.1.0-beta3 LuaJIT is a Just-In-Time (JIT) compiler for the Lua programming language. -Project Homepage: http://luajit.org/ +Project Homepage: https://luajit.org/ -LuaJIT is Copyright (C) 2005-2017 Mike Pall. +LuaJIT is Copyright (C) 2005-2020 Mike Pall. LuaJIT is free software, released under the MIT license. See full Copyright Notice in the COPYRIGHT file or in luajit.h. diff --git a/libs/LuaJIT/doc/bluequad-print.css b/libs/LuaJIT/doc/bluequad-print.css index d5a3ea3a..13ee876f 100644 --- a/libs/LuaJIT/doc/bluequad-print.css +++ b/libs/LuaJIT/doc/bluequad-print.css @@ -1,4 +1,4 @@ -/* Copyright (C) 2004-2018 Mike Pall. +/* Copyright (C) 2004-2020 Mike Pall. * * You are welcome to use the general ideas of this design for your own sites. * But please do not steal the stylesheet, the layout or the color scheme. diff --git a/libs/LuaJIT/doc/bluequad.css b/libs/LuaJIT/doc/bluequad.css index cfc889af..978719e8 100644 --- a/libs/LuaJIT/doc/bluequad.css +++ b/libs/LuaJIT/doc/bluequad.css @@ -1,4 +1,4 @@ -/* Copyright (C) 2004-2018 Mike Pall. +/* Copyright (C) 2004-2020 Mike Pall. * * You are welcome to use the general ideas of this design for your own sites. * But please do not steal the stylesheet, the layout or the color scheme. diff --git a/libs/LuaJIT/doc/changes.html b/libs/LuaJIT/doc/changes.html deleted file mode 100644 index 1208ac83..00000000 --- a/libs/LuaJIT/doc/changes.html +++ /dev/null @@ -1,882 +0,0 @@ - - - -LuaJIT Change History - - - - - - - - -
-Lua -
- - -
-

-This is a list of changes between the released versions of LuaJIT.
-The current stable version is LuaJIT 2.0.5.
-

-

-Please check the -» Online Change History -to see whether newer versions are available. -

- -
-

LuaJIT 2.1.0-beta3 — 2017-05-01

- - -

LuaJIT 2.1.0-beta2 — 2016-03-03

- - -

LuaJIT 2.1.0-beta1 — 2015-08-25

-

-This is a brief summary of the major changes in LuaJIT 2.1 compared to 2.0. -Please take a look at the commit history for more details. -

- -
- -
-

LuaJIT 2.0.5 — 2017-05-01

- - -

LuaJIT 2.0.4 — 2015-05-14

- - -

LuaJIT 2.0.3 — 2014-03-12

- - -

LuaJIT 2.0.2 — 2013-06-03

- - -

LuaJIT 2.0.1 — 2013-02-19

- - -

LuaJIT 2.0.0 — 2012-11-08

- - -

LuaJIT 2.0.0-beta11 — 2012-10-16

- - -

LuaJIT 2.0.0-beta10 — 2012-05-09

- - -

LuaJIT 2.0.0-beta9 — 2011-12-14

- - -

LuaJIT 2.0.0-beta8 — 2011-06-23

- - -

LuaJIT 2.0.0-beta7 — 2011-05-05

- - -

LuaJIT 2.0.0-beta6 — 2011-02-11

- - -

LuaJIT 2.0.0-beta5 — 2010-08-24

- - -

LuaJIT 2.0.0-beta4 — 2010-03-28

- - -

LuaJIT 2.0.0-beta3 — 2010-03-07

- - -

LuaJIT 2.0.0-beta2 — 2009-11-09

- - -

LuaJIT 2.0.0-beta1 — 2009-10-31

- -
-
-
- - - diff --git a/libs/LuaJIT/doc/contact.html b/libs/LuaJIT/doc/contact.html index 2aace4b5..c2f34283 100644 --- a/libs/LuaJIT/doc/contact.html +++ b/libs/LuaJIT/doc/contact.html @@ -3,14 +3,14 @@ Contact - +
-Lua +Lua

If you want to report bugs, propose fixes or suggest enhancements, please use the -GitHub issue tracker. +» GitHub issue tracker.

Please send general questions to the -» LuaJIT mailing list. +» LuaJIT mailing list.

You can also send any questions you have directly to me: @@ -92,7 +87,7 @@ xD("fyZKB8xv\"FJytmz8.KAB0u52D")

Copyright

All documentation is -Copyright © 2005-2018 Mike Pall. +Copyright © 2005-2020 Mike Pall.

@@ -100,7 +95,7 @@ Copyright © 2005-2018 Mike Pall.