From a79b497900ca8ec7e9e7c63c8b1e671a95cdd070 Mon Sep 17 00:00:00 2001 From: "alexey.lysiuk" Date: Fri, 3 Nov 2023 13:18:37 +0200 Subject: [PATCH] aedi: remove obsolete sdl2 patch clang from xcode 15 drops support for macos sdk older than 11.3 to build c++ code, it cannot locate standard library headers anymore without ability to use older macos sdks, it doesn't make any sense to disable gamecontroller and corehaptic support --- aedi/target/library_tier2.py | 3 +-- patch/sdl2-no-gamecontroller+corehaptic.diff | 11 ----------- 2 files changed, 1 insertion(+), 13 deletions(-) delete mode 100644 patch/sdl2-no-gamecontroller+corehaptic.diff diff --git a/aedi/target/library_tier2.py b/aedi/target/library_tier2.py index 7bac3b92..39ba94bc 100644 --- a/aedi/target/library_tier2.py +++ b/aedi/target/library_tier2.py @@ -270,8 +270,7 @@ class Sdl2Target(base.CMakeStaticDependencyTarget): def prepare_source(self, state: BuildState): state.download_source( 'https://github.com/libsdl-org/SDL/releases/download/release-2.28.4/SDL2-2.28.4.tar.gz', - '888b8c39f36ae2035d023d1b14ab0191eb1d26403c3cf4d4d5ede30e66a4942c', - patches='sdl2-no-gamecontroller+corehaptic') + '888b8c39f36ae2035d023d1b14ab0191eb1d26403c3cf4d4d5ede30e66a4942c') def configure(self, state: BuildState): opts = state.options diff --git a/patch/sdl2-no-gamecontroller+corehaptic.diff b/patch/sdl2-no-gamecontroller+corehaptic.diff deleted file mode 100644 index 9fb7306d..00000000 --- a/patch/sdl2-no-gamecontroller+corehaptic.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -2072,7 +2072,7 @@ - #import - #import - int main() { return 0; }" HAVE_FRAMEWORK_COREHAPTICS) -- if(HAVE_FRAMEWORK_GAMECONTROLLER AND HAVE_FRAMEWORK_COREHAPTICS) -+ if(0) - # Only enable MFI if we also have CoreHaptics to ensure rumble works - set(SDL_JOYSTICK_MFI 1) - set(SDL_FRAMEWORK_GAMECONTROLLER 1)