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

blender: 2.90.0 -> 2.90.1 #98982

Merged
merged 1 commit into from Sep 29, 2020
Merged

blender: 2.90.0 -> 2.90.1 #98982

merged 1 commit into from Sep 29, 2020

Conversation

@valencik
Copy link
Contributor

@valencik valencik commented Sep 28, 2020

Motivation for this change

Updates to latest blender 2.90.1

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.
lsix
lsix approved these changes Sep 28, 2020
Copy link
Member

@lsix lsix left a comment

Built & tested.

@stigtsp
Copy link
Member

@stigtsp stigtsp commented Sep 28, 2020

Build OK on linux x64. FAILED on darwin x64:

$ nix-build -A blender
[..]
/private/var/folders/hk/77b9kbln51v8hgc1c6j767k00000gn/T/nix-build-embree-3.11.0.drv-0/source/common/algorithms/../math/math.h:204:22: note: 'sincosf' declared here
  __forceinline void sincosf(float x, float *sin, float *cos) {
                     ^
1 error generated.
1 error generated.
make[2]: *** [common/algorithms/CMakeFiles/algorithms.dir/build.make:121: common/algorithms/CMakeFiles/algorithms.dir/parallel_for_for.cpp.o] Error 1
make[2]: *** [common/algorithms/CMakeFiles/algorithms.dir/build.make:108: common/algorithms/CMakeFiles/algorithms.dir/parallel_prefix_sum.cpp.o] Error 1
In file included from /private/var/folders/hk/77b9kbln51v8hgc1c6j767k00000gn/T/nix-build-embree-3.11.0.drv-0/source/common/algorithms/parallel_partition.cpp:4:
In file included from /private/var/folders/hk/77b9kbln51v8hgc1c6j767k00000gn/T/nix-build-embree-3.11.0.drv-0/source/common/algorithms/parallel_partition.h:6:
In file included from /private/var/folders/hk/77b9kbln51v8hgc1c6j767k00000gn/T/nix-build-embree-3.11.0.drv-0/source/common/algorithms/parallel_for.h:8:
/private/var/folders/hk/77b9kbln51v8hgc1c6j767k00000gn/T/nix-build-embree-3.11.0.drv-0/source/common/algorithms/../math/math.h:205:5: error: use of undeclared identifier '__sincosf'; did you mean 'sincosf'?
    __sincosf(x,sin,cos);
    ^~~~~~~~~
    sincosf
/private/var/folders/hk/77b9kbln51v8hgc1c6j767k00000gn/T/nix-build-embree-3.11.0.drv-0/source/common/algorithms/../math/math.h:204:22: note: 'sincosf' declared here
  __forceinline void sincosf(float x, float *sin, float *cos) {
                     ^
1 error generated.
make[2]: *** [common/algorithms/CMakeFiles/algorithms.dir/build.make:134: common/algorithms/CMakeFiles/algorithms.dir/parallel_for_for_prefix_sum.cpp.o] Error 1
1 error generated.
make[2]: *** [common/algorithms/CMakeFiles/algorithms.dir/build.make:147: common/algorithms/CMakeFiles/algorithms.dir/parallel_partition.cpp.o] Error 1
make[1]: *** [CMakeFiles/Makefile2:466: common/algorithms/CMakeFiles/algorithms.dir/all] Error 2
make: *** [Makefile:171: all] Error 2
builder for '/nix/store/bz97d7ny5gklf93nfj07xmkyls0dr4qi-embree-3.11.0.drv' failed with exit code 2
cannot build derivation '/nix/store/wvsq6dd3qrjzdmvyfyrn15bc791m0gic-blender-2.90.1.drv': 1 dependencies couldn't be built
error: build of '/nix/store/wvsq6dd3qrjzdmvyfyrn15bc791m0gic-blender-2.90.1.drv' failed


@valencik
Copy link
Contributor Author

@valencik valencik commented Sep 29, 2020

It appears that embree is failing on macOS currently. And so building blender on macOS also fails on the version prior to this commit.

I've created an issue for the embree problems here: #99049

Hoping we can continue with this PR for now and deal with the embree error separately.

@gebner gebner merged commit 92da99b into NixOS:master Sep 29, 2020
19 checks passed
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