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

Remove unnecessary ffmpeg-android.patch #588

Closed
wants to merge 1 commit into from

Conversation

tmm1
Copy link
Contributor

@tmm1 tmm1 commented Jul 12, 2018

cc #587

@tmm1
Copy link
Contributor Author

tmm1 commented Jul 12, 2018

Tested this locally with android-arm and it worked as expected.

@saudet
Copy link
Member

saudet commented Jul 13, 2018

Without the patch, I'm still seeing library versioning happening:

-rw-r--r--. 1 saudet saudet 3462256 Jul 13 14:18 libavutil.a
lrwxrwxrwx. 1 saudet saudet      22 Jul 13 14:18 libavutil.so -> libavutil.so.56.14.100
lrwxrwxrwx. 1 saudet saudet      22 Jul 13 14:18 libavutil.so.56 -> libavutil.so.56.14.100
-rwxr-xr-x. 1 saudet saudet  394976 Jul 13 14:18 libavutil.so.56.14.100

Is there a way to disable that without using a patch? Android doesn't officially support that: https://issuetracker.google.com/issues/36971591

@tmm1
Copy link
Contributor Author

tmm1 commented Jul 13, 2018

I didn't see those when looking at ffmpeg/cppbuild/android-arm/lib

What directory is your listing from?

@saudet
Copy link
Member

saudet commented Jul 13, 2018

It's doing that for at least android-arm64...

@saudet
Copy link
Member

saudet commented Jul 13, 2018

@tmm1
Copy link
Contributor Author

tmm1 commented Jul 14, 2018

Looks like this also requires --target-os=android, and it was only working for me because I tested a branch that had both of my PRs merged together.

https://github.com/FFmpeg/FFmpeg/blob/e5ff2c0c06188ff47706ce62db771b6b45f86b8c/configure#L5045-L5051

@saudet
Copy link
Member

saudet commented Jul 14, 2018

Indeed seems to work fine that way, so let's merge this with pull #589 and test the build together?

@tmm1
Copy link
Contributor Author

tmm1 commented Jul 14, 2018

Sounds good to me 👍

@tmm1 tmm1 closed this Jul 14, 2018
@tmm1 tmm1 deleted the android-symver branch July 14, 2018 02:25
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