Skip to content

Downgrades to SDL2 2.0.9#2180

Merged
AndreMiras merged 1 commit intokivy:developfrom
AndreMiras:feature/downgrade_sdl2_2.0.9
May 8, 2020
Merged

Downgrades to SDL2 2.0.9#2180
AndreMiras merged 1 commit intokivy:developfrom
AndreMiras:feature/downgrade_sdl2_2.0.9

Conversation

@AndreMiras
Copy link
Member

Actually simply reverted few files:

git checkout master -- \
    pythonforandroid/recipes/sdl2/__init__.py \
    pythonforandroid/bootstraps/sdl2/build/src/patches/SDLActivity.java.patch \
    pythonforandroid/bootstraps/sdl2/build/src/main/java/org/kivy/android/PythonActivity.java

Actually simply reverted few files:
```sh
git checkout master -- \
    pythonforandroid/recipes/sdl2/__init__.py \
    pythonforandroid/bootstraps/sdl2/build/src/patches/SDLActivity.java.patch \
    pythonforandroid/bootstraps/sdl2/build/src/main/java/org/kivy/android/PythonActivity.java
```
- fixes kivy#2167
- fixes kivy#2169
@AndreMiras AndreMiras requested a review from inclement May 8, 2020 18:09
@AndreMiras
Copy link
Member Author

This fixes the issue referenced above.
I could run all the apps like before (including test apps for both architectures)

Copy link
Member

@inclement inclement left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good. The details of the PythonActivity change aren't entirely obvious to me, but I totally believe it's correct. Do you think it's worth logging somewhere (e.g. another issue) what you had to revert, so it's easier to go back to newer sdl2 versions later?

@AndreMiras
Copy link
Member Author

Thanks for the review/approval!
I also don't know most of the details to be honest 😅
I'm not sure it's needed to log it somewhere else as the revert command is in the commit body (and this PR comments).
Basically I reverted the part of the PR #2113 (1b887be) that were concerning the version as I wanted to keep the SDL extract part.
To see and later re-apply the part that got reverted we could:

git show 1b887bed09a7ec19bfa00c9fb69a54e3f60a2328 -- \
    pythonforandroid/recipes/sdl2/__init__.py \
    pythonforandroid/bootstraps/sdl2/build/src/patches/SDLActivity.java.patch \
    pythonforandroid/bootstraps/sdl2/build/src/main/java/org/kivy/android/PythonActivity.java

That should be enough I think otherwise yes it doesn't hurt to create a reminder task with theses details I suppose

@AndreMiras AndreMiras merged commit 2808130 into kivy:develop May 8, 2020
@AndreMiras AndreMiras deleted the feature/downgrade_sdl2_2.0.9 branch May 8, 2020 18:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Issues introduced by PR #2113 (SDL2) App exists immediately when importing kivy.core.window.Window

2 participants