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

libaom: 1.0.0-errata1 -> 2.0.0 #88439

Merged
merged 2 commits into from May 23, 2020
Merged

libaom: 1.0.0-errata1 -> 2.0.0 #88439

merged 2 commits into from May 23, 2020

Conversation

@primeos
Copy link
Member

primeos commented May 20, 2020

Testing

Tested using ffmpeg-full as well as aomenc and aomdec directly, LGTM.

Motivation for this change

There's finally a new release :)

2020-05-07 v2.0.0 "Applejack"
First official release of libaom.
This release includes new real-time mode and SVC support.

  • Upgrading:
    AOM_SET_POSTPROC, AOM_CODEC_CAP_POSTPROC and AOM_CODEC_USE_POSTPROC are
    removed.

    AOM_SET_DBG_* is removed.

    Multi-resolution encoding is removed.

    put_frame and put_slice callbacks are removed.

  • Enhancements:
    Full-sweep document update for codec controls.

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.
@orivej-nixos orivej-nixos changed the base branch from master to staging May 22, 2020
@primeos
Copy link
Member Author

primeos commented May 22, 2020

@orivej-nixos did you test your changes and will you merge this PR? Please don't just add commits without any comment.

And FYI: Building shared libraries should probably be tested on Darwin again as this apparently caused problems in the past: d349cfe

@orivej
Copy link
Contributor

orivej commented May 23, 2020

@GrahamcOfBorg build ffmpeg_4

@orivej
Copy link
Contributor

orivej commented May 23, 2020

Yeah, I've lost track of this. I have tested building ffmpeg-full and running aomenc on Linux. At the moment I can not test on macOS, I hope the bot will confirm that it builds, since the previous shared lib error was a build failure (#52444 (comment)).

@orivej
Copy link
Contributor

orivej commented May 23, 2020

(Building ffmpeg_4 inadvertently tests building libaom due to https://github.com/NixOS/nixpkgs/pull/72941/files#r429495248. ffmpeg-full would not include libaom support without it.)

@orivej-nixos
Copy link
Contributor

orivej-nixos commented May 23, 2020

Unfortunately staging was broken, I'll temporarily switch to master; while building python3.pkgs.cython:

/nix/store/ri3b04wqx51r3xf2l7z1gz24kr299ks1-python3.7-pkgconfig-1.5.1/nix-support/setup-hook: line 61: export: `NIX_@wrapperName@_TARGET_HOST_@suffixSalt@=1': not a valid identifier

@orivej-nixos orivej-nixos changed the base branch from staging to master May 23, 2020
@orivej-nixos
Copy link
Contributor

orivej-nixos commented May 23, 2020

@GrahamcOfBorg build libaom ffmpeg_4

@ofborg ofborg bot requested a review from kiloreux May 23, 2020
@orivej-nixos orivej-nixos changed the base branch from master to staging May 23, 2020
@orivej-nixos orivej-nixos merged commit 775f0fd into NixOS:staging May 23, 2020
22 of 24 checks passed
22 of 24 checks passed
editorconfig editorconfig
Details
ffmpeg_4 on x86_64-darwin
Details
grahamcofborg-eval Checking original out paths
Details
(unknown attributes) on x86_64-darwin No attempt
Details
ffmpeg_4 on aarch64-linux Failure
Details
ffmpeg_4 on x86_64-linux Failure
Details
Evaluation Performance Report Evaluator Performance Report
Details
ffmpeg_4, libaom on aarch64-linux Success
Details
ffmpeg_4, libaom on x86_64-linux Success
Details
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="9836d06"; rev="9836d06e3d15495efd06717e1ad9c5bf7ed8f6e7"; } ./pkgs/t
Details
grahamcofborg-eval-lib-tests nix-build --arg pkgs import ./. {} ./lib/tests/release.nix
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="9836d06"; rev="9836d06e3d15495efd06717e1ad9c5bf7ed8f6e7"; } ./nixos/
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="9836d06"; rev="9836d06e3d15495efd06717e1ad9c5bf7ed8f6e7"; } ./nixos/
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="9836d06"; rev="9836d06e3d15495efd06717e1ad9c5bf7ed8f6e7"; } ./nixos/
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="9836d06"; rev="9836d06e3d15495efd06717e1ad9c5bf7ed8f6e7"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="9836d06"; rev="9836d06e3d15495efd06717e1ad9c5bf7ed8f6e7"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="9836d06"; rev="9836d06e3d15495efd06717e1ad9c5bf7ed8f6e7"; } ./pkgs/t
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
libaom, libaom.passthru.tests on aarch64-linux Success
Details
libaom, libaom.passthru.tests on x86_64-darwin Success
Details
libaom, libaom.passthru.tests on x86_64-linux Success
Details
@orivej
Copy link
Contributor

orivej commented May 23, 2020

aa44ca3 should prevent future libaom updates from triggering a mass rebuild.

@primeos
Copy link
Member Author

primeos commented May 23, 2020

@orivej Thanks

aa44ca3 should prevent future libaom updates from triggering a mass rebuild.

Nice, that explains it :) I was surprised that this caused so many rebuilds as IIRC mainly ffmpeg-full depends on it, but I forgot to have a closer look.

Edit: Oh and btw would you mind trying to upstream your patch/fix?

@orivej
Copy link
Contributor

orivej commented May 23, 2020

Aomedia patch submission seems too convoluted. Feel free to submit it as if you wrote it yourself. The only thing I would change is set exec_prefix to ${prefix} (literally, as it was before my patch) in case prefix and exec_prefix are the same, so that other distributions will see the usual exec_prefix=${prefix} in their .pc.

@primeos
Copy link
Member Author

primeos commented May 24, 2020

Aomedia patch submission seems too convoluted.

Unfortunately :o

Feel free to submit it as if you wrote it yourself.

Ok, thanks, I'll look into that then.

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

4 participants
You can’t perform that action at this time.