Skip to content

Move to glifo and remove parley_draw#586

Merged
LaurenzV merged 6 commits intomainfrom
laurenz/remove_parley_draw
Mar 27, 2026
Merged

Move to glifo and remove parley_draw#586
LaurenzV merged 6 commits intomainfrom
laurenz/remove_parley_draw

Conversation

@laurenz-canva
Copy link
Copy Markdown
Contributor

Accompanying vello commit: linebender/vello#1539

Copy link
Copy Markdown
Member

@xStrom xStrom left a comment

Choose a reason for hiding this comment

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

Looks good but of course the git rev needs to be updated once the vello PR lands.

Cargo.toml Outdated
Comment on lines +111 to +114
vello_common = { git = "https://github.com/linebender/vello.git", rev = "de56b48" }
vello_cpu = { git = "https://github.com/linebender/vello.git", rev = "de56b48" }
vello_hybrid = { git = "https://github.com/linebender/vello.git", rev = "de56b48" }

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Given that you updated these to 0.0.7 already, should this patch even remain? Perhaps it can be removed.

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

I think we'll need to depend on the git version of vello, otherwise it won't match the version of vello that glifo is depending on. But it could probably be a regular git dep rather than a patch (as we won't be publishing any of the crates with this dependency).

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

As you want! Just did it to keep it consistent with how it's currently done.

@laurenz-canva laurenz-canva force-pushed the laurenz/remove_parley_draw branch from 33254bd to 900311f Compare March 26, 2026 15:47
@LaurenzV
Copy link
Copy Markdown
Contributor

@grebmeg Same as before, feel free to merge yourself, otherwise I'll do it tomorrow.

github-merge-queue bot pushed a commit to linebender/vello that referenced this pull request Mar 27, 2026
Not hooked up yet into vello, just the raw import. First commit is a 1:1
copy-paste of the crate, all subsequent commits finetune it to work with
the workspace structure.

This is the actual diff:
96c9482...9b070fd

Accompanying parley PR: linebender/parley#586

---------

Co-authored-by: Laurenz Stampfl <47084093+LaurenzV@users.noreply.github.com>
Co-authored-by: Kaur Kuut <strom@nevermore.ee>
@xStrom
Copy link
Copy Markdown
Member

xStrom commented Mar 27, 2026

Parley 0.8 got released so this can now be rebased so we can move towards merging it.

@LaurenzV
Copy link
Copy Markdown
Contributor

Will do!

# Conflicts:
#	.github/workflows/ci.yml
#	Cargo.lock
#	examples/vello_editor/Cargo.toml
@LaurenzV
Copy link
Copy Markdown
Contributor

Updated to newest vello main rev.

@LaurenzV LaurenzV added this pull request to the merge queue Mar 27, 2026
Merged via the queue into main with commit 400e5b1 Mar 27, 2026
24 checks passed
@LaurenzV LaurenzV deleted the laurenz/remove_parley_draw branch March 27, 2026 19:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants