fix(master): replace drifted bin2c patch with clean 0062 - #68
Merged
Conversation
FFmpeg master's ffbuild/common.mak gained an INSTALL_FILES block between BIN2C and ifndef V, breaking the read-only 0057 patch context. Add version-specific 0062-use-prebuilt-bin2c-master.patch and reference it from master.yaml.
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
8.x/0057-use-prebuilt-bin2c-master.patchdrifted — FFmpeg master'sffbuild/common.makgained a newINSTALL_FILESdefinition block betweenBIN2C = $(BIN2CEXE)andifndef V, so the patch context no longer matched and everymastermatrix variant failed at patch apply.patches/8.x/0062-use-prebuilt-bin2c-master.patch(new version-specific replacement for the read-only0057)ffmpeg/master.yaml(reference0062-use-prebuilt-bin2c-master.patchinstead of0057)git apply --check patches/8.x/0062-use-prebuilt-bin2c-master.patchagainstFFmpeg@c48230effbuild/common.mak→ APPLY OKpython scripts/ffport.py generate master --version n9.1-dev-827-gc48230e --sha512 027d...→ Patches: 14 files, generated ports/ffmpeg/ (6 files); portfile.cmake listspatches/0062-use-prebuilt-bin2c-master.patchTriggered by auto-heal run: #31803514757