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.

Sign up for GitHub

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

Jump to bottom

handbrake: 1.1.0 -> 1.1.2 #50226

Merged
merged 2 commits into from Nov 13, 2018
Merged

handbrake: 1.1.0 -> 1.1.2 #50226

merged 2 commits into from Nov 13, 2018

Conversation

danieldk
Copy link
Contributor

@danieldk danieldk commented Nov 11, 2018 •
edited

Motivation for this change

Changes:

https://github.com/HandBrake/HandBrake/releases/tag/1.1.2
https://github.com/HandBrake/HandBrake/releases/tag/1.1.1

Derivation changes:

  • Retrieve A21-mp4-sdtp.patch from the Handbrake repository rather
    than a gist.

  • Transcoding to to MP4 was broken, failing with:

    Tag avc1/0x31637661 incompatible with output codec id '28'
    muxavformat: avformat_write_header failed!

    Fix this using A20-avc3-hvc1-override.patch provided by upstream.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Fits CONTRIBUTING.md.

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: handbrake

Partial log (click to expand)

Wrapping program /nix/store/gkym3zcqgjgq49p0j1sv6vk44cm19k73-handbrake-1.1.2/bin/ghb
Wrapping program /nix/store/gkym3zcqgjgq49p0j1sv6vk44cm19k73-handbrake-1.1.2/bin/HandBrakeCLI
shrinking RPATHs of ELF executables and libraries in /nix/store/gkym3zcqgjgq49p0j1sv6vk44cm19k73-handbrake-1.1.2
shrinking /nix/store/gkym3zcqgjgq49p0j1sv6vk44cm19k73-handbrake-1.1.2/bin/.ghb-wrapped
shrinking /nix/store/gkym3zcqgjgq49p0j1sv6vk44cm19k73-handbrake-1.1.2/bin/.HandBrakeCLI-wrapped
strip is /nix/store/vcc4svb8gy29g4pam2zja6llkbcwsyiq-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/gkym3zcqgjgq49p0j1sv6vk44cm19k73-handbrake-1.1.2/bin
patching script interpreter paths in /nix/store/gkym3zcqgjgq49p0j1sv6vk44cm19k73-handbrake-1.1.2
checking for references to /build in /nix/store/gkym3zcqgjgq49p0j1sv6vk44cm19k73-handbrake-1.1.2...
/nix/store/gkym3zcqgjgq49p0j1sv6vk44cm19k73-handbrake-1.1.2

@GrahamcOfBorg
Copy link

Failure on aarch64-linux (full log)

Attempted: handbrake

Partial log (click to expand)

mv -f .deps/hb-backend.Tpo .deps/hb-backend.Po
mv -f .deps/callbacks.Tpo .deps/callbacks.Po
make[3]: Leaving directory '/build/HandBrake-1.1.2/build/gtk/src'
make[2]: *** [Makefile:450: all-recursive] Error 1
make[2]: Leaving directory '/build/HandBrake-1.1.2/build/gtk'
make[1]: *** [Makefile:382: all] Error 2
make[1]: Leaving directory '/build/HandBrake-1.1.2/build/gtk'
make: *** [../gtk/module.rules:26: gtk.build] Error 2
builder for '/nix/store/khfhajnq8bgprc1iv7lhl9vlncrs7is5-handbrake-1.1.2.drv' failed with exit code 2
error: build of '/nix/store/khfhajnq8bgprc1iv7lhl9vlncrs7is5-handbrake-1.1.2.drv' failed

@danieldk
Copy link
Contributor Author

The errors might be fixed by the following upstream commit, but it does not apply cleanly to the stable branch:

HandBrake/HandBrake@c85294a

Maybe aarch64 should be disabled until the next major release?

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: handbrake

Partial log (click to expand)

Wrapping program /nix/store/fz5409sqvqxd961s6m88q8mc0gxx48zy-handbrake-1.1.2/bin/ghb
Wrapping program /nix/store/fz5409sqvqxd961s6m88q8mc0gxx48zy-handbrake-1.1.2/bin/HandBrakeCLI
shrinking RPATHs of ELF executables and libraries in /nix/store/fz5409sqvqxd961s6m88q8mc0gxx48zy-handbrake-1.1.2
shrinking /nix/store/fz5409sqvqxd961s6m88q8mc0gxx48zy-handbrake-1.1.2/bin/.HandBrakeCLI-wrapped
shrinking /nix/store/fz5409sqvqxd961s6m88q8mc0gxx48zy-handbrake-1.1.2/bin/.ghb-wrapped
strip is /nix/store/p9akxn2sfy4wkhqdqa3li97pc6jaz3r1-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/fz5409sqvqxd961s6m88q8mc0gxx48zy-handbrake-1.1.2/bin
patching script interpreter paths in /nix/store/fz5409sqvqxd961s6m88q8mc0gxx48zy-handbrake-1.1.2
checking for references to /build in /nix/store/fz5409sqvqxd961s6m88q8mc0gxx48zy-handbrake-1.1.2...
/nix/store/fz5409sqvqxd961s6m88q8mc0gxx48zy-handbrake-1.1.2

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: handbrake

Partial log (click to expand)

Wrapping program /nix/store/gkym3zcqgjgq49p0j1sv6vk44cm19k73-handbrake-1.1.2/bin/ghb
Wrapping program /nix/store/gkym3zcqgjgq49p0j1sv6vk44cm19k73-handbrake-1.1.2/bin/HandBrakeCLI
shrinking RPATHs of ELF executables and libraries in /nix/store/gkym3zcqgjgq49p0j1sv6vk44cm19k73-handbrake-1.1.2
shrinking /nix/store/gkym3zcqgjgq49p0j1sv6vk44cm19k73-handbrake-1.1.2/bin/.ghb-wrapped
shrinking /nix/store/gkym3zcqgjgq49p0j1sv6vk44cm19k73-handbrake-1.1.2/bin/.HandBrakeCLI-wrapped
strip is /nix/store/vcc4svb8gy29g4pam2zja6llkbcwsyiq-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/gkym3zcqgjgq49p0j1sv6vk44cm19k73-handbrake-1.1.2/bin
patching script interpreter paths in /nix/store/gkym3zcqgjgq49p0j1sv6vk44cm19k73-handbrake-1.1.2
checking for references to /build in /nix/store/gkym3zcqgjgq49p0j1sv6vk44cm19k73-handbrake-1.1.2...
/nix/store/gkym3zcqgjgq49p0j1sv6vk44cm19k73-handbrake-1.1.2

@danieldk
handbrake: 1.1.0 -> 1.1.2
6c2050f 
Changes:

https://github.com/HandBrake/HandBrake/releases/tag/1.1.2
https://github.com/HandBrake/HandBrake/releases/tag/1.1.1

Derivation changes:

Transcoding to to MP4 was broken, failing with:

Tag avc1/0x31637661 incompatible with output codec id '28'
muxavformat: avformat_write_header failed!

Fix this using A20-avc3-hvc1-override.patch provided by upstream.
@danieldk
Copy link
Contributor Author

I have also added a NixOS test that does a very small transcoding test. This catches problems with transcoding, such as the one fixed by the first commit.

@danieldk
Copy link
Contributor Author

@GrahamcOfBorg test handbrake

@GrahamcOfBorg
Copy link

No attempt on x86_64-linux (full log)

The following builds were skipped because they don't evaluate on x86_64-linux: tests.handbrake

Partial log (click to expand)

