diff --git a/CMakeLists.txt b/CMakeLists.txt index 60520f1a2..0cd492ac0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -154,7 +154,7 @@ endif () set(VERSION_MAJOR "2") set(VERSION_MINOR "6") -set(VERSION_PATCH "4") +set(VERSION_PATCH "5") set(PROJECT_VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}) set(SHARED_LIBRARY_VERSION ${VERSION_MAJOR}.${VERSION_MINOR}) diff --git a/ChangeLog b/ChangeLog index 9a834c54d..a8cba88a2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,40 @@ +2016-07-12 Werner Lemberg + + * Version 2.6.5 released. + ========================= + + + Tag sources with `VER-2-6-5'. + + * include/freetype/config/ftoption.h + (TT_CONFIG_OPTION_SUBPIXEL_HINTING): Comment out. + + * docs/VERSION.TXT: Add entry for version 2.6.5. + + * README, Jamfile (RefDoc), builds/windows/vc2005/freetype.vcproj, + builds/windows/vc2005/index.html, + builds/windows/vc2008/freetype.vcproj, + builds/windows/vc2008/index.html, + builds/windows/vc2010/freetype.vcxproj, + builds/windows/vc2010/index.html, + builds/windows/visualc/freetype.dsp, + builds/windows/visualc/freetype.vcproj, + builds/windows/visualc/index.html, + builds/windows/visualce/freetype.dsp, + builds/windows/visualce/freetype.vcproj, + builds/windows/visualce/index.html, + builds/wince/vc2005-ce/freetype.vcproj, + builds/wince/vc2005-ce/index.html, + builds/wince/vc2008-ce/freetype.vcproj, + builds/wince/vc2008-ce/index.html: s/2.6.4/2.6.5/, s/264/265/. + + * include/freetype/freetype.h (FREETYPE_PATCH): Set to 5. + + * builds/unix/configure.raw (version_info): Set to 18:5:12. + * CMakeLists.txt (VERSION_PATCH): Set to 5. + + * docs/CHANGES: Updated. + 2016-07-09 suzuki toshiya [mac] Fix ftexport.sym target in Jamfile. diff --git a/Jamfile b/Jamfile index 16ab6ec19..9d837baf6 100644 --- a/Jamfile +++ b/Jamfile @@ -210,7 +210,7 @@ actions RefDoc { python $(FT2_SRC)/tools/docmaker/docmaker.py --prefix=ft2 - --title=FreeType-2.6.4 + --title=FreeType-2.6.5 --output=$(DOC_DIR) $(FT2_INCLUDE)/freetype/*.h $(FT2_INCLUDE)/freetype/config/*.h diff --git a/README b/README index 09a203ab7..23c10abb1 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ - FreeType 2.6.4 + FreeType 2.6.5 ============== Homepage: http://www.freetype.org @@ -24,9 +24,9 @@ and download one of the following files. - freetype-doc-2.6.4.tar.bz2 - freetype-doc-2.6.4.tar.gz - ftdoc264.zip + freetype-doc-2.6.5.tar.bz2 + freetype-doc-2.6.5.tar.gz + ftdoc265.zip To view the documentation online, go to diff --git a/builds/unix/configure.raw b/builds/unix/configure.raw index 2d4308bdc..dc38ba4f4 100644 --- a/builds/unix/configure.raw +++ b/builds/unix/configure.raw @@ -17,7 +17,7 @@ AC_CONFIG_SRCDIR([ftconfig.in]) # Don't forget to update `docs/VERSIONS.TXT'! -version_info='18:4:12' +version_info='18:5:12' AC_SUBST([version_info]) ft_version=`echo $version_info | tr : .` AC_SUBST([ft_version]) diff --git a/builds/wince/vc2005-ce/freetype.vcproj b/builds/wince/vc2005-ce/freetype.vcproj index d2b14e4f7..c7aa5145d 100644 --- a/builds/wince/vc2005-ce/freetype.vcproj +++ b/builds/wince/vc2005-ce/freetype.vcproj @@ -21,7 +21,7 @@ - + @@ -41,7 +41,7 @@ - + @@ -61,7 +61,7 @@ - + @@ -81,7 +81,7 @@ - + @@ -101,7 +101,7 @@ - + @@ -121,7 +121,7 @@ - + @@ -141,7 +141,7 @@ - + @@ -161,7 +161,7 @@ - + @@ -181,7 +181,7 @@ - + @@ -201,7 +201,7 @@ - + @@ -221,7 +221,7 @@ - + @@ -241,7 +241,7 @@ - + @@ -261,7 +261,7 @@ - + @@ -281,7 +281,7 @@ - + @@ -301,7 +301,7 @@ - + @@ -321,7 +321,7 @@ - + @@ -341,7 +341,7 @@ - + @@ -361,7 +361,7 @@ - + @@ -381,7 +381,7 @@ - + @@ -401,7 +401,7 @@ - + @@ -421,7 +421,7 @@ - + @@ -441,7 +441,7 @@ - + @@ -461,7 +461,7 @@ - + @@ -481,7 +481,7 @@ - + @@ -501,7 +501,7 @@ - + @@ -521,7 +521,7 @@ - + @@ -541,7 +541,7 @@ - + @@ -561,7 +561,7 @@ - + @@ -581,7 +581,7 @@ - + @@ -601,7 +601,7 @@ - + @@ -621,7 +621,7 @@ - + @@ -641,7 +641,7 @@ - + @@ -661,7 +661,7 @@ - + @@ -681,7 +681,7 @@ - + @@ -701,7 +701,7 @@ - + @@ -721,7 +721,7 @@ - + @@ -741,7 +741,7 @@ - + @@ -758,7 +758,7 @@ - + diff --git a/builds/wince/vc2005-ce/index.html b/builds/wince/vc2005-ce/index.html index 8c40b61a0..4afa23d7d 100644 --- a/builds/wince/vc2005-ce/index.html +++ b/builds/wince/vc2005-ce/index.html @@ -21,14 +21,14 @@ the following targets:
  • PPC/SP WM6 (Windows Mobile 6)
    • -It compiles the following libraries from the FreeType 2.6.4 sources:

    +It compiles the following libraries from the FreeType 2.6.5 sources:

      -    freetype264.lib     - release build; single threaded
