Change from FreeType 2.7 to 2.6.5. 2.7's font rendering is too blurry at low resolutions...

CMakeLists.txt

@@ -136,7 +136,7 @@ set(MEGA_LIBOGG_VER "1.3.2")
 set(MEGA_LIBVORBIS_VER "1.3.5")
 set(MEGA_LIBTHEORA_VER "1.1.1")
 set(MEGA_MPG123_VER "1.15.3")
-set(MEGA_FREETYPE_VER "2.7")
+set(MEGA_FREETYPE_VER "2.6.5")
 set(MEGA_SDL2_VER "2.0.5-b48d8a98e261")
 set(MEGA_OPENAL_VER "1.17.0")
 set(MEGA_MODPLUG_VER "0.8.8.4")

libs/freetype-2.7/CMakeLists.txt → libs/freetype-2.6.5/CMakeLists.txt

@@ -153,8 +153,8 @@ endif ()
 
 
 set(VERSION_MAJOR "2")
-set(VERSION_MINOR "7")
-set(VERSION_PATCH "0")
+set(VERSION_MINOR "6")
+set(VERSION_PATCH "5")
 
 set(PROJECT_VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH})
 set(SHARED_LIBRARY_VERSION ${VERSION_MAJOR}.${VERSION_MINOR})
@@ -364,7 +364,7 @@ endif ()
 
 if (NOT CMAKE_VERSION VERSION_LESS 2.8.11)
   target_include_directories(freetype
-    PUBLIC include)
+    PUBLIC $<INSTALL_INTERFACE:include/freetype2>)
 endif ()
 
 if (CMAKE_VERSION VERSION_LESS 2.8.12)
@@ -392,7 +392,6 @@ if (HARFBUZZ_FOUND)
 endif ()
 
 
-if (NOT MEGA)
 # Installations
 # Note the trailing slash in the argument to the `DIRECTORY' directive
 if (NOT SKIP_INSTALL_HEADERS AND NOT SKIP_INSTALL_ALL)
@@ -450,6 +449,4 @@ if (NOT DEFINED FREETYPE_NO_DIST)
   add_custom_target(dist COMMAND ${CMAKE_MAKE_PROGRAM} package_source)
 endif ()
 
-endif() # NOT MEGA
-
 # eof

libs/freetype-2.7/ChangeLog.26 → libs/freetype-2.6.5/ChangeLog

@@ -6,10 +6,6 @@
 
 	Tag sources with `VER-2-6-5'.
 
-	This commit immediately follows `[mac] Fix ftexport.sym target in
-	Jamfile.' on a separate branch, which was then merged with master
-	after the release.
-
 	* include/freetype/config/ftoption.h
 	(TT_CONFIG_OPTION_SUBPIXEL_HINTING): Comment out.
 
@@ -39,82 +35,6 @@
 
 	* docs/CHANGES: Updated.
 
