x265: fix build on aarch64#100807
Closed
thefloweringash wants to merge 1 commit intoNixOS:stagingfrom
Closed
Conversation
Member
Author
|
Found an upstream issue: https://bitbucket.org/multicoreware/x265_git/issues/554 |
ofborg
bot
added
10.rebuild-darwin: 0
lovesegfault
approved these changes
Oct 20, 2020
Member
lovesegfault
left a comment
lovesegfault
left a comment
There was a problem hiding this comment.
Tested and working!
cc. @flokli for the big green button
flokli
requested changes
Oct 20, 2020
Member
flokli
left a comment
flokli
left a comment
There was a problem hiding this comment.
No green button, requested changes ;-)
| sha256 = "1jzgv2hxhcwmsdf6sbgyzm88a46dp09ll1fqj92g9vckvh9a7dsn"; | ||
| }; | ||
|
|
||
| patches = stdenv.lib.optionals stdenv.hostPlatform.isAarch64 [ |
Member
There was a problem hiding this comment.
patches shouldn't be conditional on a specific architecture - assuming the patch won't apply after a bump, this will lead to silent breakages.
If this patch doesn't break other arches, it should just be applied independent of architecture
| }; | ||
|
|
||
| patches = stdenv.lib.optionals stdenv.hostPlatform.isAarch64 [ | ||
| ./0001-dynamicHDR10-update-CMakeLists.txt-for-aarch64-suppo.patch |
Member
There was a problem hiding this comment.
Please don't bundle patches in nixpkgs, if they can be sent upstream, and fetchpatched in here.
When doing so, please also add a comment pointing to the upstream PR.
10 tasks
10 tasks
Member
Author
10 tasks
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Motivation for this change
Fixing aarch64 build of x265 after #98091.
I'll send the patch upstream when I figure out how to do so.
As for the high bit rate support, the header file for aarch64 assembly doesn't include the the prefixed versions (
x265_10bit,x265_12bit) from which I conclude it is not supported. Since it seems like it has to be explicitly implemented I made this a whitelist of justisx86_64.Things done
sandboxinnix.confon non-NixOS linux)aarch64-linuxonly)nix-shell -p nixpkgs-review --run "nixpkgs-review wip"./result/bin/)nix path-info -Sbefore and after)