-    freetype264_D.lib   - debug build;   single threaded
-    freetype264MT.lib   - release build; multi-threaded
-    freetype264MT_D.lib - debug build;   multi-threaded
      + freetype265.lib - release build; single threaded + freetype265_D.lib - debug build; single threaded + freetype265MT.lib - release build; multi-threaded + freetype265MT_D.lib - debug build; multi-threaded

    Be sure to extract the files with the Windows (CR+LF) line endings. ZIP diff --git a/builds/wince/vc2008-ce/freetype.vcproj b/builds/wince/vc2008-ce/freetype.vcproj index 4df524ee2..c62fda292 100644 --- a/builds/wince/vc2008-ce/freetype.vcproj +++ b/builds/wince/vc2008-ce/freetype.vcproj @@ -88,7 +88,7 @@ /> PPC/SP WM6 (Windows Mobile 6) -It compiles the following libraries from the FreeType 2.6.4 sources:

    +It compiles the following libraries from the FreeType 2.6.5 sources:

      -    freetype264.lib     - release build; single threaded
-    freetype264_D.lib   - debug build;   single threaded
-    freetype264MT.lib   - release build; multi-threaded
-    freetype264MT_D.lib - debug build;   multi-threaded
      + freetype265.lib - release build; single threaded + freetype265_D.lib - debug build; single threaded + freetype265MT.lib - release build; multi-threaded + freetype265MT_D.lib - debug build; multi-threaded

    Be sure to extract the files with the Windows (CR+LF) line endings. ZIP diff --git a/builds/windows/vc2005/freetype.vcproj b/builds/windows/vc2005/freetype.vcproj index 2cabce973..f938b5358 100644 --- a/builds/windows/vc2005/freetype.vcproj +++ b/builds/windows/vc2005/freetype.vcproj @@ -16,7 +16,7 @@ - + @@ -33,7 +33,7 @@ - + @@ -50,7 +50,7 @@ - + @@ -67,7 +67,7 @@ - + @@ -84,7 +84,7 @@ - + @@ -101,7 +101,7 @@ - + diff --git a/builds/windows/vc2005/index.html b/builds/windows/vc2005/index.html index d69d6264c..f6eb4fd06 100644 --- a/builds/windows/vc2005/index.html +++ b/builds/windows/vc2005/index.html @@ -11,14 +11,14 @@

    This directory contains project files for Visual C++, named freetype.vcproj, and Visual Studio, called freetype.sln. It -compiles the following libraries from the FreeType 2.6.4 sources:

    +compiles the following libraries from the FreeType 2.6.5 sources:

      -    freetype264.lib     - release build; single threaded
