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

meshlab: 2022.02 -> 2023.12 #299049

Merged
merged 8 commits into from
Apr 20, 2024
Merged

meshlab: 2022.02 -> 2023.12 #299049

merged 8 commits into from
Apr 20, 2024

Conversation

nim65s
Copy link
Contributor

@nim65s nim65s commented Mar 26, 2024

Description of changes

This WIP requires #298963, #298888, PixarAnimationStudios/OpenUSD#2266
I'll try to add pymeshlab.

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/)
  • 24.05 Release Notes (or backporting 23.05 and 23.11 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.

@nim65s nim65s force-pushed the meshlab branch 2 times, most recently from 3aff545 to 5987fad Compare March 26, 2024 00:15
"MAN1DIR=$(man)/share/man//man1"
];

makefile = if stdenv.isDarwin then "Makefile.macosx" else "Makefile.linux";
Copy link
Contributor Author

Choose a reason for hiding this comment

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

NB: I didn't test on darwin

@nim65s
Copy link
Contributor Author

nim65s commented Mar 27, 2024

This branch now include #298963, #298888, and PixarAnimationStudios/OpenUSD#2266, and pymeshlab seems to be working

@ofborg ofborg bot requested a review from ShaddyDC March 27, 2024 15:14
@nim65s
Copy link
Contributor Author

nim65s commented Mar 27, 2024

Result of nixpkgs-review pr 299049 run on x86_64-linux 1

16 packages built:
  • blender
  • blender-hip
  • corto
  • embree
  • libigl
  • meshlab
  • openctm
  • openctm.bin
  • openctm.dev
  • openctm.man
  • openusd
  • python311Packages.openusd
  • python311Packages.pymeshlab (python312Packages.pymeshlab)
  • python312Packages.openusd
  • structuresynth
  • structuresynth.dev

@nim65s nim65s mentioned this pull request Mar 27, 2024
13 tasks
pkgs/development/libraries/structuresynth/default.nix Outdated Show resolved Hide resolved
pkgs/development/libraries/embree/default.nix Show resolved Hide resolved
pkgs/by-name/op/openctm/package.nix Outdated Show resolved Hide resolved
pkgs/by-name/op/openctm/package.nix Outdated Show resolved Hide resolved
pkgs/by-name/li/libigl/package.nix Outdated Show resolved Hide resolved
pkgs/applications/graphics/pymeshlab/default.nix Outdated Show resolved Hide resolved
pkgs/applications/graphics/pymeshlab/default.nix Outdated Show resolved Hide resolved
pkgs/applications/graphics/pymeshlab/default.nix Outdated Show resolved Hide resolved
pkgs/applications/graphics/pymeshlab/default.nix Outdated Show resolved Hide resolved
repo = finalAttrs.pname;
rev = "v${finalAttrs.version}";
hash = "sha256-IOlRdXoUPOJt67g3HqsLchV5aL+JUEks2y1Sy+wpwsg=";
fetchSubmodules = true;
Copy link
Member

Choose a reason for hiding this comment

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

Since we are not using them, why even download them?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Hum, here, I iuse the meshlab submodule, as upstream is basically rebuilding meshlab to get pymeshlab.
I wasn't able to do otherwise yet, so I think this should be fixed upstream first. But I would be glad if anybody find another solution !

@nim65s
Copy link
Contributor Author

nim65s commented Apr 16, 2024

Thanks for the review ! Since #298888 was merged, I will rebase this and close #298963

@nim65s
Copy link
Contributor Author

nim65s commented Apr 16, 2024

Result of nixpkgs-review pr 299049 run on aarch64-darwin 1

8 packages failed to build:
  • embree
  • openctm
  • openctm.bin
  • openctm.dev
  • openctm.man
  • openusd
  • python311Packages.openusd
  • python312Packages.openusd
4 packages built:
  • corto
  • libigl
  • structuresynth
  • structuresynth.dev

edit: I need to manually download Xcode.app on this machine

@nim65s
Copy link
Contributor Author

nim65s commented Apr 16, 2024

About testing: on linux, I can import pymeshlab and use, with eg. https://gist.github.com/nim65s/295bc6eda86dc8250e982dac566a96f5#file-lighter-meshes-py to reduce some meshes.

I can also open a meshlab gui and use it to load a mesh, but I don't have the icons in the app, and the 3D view is full black. I have the same issue with the package before this PR, so maybe something is wrong with my setup, or meshlab was just broken before.

Blender GUI also seems to work fine, but I'm not sure how to specifically test openUSD inside blender.

@nim65s nim65s marked this pull request as ready for review April 16, 2024 21:57
@nim65s
Copy link
Contributor Author

nim65s commented Apr 16, 2024

Result of nixpkgs-review pr 299049 run on x86_64-linux 1

16 packages built:
  • blender
  • blender-hip
  • corto
  • embree
  • libigl
  • meshlab
  • openctm
  • openctm.bin
  • openctm.dev
  • openctm.man
  • openusd
  • python311Packages.openusd
  • python311Packages.pymeshlab (python312Packages.pymeshlab)
  • python312Packages.openusd
  • structuresynth
  • structuresynth.dev

Copy link
Contributor

@ShaddyDC ShaddyDC left a comment

Choose a reason for hiding this comment

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

The changes to openusd look fine to me, and I can confirm that opening a usd file in blender works.

@wegank wegank added 12.approvals: 2 This PR was reviewed and approved by two reputable people 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in the package labels Apr 17, 2024
@ofborg ofborg bot requested a review from ShaddyDC April 18, 2024 20:35
@wegank wegank removed the 12.approvals: 2 This PR was reviewed and approved by two reputable people label Apr 19, 2024
Copy link
Member

@SuperSandro2000 SuperSandro2000 left a comment

Choose a reason for hiding this comment

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

I've cleaned up the commit history a bit

@SuperSandro2000 SuperSandro2000 merged commit 3773b49 into NixOS:master Apr 20, 2024
23 of 24 checks passed
@nim65s nim65s deleted the meshlab branch April 21, 2024 18:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
6.topic: python 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 1-10 10.rebuild-linux: 11-100 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in the package
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants