SDL_ttf: Updated to version 2.0.18 for release

From 2cf43ae44aeccbdb4040f0c173d7d7001cdea411 Mon Sep 17 00:00:00 2001
From: Sam Lantinga <[EMAIL REDACTED]>
Date: Fri, 31 Dec 2021 10:07:32 -0800
Subject: [PATCH] Updated to version 2.0.18 for release

---
 CHANGES.txt                             | 38 +++++++++++++++++++++++++
 CMakeLists.txt                          |  6 ++--
 Makefile.os2                            |  2 +-
 SDL_ttf.h                               |  2 +-
 VisualC/Version.rc                      |  8 +++---
 Xcode/Info-Framework.plist              |  4 +--
 Xcode/SDL_ttf.xcodeproj/project.pbxproj |  4 +--
 configure                               | 26 ++++++++---------
 configure.ac                            |  6 ++--
 debian/changelog                        |  6 ++++
 version.rc                              |  8 +++---
 11 files changed, 77 insertions(+), 33 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index e4c9bcf..6fcf490 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,3 +1,41 @@
+2.0.18:
+Sylvain - Jan 16, 2021
+ * Added support for Signed Distance Field rendering with TTF_SetFontSDF() and TTF_GetFontSDF()
+David Ludwig - Dec 28, 2019
+ * Added optional DPI-scaling of fonts, with the following new functions:
+    TTF_OpenFontDPI()
+    TTF_OpenFontIndexDPI()
+    TTF_OpenFontDPIRW()
+    TTF_OpenFontIndexDPIRW()
+    TTF_SetFontSizeDPI()
+Weard Anaether - Dec 2, 2019 
+ * Added 32-bit character support with:
+    TTF_RenderGlyph32_Solid()
+    TTF_RenderGlyph32_Shaded()
+    TTF_RenderGlyph32_Blended()
+    TTF_GetFontKerningSizeGlyphs32()
+Arthur Danskin - Sep 3, 2019 
+ * Added 32-bit character support with TTF_GlyphIsProvided32() and TTF_GlyphMetrics32()
+Sylvain - Apr 5, 2019 
+ * Added functions to set direction and script when using Harfbuzz:
+    TTF_SetDirection()
+    TTF_SetScript()
+Sylvain - Mar 25, 2019
+ * Added extended API for text measurement:
+    TTF_MeasureText()
+    TTF_MeasureUTF8()
+    TTF_MeasureUNICODE()
+Sylvain - Jan 31, 2019
+ * Added TTF_SetFontSize() to set font size dynamically
+ * Added 'Shaded' and 'Solid' text wrapped functions:
+    TTF_RenderText_Solid_Wrapped()
+    TTF_RenderUTF8_Solid_Wrapped()
+    TTF_RenderUNICODE_Solid_Wrapped()
+    TTF_RenderText_Shaded_Wrapped()
+    TTF_RenderUTF8_Shaded_Wrapped()
+    TTF_RenderUNICODE_Shaded_Wrapped()
+ * Added TTF_HINTING_LIGHT_SUBPIXEL for better results at small text sizes at a performance cost
+
 2.0.15:
 Sam Lantinga - Fri Oct 26 13:26:54 PDT 2018
  * Updated to FreeType version 2.9.1
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6750436..ed087ac 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -58,9 +58,9 @@ find_package(PkgConfig QUIET)
 
 set(SDL_TTF_MAJOR_VERSION 2)
 set(SDL_TTF_MINOR_VERSION 0)
-set(SDL_TTF_MICRO_VERSION 15)
-set(SDL_TTF_INTERFACE_AGE 1)
-set(SDL_TTF_BINARY_AGE 15)
+set(SDL_TTF_MICRO_VERSION 18)
+set(SDL_TTF_INTERFACE_AGE 0)
+set(SDL_TTF_BINARY_AGE 18)
 set(SDL_TTF_VERSION "${SDL_TTF_MAJOR_VERSION}.${SDL_TTF_MINOR_VERSION}.${SDL_TTF_MICRO_VERSION}")
 
 ##### library generation #####
diff --git a/Makefile.os2 b/Makefile.os2
index 2cfe086..f6d848f 100644
--- a/Makefile.os2
+++ b/Makefile.os2
@@ -5,7 +5,7 @@
 # your own environment!.
 
 LIBNAME = SDL2ttf
-VERSION = 2.0.15
+VERSION = 2.0.18
 
 TITLENAME = $(LIBNAME) $(VERSION)
 
diff --git a/SDL_ttf.h b/SDL_ttf.h
index 5b6b787..b85fd2f 100644
--- a/SDL_ttf.h
+++ b/SDL_ttf.h
@@ -43,7 +43,7 @@ extern "C" {
 */
 #define SDL_TTF_MAJOR_VERSION   2
 #define SDL_TTF_MINOR_VERSION   0
-#define SDL_TTF_PATCHLEVEL      15
+#define SDL_TTF_PATCHLEVEL      18
 
 /* This macro can be used to fill a version structure with the compile-time
  * version of the SDL_ttf library.
diff --git a/VisualC/Version.rc b/VisualC/Version.rc
index 31656e8..0319c96 100644
--- a/VisualC/Version.rc
+++ b/VisualC/Version.rc
@@ -28,8 +28,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,0,15,0
- PRODUCTVERSION 2,0,15,0
+ FILEVERSION 2,0,18,0
+ PRODUCTVERSION 2,0,18,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -46,12 +46,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "\0"
             VALUE "FileDescription", "SDL_ttf\0"
-            VALUE "FileVersion", "2, 0, 15, 0\0"
+            VALUE "FileVersion", "2, 0, 18, 0\0"
             VALUE "InternalName", "SDL_ttf\0"
             VALUE "LegalCopyright", "Copyright  2021 Sam Lantinga\0"
             VALUE "OriginalFilename", "SDL_ttf.dll\0"
             VALUE "ProductName", "Simple DirectMedia Layer\0"
-            VALUE "ProductVersion", "2, 0, 15, 0\0"
+            VALUE "ProductVersion", "2, 0, 18, 0\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Xcode/Info-Framework.plist b/Xcode/Info-Framework.plist
index 447ca3b..639f807 100644
--- a/Xcode/Info-Framework.plist
+++ b/Xcode/Info-Framework.plist
@@ -15,8 +15,8 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.0.15</string>
+	<string>2.0.18</string>
 	<key>CFBundleVersion</key>
-	<string>2.0.15</string>
+	<string>2.0.18</string>
 </dict>
 </plist>
diff --git a/Xcode/SDL_ttf.xcodeproj/project.pbxproj b/Xcode/SDL_ttf.xcodeproj/project.pbxproj
index 466e514..61425cf 100644
--- a/Xcode/SDL_ttf.xcodeproj/project.pbxproj
+++ b/Xcode/SDL_ttf.xcodeproj/project.pbxproj
@@ -1957,7 +1957,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COPY_PHASE_STRIP = NO;
 				DYLIB_COMPATIBILITY_VERSION = 15.0.0;
-				DYLIB_CURRENT_VERSION = 15.1.0;
+				DYLIB_CURRENT_VERSION = 19.0.0;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
@@ -2028,7 +2028,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				DEPLOYMENT_POSTPROCESSING = YES;
 				DYLIB_COMPATIBILITY_VERSION = 15.0.0;
-				DYLIB_CURRENT_VERSION = 15.1.0;
+				DYLIB_CURRENT_VERSION = 19.0.0;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				"FRAMEWORK_SEARCH_PATHS[sdk=appletvos*]" = "\"$(SRCROOT)/tvOS\"";
diff --git a/configure b/configure
index 65eaccf..9b028e8 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for SDL2_ttf 2.0.15.
+# Generated by GNU Autoconf 2.69 for SDL2_ttf 2.0.18.
 #
 # Report bugs to <https://github.com/libsdl-org/SDL_ttf/issues>.
 #
@@ -729,8 +729,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='SDL2_ttf'
 PACKAGE_TARNAME='SDL2_ttf'
-PACKAGE_VERSION='2.0.15'
-PACKAGE_STRING='SDL2_ttf 2.0.15'
+PACKAGE_VERSION='2.0.18'
+PACKAGE_STRING='SDL2_ttf 2.0.18'
 PACKAGE_BUGREPORT='https://github.com/libsdl-org/SDL_ttf/issues'
 PACKAGE_URL=''
 
@@ -1524,7 +1524,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 SDL2_ttf 2.0.15 to adapt to many kinds of systems.
+\`configure' configures SDL2_ttf 2.0.18 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1598,7 +1598,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of SDL2_ttf 2.0.15:";;
+     short | recursive ) echo "Configuration of SDL2_ttf 2.0.18:";;
    esac
   cat <<\_ACEOF
 
@@ -1730,7 +1730,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-SDL2_ttf configure 2.0.15
+SDL2_ttf configure 2.0.18
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2366,7 +2366,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 SDL2_ttf $as_me 2.0.15, which was
+It was created by SDL2_ttf $as_me 2.0.18, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2721,11 +2721,11 @@ MAJOR_VERSION=2
 
 MINOR_VERSION=0
 
-MICRO_VERSION=15
+MICRO_VERSION=18
 
-INTERFACE_AGE=1
+INTERFACE_AGE=0
 
-BINARY_AGE=15
+BINARY_AGE=18
 
 
 case `pwd` in
@@ -11163,7 +11163,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='SDL2_ttf'
- VERSION='2.0.15'
+ VERSION='2.0.18'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -20022,7 +20022,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 SDL2_ttf $as_me 2.0.15, which was
+This file was extended by SDL2_ttf $as_me 2.0.18, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -20079,7 +20079,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="\\
-SDL2_ttf config.status 2.0.15
+SDL2_ttf config.status 2.0.18
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index c4ebbdc..cb2a65e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10,9 +10,9 @@ dnl Set various version strings - taken gratefully from the GTk sources
 # set BINARY_AGE_MACRO and INTERFACE_AGE_MACRO to 0.
 m4_define([MAJOR_VERSION_MACRO], [2])
 m4_define([MINOR_VERSION_MACRO], [0])
-m4_define([MICRO_VERSION_MACRO], [15])
-m4_define([INTERFACE_AGE_MACRO], [1])
-m4_define([BINARY_AGE_MACRO], [15])
+m4_define([MICRO_VERSION_MACRO], [18])
+m4_define([INTERFACE_AGE_MACRO], [0])
+m4_define([BINARY_AGE_MACRO], [18])
 
 AC_INIT([SDL2_ttf],
         MAJOR_VERSION_MACRO.MINOR_VERSION_MACRO.MICRO_VERSION_MACRO,
diff --git a/debian/changelog b/debian/changelog
index 5d8f058..7a92bce 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libsdl2-ttf (2.0.18) UNRELEASED; urgency=medium
+
+  * Updated to version 2.0.18
+
+ -- Sam Lantinga <slouken@libsdl.org>  Fri, 31 Dec 2021 10:03:03 -0800
+
 libsdl2-ttf (2.0.15) UNRELEASED; urgency=medium
 
   * Updated to version 2.0.15
diff --git a/version.rc b/version.rc
index f5d4c8e..a321d84 100644
--- a/version.rc
+++ b/version.rc
@@ -9,8 +9,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,0,15,0
- PRODUCTVERSION 2,0,15,0
+ FILEVERSION 2,0,18,0
+ PRODUCTVERSION 2,0,18,0
  FILEFLAGSMASK 0x3fL
  FILEFLAGS 0x0L
  FILEOS 0x40004L
@@ -23,12 +23,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "\0"
             VALUE "FileDescription", "SDL_ttf\0"
-            VALUE "FileVersion", "2, 0, 15, 0\0"
+            VALUE "FileVersion", "2, 0, 18, 0\0"
             VALUE "InternalName", "SDL_ttf\0"
             VALUE "LegalCopyright", "Copyright  2021 Sam Lantinga\0"
             VALUE "OriginalFilename", "SDL_ttf.dll\0"
             VALUE "ProductName", "Simple DirectMedia Layer\0"
-            VALUE "ProductVersion", "2, 0, 15, 0\0"
+            VALUE "ProductVersion", "2, 0, 18, 0\0"
         END
     END
     BLOCK "VarFileInfo"