-    freetype264_D.lib   - debug build;   single threaded
-    freetype264MT.lib   - release build; multi-threaded
-    freetype264MT_D.lib - debug build;   multi-threaded
      + freetype265.lib - release build; single threaded + freetype265_D.lib - debug build; single threaded + freetype265MT.lib - release build; multi-threaded + freetype265MT_D.lib - debug build; multi-threaded

    Be sure to extract the files with the Windows (CR+LF) line endings. ZIP diff --git a/builds/windows/vc2008/freetype.vcproj b/builds/windows/vc2008/freetype.vcproj index 06c25f08f..b83b5b12c 100644 --- a/builds/windows/vc2008/freetype.vcproj +++ b/builds/windows/vc2008/freetype.vcproj @@ -70,7 +70,7 @@ /> This directory contains project files for Visual C++, named freetype.vcproj, and Visual Studio, called freetype.sln. It -compiles the following libraries from the FreeType 2.6.4 sources:

    +compiles the following libraries from the FreeType 2.6.5 sources:

      -    freetype264.lib     - release build; single threaded
-    freetype264_D.lib   - debug build;   single threaded
-    freetype264MT.lib   - release build; multi-threaded
-    freetype264MT_D.lib - debug build;   multi-threaded
      + freetype265.lib - release build; single threaded + freetype265_D.lib - debug build; single threaded + freetype265MT.lib - release build; multi-threaded + freetype265MT_D.lib - debug build; multi-threaded

    Be sure to extract the files with the Windows (CR+LF) line endings. ZIP diff --git a/builds/windows/vc2010/freetype.vcxproj b/builds/windows/vc2010/freetype.vcxproj index 9323f3a38..f164b31cb 100644 --- a/builds/windows/vc2010/freetype.vcxproj +++ b/builds/windows/vc2010/freetype.vcxproj @@ -191,18 +191,18 @@ - freetype264d - freetype264d - freetype264MTd - freetype264MTd - freetype264STd - freetype264STd - freetype264 - freetype264 - freetype264MT - freetype264MT - freetype264ST - freetype264ST + freetype265d + freetype265d + freetype265MTd + freetype265MTd + freetype265STd + freetype265STd + freetype265 + freetype265 + freetype265MT + freetype265MT + freetype265ST + freetype265ST diff --git a/builds/windows/vc2010/index.html b/builds/windows/vc2010/index.html index 15b95e89f..2e27e8518 100644 --- a/builds/windows/vc2010/index.html +++ b/builds/windows/vc2010/index.html @@ -12,16 +12,16 @@

    This directory contains a project file for Visual C++ (VS.NET 2010 or newer), named freetype.vcxproj, and Visual Studio, called freetype.sln. It compiles the following libraries from the -FreeType 2.6.4 sources:

    +FreeType 2.6.5 sources:

      -    freetype264.lib    - release build
