From a34168824f8a0d83a1842fd71c77b304a793ac24 Mon Sep 17 00:00:00 2001
From: Simon McVittie <[EMAIL REDACTED]>
Date: Fri, 6 May 2022 11:20:12 +0100
Subject: [PATCH] Revert "Make it possible to build with older SDL (for GitHub
CI)"
SDL < 2.0.10 would have freed the memory with SDL_free(pixels)
rather than SDL_SIMDFree(pixels), which is invalid when pixels is a
pointer into the middle of a malloc-allocated block.
SDL_SIMDFree(pixels) expects the pointer `pixels` to be like this,
with a poitner to the malloc'd block "behind" the texture data:
sizeof(void*)
|<--->|
[ unused | ptr | texture data... ]
^ ^
| |
ptr pixels
|<-- malloc'd block -->|
which is also what this function has been constructed to do.
This reverts commit 9a86e3f1e167f9d117a1723c67c802cda1a48e3a.
Signed-off-by: Simon McVittie <smcv@collabora.com>
---
SDL_ttf.c | 6 ------
configure | 2 +-
configure.ac | 2 +-
3 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/SDL_ttf.c b/SDL_ttf.c
index 08ac764..c6f1552 100644
--- a/SDL_ttf.c
+++ b/SDL_ttf.c
@@ -33,12 +33,6 @@
#include FT_TRUETYPE_IDS_H
#include FT_IMAGE_H
-
-/* SDL_SIMD_ALIGNED is defined in SDL 2.0.12 and newer */
-#ifndef SDL_SIMD_ALIGNED
-#define SDL_SIMD_ALIGNED 0
-#endif
-
/* Enable rendering with color
* Freetype may need to be compiled with FT_CONFIG_OPTION_USE_PNG */
#if defined(FT_HAS_COLOR)
diff --git a/configure b/configure
index 662cb3e..292ad81 100755
--- a/configure
+++ b/configure
@@ -16021,7 +16021,7 @@ fi
SUMMARY="\nSDL2_ttf Configure Summary:\n"
-SDL_VERSION=2.0.8
+SDL_VERSION=2.0.12
diff --git a/configure.ac b/configure.ac
index 8210727..f98ef4e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -86,7 +86,7 @@ AM_CONDITIONAL(USE_VERSION_RC, test x$use_version_rc = xtrue)
SUMMARY="\nSDL2_ttf Configure Summary:\n"
dnl Check for SDL
-SDL_VERSION=2.0.8
+SDL_VERSION=2.0.12
AC_SUBST(SDL_VERSION)
AM_PATH_SDL2($SDL_VERSION,
:,