Skip to content

mplayer: unstable-2022-02-03 -> 1.5-unstable-2024-07-03#331568

Merged
marcusramberg merged 1 commit intoNixOS:masterfrom
emilazy:push-nxpypquxrpmk
Aug 6, 2024
Merged

mplayer: unstable-2022-02-03 -> 1.5-unstable-2024-07-03#331568
marcusramberg merged 1 commit intoNixOS:masterfrom
emilazy:push-nxpypquxrpmk

Conversation

@emilazy
Copy link
Member

@emilazy emilazy commented Aug 1, 2024

Description of changes

Includes fixes for FFmpeg 6. It seems like it will require work for 7, though.

(Yeah, MPlayer apparently still gets updates! I’m as surprised as you are.)

Result of nixpkgs-review run on aarch64-linux 1

10 packages built:
  • devede
  • devede.dist
  • gmtk
  • gnome_mplayer
  • gopro
  • hollywood
  • kmplayer
  • mplayer
  • vcs
  • wtwitch

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.

Includes fixes for FFmpeg 6. It seems like it will require work for
7, though.
@ofborg ofborg bot requested a review from edolstra August 1, 2024 18:24
@ofborg ofborg bot added 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels Aug 1, 2024
@emilazy emilazy mentioned this pull request Aug 1, 2024
13 tasks
Copy link
Contributor

@Mindavi Mindavi left a comment

Choose a reason for hiding this comment

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

Diff LGTM. Derivation could maybe use some cleanup at some point, but can also be something for later

@emilazy
Copy link
Member Author

emilazy commented Aug 2, 2024

Yeah I’ve been doing a fair bit of clean‐up while going through users of FFmpeg 4 to patch them up but this one is kind of huge and my refactoring would just be { mpv }: mpv so I’m afraid I did the minimum necessary this time 🫠

@wegank wegank added the 12.approvals: 1 This PR was reviewed and approved by one person. label Aug 3, 2024
@marcusramberg
Copy link
Contributor

Result of nixpkgs-review pr 331568 run on x86_64-linux 1

12 packages built:
  • devede
  • devede.dist
  • gmtk
  • gnome_mplayer
  • gopro
  • haskellPackages.mplayer-spot
  • haskellPackages.mplayer-spot.doc
  • hollywood
  • kmplayer
  • mplayer
  • vcs
  • wtwitch

@marcusramberg
Copy link
Contributor

Also tested that it can still play videos :)

@marcusramberg marcusramberg merged commit 0beb739 into NixOS:master Aug 6, 2024
This was referenced Aug 21, 2024
@emilazy emilazy deleted the push-nxpypquxrpmk branch August 26, 2024 01:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 12.approvals: 1 This PR was reviewed and approved by one person.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

Comments