-    freetype264d.lib   - debug build
-    freetype264ST.lib  - release build; single threaded
-    freetype264STd.lib - debug build;   single threaded
-    freetype264MT.lib  - release build; multi-threaded
-    freetype264MTd.lib - debug build;   multi-threaded
      + freetype265.lib - release build + freetype265d.lib - debug build + freetype265ST.lib - release build; single threaded + freetype265STd.lib - debug build; single threaded + freetype265MT.lib - release build; multi-threaded + freetype265MTd.lib - debug build; multi-threaded

    Both Win32 and x64 builds are supported.

    diff --git a/builds/windows/visualc/freetype.dsp b/builds/windows/visualc/freetype.dsp index 8fc0a9aec..1028ad110 100644 --- a/builds/windows/visualc/freetype.dsp +++ b/builds/windows/visualc/freetype.dsp @@ -54,7 +54,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype264.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype265.lib" !ELSEIF "$(CFG)" == "freetype - Win32 Debug" @@ -78,7 +78,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype264_D.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype265_D.lib" !ELSEIF "$(CFG)" == "freetype - Win32 Debug Multithreaded" @@ -102,8 +102,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"lib\freetype264_D.lib" -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype264MT_D.lib" +# ADD BASE LIB32 /nologo /out:"lib\freetype265_D.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype265MT_D.lib" !ELSEIF "$(CFG)" == "freetype - Win32 Release Multithreaded" @@ -126,8 +126,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"lib\freetype264.lib" -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype264MT.lib" +# ADD BASE LIB32 /nologo /out:"lib\freetype265.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype265MT.lib" !ELSEIF "$(CFG)" == "freetype - Win32 Release Singlethreaded" @@ -151,8 +151,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype264.lib" -# ADD LIB32 /out:"..\..\..\objs\freetype264ST.lib" +# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype265.lib" +# ADD LIB32 /out:"..\..\..\objs\freetype265ST.lib" # SUBTRACT LIB32 /nologo !ELSEIF "$(CFG)" == "freetype - Win32 Debug Singlethreaded" @@ -177,8 +177,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype264_D.lib" -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype264ST_D.lib" +# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype265_D.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype265ST_D.lib" !ENDIF diff --git a/builds/windows/visualc/freetype.vcproj b/builds/windows/visualc/freetype.vcproj index 545c4bae4..b8d68bf36 100644 --- a/builds/windows/visualc/freetype.vcproj +++ b/builds/windows/visualc/freetype.vcproj @@ -69,7 +69,7 @@ /> This directory contains project files for Visual C++, named freetype.dsp, and Visual Studio, called freetype.sln. It -compiles the following libraries from the FreeType 2.6.4 sources:

    +compiles the following libraries from the FreeType 2.6.5 sources:

      -    freetype264.lib     - release build; single threaded
-    freetype264_D.lib   - debug build;   single threaded
-    freetype264MT.lib   - release build; multi-threaded
-    freetype264MT_D.lib - debug build;   multi-threaded
      + freetype265.lib - release build; single threaded + freetype265_D.lib - debug build; single threaded + freetype265MT.lib - release build; multi-threaded + freetype265MT_D.lib - debug build; multi-threaded

    Be sure to extract the files with the Windows (CR+LF) line endings. ZIP diff --git a/builds/windows/visualce/freetype.dsp b/builds/windows/visualce/freetype.dsp index 8fc0a9aec..1028ad110 100644 --- a/builds/windows/visualce/freetype.dsp +++ b/builds/windows/visualce/freetype.dsp @@ -54,7 +54,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype264.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype265.lib" !ELSEIF "$(CFG)" == "freetype - Win32 Debug" @@ -78,7 +78,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype264_D.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype265_D.lib" !ELSEIF "$(CFG)" == "freetype - Win32 Debug Multithreaded" @@ -102,8 +102,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"lib\freetype264_D.lib" -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype264MT_D.lib" +# ADD BASE LIB32 /nologo /out:"lib\freetype265_D.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype265MT_D.lib" !ELSEIF "$(CFG)" == "freetype - Win32 Release Multithreaded" @@ -126,8 +126,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"lib\freetype264.lib" -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype264MT.lib" +# ADD BASE LIB32 /nologo /out:"lib\freetype265.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype265MT.lib" !ELSEIF "$(CFG)" == "freetype - Win32 Release Singlethreaded" @@ -151,8 +151,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype264.lib" -# ADD LIB32 /out:"..\..\..\objs\freetype264ST.lib" +# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype265.lib" +# ADD LIB32 /out:"..\..\..\objs\freetype265ST.lib" # SUBTRACT LIB32 /nologo !ELSEIF "$(CFG)" == "freetype - Win32 Debug Singlethreaded" @@ -177,8 +177,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype264_D.lib" -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype264ST_D.lib" +# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype265_D.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype265ST_D.lib" !ENDIF diff --git a/builds/windows/visualce/freetype.vcproj b/builds/windows/visualce/freetype.vcproj index 6cc04a298..ff680dab8 100644 --- a/builds/windows/visualce/freetype.vcproj +++ b/builds/windows/visualce/freetype.vcproj @@ -87,7 +87,7 @@ /> PPC/SP WM6 (Windows Mobile 6) -It compiles the following libraries from the FreeType 2.6.4 sources:

    +It compiles the following libraries from the FreeType 2.6.5 sources:

      -    freetype264.lib     - release build; single threaded
