Skip to content

Comments

retroarch: unpin FFmpeg 4#336201

Merged
thiagokokada merged 1 commit intoNixOS:masterfrom
emilazy:push-uswltvwyyuwy
Aug 21, 2024
Merged

retroarch: unpin FFmpeg 4#336201
thiagokokada merged 1 commit intoNixOS:masterfrom
emilazy:push-uswltvwyyuwy

Conversation

@emilazy
Copy link
Member

@emilazy emilazy commented Aug 21, 2024

Description of changes

FFmpeg 7 support was added in 1.19.0; see libretro/RetroArch#16499.

It seems like RetroArch split the FFmpeg media player support back into its own separate core, whereas this dependency is added directly to the bare package and we have no separate FFmpeg core. Are we actually building this right now? I’d appreciate someone who knows RetroArch better than me taking a look. It does build, though.

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.

FFmpeg 7 support was added in 1.19.0; see
<libretro/RetroArch#16499>.
@emilazy
Copy link
Member Author

emilazy commented Aug 21, 2024

It does look for libavcodec etc. when configuring, and build files like cores/libretro-ffmpeg/ffmpeg_core.c, so this seems fine. I guess we might want to split it out in future, though?

@ofborg ofborg bot added 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 101-500 This PR causes between 101 and 500 packages to rebuild on Linux. labels Aug 21, 2024
@thiagokokada
Copy link
Contributor

It does look for libavcodec etc. when configuring, and build files like cores/libretro-ffmpeg/ffmpeg_core.c, so this seems fine. I guess we might want to split it out in future, though?

I think ffmpeg is used for things like recording, but I am not completely sure. I can test this later, for now we can go and merge it since it looks to build fine.

@thiagokokada thiagokokada merged commit 83753f0 into NixOS:master Aug 21, 2024
@emilazy emilazy mentioned this pull request Aug 21, 2024
13 tasks
@emilazy emilazy deleted the push-uswltvwyyuwy branch August 26, 2024 00:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 101-500 This PR causes between 101 and 500 packages to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants