openjfx22: 22.0.1-ga -> 22.0.2-ga; openjfx{11,17,21,22}: add upstream patch for FFmpeg 7 #339357
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.
Description of changes
Upstream just added FFmpeg 7 support in openjdk/jfx#1552. The patch applies cleanly to 22.0.2-ga, and only required a trivial conflict resolution in an XML file for 21. The backport to 11 and 17 I’m not as thoroughly confident about (I had to make a judgement call of using
base->frame->pts
to replace the local variable that isn’t in the old version because it was added for H.265 support), but all of these do compile.Things done
openjfx11
)openjfx{17,21,22}
)nix.conf
? (See Nix manual)sandbox = relaxed
sandbox = true
nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD"
. Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/
)Add a 👍 reaction to pull requests you find important.