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

ffmpeg-full: Added libaom. Needed for AV1 encoder. #43789

Merged
merged 2 commits into from Aug 1, 2018
Merged

ffmpeg-full: Added libaom. Needed for AV1 encoder. #43789

merged 2 commits into from Aug 1, 2018

Conversation

kiloreux
Copy link
Member

Motivation for this change
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.

@kiloreux kiloreux changed the title Added AV1 encoder with libaom ffmpeg-full: Added libaom. Needed for AV1 encoder. Jul 19, 2018
@infinisil
Copy link
Member

Can you fix the merge conflicts? Looks good to me

@kiloreux
Copy link
Member Author

@infinisil , fixed.

@infinisil
Copy link
Member

Do a rebase, such that there's only 1 commit, not a merge

@xeji
Copy link
Contributor

xeji commented Aug 1, 2018

@GrahamcOfBorg build ffmpeg-full

@GrahamcOfBorg
Copy link

Success on x86_64-darwin (full log)

Attempted: ffmpeg-full

Partial log (click to expand)

/nix/store/xgkiw4m7n51afb3cspg6ipszn6ghfmvy-ffmpeg-full-4.0.1/lib/libavformat.58.12.100.dylib: fixing dylib
/nix/store/xgkiw4m7n51afb3cspg6ipszn6ghfmvy-ffmpeg-full-4.0.1/lib/libavutil.56.14.100.dylib: fixing dylib
/nix/store/xgkiw4m7n51afb3cspg6ipszn6ghfmvy-ffmpeg-full-4.0.1/lib/libavcodec.58.18.100.dylib: fixing dylib
/nix/store/xgkiw4m7n51afb3cspg6ipszn6ghfmvy-ffmpeg-full-4.0.1/lib/libswresample.3.1.100.dylib: fixing dylib
/nix/store/xgkiw4m7n51afb3cspg6ipszn6ghfmvy-ffmpeg-full-4.0.1/lib/libavresample.4.0.0.dylib: fixing dylib
/nix/store/xgkiw4m7n51afb3cspg6ipszn6ghfmvy-ffmpeg-full-4.0.1/lib/libpostproc.55.1.100.dylib: fixing dylib
/nix/store/xgkiw4m7n51afb3cspg6ipszn6ghfmvy-ffmpeg-full-4.0.1/lib/libavdevice.58.3.100.dylib: fixing dylib
/nix/store/xgkiw4m7n51afb3cspg6ipszn6ghfmvy-ffmpeg-full-4.0.1/lib/libswscale.5.1.100.dylib: fixing dylib
/nix/store/xgkiw4m7n51afb3cspg6ipszn6ghfmvy-ffmpeg-full-4.0.1/lib/libavfilter.7.16.100.dylib: fixing dylib
/nix/store/xgkiw4m7n51afb3cspg6ipszn6ghfmvy-ffmpeg-full-4.0.1

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: ffmpeg-full

Partial log (click to expand)

shrinking /nix/store/6czqk31jjw8kf33r9iqhq60lpa5ndga4-ffmpeg-full-4.0.1/lib/libavfilter.so.7.16.100
shrinking /nix/store/6czqk31jjw8kf33r9iqhq60lpa5ndga4-ffmpeg-full-4.0.1/lib/libavdevice.so.58.3.100
shrinking /nix/store/6czqk31jjw8kf33r9iqhq60lpa5ndga4-ffmpeg-full-4.0.1/lib/libavresample.so.4.0.0
shrinking /nix/store/6czqk31jjw8kf33r9iqhq60lpa5ndga4-ffmpeg-full-4.0.1/lib/libswscale.so.5.1.100
gzipping man pages under /nix/store/6czqk31jjw8kf33r9iqhq60lpa5ndga4-ffmpeg-full-4.0.1/share/man/
strip is /nix/store/1hi76hr87bd1y1q1qjk0lv8nmcjip1c8-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/6czqk31jjw8kf33r9iqhq60lpa5ndga4-ffmpeg-full-4.0.1/lib  /nix/store/6czqk31jjw8kf33r9iqhq60lpa5ndga4-ffmpeg-full-4.0.1/bin
patching script interpreter paths in /nix/store/6czqk31jjw8kf33r9iqhq60lpa5ndga4-ffmpeg-full-4.0.1
checking for references to /build in /nix/store/6czqk31jjw8kf33r9iqhq60lpa5ndga4-ffmpeg-full-4.0.1...
/nix/store/6czqk31jjw8kf33r9iqhq60lpa5ndga4-ffmpeg-full-4.0.1

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: ffmpeg-full

Partial log (click to expand)

shrinking /nix/store/cb1ggzs9iq6m6iag1i0rqf8yf92kfpz6-ffmpeg-full-4.0.1/lib/libavcodec.so.58.18.100
shrinking /nix/store/cb1ggzs9iq6m6iag1i0rqf8yf92kfpz6-ffmpeg-full-4.0.1/lib/libavformat.so.58.12.100
shrinking /nix/store/cb1ggzs9iq6m6iag1i0rqf8yf92kfpz6-ffmpeg-full-4.0.1/lib/libavfilter.so.7.16.100
shrinking /nix/store/cb1ggzs9iq6m6iag1i0rqf8yf92kfpz6-ffmpeg-full-4.0.1/lib/libavdevice.so.58.3.100
gzipping man pages under /nix/store/cb1ggzs9iq6m6iag1i0rqf8yf92kfpz6-ffmpeg-full-4.0.1/share/man/
strip is /nix/store/zrs21zqcchgyabjf4xfimncdq16njizc-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/cb1ggzs9iq6m6iag1i0rqf8yf92kfpz6-ffmpeg-full-4.0.1/lib  /nix/store/cb1ggzs9iq6m6iag1i0rqf8yf92kfpz6-ffmpeg-full-4.0.1/bin
patching script interpreter paths in /nix/store/cb1ggzs9iq6m6iag1i0rqf8yf92kfpz6-ffmpeg-full-4.0.1
checking for references to /build in /nix/store/cb1ggzs9iq6m6iag1i0rqf8yf92kfpz6-ffmpeg-full-4.0.1...
/nix/store/cb1ggzs9iq6m6iag1i0rqf8yf92kfpz6-ffmpeg-full-4.0.1

@xeji xeji merged commit 954489d into NixOS:master Aug 1, 2018
@xeji
Copy link
Contributor

xeji commented Aug 1, 2018

squashed during merge

@kiloreux kiloreux deleted the libaom-ffmpeg branch August 1, 2018 17:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@kiloreux @infinisil @xeji @GrahamcOfBorg