From 367c7cb7c0e9f9ee2faed652e92aa2fc6ddeb18e Mon Sep 17 00:00:00 2001
From: Anonymous Maarten <[EMAIL REDACTED]>
Date: Sat, 15 Nov 2025 00:06:10 +0100
Subject: [PATCH] release: apply updates from SDL3 repo fix-ups
---
.github/workflows/release.yml | 3 +--
Xcode/pkg-support/resources/CMake/SDL3_imageConfig.cmake | 1 -
.../pkg-support/resources/CMake/SDL3_imageConfigVersion.cmake | 2 +-
build-scripts/pkg-support/msvc/cmake/SDL3_imageConfig.cmake.in | 2 +-
4 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 16fa4e9f0..2d9b147e5 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -753,8 +753,6 @@ jobs:
unzip -o "${{ github.workspace }}/${{ needs.android.outputs.android-aar }}"
python "${{ needs.src.outputs.project }}-${{ needs.src.outputs.version }}.aar" -o /tmp/SDL3_image-android
echo "prefix=/tmp/SDL3_image-android" >>$GITHUB_OUTPUT
- - name: Check Android ELF Alignment
- uses: Dermochelys/check-android-elf-alignment@v3
- name: 'Download dependencies'
id: deps
env:
@@ -793,6 +791,7 @@ jobs:
-DTEST_STATIC=FALSE \
-DCMAKE_PREFIX_PATH="${{ steps.sdk.outputs.prefix }};${{ steps.deps-extract.outputs.sdl3-prefix }}" \
-DCMAKE_TOOLCHAIN_FILE=${ANDROID_NDK_HOME}/build/cmake/android.toolchain.cmake \
+ -DANDROID_USE_LEGACY_TOOLCHAIN=0 \
-DANDROID_ABI=${android_abi} \
-DCMAKE_BUILD_TYPE=Release \
-B "${android_abi}"
diff --git a/Xcode/pkg-support/resources/CMake/SDL3_imageConfig.cmake b/Xcode/pkg-support/resources/CMake/SDL3_imageConfig.cmake
index 59c8b4b17..fda295a15 100644
--- a/Xcode/pkg-support/resources/CMake/SDL3_imageConfig.cmake
+++ b/Xcode/pkg-support/resources/CMake/SDL3_imageConfig.cmake
@@ -83,7 +83,6 @@ set(SDL3_image_SDL3_image-shared_FOUND TRUE)
set(SDL3_image_SDL3_image-static FALSE)
unset(_sdl3_image_framework_path)
-unset(_sdl3_image_framework_parent_path)
if(SDL3_image_SDL3_image-shared_FOUND)
set(SDL3_image_SDL3_image_FOUND TRUE)
diff --git a/Xcode/pkg-support/resources/CMake/SDL3_imageConfigVersion.cmake b/Xcode/pkg-support/resources/CMake/SDL3_imageConfigVersion.cmake
index 982da8459..b8506b9e7 100644
--- a/Xcode/pkg-support/resources/CMake/SDL3_imageConfigVersion.cmake
+++ b/Xcode/pkg-support/resources/CMake/SDL3_imageConfigVersion.cmake
@@ -6,7 +6,7 @@
cmake_minimum_required(VERSION 3.12...4.0)
-# Find SDL_image.h.h
+# Find SDL_image.h.
set(_sdl_image_h_path "")
if(EXISTS "${CMAKE_CURRENT_LIST_DIR}/../../Headers/SDL_image.h")
set(_sdl_image_h_path "${CMAKE_CURRENT_LIST_DIR}/../../Headers/SDL_image.h")
diff --git a/build-scripts/pkg-support/msvc/cmake/SDL3_imageConfig.cmake.in b/build-scripts/pkg-support/msvc/cmake/SDL3_imageConfig.cmake.in
index d84fff285..5938b3e45 100644
--- a/build-scripts/pkg-support/msvc/cmake/SDL3_imageConfig.cmake.in
+++ b/build-scripts/pkg-support/msvc/cmake/SDL3_imageConfig.cmake.in
@@ -7,7 +7,7 @@ set_package_properties(SDL3_image PROPERTIES
DESCRIPTION "SDL_image is an image file loading library"
)
-cmake_minimum_required(VERSION 3.0...3.28)
+cmake_minimum_required(VERSION 3.0...4.0)
# Copied from `configure_package_config_file`
macro(check_required_components _NAME)