Cannot nix-instantiate `tests.handbrake' because:
error: while evaluating 'recursiveUpdate' at /var/lib/gc-of-borg/.nix-test-rs/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/rbvermaa-spot/lib/attrsets.nix:415:26, called from /var/lib/gc-of-borg/.nix-test-rs/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/rbvermaa-spot/lib/attrsets.nix:148:28:
while evaluating 'recursiveUpdateUntil' at /var/lib/gc-of-borg/.nix-test-rs/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/rbvermaa-spot/lib/attrsets.nix:384:37, called from /var/lib/gc-of-borg/.nix-test-rs/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/rbvermaa-spot/lib/attrsets.nix:416:5:
while evaluating 'zipAttrsWith' at /var/lib/gc-of-borg/.nix-test-rs/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/rbvermaa-spot/lib/attrsets.nix:347:21, called from /var/lib/gc-of-borg/.nix-test-rs/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/rbvermaa-spot/lib/attrsets.nix:394:8:
while evaluating 'zipAttrsWithNames' at /var/lib/gc-of-borg/.nix-test-rs/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/rbvermaa-spot/lib/attrsets.nix:332:33, called from /var/lib/gc-of-borg/.nix-test-rs/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/rbvermaa-spot/lib/attrsets.nix:347:27:
while evaluating anonymous function at /var/lib/gc-of-borg/.nix-test-rs/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/rbvermaa-spot/lib/lists.nix:113:41, called from /var/lib/gc-of-borg/.nix-test-rs/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/rbvermaa-spot/lib/attrsets.nix:347:46:
while evaluating the attribute 'handbrake' at /var/lib/gc-of-borg/.nix-test-rs/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/rbvermaa-spot/nixos/tests/all-tests.nix:91:3:
while evaluating 'handleTestOn' at /var/lib/gc-of-borg/.nix-test-rs/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/rbvermaa-spot/nixos/tests/all-tests.nix:19:33, called from /var/lib/gc-of-borg/.nix-test-rs/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/rbvermaa-spot/nixos/tests/all-tests.nix:91:15:
access to path '/nix/store/zncwxxifhp3jsi2w5s8q91dl44a7pjqb-rbvermaa-spot' is forbidden in restricted mode

@GrahamcOfBorg
Copy link

No attempt on aarch64-linux (full log)

The following builds were skipped because they don't evaluate on aarch64-linux: tests.handbrake

Partial log (click to expand)

Cannot nix-instantiate `tests.handbrake' because:
error: while evaluating 'recursiveUpdate' at /var/lib/gc-of-borg/nix-test-rs-14/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-aarch64-community-14/lib/attrsets.nix:415:26, called from /var/lib/gc-of-borg/nix-test-rs-14/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-aarch64-community-14/lib/attrsets.nix:148:28:
while evaluating 'recursiveUpdateUntil' at /var/lib/gc-of-borg/nix-test-rs-14/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-aarch64-community-14/lib/attrsets.nix:384:37, called from /var/lib/gc-of-borg/nix-test-rs-14/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-aarch64-community-14/lib/attrsets.nix:416:5:
while evaluating 'zipAttrsWith' at /var/lib/gc-of-borg/nix-test-rs-14/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-aarch64-community-14/lib/attrsets.nix:347:21, called from /var/lib/gc-of-borg/nix-test-rs-14/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-aarch64-community-14/lib/attrsets.nix:394:8:
while evaluating 'zipAttrsWithNames' at /var/lib/gc-of-borg/nix-test-rs-14/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-aarch64-community-14/lib/attrsets.nix:332:33, called from /var/lib/gc-of-borg/nix-test-rs-14/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-aarch64-community-14/lib/attrsets.nix:347:27:
while evaluating the attribute 'handbrake' at /var/lib/gc-of-borg/nix-test-rs-14/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-aarch64-community-14/nixos/tests/all-tests.nix:91:3:
while evaluating 'handleTestOn' at /var/lib/gc-of-borg/nix-test-rs-14/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-aarch64-community-14/nixos/tests/all-tests.nix:19:33, called from /var/lib/gc-of-borg/nix-test-rs-14/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-aarch64-community-14/nixos/tests/all-tests.nix:91:15:
access to path '/nix/store/7afdx3h2jw0lq50l9kgp1p1h56d76dwf-grahamc-aarch64-community-14' is forbidden in restricted mode

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: handbrake

