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.

Sign up for GitHub

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

Jump to bottom

blender: 4.2.3 -> 4.3.0 #358085

Merged
merged 1 commit into from
Nov 25, 2024
Merged

blender: 4.2.3 -> 4.3.0 #358085

merged 1 commit into from
Nov 25, 2024
+29 −13

Conversation

VuiMuich
Copy link
Contributor

@VuiMuich VuiMuich commented Nov 22, 2024 •
edited
Loading

Bump Blender to latest release 4.3.0

This adds vulkan as a dependency and I was a bit unsure if this is needed on all platforms. If this is only needed for the linux platforms I will move the buildIput accordingly.

Also I am a but unsure if we should split the draco.patch in a <4.3.0 and a >=4.3.0 version?

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 25.05 Release Notes (or backporting 24.11 and 25.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@ofborg ofborg bot requested review from veprbl and amarshall November 23, 2024 01:32
amarshall
amarshall reviewed Nov 23, 2024
View reviewed changes
Copy link
Member

@amarshall amarshall left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for this! Added inline replied to your comments in the PR desc. I’ll do some testing a bit later.

pkgs/applications/misc/blender/default.nix Outdated Show resolved Hide resolved
pkgs/applications/misc/blender/draco.patch
@@ -1,26 +1,33 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 97596dbee8d..d1ad6ac5de0 100644
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It’s fine to have this only work on 4.3, we don’t currently support building on different versions anyway (maybe one day will do LTS as well…)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would we want to expand the scope of this pr to add LTS?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, that’s a bigger topic :)

@amarshall
Copy link
Member

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review

x86_64-linux

✅ 3 packages built:
  • blender
  • blender-hip
  • blendfarm

@amarshall
Copy link
Member

Successfully tested CUDA build and OptiX render.

@VuiMuich VuiMuich mentioned this pull request Nov 23, 2024
Open
13 tasks
amarshall
amarshall approved these changes Nov 23, 2024
View reviewed changes
Copy link
Member

@amarshall amarshall left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changes look good!

Tested basic build again. Also tested running with --gpu-backend vulkan and that works okay enough. I would say it definitely still seems “experimental”, but that’s fine they enabled it upstream anyway and it’s useful for addon dev.

@clamydo
Copy link

clamydo commented Nov 23, 2024

There seems to be an issue with the newly shipped assets for grease pencil? After building this PR locally, running blender and trying to draw something there are no brushes available and in the console I get:

./result/bin/blender
Warning: Unable to open '/nix/store/hhs3b7gdwa9wfzkgz6d3q9b6bzxgazf9-blender-4.3.0/share/blender/4.3/datafiles/assets/brushes/essentials_brushes-gp_draw.blend': No such file or directory
Warning: Unable to open '/nix/store/hhs3b7gdwa9wfzkgz6d3q9b6bzxgazf9-blender-4.3.0/share/blender/4.3/datafiles/assets/brushes/essentials_brushes-gp_draw.blend': No such file or directory
Warning: Unable to open '/nix/store/hhs3b7gdwa9wfzkgz6d3q9b6bzxgazf9-blender-4.3.0/share/blender/4.3/datafiles/assets/brushes/essentials_brushes-gp_draw.blend': No such file or directory
Warning: Unable to open '/nix/store/hhs3b7gdwa9wfzkgz6d3q9b6bzxgazf9-blender-4.3.0/share/blender/4.3/datafiles/assets/brushes/essentials_brushes-gp_draw.blend': No such file or directory
Warning: Unable to open '/nix/store/hhs3b7gdwa9wfzkgz6d3q9b6bzxgazf9-blender-4.3.0/share/blender/4.3/datafiles/assets/brushes/essentials_brushes-gp_draw.blend': No such file or directory
Warning: Unable to open '/nix/store/hhs3b7gdwa9wfzkgz6d3q9b6bzxgazf9-blender-4.3.0/share/blender/4.3/datafiles/assets/brushes/essentials_brushes-gp_draw.blend': No such file or directory
Warning: Unable to open '/nix/store/hhs3b7gdwa9wfzkgz6d3q9b6bzxgazf9-blender-4.3.0/share/blender/4.3/datafiles/assets/brushes/essentials_brushes-gp_vertex.blend': No such file or directory
Warning: Unable to open '/nix/store/hhs3b7gdwa9wfzkgz6d3q9b6bzxgazf9-blender-4.3.0/share/blender/4.3/datafiles/assets/brushes/essentials_brushes-gp_draw.blend': No such file or directory
Warning: Unable to open '/nix/store/hhs3b7gdwa9wfzkgz6d3q9b6bzxgazf9-blender-4.3.0/share/blender/4.3/datafiles/assets/brushes/essentials_brushes-gp_draw.blend': No such file or directory

@amarshall
Copy link
Member

amarshall commented Nov 23, 2024 •
edited
Loading

@clamydo Ah yes thanks for the testing. Added an inline comment. …need to think of a good way to assert the srcs are aligned going forward—guess should really write an updateScript but dunno of any that handle multiple srcs well…

@ofborg ofborg bot requested a review from amarshall November 24, 2024 10:02
@VuiMuich
Copy link
Contributor Author

Tested functionality of GreasPencil, works fine now.

@ofborg ofborg bot requested a review from veprbl November 25, 2024 01:06
@veprbl veprbl merged commit b5ceafb into NixOS:master Nov 25, 2024
30 of 34 checks passed
@VuiMuich VuiMuich deleted the blender-4.3.0 branch November 25, 2024 05:23
@VuiMuich
Copy link
Contributor Author

Thanks for the merge and thanks for the review!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@amarshall amarshall Awaiting requested review from amarshall

@veprbl veprbl Awaiting requested review from veprbl

Assignees
No one assigned
Labels
10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@VuiMuich @amarshall @clamydo @veprbl