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.

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: 4.1.4 -> 4.2 #67205

Merged
merged 2 commits into from Aug 23, 2019
Merged

ffmpeg-full: 4.1.4 -> 4.2 #67205

merged 2 commits into from Aug 23, 2019

Conversation

primeos
Copy link
Member

@primeos primeos commented Aug 21, 2019 •
edited

Changelog: https://git.ffmpeg.org/gitweb/ffmpeg.git/blob/refs/heads/release/4.2:/Changelog

Configuration flag changes:
https://git.ffmpeg.org/gitweb/ffmpeg.git/blobdiff/n4.1.4..n4.2:/configure

Ignored new configuration flags:
--enable-libaribb24 enable ARIB text and caption decoding via libaribb24 [no]
--enable-pocketsphinx enable PocketSphinx, needed for asr filter [no]
--enable-cuda-nvcc enable Nvidia CUDA compiler [no]
--disable-cuda-llvm disable CUDA compilation using clang [autodetect]
--disable-msa2 disable MSA2 optimizations

The renamed and removed configuration options where not used.

Motivation for this change

Update to the latest version (ffmpeg_4 is already updated) and add proper support for AV1 decoding.

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 nix-review --run "nix-review wip"
    • Only meguca fails, which is broken on Hydra for quite a while now.
  • 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)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.
Notify maintainers

cc @

@ofborg ofborg bot requested a review from Fuuzetsu August 21, 2019 14:48
@primeos
ffmpeg-full: 4.1.4 -> 4.2
1537ce2 
Changelog: https://git.ffmpeg.org/gitweb/ffmpeg.git/blob/refs/heads/release/4.2:/Changelog

Configuration flag changes:
https://git.ffmpeg.org/gitweb/ffmpeg.git/blobdiff/n4.1.4..n4.2:/configure

Ignored new configuration flags:
--enable-libaribb24      enable ARIB text and caption decoding via libaribb24 [no]
--enable-pocketsphinx    enable PocketSphinx, needed for asr filter [no]
--enable-cuda-nvcc       enable Nvidia CUDA compiler [no]
--disable-cuda-llvm      disable CUDA compilation using clang [autodetect]
--disable-msa2           disable MSA2 optimizations

The renamed and removed configuration options where not used.

I've added a patch to prefer libdav1d over libaom, as libaom wasn't even
able to play my sample videos for AV1 (apart from the reduced
performance, at least in theory).
@primeos primeos mentioned this pull request Aug 21, 2019
Closed
@mmahut
Copy link
Member

mmahut commented Aug 22, 2019

Fails on darwin as we have g++: error: unrecognized command line option '-msse4.2'.

@primeos
Copy link
Member Author

primeos commented Aug 23, 2019 •
edited

@mmahut are you sure that error message was from the build of ffmpeg-full? And if so: Could you have a look at it (I don't have a darwin system) / provide some additional information?

Also: Did the build of 4.1.4 succeed on your darwin setup (at least the --disable-sse42 option was already present in 4.1.4)?

The darwin build from ofborg did succeed (I assume it was either based on a different Nixpkgs commit or there's an important difference in the setup): https://github.com/NixOS/nixpkgs/pull/67205/checks?check_run_id=199575061

Only the aarch64 build was failing, but due to a build failure in a dependency and the build for 4.1.4 was also failing: https://hydra.nixos.org/build/98821440

@mmahut
Copy link
Member

mmahut commented Aug 23, 2019

Sorry, @primeos I meant aarch64 and did not know it is because of a dependency.

@primeos
Copy link
Member Author

primeos commented Aug 23, 2019

@mmahut ok, no problem, I tried to fix it, let's see if it works (cannot test it locally atm).

@primeos
Copy link
Member Author

primeos commented Aug 23, 2019 •
edited

ok, it builds on all three platforms now :)
(The fix for AArch64 isn't that great tbh, but it'll work for now and its definitely better than a broken package IMO)

I'll merge it as my manual tests where fine so far (tested all three binaries, playing videos, transcoding videos, etc.).

@primeos primeos merged commit 7126eed into NixOS:master Aug 23, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Fuuzetsu Fuuzetsu Awaiting requested review from Fuuzetsu

Assignees
No one assigned
Labels
10.rebuild-darwin: 1-10 10.rebuild-linux: 11-100
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@primeos @mmahut