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

openjfx22: 22.0.1-ga -> 22.0.2-ga; openjfx{11,17,21,22}: add upstream patch for FFmpeg 7 #339357

Merged
merged 2 commits into from
Sep 16, 2024

Conversation

emilazy
Copy link
Member

@emilazy emilazy commented Sep 3, 2024

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

  • Built on platform(s)
    • x86_64-linux (openjfx11)
    • aarch64-linux (openjfx{17,21,22})
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.11 Release Notes (or backporting 23.11 and 24.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

Copy link
Member

@SuperSandro2000 SuperSandro2000 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@thiagokokada thiagokokada merged commit b34e8e9 into NixOS:master Sep 16, 2024
27 of 28 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants