Merge e7ef1e4 into 436d5a9

kivy · Dec 2, 2023 · 5ba2dfa · 5ba2dfa
2 parents 436d5a9 + e7ef1e4
commit 5ba2dfa
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 35 deletions.
diff --git a/pythonforandroid/recipes/sdl2/__init__.py b/pythonforandroid/recipes/sdl2/__init__.py
@@ -6,16 +6,14 @@
 
 
 class LibSDL2Recipe(BootstrapNDKRecipe):
-    version = "2.26.1"
+    version = "2.28.5"
     url = "https://github.com/libsdl-org/SDL/releases/download/release-{version}/SDL2-{version}.tar.gz"
-    md5sum = 'fba211fe2c67609df6fa3cf55d3c74dc'
+    md5sum = 'a344eb827a03045c9b399e99af4af13d'
 
     dir_name = 'SDL'
 
     depends = ['sdl2_image', 'sdl2_mixer', 'sdl2_ttf']
 
-    patches = ['sdl-orientation-pr-6984.diff']
-
     def get_recipe_env(self, arch=None, with_flags_in_cc=True, with_python=True):
         env = super().get_recipe_env(
             arch=arch, with_flags_in_cc=with_flags_in_cc, with_python=with_python)

diff --git a/pythonforandroid/recipes/sdl2/sdl-orientation-pr-6984.diff b/pythonforandroid/recipes/sdl2/sdl-orientation-pr-6984.diff
diff --git a/pythonforandroid/recipes/sdl2_image/__init__.py b/pythonforandroid/recipes/sdl2_image/__init__.py
@@ -6,8 +6,8 @@
 
 
 class LibSDL2Image(BootstrapNDKRecipe):
-    version = '2.6.2'
-    url = 'https://github.com/libsdl-org/SDL_image/releases/download/release-{version}/SDL2_image-{version}.tar.gz'
+    version = '2.7.1'
+    url = 'https://github.com/libsdl-org/SDL_image/releases/download/prerelease-{version}/SDL2_image-{version}.tar.gz'
     dir_name = 'SDL2_image'
 
     patches = ['enable-webp.patch']

diff --git a/pythonforandroid/recipes/sdl2_mixer/__init__.py b/pythonforandroid/recipes/sdl2_mixer/__init__.py
@@ -4,7 +4,7 @@
 
 
 class LibSDL2Mixer(BootstrapNDKRecipe):
-    version = '2.6.2'
+    version = '2.6.3'
     url = 'https://github.com/libsdl-org/SDL_mixer/releases/download/release-{version}/SDL2_mixer-{version}.tar.gz'
     dir_name = 'SDL2_mixer'
 

diff --git a/pythonforandroid/recipes/sdl2_ttf/__init__.py b/pythonforandroid/recipes/sdl2_ttf/__init__.py
@@ -2,7 +2,7 @@
 
 
 class LibSDL2TTF(BootstrapNDKRecipe):
-    version = '2.20.1'
+    version = '2.20.2'
     url = 'https://github.com/libsdl-org/SDL_ttf/releases/download/release-{version}/SDL2_ttf-{version}.tar.gz'
     dir_name = 'SDL2_ttf'