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

Fix sdl2_image compile error when arch is x86 #1718

Merged
merged 2 commits into from
Feb 25, 2019

Conversation

j-devel
Copy link
Contributor

@j-devel j-devel commented Feb 19, 2019

Building an apk with --bootstrap=sdl2 and --arch=x86 breaks due to failing pythonforandroid/recipes/sdl2_image/disable_jpg.patch. This error is minor regression of #1692 where disable_jpg.patch was not upgraded for SDL2_image 2.0.4.

$ p4a apk --private ./myapp --package=org.example.myapp --name myapp --version 0.1 --bootst
rap=sdl2 --requirements=python2 --arch=x86 --debug
  RAN: /usr/bin/patch -t -d /home/a/.local/share/python-for-android/build/bootstrap_builds/sdl2-python2/jni/SDL2_image -p1 -i /media/sf_vb-share-xubuntu-1804/python-for-android-j-fixSdlImageCompileX86-2/pythonforandroid/recipes/sdl2_image/disable_jpg.patch

  STDOUT:
patching file Android.mk
Hunk #1 FAILED at 6.
1 out of 1 hunk FAILED -- saving rejects to file Android.mk.rej

Fix
I think this disable_jpg.patch is a legacy that was introduced when multi-arch support was being added to the project (f8eb278); and we can safely void it now (I guess it would be the best to
ask for a comment from @inclement ). (I tested compiling without this patch for x86 and everything works fine including runtime tests.)

@inclement
Copy link
Member

Thanks, learning that it works without the patch is even better :)

@inclement inclement merged commit 36b418c into kivy:master Feb 25, 2019
@j-devel j-devel deleted the fix-sdl2image-compile-x86 branch February 26, 2019 03:15
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.

2 participants