aedi: update sdl2 to 2.0.22

This commit is contained in:
alexey.lysiuk 2022-04-30 12:41:42 +03:00
parent 3fa4253796
commit 6c2e477c87
3 changed files with 7 additions and 7 deletions

View file

@ -456,8 +456,8 @@ class Sdl2Target(CMakeStaticDependencyTarget):
def prepare_source(self, state: BuildState):
state.download_source(
'https://libsdl.org/release/SDL2-2.0.20.tar.gz',
'c56aba1d7b5b0e7e999e4a7698c70b63a3394ff9704b5f6e1c57e0c16f04dd06',
'https://libsdl.org/release/SDL2-2.0.22.tar.gz',
'fe7cbf3127882e3fc7259a75a0cb585620272c51745d3852ab9dd87960697f2e',
patches=('sdl2-no-updaterev', 'sdl2-no-gamecontroller+corehaptic'))
FRAMEWORKS = '-framework AudioToolbox -framework AVFoundation -framework Carbon' \

View file

@ -1,9 +1,9 @@
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1872,7 +1872,7 @@
@@ -1902,7 +1902,7 @@
#import <Foundation/Foundation.h>
#import <CoreHaptics/CoreHaptics.h>
int main() {}" HAVE_FRAMEWORK_COREHAPTICS)
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

View file

@ -1,6 +1,6 @@
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2528,7 +2528,7 @@
@@ -2643,7 +2643,7 @@
# Compat helpers for the configuration files
find_package(Git)
@ -9,12 +9,12 @@
execute_process(COMMAND
"${GIT_EXECUTABLE}" remote get-url origin
WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
@@ -2549,7 +2549,7 @@
@@ -2664,7 +2664,7 @@
set(SDL_REVISION "")
endif()
else()
- set(SDL_REVISION "")
+ set(SDL_REVISION "https://github.com/libsdl-org/SDL.git@2e9821423a237a1206e3c09020778faacfe430be")
+ set(SDL_REVISION "https://github.com/libsdl-org/SDL.git@53dea9830964eee8b5c2a7ee0a65d6e268dc78a1")
endif()
configure_file("${SDL2_SOURCE_DIR}/include/SDL_revision.h.cmake"