Skip to content

Comments

ppsspp: add upstream patch for FFmpeg 6#336187

Merged
emilazy merged 1 commit intoNixOS:masterfrom
emilazy:push-zxlwvorpmymk
Aug 23, 2024
Merged

ppsspp: add upstream patch for FFmpeg 6#336187
emilazy merged 1 commit intoNixOS:masterfrom
emilazy:push-zxlwvorpmymk

Conversation

@emilazy
Copy link
Member

@emilazy emilazy commented Aug 20, 2024

Description of changes

The bundled FFmpeg is used by default anyway, but this fixes compilation with FFmpeg 6 when opting in.

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.

The bundled FFmpeg is used by default anyway, but this fixes
compilation with FFmpeg 6 when opting in.
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. labels Aug 20, 2024
@emilazy emilazy requested a review from AndersonTorres August 21, 2024 14:27
@emilazy emilazy mentioned this pull request Aug 21, 2024
13 tasks
@SuperSandro2000
Copy link
Member

Why do we even have an option to use the bundled ffmpeg? This seems to go against the distro idea

@emilazy
Copy link
Member Author

emilazy commented Aug 22, 2024

Because upstream have their own hacked up FFmpeg and the emulator is often broken with the system one and they don’t support it and are trying to rip out the FFmpeg code entirely in favour of their own stuff. That seems like a distinct discussion from whether to get it off FFmpeg 4.

If you want to get rid of vendored FFmpegs, I’d suggest starting with Chromium (I did some work there for Qt WebEngine that would be useful).

@emilazy emilazy merged commit c15e130 into NixOS:master Aug 23, 2024
@emilazy emilazy deleted the push-zxlwvorpmymk 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: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants