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, ffmpeg-full: enable libvpx on Darwin #43601

Merged
merged 2 commits into from Jul 16, 2018
Merged

ffmpeg, ffmpeg-full: enable libvpx on Darwin #43601

merged 2 commits into from Jul 16, 2018

Conversation

thefloweringash
Copy link
Member

@thefloweringash thefloweringash commented Jul 16, 2018 •
edited

Motivation for this change

Having a more featureful ffmpeg on Darwin.

The comments indicate that libvpx is not supported, but this appears to no longer be the case. I don't have a way to test Aarch32, so I left the exclusion for that platform.

This affects ffmpeg_0, ffmpeg_1, ffmpeg_2, ffmpeg_3, ffmpeg_4, and ffmpeg-full. ffmpeg_0 and ffmpeg_1 don't build on Darwin, but that seems to already be the case on master.

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.

@thefloweringash thefloweringash changed the title ffmpeg: libvpx ffmpeg, ffmpeg-full: enable libvpx on Darwin Jul 16, 2018
@xeji
Copy link
Contributor

xeji commented Jul 16, 2018

@GrahamcOfBorg eval

@xeji
Copy link
Contributor

xeji commented Jul 16, 2018

@GrahamcOfBorg build ffmpeg_4 ffmpeg-full

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: ffmpeg_4, ffmpeg-full

Partial log (click to expand)

  /nix/store/z6nfpf6q621kwg4wkdq1qikkcy9xz35f-ffmpeg-4.0.1
copying path '/nix/store/z6nfpf6q621kwg4wkdq1qikkcy9xz35f-ffmpeg-4.0.1' from 'https://cache.nixos.org'...
copying path '/nix/store/1rbxmwpkhwp9s53gdk7hkg8bm23ishw4-libdc1394-2.2.5' from 'https://cache.nixos.org'...
copying path '/nix/store/ygg1shv4nifz9v2lwq7yk9ngp7j3fpmf-ffmpeg-4.0.1-bin' from 'https://cache.nixos.org'...
copying path '/nix/store/jx8x7hjjj0a4h3jq9yxa6yz7phx9r3sl-openal-soft-1.18.2' from 'https://cache.nixos.org'...
copying path '/nix/store/lhxdrskms1m9iibkssn7nw5gh24ibg7p-v4l-utils-1.14.2' from 'https://cache.nixos.org'...
copying path '/nix/store/akf3wzjiagvgrapg96dbjr5k228akv8g-vid-stab-0.98b' from 'https://cache.nixos.org'...
copying path '/nix/store/4dx6cm4i4pk7l314f2aami4q584r9acd-ffmpeg-full-4.0.1' from 'https://cache.nixos.org'...
/nix/store/ygg1shv4nifz9v2lwq7yk9ngp7j3fpmf-ffmpeg-4.0.1-bin
/nix/store/4dx6cm4i4pk7l314f2aami4q584r9acd-ffmpeg-full-4.0.1

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: ffmpeg_4, ffmpeg-full

Partial log (click to expand)

copying path '/nix/store/fkyzyx7zq5ja1k9rif4b9dzcx665d39f-pixman-0.34.0' from 'https://cache.nixos.org'...
copying path '/nix/store/kzfk76yimna563d74sxjvc68hx2hg9s4-libdc1394-2.2.5' from 'https://cache.nixos.org'...
copying path '/nix/store/cgrks275ihcdk5an7gmi9jpcpq3h001c-openexr-2.2.1' from 'https://cache.nixos.org'...
copying path '/nix/store/s0cx99grl19zpb82dc7ar17l5dd81jmz-openjpeg-2.3.0' from 'https://cache.nixos.org'...
copying path '/nix/store/s0g6jxg5ak9f9ph1qadzs19x1xvyv2w1-cairo-1.15.12' from 'https://cache.nixos.org'...
copying path '/nix/store/zrz86wy0njcrkw6zmb6lphma3rh7j87x-opencv-2.4.13' from 'https://cache.nixos.org'...
copying path '/nix/store/6k5418fh3n5rsb165fsqqbs8gd6zyc2l-frei0r-plugins-1.6.1' from 'https://cache.nixos.org'...
copying path '/nix/store/sh2q05qs3z5r4iwr46hc56bkdl9khyzs-ffmpeg-full-4.0.1' from 'https://cache.nixos.org'...
/nix/store/w5xkziv3i57lx0qxfa0lc1alkxwgr6zg-ffmpeg-4.0.1-bin
/nix/store/sh2q05qs3z5r4iwr46hc56bkdl9khyzs-ffmpeg-full-4.0.1

@GrahamcOfBorg
Copy link

Success on x86_64-darwin (full log)

Attempted: ffmpeg_4, ffmpeg-full

Partial log (click to expand)

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

@xeji xeji merged commit f4fbdf0 into NixOS:master Jul 16, 2018
@thefloweringash thefloweringash deleted the ffmpeg-libvpx branch August 19, 2018 03:30
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
6.topic: darwin Running or building packages on Darwin 10.rebuild-darwin: 11-100 10.rebuild-linux: 0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@thefloweringash @xeji @GrahamcOfBorg