-
-
Notifications
You must be signed in to change notification settings - Fork 14.3k
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
Blender darwin #307833
Blender darwin #307833
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I stopped commenting the final commit at some point because there were too many seemingly-unrelated unexplained changes. Please make atomic commits.
First: Thank you for taking your time reviewing! The changes do concern non-darwin, since (e.g. the inclusion of sse2neon or materialx) can be used in the non-darwin build, too. Ijust worked on this with both in mind and didn't see any reason to not include it in the non-darwin build, too. But of course this should go into a seperate commit. I'll work through your comments and split the blender commit into seperate ones. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm not sure how to test the materialx support in openusd, but otherwise, beyond what was mentioned, the changes to that package look fine to me.
@ShaddyDC thanks! I work on refactoring and splitting the unbreak-darwin and add-other-dependencies now. Unfortunatly testing and building takes quite some time. |
4af50b9
to
58569e7
Compare
Result of 1 package failed to build:
12 packages built:
|
Result of 1 package marked as broken and skipped:
10 packages built:
|
|
This is a semi-automatic executed nixpkgs-review with nixpkgs-review-checks extension. It is checked by a human on a best effort basis and does not build all packages (e.g. lumo, tensorflow or pytorch). Result of 1 package failed to build and already failed to build on hydra master:
1 package failed to build and are new build failure:
19 packages built:
The following issues got detected with the above build packages.
bambu-studio.debug:
got build log for '/nix/store/r9dadl15hpk57dabwn7qj0sc1bzgxi12-bambu-studio-01.09.00.70-debug' from 'daemon'
warning: unused-argument
got build log for '/nix/store/b884lc5clrmjb9rpzkjks3dqharrjrjf-bambu-studio-01.09.00.70' from 'daemon' Near pkgs/applications/misc/bambu-studio/default.nix:140:3:
See: https://github.com/jtojnar/nixpkgs-hammering/blob/master/explanations/environment-variables-go-to-env.md Near pkgs/applications/misc/bambu-studio/default.nix:143:3:
See: https://github.com/jtojnar/nixpkgs-hammering/blob/master/explanations/environment-variables-go-to-env.md
warning: unused-argument
got build log for '/nix/store/r6g53af4f9yq0zsdbgywpajdd3d8ai39-blender-4.1.1' from 'daemon'
got build log for '/nix/store/0caa3m6c18xi2m2iz6m9l0z0449z0hns-blender-4.1.1' from 'daemon'
got build log for '/nix/store/2n41jq5ssm44rwz7275bxvcvr2xp9wy8-prusa-slicer-2.7.4' from 'daemon' Near pkgs/applications/misc/prusa-slicer/default.nix:128:3:
got build log for '/nix/store/mny6a72bcynpsdx2hgpy6rjab2zjfs37-super-slicer-2.4.58.5-debug' from 'daemon'
See: https://github.com/jtojnar/nixpkgs-hammering/blob/master/explanations/stale-substitute.md
got build log for '/nix/store/ddi8z5gfvqs1kjsg3d49i2fjbv07cxzv-super-slicer-2.4.58.5' from 'daemon'
See: https://github.com/jtojnar/nixpkgs-hammering/blob/master/explanations/stale-substitute.md
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
See below for a few thoughts, questions, and suggestions while taking a first glance at the changes in this PR…
Update: I suggest revisting blender x86_64-darwin, after #229210 has been merged. |
@afh ah ok. I don't think apple sdk 14 will bring much improvement for this PR, but if you have something, I'll test it against blender 👍 |
Result of 1 package marked as broken and skipped:
10 packages built:
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
A few thoughts, questions, and suggestions on this PR for you, @gador. Keep up the great work 👏, I'd love to see this PR get completed and merged.
e445fd4
to
65c76dd
Compare
As far as I can see, all comments have been addressed and blender builds and works on |
Signed-off-by: Florian Brandes <florian.brandes@posteo.de>
Signed-off-by: Florian Brandes <florian.brandes@posteo.de>
Signed-off-by: Florian Brandes <florian.brandes@posteo.de>
Co-authored-by: Alexis Hildebrandt <afh@surryhill.net> Signed-off-by: Florian Brandes <florian.brandes@posteo.de>
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sorry to drop by again so late with these minor points. I might have missed a spot where something wasn't inserted in order. The openusd changes still look good to me and worked fine. The rest looks fine to me, but I haven't tested it and am not familiar with the details.
Thank you for your work!
Signed-off-by: Florian Brandes <florian.brandes@posteo.de> Co-authored-by: Alexis Hildebrandt <afh@surryhill.net>
Signed-off-by: Florian Brandes <florian.brandes@posteo.de>
Signed-off-by: Florian Brandes <florian.brandes@posteo.de>
currently builds on aarch64-darwin, but not on x86_64-darwin. Blender (specifically the ghost window library) depends on "metal" on apple devices. (For details see source/intern/ghost/intern/GHOST_System.cc line 416ff) It cannot build without it. Metal support should be introduced by apple sdk 11_1 (?) onward. Once this has been updated in nixpkgs, this derivation can be revised. Signed-off-by: Florian Brandes <florian.brandes@posteo.de> Co-authored-by: Alexis Hildebrandt <afh@surryhill.net>
Signed-off-by: Florian Brandes <florian.brandes@posteo.de>
Thanks for putting in all the hard work on this PR, @gador, very well done and very much appreciated 💯 |
Description of changes
This PR fixes the build of
blender
on darwin.To do so, the following changes have been made:
sse2neon
package (fixed compiler warning)openpgl
darwin build (needed as build input)openimagedenoise
darwin build. This could theoretically build withmetal
M1 support, but due to the older apple sdk in nixpkgs, this doesn't work, yet. When the sdk is updated, changes should be easy to includemetal
support.materialx
. This fixes another compiler warning, enables thematerialx
build flag and can be used in other packages, tooNanoVDB
libraries included byopenvdb
to also be built (needed by blender)python311Packages.openusd
enablematerialx
build flagDue to these changes, blender can now be build with sse2neon, materialx and open/nanoVDB support.
Things done
nix.conf
? (See Nix manual)sandbox = relaxed
sandbox = true
nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD"
. Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/
)Add a 👍 reaction to pull requests you find important.