fix(master): adapt use-prebuilt-bin2c patch for ffmpeg master#58
Merged
Conversation
The 0045-use-prebuilt-bin2c-8.1.patch failed on ffbuild/common.mak because the master version (7660741) has updated RUN_GZIP and RUN_MINIFY targets with mkdir -p prefix. Create a new version- specific patch 0057-use-prebuilt-bin2c-master.patch with corrected context.
This file contains hidden or 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
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.
Fix Summary
0045-use-prebuilt-bin2c-8.1.patchfailed onffbuild/common.makbecause the master version (commit 7660741) has updatedRUN_GZIPandRUN_MINIFYtargets that includemkdir -p $(dir $@) &&prefix, while the 8.1-based patch expected the older form without that prefix.patches/8.x/0057-use-prebuilt-bin2c-master.patch(new)ffmpeg/master.yaml(patch reference updated)git apply --checkin YAML patch-list order: ALL PATCHES APPLIEDpython scripts/ffport.py list: master YAML parsed correctlypython -m pytest tests/ -v: 450 passed, 14 failed (pre-existing, unrelated)Triggered by auto-heal run: #28665935187