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

Upgrade source-download SDL to 2.28.5 #6838

Merged
merged 3 commits into from
Nov 26, 2023

Conversation

tsunamistate
Copy link
Collaborator

Looks like this is all that was needed for Android to build, let's see how other platforms will react

WARNING: I play tested the build on my Google Pixel 2 with Android 11, but I would recommend to play test the CI build on couple more devices before this is merged

P.S. I don't know why Android Studio had to change the whole file when I committed 2 lines, so look at SDLActivity.java changes with "Hide whitespace" ON

@tsunamistate
Copy link
Collaborator Author

tsunamistate commented Nov 26, 2023

error: static assertion failed due to requirement '27 == 28': SDL_MINOR_VERSION == SDL_BUILD_MINOR_VERSION
error: static assertion failed due to requirement '0 == 5': SDL_PATCHLEVEL == SDL_BUILD_MICRO_VERSION

The errors are due to cached SDL version in the runners
Can we rerun the jobs with busted cache? Figured it out, you need to update cache number in workflow .yml files

macOS build failure is being tacked by diasurgical#6832
@AJenbo
Copy link
Member

AJenbo commented Nov 26, 2023

Rather then patching the SDL Java files could you please copy them from the same release of SDL as is used on the C side of things: https://github.com/libsdl-org/SDL/tree/release-2.28.5/android-project
Else we are left with a hybrid where the Java portion is using an older version then the C part, this is what is causing the issue currently (the C portion was updated, but the Java part was not).

@tsunamistate
Copy link
Collaborator Author

Sure, no problem
The main changes are in SDLActivity.java (changes to InputDevice.SOURCE_MOUSE) and HIDDeviceManager.java (adding new controller device IDs) the rest are just comments for magic numbers

@AJenbo
Copy link
Member

AJenbo commented Nov 26, 2023

Thanks that was really helpful :)

@AJenbo AJenbo merged commit ef69727 into diasurgical:master Nov 26, 2023
23 checks passed
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.

3 participants