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-full: patch for libsrt deprecated API #101994

Merged
merged 1 commit into from Oct 29, 2020
Merged

Conversation

@peterhoeg
Copy link
Member

@peterhoeg peterhoeg commented Oct 29, 2020

Motivation for this change

ffmpeg uses functionality which has been removed from libsrt. This makes
things build again by taking a commit from master.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • 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 nixpkgs-review --run "nixpkgs-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)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.
@peterhoeg
Copy link
Member Author

@peterhoeg peterhoeg commented Oct 29, 2020

Related to #101906.

@beardhatcode
Copy link
Contributor

@beardhatcode beardhatcode commented Oct 29, 2020

This PR adds the patch suggested in https://trac.ffmpeg.org/ticket/8760

@peterhoeg
Copy link
Member Author

@peterhoeg peterhoeg commented Oct 29, 2020

Fixes #101966

@peterhoeg peterhoeg merged commit 0cc9ad7 into NixOS:master Oct 29, 2020
19 checks passed
19 checks passed
@github-actions
tests
Details
@github-actions
action
Details
@ofborg
Evaluation Performance Report Evaluator Performance Report
Details
@github-actions
Wait for ofborg
Details
@ofborg
ffmpeg-full, ffmpeg-full.passthru.tests on aarch64-linux Success
Details
@ofborg
ffmpeg-full, ffmpeg-full.passthru.tests on x86_64-linux Success
Details
@ofborg
grahamcofborg-eval ^.^!
Details
@ofborg
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
@ofborg
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
@ofborg
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="8884809"; rev="88848095a5f6c24e8b2dd71285655d85561a66a9"; } ./pkgs/t
Details
@ofborg
grahamcofborg-eval-lib-tests nix-build --arg pkgs import ./. {} ./lib/tests/release.nix
Details
@ofborg
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="8884809"; rev="88848095a5f6c24e8b2dd71285655d85561a66a9"; } ./nixos/
Details
@ofborg
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="8884809"; rev="88848095a5f6c24e8b2dd71285655d85561a66a9"; } ./nixos/
Details
@ofborg
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="8884809"; rev="88848095a5f6c24e8b2dd71285655d85561a66a9"; } ./nixos/
Details
@ofborg
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="8884809"; rev="88848095a5f6c24e8b2dd71285655d85561a66a9"; } ./pkgs/t
Details
@ofborg
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="8884809"; rev="88848095a5f6c24e8b2dd71285655d85561a66a9"; } ./pkgs/t
Details
@ofborg
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="8884809"; rev="88848095a5f6c24e8b2dd71285655d85561a66a9"; } ./pkgs/t
Details
@ofborg
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
@ofborg
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
@peterhoeg peterhoeg deleted the peterhoeg:f/ffmpeg-full branch Oct 29, 2020
@jonringer
Copy link
Contributor

@jonringer jonringer commented Oct 29, 2020

20.09 isn't affected by this

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

Successfully merging this pull request may close these issues.

None yet

3 participants