summaryrefslogtreecommitdiff
path: root/Build/source/libs/freetype2/freetype-src/builds/unix
diff options
context:
space:
mode:
Diffstat (limited to 'Build/source/libs/freetype2/freetype-src/builds/unix')
-rwxr-xr-xBuild/source/libs/freetype2/freetype-src/builds/unix/configure20
-rw-r--r--Build/source/libs/freetype2/freetype-src/builds/unix/configure.ac6
-rw-r--r--Build/source/libs/freetype2/freetype-src/builds/unix/configure.raw4
-rw-r--r--Build/source/libs/freetype2/freetype-src/builds/unix/detect.mk2
-rw-r--r--Build/source/libs/freetype2/freetype-src/builds/unix/freetype-config.in2
-rw-r--r--Build/source/libs/freetype2/freetype-src/builds/unix/freetype2.m42
-rw-r--r--Build/source/libs/freetype2/freetype-src/builds/unix/ft-munmap.m42
-rw-r--r--Build/source/libs/freetype2/freetype-src/builds/unix/ftconfig.in18
-rw-r--r--Build/source/libs/freetype2/freetype-src/builds/unix/ftsystem.c2
-rwxr-xr-xBuild/source/libs/freetype2/freetype-src/builds/unix/install-sh4
-rw-r--r--Build/source/libs/freetype2/freetype-src/builds/unix/install.mk5
-rw-r--r--Build/source/libs/freetype2/freetype-src/builds/unix/unix-cc.in2
-rw-r--r--Build/source/libs/freetype2/freetype-src/builds/unix/unix-def.in4
-rw-r--r--Build/source/libs/freetype2/freetype-src/builds/unix/unix-dev.mk2
-rw-r--r--Build/source/libs/freetype2/freetype-src/builds/unix/unix-lcc.mk2
-rw-r--r--Build/source/libs/freetype2/freetype-src/builds/unix/unix.mk2
-rw-r--r--Build/source/libs/freetype2/freetype-src/builds/unix/unixddef.mk2
17 files changed, 45 insertions, 36 deletions
diff --git a/Build/source/libs/freetype2/freetype-src/builds/unix/configure b/Build/source/libs/freetype2/freetype-src/builds/unix/configure
index 3077c129379..a20524dc622 100755
--- a/Build/source/libs/freetype2/freetype-src/builds/unix/configure
+++ b/Build/source/libs/freetype2/freetype-src/builds/unix/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for FreeType 2.6.2.
+# Generated by GNU Autoconf 2.69 for FreeType 2.6.3.
#
# Report bugs to <freetype@nongnu.org>.
#
@@ -590,8 +590,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='FreeType'
PACKAGE_TARNAME='freetype'
-PACKAGE_VERSION='2.6.2'
-PACKAGE_STRING='FreeType 2.6.2'
+PACKAGE_VERSION='2.6.3'
+PACKAGE_STRING='FreeType 2.6.3'
PACKAGE_BUGREPORT='freetype@nongnu.org'
PACKAGE_URL=''
@@ -1328,7 +1328,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures FreeType 2.6.2 to adapt to many kinds of systems.
+\`configure' configures FreeType 2.6.3 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1393,7 +1393,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of FreeType 2.6.2:";;
+ short | recursive ) echo "Configuration of FreeType 2.6.3:";;
esac
cat <<\_ACEOF
@@ -1539,7 +1539,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-FreeType configure 2.6.2
+FreeType configure 2.6.3
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2137,7 +2137,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by FreeType $as_me 2.6.2, which was
+It was created by FreeType $as_me 2.6.3, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2493,7 +2493,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
# Don't forget to update docs/VERSION.DLL!
-version_info='18:2:12'
+version_info='18:3:12'
ft_version=`echo $version_info | tr : .`
@@ -14694,7 +14694,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by FreeType $as_me 2.6.2, which was
+This file was extended by FreeType $as_me 2.6.3, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -14760,7 +14760,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-FreeType config.status 2.6.2
+FreeType config.status 2.6.3
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/Build/source/libs/freetype2/freetype-src/builds/unix/configure.ac b/Build/source/libs/freetype2/freetype-src/builds/unix/configure.ac
index 2ca3053e84c..b568e51e04e 100644
--- a/Build/source/libs/freetype2/freetype-src/builds/unix/configure.ac
+++ b/Build/source/libs/freetype2/freetype-src/builds/unix/configure.ac
@@ -2,7 +2,7 @@
#
# Process this file with autoconf to produce a configure script.
#
-# Copyright 2001-2015 by
+# Copyright 2001-2016 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,
@@ -11,13 +11,13 @@
# indicate that you have read the license and understand and accept it
# fully.
-AC_INIT([FreeType], [2.6.2], [freetype@nongnu.org], [freetype])
+AC_INIT([FreeType], [2.6.3], [freetype@nongnu.org], [freetype])
AC_CONFIG_SRCDIR([ftconfig.in])
# Don't forget to update docs/VERSION.DLL!
-version_info='18:2:12'
+version_info='18:3:12'
AC_SUBST([version_info])
ft_version=`echo $version_info | tr : .`
AC_SUBST([ft_version])
diff --git a/Build/source/libs/freetype2/freetype-src/builds/unix/configure.raw b/Build/source/libs/freetype2/freetype-src/builds/unix/configure.raw
index 7f4986f7e2b..1be10a3ca33 100644
--- a/Build/source/libs/freetype2/freetype-src/builds/unix/configure.raw
+++ b/Build/source/libs/freetype2/freetype-src/builds/unix/configure.raw
@@ -2,7 +2,7 @@
#
# Process this file with autoconf to produce a configure script.
#
-# Copyright 2001-2015 by
+# Copyright 2001-2016 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,
@@ -17,7 +17,7 @@ AC_CONFIG_SRCDIR([ftconfig.in])
# Don't forget to update docs/VERSION.DLL!
-version_info='18:2:12'
+version_info='18:3:12'
AC_SUBST([version_info])
ft_version=`echo $version_info | tr : .`
AC_SUBST([ft_version])
diff --git a/Build/source/libs/freetype2/freetype-src/builds/unix/detect.mk b/Build/source/libs/freetype2/freetype-src/builds/unix/detect.mk
index 025ed491d4c..557dc92ac03 100644
--- a/Build/source/libs/freetype2/freetype-src/builds/unix/detect.mk
+++ b/Build/source/libs/freetype2/freetype-src/builds/unix/detect.mk
@@ -3,7 +3,7 @@
#
-# Copyright 1996-2015 by
+# Copyright 1996-2016 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,
diff --git a/Build/source/libs/freetype2/freetype-src/builds/unix/freetype-config.in b/Build/source/libs/freetype2/freetype-src/builds/unix/freetype-config.in
index 371f615daae..f74707d5aea 100644
--- a/Build/source/libs/freetype2/freetype-src/builds/unix/freetype-config.in
+++ b/Build/source/libs/freetype2/freetype-src/builds/unix/freetype-config.in
@@ -1,6 +1,6 @@
#! /bin/sh
#
-# Copyright 2000-2015 by
+# Copyright 2000-2016 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,
diff --git a/Build/source/libs/freetype2/freetype-src/builds/unix/freetype2.m4 b/Build/source/libs/freetype2/freetype-src/builds/unix/freetype2.m4
index 3dc88076ab2..1462fc791f4 100644
--- a/Build/source/libs/freetype2/freetype-src/builds/unix/freetype2.m4
+++ b/Build/source/libs/freetype2/freetype-src/builds/unix/freetype2.m4
@@ -1,7 +1,7 @@
# Configure paths for FreeType2
# Marcelo Magallon 2001-10-26, based on gtk.m4 by Owen Taylor
#
-# Copyright 2001-2015 by
+# Copyright 2001-2016 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,
diff --git a/Build/source/libs/freetype2/freetype-src/builds/unix/ft-munmap.m4 b/Build/source/libs/freetype2/freetype-src/builds/unix/ft-munmap.m4
index 72b08645dd6..db798d8d930 100644
--- a/Build/source/libs/freetype2/freetype-src/builds/unix/ft-munmap.m4
+++ b/Build/source/libs/freetype2/freetype-src/builds/unix/ft-munmap.m4
@@ -1,6 +1,6 @@
## FreeType specific autoconf tests
#
-# Copyright 2002-2015 by
+# Copyright 2002-2016 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,
diff --git a/Build/source/libs/freetype2/freetype-src/builds/unix/ftconfig.in b/Build/source/libs/freetype2/freetype-src/builds/unix/ftconfig.in
index fc5c89ba3e0..fbb1c147411 100644
--- a/Build/source/libs/freetype2/freetype-src/builds/unix/ftconfig.in
+++ b/Build/source/libs/freetype2/freetype-src/builds/unix/ftconfig.in
@@ -4,7 +4,7 @@
/* */
/* UNIX-specific configuration file (specification only). */
/* */
-/* Copyright 1996-2015 by */
+/* Copyright 1996-2016 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@@ -34,8 +34,8 @@
/*************************************************************************/
-#ifndef __FTCONFIG_H__
-#define __FTCONFIG_H__
+#ifndef FTCONFIG_H_
+#define FTCONFIG_H_
#include <ft2build.h>
#include FT_CONFIG_OPTIONS_H
@@ -305,7 +305,13 @@ FT_BEGIN_HEADER
/* */
#elif !defined( __STDC__ ) || defined( FT_CONFIG_OPTION_FORCE_INT64 )
-#if defined( _MSC_VER ) && _MSC_VER >= 900 /* Visual C++ (and Intel C++) */
+#if defined( __STDC_VERSION__ ) && __STDC_VERSION__ >= 199901L
+
+#define FT_LONG64
+#define FT_INT64 long long int
+#define FT_UINT64 unsigned long long int
+
+#elif defined( _MSC_VER ) && _MSC_VER >= 900 /* Visual C++ (and Intel C++) */
/* this compiler provides the __int64 type */
#define FT_LONG64
@@ -339,7 +345,7 @@ FT_BEGIN_HEADER
#define FT_INT64 long long int
#define FT_UINT64 unsigned long long int
-#endif /* _MSC_VER */
+#endif /* __STDC_VERSION__ >= 199901L */
#endif /* FT_SIZEOF_LONG == 8 */
@@ -491,7 +497,7 @@ FT_BEGIN_HEADER
FT_END_HEADER
-#endif /* __FTCONFIG_H__ */
+#endif /* FTCONFIG_H_ */
/* END */
diff --git a/Build/source/libs/freetype2/freetype-src/builds/unix/ftsystem.c b/Build/source/libs/freetype2/freetype-src/builds/unix/ftsystem.c
index d7513d9e963..a5e44591c61 100644
--- a/Build/source/libs/freetype2/freetype-src/builds/unix/ftsystem.c
+++ b/Build/source/libs/freetype2/freetype-src/builds/unix/ftsystem.c
@@ -4,7 +4,7 @@
/* */
/* Unix-specific FreeType low-level system interface (body). */
/* */
-/* Copyright 1996-2015 by */
+/* Copyright 1996-2016 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
diff --git a/Build/source/libs/freetype2/freetype-src/builds/unix/install-sh b/Build/source/libs/freetype2/freetype-src/builds/unix/install-sh
index 0360b79e7d0..0b0fdcbba69 100755
--- a/Build/source/libs/freetype2/freetype-src/builds/unix/install-sh
+++ b/Build/source/libs/freetype2/freetype-src/builds/unix/install-sh
@@ -1,7 +1,7 @@
#!/bin/sh
# install - install a program, script, or datafile
-scriptversion=2016-01-11.22; # UTC
+scriptversion=2013-12-25.23; # UTC
# This originates from X11R5 (mit/util/scripts/install.sh), which was
# later released in X11R6 (xc/config/util/install.sh) with the
@@ -496,6 +496,6 @@ done
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC0"
+# time-stamp-time-zone: "UTC"
# time-stamp-end: "; # UTC"
# End:
diff --git a/Build/source/libs/freetype2/freetype-src/builds/unix/install.mk b/Build/source/libs/freetype2/freetype-src/builds/unix/install.mk
index c7a20a35e24..f944c5c239c 100644
--- a/Build/source/libs/freetype2/freetype-src/builds/unix/install.mk
+++ b/Build/source/libs/freetype2/freetype-src/builds/unix/install.mk
@@ -3,7 +3,7 @@
#
-# Copyright 1996-2015 by
+# Copyright 1996-2016 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,
@@ -28,8 +28,11 @@
# installing new files to avoid interferences with files installed by
# previous FreeType versions (which use slightly different locations).
#
+# We also remove `$(includedir)/ft2build.h' for the same reason.
+#
install: $(PROJECT_LIBRARY)
-$(DELDIR) $(DESTDIR)$(includedir)/freetype2
+ -$(DELETE) $(DESTDIR)$(includedir)/ft2build.h
$(MKINSTALLDIRS) $(DESTDIR)$(libdir) \
$(DESTDIR)$(libdir)/pkgconfig \
$(DESTDIR)$(includedir)/freetype2/freetype/config \
diff --git a/Build/source/libs/freetype2/freetype-src/builds/unix/unix-cc.in b/Build/source/libs/freetype2/freetype-src/builds/unix/unix-cc.in
index d53b25f6d82..0083e05b041 100644
--- a/Build/source/libs/freetype2/freetype-src/builds/unix/unix-cc.in
+++ b/Build/source/libs/freetype2/freetype-src/builds/unix/unix-cc.in
@@ -2,7 +2,7 @@
# FreeType 2 template for Unix-specific compiler definitions
#
-# Copyright 1996-2015 by
+# Copyright 1996-2016 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,
diff --git a/Build/source/libs/freetype2/freetype-src/builds/unix/unix-def.in b/Build/source/libs/freetype2/freetype-src/builds/unix/unix-def.in
index 3c2d599d0fa..f7b557fb409 100644
--- a/Build/source/libs/freetype2/freetype-src/builds/unix/unix-def.in
+++ b/Build/source/libs/freetype2/freetype-src/builds/unix/unix-def.in
@@ -3,7 +3,7 @@
#
-# Copyright 1996-2015 by
+# Copyright 1996-2016 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,
@@ -142,7 +142,7 @@ $(OBJ_BUILD)/freetype2.pc: $(TOP_DIR)/builds/unix/freetype2.in
chmod a-w $@.tmp
mv $@.tmp $@
-all: $(OBJ_BUILD)/freetype-config \
+all install: $(OBJ_BUILD)/freetype-config \
$(OBJ_BUILD)/freetype2.pc
# EOF
diff --git a/Build/source/libs/freetype2/freetype-src/builds/unix/unix-dev.mk b/Build/source/libs/freetype2/freetype-src/builds/unix/unix-dev.mk
index 62de3445fc4..3c72e577f8e 100644
--- a/Build/source/libs/freetype2/freetype-src/builds/unix/unix-dev.mk
+++ b/Build/source/libs/freetype2/freetype-src/builds/unix/unix-dev.mk
@@ -6,7 +6,7 @@
#
-# Copyright 1996-2015 by
+# Copyright 1996-2016 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,
diff --git a/Build/source/libs/freetype2/freetype-src/builds/unix/unix-lcc.mk b/Build/source/libs/freetype2/freetype-src/builds/unix/unix-lcc.mk
index 328cc80ebe2..1c254d13a58 100644
--- a/Build/source/libs/freetype2/freetype-src/builds/unix/unix-lcc.mk
+++ b/Build/source/libs/freetype2/freetype-src/builds/unix/unix-lcc.mk
@@ -6,7 +6,7 @@
#
-# Copyright 1996-2015 by
+# Copyright 1996-2016 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,
diff --git a/Build/source/libs/freetype2/freetype-src/builds/unix/unix.mk b/Build/source/libs/freetype2/freetype-src/builds/unix/unix.mk
index 542aa7fe3b9..fba1e1d87a2 100644
--- a/Build/source/libs/freetype2/freetype-src/builds/unix/unix.mk
+++ b/Build/source/libs/freetype2/freetype-src/builds/unix/unix.mk
@@ -3,7 +3,7 @@
#
-# Copyright 1996-2015 by
+# Copyright 1996-2016 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,
diff --git a/Build/source/libs/freetype2/freetype-src/builds/unix/unixddef.mk b/Build/source/libs/freetype2/freetype-src/builds/unix/unixddef.mk
index f3336408fd0..adba517d194 100644
--- a/Build/source/libs/freetype2/freetype-src/builds/unix/unixddef.mk
+++ b/Build/source/libs/freetype2/freetype-src/builds/unix/unixddef.mk
@@ -4,7 +4,7 @@
#
-# Copyright 1996-2015 by
+# Copyright 1996-2016 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,