[ffmpeg] Allow gpl builds without avisynthplus #12083
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mcmtroffaes
force-pushed
the
feature/ffmpeg-avisynthplus-gpl-flag-fix
branch
from
2610d8b
to
33c3dd9
Compare
|
... quick force push as I forgot to bump the version in the original commit. |
vicroms
approved these changes
Jun 24, 2020
…ynthplus-gpl-flag-fix
LilyWangL
approved these changes
Jun 29, 2020
LilyWangL
added
category:port-feature
|
Thanks for the PR! |
|
You're welcome. Thanks for the review and merge! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What does your PR fix? Building ffmpeg[gpl] results in an LGPL build instead of a GPL build. This appears to have been introduced with pull request [ffmpeg] Add avisynthplus support #11946 which passes "--disable-gpl" if avisynthplus feature is not enabled. This patch corrects this behaviour by not passing this flag anymore when avisynthplus is not enabled. In addition, the avisynthplus build now simply depends on ffmpeg[gpl] to make it more transparent that GPL is enabled when avisynthplus is enabled. This is similar to how the x264 feature was implemented. Tested ffmpeg, ffmpeg[gpl] and ffmpeg[avisynthplus] on x64-windows and verified license manually.
Which triplets are supported/not supported? Have you updated the CI baseline? No change.
Does your PR follow the maintainer guide? To the best of my knowledge, yes.