-    freetype264_D.lib   - debug build;   single threaded
-    freetype264MT.lib   - release build; multi-threaded
-    freetype264MT_D.lib - debug build;   multi-threaded
      + freetype265.lib - release build; single threaded + freetype265_D.lib - debug build; single threaded + freetype265MT.lib - release build; multi-threaded + freetype265MT_D.lib - debug build; multi-threaded

    Be sure to extract the files with the Windows (CR+LF) line endings. ZIP diff --git a/docs/CHANGES b/docs/CHANGES index 39f69221e..c1db81bc5 100644 --- a/docs/CHANGES +++ b/docs/CHANGES @@ -1,4 +1,24 @@ +CHANGES BETWEEN 2.6.4 and 2.6.5 + + I. IMPORTANT BUG FIXES + + - Compilation works again on Mac OS X (bug introduced in version + 2.6.4). + + + I. IMPORTANT CHANGES + + - The new subpixel hinting mode is now disabled by default; it + will be enabled by default in the forthcoming 2.7.x series. + Main reason for reverting this feature is the principle of least + surprise: a sudden change in appearance of all fonts (even if + the rendering improves for almost all recent fonts) should not + be expected in a new micro version of a series. + + +====================================================================== + CHANGES BETWEEN 2.6.3 and 2.6.4 I. IMPORTANT CHANGES diff --git a/docs/VERSIONS.TXT b/docs/VERSIONS.TXT index 3c851738d..c5a57e7ac 100644 --- a/docs/VERSIONS.TXT +++ b/docs/VERSIONS.TXT @@ -52,6 +52,7 @@ on _most_ systems, but not all of them: release libtool so ------------------------------- + 2.6.5 18.5.12 6.12.5 2.6.4 18.4.12 6.12.4 2.6.3 18.3.12 6.12.3 2.6.2 18.2.12 6.12.2 diff --git a/docs/freetype-config.1 b/docs/freetype-config.1 index 6dffcce32..63e5aed3c 100644 --- a/docs/freetype-config.1 +++ b/docs/freetype-config.1 @@ -1,4 +1,4 @@ -.TH FREETYPE-CONFIG 1 "July 2016" "FreeType 2.6.4" +.TH FREETYPE-CONFIG 1 "July 2016" "FreeType 2.6.5" . . .SH NAME diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h index 7dd3f55e5..2556c64d9 100644 --- a/include/freetype/config/ftoption.h +++ b/include/freetype/config/ftoption.h @@ -630,8 +630,8 @@ FT_BEGIN_HEADER /* */ /* [1] http://www.microsoft.com/typography/cleartype/truetypecleartype.aspx */ /* */ -/* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING 1 */ -#define TT_CONFIG_OPTION_SUBPIXEL_HINTING 2 +/* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING 1 */ +/* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING 2 */ /* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING ( 1 | 2 ) */ diff --git a/include/freetype/freetype.h b/include/freetype/freetype.h index 7baf185ce..45e10c48a 100644 --- a/include/freetype/freetype.h +++ b/include/freetype/freetype.h @@ -4176,7 +4176,7 @@ FT_BEGIN_HEADER */ #define FREETYPE_MAJOR 2 #define FREETYPE_MINOR 6 -#define FREETYPE_PATCH 4 +#define FREETYPE_PATCH 5 /*************************************************************************/