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

openjfx{11,17,21,22}: pin to FFmpeg 6 #331522

Merged
merged 5 commits into from
Aug 1, 2024

Conversation

emilazy
Copy link
Member

@emilazy emilazy commented Aug 1, 2024

Description of changes

Part of my campaign to get rid of FFmpeg 4. This is stacked on top of #331514, so please ignore all but the last commit.

This is completely untested. The builds go through successfully on x86_64-linux and aarch64-darwin, and the upstream compatibility fixes are pretty trivial, but I suspect that OpenJFX might be doing runtime dynamic library loading stuff that could mask problems. There are two relevant upstream PRs here:

These have both been merged; FFmpeg 5 support was backported to OpenJFX ≥ 11 and FFmpeg 6 support to OpenJFX ≥ 20. I have backported the trivial FFmpeg 6 to 11 and 17 myself, although I’m not sure if it was actually necessary since they built fine without it. (I do get build failures for all of these versions when trying to use FFmpeg 7, so they’re not completely agnostic to the package they’re being supplied, but then I’m unsure what those version lines are doing.)

I have no real idea how to go about testing these changes – what uses OpenJFX anyway, and what would exercise the FFmpeg‐related parts of it? – so suggestions and help with that would be very useful.

Result of nixpkgs-review run on x86_64-linux 1

1 package failed to build:
  • microsoft-identity-broker
24 packages built:
  • autopsy
  • bisq-desktop
  • bluej
  • cryptomator
  • ganttproject-bin
  • greenfoot
  • jabref
  • javaPackages.openjfx11
  • javaPackages.openjfx17
  • javaPackages.openjfx21
  • javaPackages.openjfx22
  • maptool
  • mcaselector
  • mediathekview
  • moneydance
  • ns-usbloader
  • olvid
  • pattypan
  • pdfsam-basic
  • quark-goldleaf
  • scenebuilder
  • scenic-view
  • sparrow
  • sparrow-unwrapped

Result of nixpkgs-review run on aarch64-linux 1

17 packages built:
  • bluej
  • ganttproject-bin
  • greenfoot
  • jabref
  • javaPackages.openjfx17
  • javaPackages.openjfx21
  • javaPackages.openjfx22
  • mcaselector
  • mediathekview
  • moneydance
  • ns-usbloader
  • olvid
  • pattypan
  • pdfsam-basic
  • quark-goldleaf
  • scenebuilder
  • scenic-view

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • 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.

emilazy added 4 commits August 1, 2024 11:57
Not “drop”; these files are literally not referenced anywhere in
the tree, as far as I can tell.
These have all been end‐of‐life for more than 10 months.
Seems to start up fine for me with the default JRE, and the package
couldn’t be easily used before this anyway as version 20 has reached
end of life.

It does complain about what a big mistake we’re making by not passing
Shenandoah GC flags to the JVM on start‐up, but I doubt that has
anything to do with the JRE bump, and it lets you click through.
These have all been end‐of‐life for more than 10 months.
@emilazy
Copy link
Member Author

emilazy commented Aug 1, 2024

(I initially had a bunch of confused stuff in the original post because I didn’t realize how far back the FFmpeg 5 patch had been backported. Fixed now.)

@thiagokokada
Copy link
Contributor

My suggestion is to just disable ffmpeg for older versions and see if someone complains about them. From my experience nobody cares too much about OpenJfx, but if there is someone that comes and complains we have two alternatives:

  • Try to run the program in a newer version of OpenJfx
  • Backport the patches

@emilazy emilazy force-pushed the push-qwqwnrwsktks branch from 2dc6ced to 164f9ea Compare August 1, 2024 13:49
@emilazy
Copy link
Member Author

emilazy commented Aug 1, 2024

It was really easy to backport the FFmpeg 6 patch to OpenJFX 11 and 17, given that upstream already did the hard work for the FFmpeg 5 one, so I just did that. I have no idea if it’s actually necessary or not, but it should put to rest any potential concerns. I might not be so merciful when the time comes to drop FFmpeg 6, though :)

I’m running the builds again now but this should be good to go after #331514 is merged. Though, of course, it would be good if someone could try to actually run some JavaFX thing and see how it goes.

@emilazy emilazy marked this pull request as ready for review August 1, 2024 14:50
@emilazy
Copy link
Member Author

emilazy commented Aug 1, 2024

The builds went fine.

@thiagokokada thiagokokada merged commit f42f535 into NixOS:master Aug 1, 2024
33 of 35 checks passed
@emilazy emilazy mentioned this pull request Aug 1, 2024
13 tasks
@emilazy emilazy mentioned this pull request Aug 21, 2024
13 tasks
@emilazy emilazy deleted the push-qwqwnrwsktks branch August 26, 2024 01:01
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.

2 participants