From 88991007de1c45573dd6b824c4dc3526847cbcce Mon Sep 17 00:00:00 2001
From: Bruce Mitchener <bruce.mitchener@gmail.com>
Date: Tue, 21 Feb 2023 17:27:41 +0700
Subject: [PATCH] Update SDL2_ttf port to 2.20.2 from old.

This updates the SDL2_ttf port to the latest version.

Fixes bug #18639.
---
 ChangeLog.md                     | 1 +
 test/browser/test_sdl2_ttf_rtl.c | 5 ++---
 tools/ports/sdl2_ttf.py          | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ChangeLog.md b/ChangeLog.md
index a546e5c78f5ad..d2d75e77e50e1 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -20,6 +20,7 @@ See docs/process.md for more on how version tagging works.
 
 3.1.33 (in development)
 -----------------------
+- Update SDL2_ttf port to 2.20.2 (#18804)
 
 3.1.32 - 02/17/23
 -----------------
diff --git a/test/browser/test_sdl2_ttf_rtl.c b/test/browser/test_sdl2_ttf_rtl.c
index c4cf709d47a7d..a0a528f03e97c 100644
--- a/test/browser/test_sdl2_ttf_rtl.c
+++ b/test/browser/test_sdl2_ttf_rtl.c
@@ -8,7 +8,6 @@
 #include <stdio.h>
 #include <SDL.h>
 #include <SDL_ttf.h>
-#include <hb.h>
 
 SDL_Window *window;
 SDL_Renderer *renderer;
@@ -21,8 +20,8 @@ void render()
     static SDL_Rect upperRect = {0, 0, 640, 240};
     static SDL_Rect lowerRect = {0, 240, 640, 240};
 
-    TTF_SetDirection(HB_DIRECTION_RTL);
-    TTF_SetScript(HB_SCRIPT_ARABIC);
+    TTF_SetFontDirection(font, TTF_DIRECTION_RTL);
+    TTF_SetFontScriptName(font, "Arab");
 
     SDL_Surface *helloSurface = TTF_RenderUTF8_Shaded(font, "سلام", colorA, colorB);
     SDL_Surface *worldSurface = TTF_RenderUTF8_Shaded(font, "جهان", colorB, colorA);
diff --git a/tools/ports/sdl2_ttf.py b/tools/ports/sdl2_ttf.py
index b2854add6d19b..db7674ff3f2c6 100644
--- a/tools/ports/sdl2_ttf.py
+++ b/tools/ports/sdl2_ttf.py
@@ -5,8 +5,8 @@
 
 import os
 
-TAG = '38fcb695276ed794f879d5d9c5ef4e5286a5200d' # Latest as of 24 November 2020
-HASH = '4c1ac5d27439d28c6d84593dd15dd80c825d68c6bf1020ab4317f2bce1efe16401b5b3280a181047c8317c38a19bbeeae8d52862e6b2c9776d5809758ee7aaa6'
+TAG = 'release-2.20.2' # Latest as of 21 February 2023
+HASH = '8a625d29bef2ab7cbfe2143136a303c0fdb066ecd802d6c725de1b73ad8b056908cb524fe58f38eaee9f105471d2af50bbcb17911d46506dbcf573db218b3685'
 
 deps = ['freetype', 'sdl2', 'harfbuzz']