Merge pull request #8524 from shuffle2/update-externals

Update externals

Externals/LZO/Makefile

@@ -0,0 +1,100 @@
+#
+# a very simple Makefile for miniLZO
+#
+# Copyright (C) 1996-2017 Markus F.X.J. Oberhumer
+#
+
+PROGRAM = testmini
+SOURCES = testmini.c minilzo.c
+
+default:
+	@echo ""
+	@echo "Welcome to miniLZO. Please choose one of the following 'make' targets:"
+	@echo ""
+	@echo "    gcc:   gcc"
+	@echo "    unix:  hpux hpux9"
+	@echo "    win32: win32-bc win32-cygwin win32-dm win32-lccwin32"
+	@echo "           win32-intelc win32-mingw win32-vc win32-watcomc"
+	@echo "    dos32: dos32-djgpp2 dos32-wc"
+	@echo ""
+
+
+# Make sure that minilzo.h, lzoconf.h and lzodefs.h are in the
+# current dircectory. Otherwise you may want to adjust CPPFLAGS.
+CPPFLAGS = -I. -I../include/lzo
+
+GCC_CFLAGS = -s -Wall -O2 -fomit-frame-pointer
+
+
+#
+# gcc (generic)
+#
+
+gcc:
+	gcc $(CPPFLAGS) $(GCC_CFLAGS) -o $(PROGRAM) $(SOURCES)
+
+cc:
+	cc $(CPPFLAGS) -o $(PROGRAM) $(SOURCES)
+
+
+#
+# UNIX
+#
+
+hpux:
+	cc -Ae $(CPPFLAGS) -o $(PROGRAM) $(SOURCES)
+
+hpux9:
+	cc -Aa -D_HPUX_SOURCE $(CPPFLAGS) -o $(PROGRAM) $(SOURCES)
+
+
+#
+# Windows (32-bit)
+#
+
+win32-borlandc win32-bc:
+	bcc32 -O2 -d -w -w-aus $(CPPFLAGS) $(SOURCES)
+
+win32-cygwin32 win32-cygwin:
+	gcc -mcygwin $(CPPFLAGS) $(GCC_CFLAGS) -o $(PROGRAM).exe $(SOURCES)
+
+win32-digitalmars win32-dm:
+	dmc -mn -o -w- $(CPPFLAGS) $(SOURCES)
+
+win32-intelc win32-ic:
+	icl -nologo -MT -W3 -O2 -GF $(CPPFLAGS) $(SOURCES)
+
+win32-lccwin32:
+	@echo "NOTE: need lcc 2002-07-25 or newer, older versions have bugs"
+	lc -A -unused -O $(CPPFLAGS) $(SOURCES)
+
+win32-mingw32 win32-mingw:
+	gcc -mno-cygwin $(CPPFLAGS) $(GCC_CFLAGS) -o $(PROGRAM).exe $(SOURCES)
+
+win32-visualc win32-vc:
+	cl -nologo -MT -W3 -O2 -GF $(CPPFLAGS) $(SOURCES)
+
+win32-watcomc win32-wc:
+	wcl386 -bt=nt -zq -mf -5r -zc -w5 -oneatx $(CPPFLAGS) $(SOURCES)
+
+
+#
+# DOS (32-bit)
+#
+
+dos32-djgpp2 dos32-dj2:
+	gcc $(CPPFLAGS) $(GCC_CFLAGS) -o $(PROGRAM).exe $(SOURCES)
+
+dos32-watcomc dos32-wc:
+	wcl386 -zq -mf -bt=dos -l=dos4g -5r -ox -zc $(CPPFLAGS) $(SOURCES)
+
+
+#
+# other targets
+#
+
+clean:
+	rm -f $(PROGRAM) $(PROGRAM).exe $(PROGRAM).map $(PROGRAM).tds
+	rm -f *.err *.o *.obj
+
+.PHONY: default clean

Externals/LZO/README.LZO

@@ -6,8 +6,8 @@
  Author  : Markus Franz Xaver Johannes Oberhumer
            <markus@oberhumer.com>
            http://www.oberhumer.com/opensource/lzo/
- Version : 2.04
- Date    : 31 Oct 2010
+ Version : 2.10
+ Date    : 01 Mar 2017
 
  I've created miniLZO for projects where it is inconvenient to
  include (or require) the full LZO source code just because you
@@ -26,8 +26,8 @@
  minilzo.c to your Makefile and #include minilzo.h from your program.
  Note: you also must distribute this file ('README.LZO') with your project.
 
- minilzo.o compiles to about 6 kB (using gcc or Visual C on a i386), and
- the sources are about 30 kB when packed with zip - so there's no more
+ minilzo.o compiles to about 6 KiB (using gcc or Visual C on an i386), and
+ the sources are about 30 KiB when packed with zip - so there's no more
  excuse that your application doesn't support data compression :-)
 
  For more information, documentation, example programs and other support
@@ -50,14 +50,14 @@
 
  If you are running on a very unusual architecture and lzo_init() fails then
  you should first recompile with '-DLZO_DEBUG' to see what causes the failure.
- The most probable case is something like 'sizeof(char *) != sizeof(long)'.
+ The most probable case is something like 'sizeof(void *) != sizeof(size_t)'.
  After identifying the problem you can compile by adding some defines
- like '-DSIZEOF_CHAR_P=8' to your Makefile.
+ like '-DSIZEOF_VOID_P=8' to your Makefile.
 
  The best solution is (of course) using Autoconf - if your project uses
  Autoconf anyway just add '-DMINILZO_HAVE_CONFIG_H' to your compiler
  flags when compiling minilzo.c. See the LZO distribution for an example
- how to set up configure.in.
+ how to set up configure.ac.
 
 
  Appendix B: list of public functions available in miniLZO
@@ -87,7 +87,7 @@
     lzo_memset()
 
 
- Appendix C: suggested macros for 'configure.in' when using Autoconf
+ Appendix C: suggested macros for 'configure.ac' when using Autoconf
  -------------------------------------------------------------------
  Checks for typedefs and structures
     AC_CHECK_TYPE(ptrdiff_t,long)
@@ -110,8 +110,8 @@
 
  Appendix D: Copyright
  ---------------------
- LZO and miniLZO are Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002,
- 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Markus Franz Xaver Oberhumer
+ LZO and miniLZO are Copyright (C) 1996-2017 Markus Franz Xaver Oberhumer
+ All Rights Reserved.
 
  LZO and miniLZO are distributed under the terms of the GNU General
  Public License (GPL).  See the file COPYING.