Merge remote-tracking branch 'upstream/main' into docking-frame-trial

# Conflicts:
#	crates/ui-egui/src/panels/mod.rs
This commit is contained in:
aiongg
2026-10-24 18:47:25 +00:00
486 changed files with 7429 additions and 10849 deletions
Generated
+21 -3
View File
@@ -1016,6 +1016,14 @@ name = "craft-docpath"
version = "0.1.0"
source = "git+https://github.com/storytold/craft-libs?rev=82a24b006eefa036b43c09a67fb9a3fbd17ffe63#82a24b006eefa036b43c09a67fb9a3fbd17ffe63"
[[package]]
name = "craft-media"
version = "0.1.0"
source = "git+https://github.com/storytold/craft-libs?rev=f0ad6c1e1d297908915f4be315b0fcfc9be7b5d4#f0ad6c1e1d297908915f4be315b0fcfc9be7b5d4"
dependencies = [
"thiserror 2.0.21",
]
[[package]]
name = "craft-ui"
version = "0.1.0"
@@ -1758,6 +1766,7 @@ dependencies = [
"schemars",
"serde",
"serde_json",
"tempfile",
"thiserror 2.0.21",
"tokio",
]
@@ -1784,7 +1793,7 @@ dependencies = [
name = "filmcraft-bitstream"
version = "0.12.0"
dependencies = [
"proptest",
"craft-media",
]
[[package]]
@@ -1908,6 +1917,7 @@ dependencies = [
name = "filmcraft-engine"
version = "0.12.0"
dependencies = [
"chrono",
"craft-docpath",
"filmcraft-audio-dsp",
"filmcraft-captions",
@@ -1983,6 +1993,7 @@ dependencies = [
name = "filmcraft-format"
version = "0.12.0"
dependencies = [
"chrono",
"filmcraft-media",
"filmcraft-project",
"filmcraft-time",
@@ -2098,17 +2109,17 @@ dependencies = [
name = "filmcraft-isobmff"
version = "0.12.0"
dependencies = [
"filmcraft-bitstream",
"craft-media",
"filmcraft-testkit",
"proptest",
"serde_json",
"thiserror 2.0.21",
]
[[package]]
name = "filmcraft-matroska"
version = "0.12.0"
dependencies = [
"craft-media",
"filmcraft-testkit",
"serde_json",
]
@@ -2159,6 +2170,7 @@ dependencies = [
name = "filmcraft-mxf"
version = "0.12.0"
dependencies = [
"chrono",
"filmcraft-testkit",
]
@@ -2269,6 +2281,7 @@ dependencies = [
"serde",
"serde_json",
"sha2",
"tempfile",
"thiserror 2.0.21",
"ureq",
]
@@ -2277,7 +2290,9 @@ dependencies = [
name = "filmcraft-testkit"
version = "0.12.0"
dependencies = [
"chrono",
"png",
"tempfile",
]
[[package]]
@@ -2287,6 +2302,7 @@ dependencies = [
"filmcraft-color",
"harfrust",
"skrifa",
"tempfile",
"unicode-bidi",
"unicode-linebreak",
"unicode-segmentation",
@@ -2310,6 +2326,7 @@ dependencies = [
"filmcraft-tts-text",
"serde",
"serde_json",
"sha2",
"thiserror 2.0.21",
"zip",
]
@@ -2356,6 +2373,7 @@ dependencies = [
"rustix 1.1.5",
"serde",
"serde_json",
"tempfile",
"toml 1.1.6+spec-1.1.0",
"unicode-bidi",
"web-time",