Partial log (click to expand)

Wrapping program /nix/store/fz5409sqvqxd961s6m88q8mc0gxx48zy-handbrake-1.1.2/bin/ghb
Wrapping program /nix/store/fz5409sqvqxd961s6m88q8mc0gxx48zy-handbrake-1.1.2/bin/HandBrakeCLI
shrinking RPATHs of ELF executables and libraries in /nix/store/fz5409sqvqxd961s6m88q8mc0gxx48zy-handbrake-1.1.2
shrinking /nix/store/fz5409sqvqxd961s6m88q8mc0gxx48zy-handbrake-1.1.2/bin/.HandBrakeCLI-wrapped
shrinking /nix/store/fz5409sqvqxd961s6m88q8mc0gxx48zy-handbrake-1.1.2/bin/.ghb-wrapped
strip is /nix/store/p9akxn2sfy4wkhqdqa3li97pc6jaz3r1-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/fz5409sqvqxd961s6m88q8mc0gxx48zy-handbrake-1.1.2/bin
patching script interpreter paths in /nix/store/fz5409sqvqxd961s6m88q8mc0gxx48zy-handbrake-1.1.2
checking for references to /build in /nix/store/fz5409sqvqxd961s6m88q8mc0gxx48zy-handbrake-1.1.2...
/nix/store/fz5409sqvqxd961s6m88q8mc0gxx48zy-handbrake-1.1.2

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: handbrake

Partial log (click to expand)

Wrapping program /nix/store/gkym3zcqgjgq49p0j1sv6vk44cm19k73-handbrake-1.1.2/bin/ghb
Wrapping program /nix/store/gkym3zcqgjgq49p0j1sv6vk44cm19k73-handbrake-1.1.2/bin/HandBrakeCLI
shrinking RPATHs of ELF executables and libraries in /nix/store/gkym3zcqgjgq49p0j1sv6vk44cm19k73-handbrake-1.1.2
shrinking /nix/store/gkym3zcqgjgq49p0j1sv6vk44cm19k73-handbrake-1.1.2/bin/.HandBrakeCLI-wrapped
shrinking /nix/store/gkym3zcqgjgq49p0j1sv6vk44cm19k73-handbrake-1.1.2/bin/.ghb-wrapped
strip is /nix/store/vcc4svb8gy29g4pam2zja6llkbcwsyiq-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/gkym3zcqgjgq49p0j1sv6vk44cm19k73-handbrake-1.1.2/bin
patching script interpreter paths in /nix/store/gkym3zcqgjgq49p0j1sv6vk44cm19k73-handbrake-1.1.2
checking for references to /build in /nix/store/gkym3zcqgjgq49p0j1sv6vk44cm19k73-handbrake-1.1.2...
/nix/store/gkym3zcqgjgq49p0j1sv6vk44cm19k73-handbrake-1.1.2

@c0bw3b c0bw3b mentioned this pull request Nov 12, 2018
Closed
9 tasks
@c0bw3b
Copy link
Contributor

c0bw3b commented Nov 12, 2018 •
edited

/cc @Anton-Latukha builds ok on aarch64 now it seems

@Anton-Latukha
Copy link
Contributor

@c0bw3b More than good to me. Handbrake project itself tends to accumulate patches.

@danieldk Thank you.

@c0bw3b c0bw3b merged commit 56f5088 into NixOS:master Nov 13, 2018
@danieldk danieldk deleted the handbrake-1.1.2 branch June 4, 2019 05:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jtojnar jtojnar jtojnar left review comments

Assignees
No one assigned
Labels
6.topic: nixos 10.rebuild-darwin: 0 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@danieldk @GrahamcOfBorg @c0bw3b @Anton-Latukha @jtojnar