Skip to content

Comments

handbrake: fix build#235822

Merged
drupol merged 1 commit intoNixOS:masterfrom
thiagokokada:fix-handbrake
Jun 5, 2023
Merged

handbrake: fix build#235822
drupol merged 1 commit intoNixOS:masterfrom
thiagokokada:fix-handbrake

Conversation

@thiagokokada
Copy link
Contributor

Description of changes

There were 2 issues in the current handbrake derivation:

  • Since version 1.6.0 upstream is using ffmpeg 5.1.2 instead of 5.1.1
  • One of the ffmpeg patches from upstream are not applying anymore at least since 5.1.1

This commit fixes those 2 issues and allow handbrake to build again.

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • 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/)
  • 23.11 Release Notes (or backporting 23.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.

There were 2 issues in the current handbrake derivation:
- Since version 1.6.0 upstream is using ffmpeg 5.1.2 instead of 5.1.1
- One of the ffmpeg patches from upstream are not applying anymore at
  least since 5.1.1

This commit fixes those 2 issues and allow handbrake to build again.
@thiagokokada thiagokokada marked this pull request as ready for review June 3, 2023 19:39
@thiagokokada
Copy link
Contributor Author

@ofborg test handbrake

@ofborg ofborg bot requested review from Anton-Latukha and wmertens June 3, 2023 20:08
@ofborg ofborg bot added 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. labels Jun 3, 2023
@drupol
Copy link
Contributor

drupol commented Jun 4, 2023

The package is set as broken, shouldn't that flag be removed now?

@thiagokokada
Copy link
Contributor Author

The package is set as broken, shouldn't that flag be removed now?

It is only marked as broken Darwin, which I assume is still broken. The issue I am fixing is for Linux systems.

@drupol drupol merged commit 3b6a291 into NixOS:master Jun 5, 2023
@vcunat
Copy link
Member

vcunat commented Jun 5, 2023

Well, this is short-lived, as we're about to merge staging-next #235556 which has ffmpeg-5.1.3, making handbrake fail again.

EDIT log: https://hydra.nixos.org/build/222801596/nixlog/3/tail

@thiagokokada
Copy link
Contributor Author

thiagokokada commented Jun 5, 2023

Well, this is short-lived, as we're about to merge staging-next #235556 which has ffmpeg-5.1.3, making handbrake fail again.

EDIT log: https://hydra.nixos.org/build/222801596/nixlog/3/tail

This is strange, the derivation pins the ffmpeg version so it shouldn't matter if the derivation for ffmpeg_5 itself is bumped.

Edit: unless the ffmpeg_5 derivation includes the same patches as this patched version.

@thiagokokada thiagokokada deleted the fix-handbrake branch June 5, 2023 15:51
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-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants