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

ffmpeg: 4.3.2 -> 4.4 #118990

Merged
merged 1 commit into from Apr 17, 2021
Merged

ffmpeg: 4.3.2 -> 4.4 #118990

merged 1 commit into from Apr 17, 2021

Conversation

TredwellGit
Copy link
Member

Motivation for this change

https://github.com/FFmpeg/FFmpeg/blob/n4.4/Changelog

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

@mweinelt mweinelt merged commit 2a2f1b4 into NixOS:staging Apr 17, 2021
@TredwellGit TredwellGit deleted the ffmpeg branch April 17, 2021 03:13
@vcunat
Copy link
Member

vcunat commented May 13, 2021

It won't build on x86_64-darwin

libavcodec/videotoolboxenc.c:1036:29: error: use of undeclared identifier 'TARGET_CPU_ARM64'
    return TARGET_OS_OSX && TARGET_CPU_ARM64;

As a fallback, we might e.g. get 4.3 back just for darwin, even though it's not ideal.

@vcunat vcunat mentioned this pull request May 13, 2021
@vs49688
Copy link
Contributor

vs49688 commented May 14, 2021

@vcunat I'm working with upstream on this, what SDK version are we building with?

@vcunat
Copy link
Member

vcunat commented May 14, 2021

@vs49688: 10.12, I think. I'm not involved but it seems clear from pkgs/os-specific/darwin/apple-sdk/default.nix

@vcunat
Copy link
Member

vcunat commented May 15, 2021

Overall, perhaps it would be better to keep NixOS 21.05 default on ffmpeg 4.3.x? I see also mplayer regressing: https://hydra.nixos.org/build/142702864

/cc @NixOS/nixos-release-managers #122068 (ffmpeg doesn't cause that huge rebuild)

@vs49688
Copy link
Contributor

vs49688 commented May 15, 2021

That's been fixed in a newer revision of mplayer. I'm backporting it now.

@jonringer
Copy link
Contributor

21.05 doesn't need a backport yet. There hasn't been a branchoff yet

@vs49688
Copy link
Contributor

vs49688 commented May 15, 2021

I meant backporting the mplayer fix. Here 'tis: #123068

@vcunat

This comment has been minimized.

@vcunat
Copy link
Member

vcunat commented May 15, 2021

I'm working with upstream on this, what SDK version are we building with?

@vs49688: any outlooks for that? (the darwin build)

@vs49688
Copy link
Contributor

vs49688 commented May 15, 2021

@vcunat Submitted draft PR, waiting for ofborg to build it as I don't have any OSX machines. #123169
Patch (v2): https://ffmpeg.org/pipermail/ffmpeg-devel/2021-May/280337.html
Bug: https://trac.ffmpeg.org/ticket/9242

EDIT: Could someone request a darwin build from ofborg on the above pr? I don't have permissions.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants