Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Downgrades to SDL2 2.0.9 #2180

Merged
merged 1 commit into from
May 8, 2020

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
lerela added a commit to chronolife-rd/python-for-android that referenced this pull request Jun 23, 2020
🔖 v2020.06.02

* Adds missing requests sub dependencies (kivy#2221)
* Bumps to Gradle 6.4.1 (kivy#2222)
* Bumps to Cython==0.29.19 (kivy#2220)
* Updates install and troubleshooting docs (kivy#2219)
* Bumps to Ubuntu 20.04 (kivy#2218)
* Attempt to improve the issue template (kivy#2217)
* Add `opencv_extras` recipe (kivy#2209)
* Split logic for build modes & debug symbols (kivy#2213)
* Troubleshoot SSL error (kivy#2205)
* Remove superfluous recipes fixes (kivy#2202)
* Add tests for hostpython3 recipe (kivy#2196)
* Fix for 'cannot find setuptools module' (kivy#2195)
* Rename `Hostpython3Recipe` class to camel case (kivy#2194)
* Fix `test_should_build` (kivy#2193)
* Add initial tests for python3 recipe (kivy#2192)
* PythonActivityUtil helper for unpacking data (kivy#2189)
* Fixes flake8 errors post update (kivy#2191)
* Share PythonUtil.java between bootstraps (kivy#2188)
* Java code linting using PMD 6.23.0 (kivy#2187)
* Deletes deprecated renpy Python{Activity,Service}.java (kivy#2186)
* Removes java concurrency/ folder (kivy#2185)
* Reuse common AssetExtract.java (kivy#2182)
* Use common Hardware.java (kivy#2183)
* Moves kamranzafar/ java directory to common/ (kivy#2184)
* Updates release documentation (kivy#2177)
* Fixes service only unittest loading (kivy#2181)
* Narrows some context manager scopes (kivy#2179)
* Downgrades to SDL2 2.0.9 (kivy#2180)
* Bump to SDL2 2.0.10 & extract .java from SDL2 tarball (kivy#2113)
* Adds pygame recipe (kivy#2164)
* Adds macOS install instructions (2165)
* Removed python2 support mention from README (kivy#2162)
* Adding more assets (kivy#2132)
* Get --add-source working for dirs in Gradle builds (kivy#2156)
* Fixes python build with macOS venv (kivy#2159)
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