-2016-07-11  Werner Lemberg  <[email protected]>
-
-	Conditionally compile environment support.
-
-	* include/freetype/internal/ftobjs.h, src/autofit/afmodule.c,
-	src/base/ftobjs.c, src/cff/cffdrivr.c, src/truetype/ttdriver.c:
-	Decorate with `FT_CONFIG_OPTION_ENVIRONMENT_PROPERTIES' where
-	necessary.
-
-2016-07-11  Werner Lemberg  <[email protected]>
-
-	Handle properties in `FREETYPE_PROPERTIES' environment variable.
-
-	This commit covers the most important one.
-
-	* src/autofit/afmodule.c (af_property_set): Handle `warping',
-	`darkening-parameters', and `no-stem-darkening'.
-
-	* src/cff/cffdrivr.c (cff_property_set): Handle
-	`darkening-parameters', `hinting-engine', and `no-stem-darkening'.
-
-	* src/truetype/ttdriver.c (tt_property_set): Handle
-	`interpreter-version'.
-
-2016-07-11  Werner Lemberg  <[email protected]>
-
-	Replace calls to `atol' with `strtol'.
-
-	We later on need strtol's `endptr' feature.
-
-	* include/freetype/config/ftstdlib.h (ft_atol): Replace with...
-	(ft_strtol): ... this.
-
-	* src/base/ftdbgmem.c (ft_mem_debug_init): Updated.
-	* src/cid/cidparse.c (cid_parser_new): Ditto.
-	* src/type42/t42drivr.c (t42_get_name_index), src/type42/t42objs.c
-	(T42_GlyphSlot_Load): Ditto.
-
-2016-07-10  Werner Lemberg  <[email protected]>
-
-	Implement handling of `FREETYPE_PROPERTIES' environment variable.
-
-	Recognizing properties follows in another commit.
-
-	* devel/ftoption.h, include/freetype/config/ftoption.h
-	(FT_CONFIG_OPTION_ENVIRONMENT_PROPERTIES): New macro.
-
-	* include/freetype/config/ftstdlib.h (ft_getenv): New macro.
-
-	* src/base/ftinit.c (ft_set_default_properties): New function to
-	parse `FREETYPE_PROPERTIES' and calling `ft_property_string_set'.
-	(FT_Init_FreeType): Updated.
-
-2016-07-09  Werner Lemberg  <[email protected]>
-
-	Add function `ft_property_string_set'.
-
-	This is a preparation for handling an `FREETYPE_PROPERTIES'
-	environment variable to control (some) driver properties.
-
-	No change in functionality.
-
-	* src/base/ftobjs.c (ft_property_do): Add `value_is_string'
-	parameter.
-	(ft_property_string_set): New function.
-	(FT_Property_Set, FT_Property_Get): Updated.
-
-	* include/freetype/internal/ftobjs.h: Updated.
-
-	* include/freetype/internal/services/svprop.h
-	(FT_Properties_SetFunc): Add `value_is_string' parameter.
-
-	* src/autofit/afmodule.c (af_property_set), src/cff/cffdrivr.c
-	(cff_property_set), src/truetype/ttdriver.c (tt_property_set):
-	Updated, emitting an error currently if `value_is_string' is set.
-
 2016-07-09  suzuki toshiya  <[email protected]>
 
 	[mac] Fix ftexport.sym target in Jamfile.

libs/freetype-2.7/Jamfile → libs/freetype-2.6.5/Jamfile

@@ -210,7 +210,7 @@ actions RefDoc
 {
   python $(FT2_SRC)/tools/docmaker/docmaker.py
          --prefix=ft2
-         --title=FreeType-2.7
+         --title=FreeType-2.6.5
          --output=$(DOC_DIR)
          $(FT2_INCLUDE)/freetype/*.h
          $(FT2_INCLUDE)/freetype/config/*.h

libs/freetype-2.7/README → libs/freetype-2.6.5/README

@@ -1,5 +1,5 @@
-  FreeType 2.7
-  ============
+  FreeType 2.6.5
+  ==============
 
   Homepage: http://www.freetype.org
 
@@ -24,9 +24,9 @@
 
   and download one of the following files.
 
-    freetype-doc-2.7.tar.bz2
-    freetype-doc-2.7.tar.gz
-    ftdoc27.zip
+    freetype-doc-2.6.5.tar.bz2
+    freetype-doc-2.6.5.tar.gz
+    ftdoc265.zip
 
   To view the documentation online, go to
 

libs/freetype-2.7/builds/unix/config.sub → libs/freetype-2.6.5/builds/unix/config.sub

@@ -2,7 +2,7 @@
 # Configuration validation subroutine script.
 #   Copyright 1992-2016 Free Software Foundation, Inc.
 
-timestamp='2016-08-25'
+timestamp='2016-06-20'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -1030,7 +1030,7 @@ case $basic_machine in
 	ppc-* | ppcbe-*)
 		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
-	ppcle | powerpclittle)
+	ppcle | powerpclittle | ppc-le | powerpc-little)
 		basic_machine=powerpcle-unknown
 		;;
 	ppcle-* | powerpclittle-*)
@@ -1040,7 +1040,7 @@ case $basic_machine in
 		;;
 	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
-	ppc64le | powerpc64little)
+	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
 		basic_machine=powerpc64le-unknown
 		;;
 	ppc64le-* | powerpc64little-*)

libs/freetype-2.7/builds/unix/configure → libs/freetype-2.6.5/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.7.
+# Generated by GNU Autoconf 2.69 for FreeType 2.6.5.
 #
 # Report bugs to <[email protected]>.
 #
@@ -590,8 +590,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='FreeType'
 PACKAGE_TARNAME='freetype'
-PACKAGE_VERSION='2.7'
-PACKAGE_STRING='FreeType 2.7'
+PACKAGE_VERSION='2.6.5'
+PACKAGE_STRING='FreeType 2.6.5'
 PACKAGE_BUGREPORT='[email protected]'
 PACKAGE_URL=''
 
@@ -755,7 +755,6 @@ with_gnu_ld
 with_sysroot
 enable_libtool_lock
 enable_biarch_config
-enable_largefile
 enable_mmap
 with_zlib
 with_bzip2
@@ -1329,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.7 to adapt to many kinds of systems.
+\`configure' configures FreeType 2.6.5 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1394,7 +1393,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of FreeType 2.7:";;
+     short | recursive ) echo "Configuration of FreeType 2.6.5:";;
    esac
   cat <<\_ACEOF
 
@@ -1409,7 +1408,6 @@ Optional Features:
   --disable-libtool-lock  avoid locking (might break parallel builds)
   --enable-biarch-config  install biarch ftconfig.h to support multiple
                           architectures by single file
-  --disable-largefile     omit support for large files
   --disable-mmap          do not check mmap() and do not use
 
 Optional Packages:
@@ -1541,7 +1539,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-FreeType configure 2.7
+FreeType configure 2.6.5
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2139,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.7, which was
+It was created by FreeType $as_me 2.6.5, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2495,7 +2493,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 # Don't forget to update `docs/VERSIONS.TXT'!
 
