Add SDL3 bootstrap (alongside SDL3, SDL3_ttf, SDL3_mixer, SDL3_image recipes) for Kivy 3.0.0
#3125
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
misl6
changed the title
SDL3 bootstrap (and allow kivy to build with it)
misl6
changed the title
SDL3 bootstrap (and allow kivy to build with it)SDL3 bootstrap (alongside SDL3, SDL3_ttf, SDL3_mixer, SDL3_image recipes) for Kivy 3.0.0
AndreMiras
approved these changes
Apr 8, 2025
| sdl2_recipe = Recipe.get_recipe("sdl2", self.ctx) | ||
| sdl2_build_dir = sdl2_recipe.get_jni_dir() | ||
| src_dir = join(sdl2_build_dir, "SDL", "android-project", | ||
| if self.name in ["sdl2", "sdl3"]: |
There was a problem hiding this comment.
Would it make sense to have a variable for all supported SDL?
SDL_BOOTSTRAPS = ("sdl2", "sdl3")
| @@ -541,7 +541,7 @@ def make_package(args): | |||
| "debug": "debug" in args.build_mode, | |||
| "native_services": args.native_services | |||
| } | |||
| if get_bootstrap_name() == "sdl2": | |||
| if get_bootstrap_name() in ["sdl2", "sdl3"]: | |||
| class LibSDL3Recipe(BootstrapNDKRecipe): | ||
| version = "3.2.8" | ||
| url = "https://github.com/libsdl-org/SDL/releases/download/release-{version}/SDL3-{version}.tar.gz" | ||
| # md5sum = 'a344eb827a03045c9b399e99af4af13d' |
There was a problem hiding this comment.
Maybe fix the sum or remove the code?
Comment on lines
+10
to
+13
| url = "https://github.com/libsdl-org/SDL/releases/download/release-{version}/SDL3-{version}.tar.gz" | ||
| # md5sum = 'a344eb827a03045c9b399e99af4af13d' | ||
|
|
||
| dir_name = "SDL" |
There was a problem hiding this comment.
conflicts = ['sdl2']
Same thing for the SDL2GradleBootstrap bootstrap, it could also have the conflicts = ['sdl3']
| import sh | ||
|
|
||
|
|
||
| class LibSDL3Recipe(BootstrapNDKRecipe): |
There was a problem hiding this comment.
In a follow up maybe we could inherit from a base LibSDLBootstrapNDKRecipe since 2 and 3 have quite a lot in commun.
class LibSDL3Recipe(LibSDLBootstrapNDKRecipe):
Comment on lines
+10
to
+17
| class SDL3GradleBootstrap(Bootstrap): | ||
| name = 'sdl3' | ||
|
|
||
| conflicts = ['sdl2'] | ||
|
|
||
| recipe_depends = list( | ||
| set(Bootstrap.recipe_depends).union({'sdl3'}) | ||
| ) |
There was a problem hiding this comment.
This is also almost an exact copy of SDL2GradleBootstrap, maybe we can have a SDLGradleBootstrap and inherit from it
Comment on lines
+18
to
+19
| -cdef extern JNIEnv *SDL_AndroidGetJNIEnv() | ||
| +cdef extern JNIEnv *SDL_GetAndroidJNIEnv() |
There was a problem hiding this comment.
Not too clear to me why we changed it SDL3 and not SDL2, why is this needed?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
sdl3bootstrap (alongsidesdl3,sdl3_ttf,sdl3_mixer,sdl3_imagerecipes)kivyrecipe to build withsdl3support (but keepssdl2support)androidandpyjniusrecipe to build withsdl3support (but keepssdl2support)sdl2boostrap but tries to buildsdl3which is incompatible)Similar to kivy/kivy-ios#961