-version_info='18:6:12'
+version_info='18:5:12'
 
 ft_version=`echo $version_info | tr : .`
 
@@ -12525,207 +12523,6 @@ CPPFLAGS="${orig_CPPFLAGS}"
 
 # checks for library functions
 
-# Check whether --enable-largefile was given.
-if test "${enable_largefile+set}" = set; then :
-  enableval=$enable_largefile;
-fi
-
-if test "$enable_largefile" != no; then
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for special C compiler options needed for large files" >&5
-$as_echo_n "checking for special C compiler options needed for large files... " >&6; }
-if ${ac_cv_sys_largefile_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_cv_sys_largefile_CC=no
-     if test "$GCC" != yes; then
-       ac_save_CC=$CC
-       while :; do
-	 # IRIX 6.2 and later do not support large files by default,
-	 # so use the C compiler's -n32 option if that helps.
-	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <sys/types.h>
- /* Check that off_t can represent 2**63 - 1 correctly.
-    We can't simply define LARGE_OFF_T to be 9223372036854775807,
-    since some C++ compilers masquerading as C compilers
-    incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
-  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
-		       && LARGE_OFF_T % 2147483647 == 1)
-		      ? 1 : -1];
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-	 if ac_fn_c_try_compile "$LINENO"; then :
-  break
-fi
-rm -f core conftest.err conftest.$ac_objext
-	 CC="$CC -n32"
-	 if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_sys_largefile_CC=' -n32'; break
-fi
-rm -f core conftest.err conftest.$ac_objext
-	 break
-       done
-       CC=$ac_save_CC
-       rm -f conftest.$ac_ext
-    fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_CC" >&5
-$as_echo "$ac_cv_sys_largefile_CC" >&6; }
-  if test "$ac_cv_sys_largefile_CC" != no; then
-    CC=$CC$ac_cv_sys_largefile_CC
-  fi
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5
-$as_echo_n "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; }
-if ${ac_cv_sys_file_offset_bits+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  while :; do
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <sys/types.h>
- /* Check that off_t can represent 2**63 - 1 correctly.
-    We can't simply define LARGE_OFF_T to be 9223372036854775807,
-    since some C++ compilers masquerading as C compilers
-    incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
-  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
-		       && LARGE_OFF_T % 2147483647 == 1)
-		      ? 1 : -1];
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_sys_file_offset_bits=no; break
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#define _FILE_OFFSET_BITS 64
-#include <sys/types.h>
- /* Check that off_t can represent 2**63 - 1 correctly.
-    We can't simply define LARGE_OFF_T to be 9223372036854775807,
-    since some C++ compilers masquerading as C compilers
-    incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
-  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
-		       && LARGE_OFF_T % 2147483647 == 1)
-		      ? 1 : -1];
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_sys_file_offset_bits=64; break
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  ac_cv_sys_file_offset_bits=unknown
-  break
-done
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_file_offset_bits" >&5
-$as_echo "$ac_cv_sys_file_offset_bits" >&6; }
-case $ac_cv_sys_file_offset_bits in #(
-  no | unknown) ;;
-  *)
-cat >>confdefs.h <<_ACEOF
-#define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits
-_ACEOF
-;;
-esac
-rm -rf conftest*
-  if test $ac_cv_sys_file_offset_bits = unknown; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5
-$as_echo_n "checking for _LARGE_FILES value needed for large files... " >&6; }
-if ${ac_cv_sys_large_files+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  while :; do
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <sys/types.h>
- /* Check that off_t can represent 2**63 - 1 correctly.
-    We can't simply define LARGE_OFF_T to be 9223372036854775807,
-    since some C++ compilers masquerading as C compilers
-    incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
-  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
-		       && LARGE_OFF_T % 2147483647 == 1)
-		      ? 1 : -1];
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_sys_large_files=no; break
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#define _LARGE_FILES 1
-#include <sys/types.h>
- /* Check that off_t can represent 2**63 - 1 correctly.
-    We can't simply define LARGE_OFF_T to be 9223372036854775807,
-    since some C++ compilers masquerading as C compilers
-    incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
-  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
-		       && LARGE_OFF_T % 2147483647 == 1)
-		      ? 1 : -1];
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_sys_large_files=1; break
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  ac_cv_sys_large_files=unknown
-  break
-done
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_large_files" >&5
-$as_echo "$ac_cv_sys_large_files" >&6; }
-case $ac_cv_sys_large_files in #(
-  no | unknown) ;;
-  *)
-cat >>confdefs.h <<_ACEOF
-#define _LARGE_FILES $ac_cv_sys_large_files
-_ACEOF
-;;
-esac
-rm -rf conftest*
-  fi
-
-
-fi
-
-
 # Here we check whether we can use our mmap file component.
 
 # Check whether --enable-mmap was given.
@@ -14900,7 +14697,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.7, which was
+This file was extended by FreeType $as_me 2.6.5, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -14966,7 +14763,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.7
+FreeType config.status 2.6.5
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

libs/freetype-2.7/builds/unix/configure.ac → libs/freetype-2.6.5/builds/unix/configure.ac

@@ -11,13 +11,13 @@
 # indicate that you have read the license and understand and accept it
 # fully.
 
-AC_INIT([FreeType], [2.7], [[email protected]], [freetype])
+AC_INIT([FreeType], [2.6.5], [[email protected]], [freetype])
 AC_CONFIG_SRCDIR([ftconfig.in])
 
 
 # Don't forget to update `docs/VERSIONS.TXT'!
 
-version_info='18:6:12'
+version_info='18:5:12'
 AC_SUBST([version_info])
 ft_version=`echo $version_info | tr : .`
 AC_SUBST([ft_version])
@@ -180,8 +180,6 @@ CPPFLAGS="${orig_CPPFLAGS}"
 
 # checks for library functions
 
-AC_SYS_LARGEFILE
-
 # Here we check whether we can use our mmap file component.
 
 AC_ARG_ENABLE([mmap],

libs/freetype-2.7/builds/unix/configure.raw → libs/freetype-2.6.5/builds/unix/configure.raw

@@ -17,7 +17,7 @@ AC_CONFIG_SRCDIR([ftconfig.in])
 
 # Don't forget to update `docs/VERSIONS.TXT'!
 
-version_info='18:6:12'
+version_info='18:5:12'
 AC_SUBST([version_info])
 ft_version=`echo $version_info | tr : .`
 AC_SUBST([ft_version])
@@ -180,8 +180,6 @@ CPPFLAGS="${orig_CPPFLAGS}"
 
 # checks for library functions
 
-AC_SYS_LARGEFILE
-
 # Here we check whether we can use our mmap file component.
 
 AC_ARG_ENABLE([mmap],