The truly free, open-source, local-first, cross-platform CapCut replacement. Scriptable through a JSON-RPC API & MCP.
Rust ffmpegfree-video-editormodel-context-protocolnon-linear-editoroffline-firstopen-source-video-editorself-hostedvideo-editingvideo-editing-automationvideo-editing-softwarevideo-editing-toolsvideo-editorvoice-cloningyoutube-automationyoutube-shorts
chore(deps): Slint 1.18, and Skia is the one renderer, the Nix package included
Jareercfe9a99c346a
diff --git a/THIRD_PARTY_NOTICES.md b/THIRD_PARTY_NOTICES.mdindex 3d0f49d3..97c1efc7 100644--- a/THIRD_PARTY_NOTICES.md+++ b/THIRD_PARTY_NOTICES.md@@ -49,9 +49,8 @@ would rather not be bound by the GPL must take Slint under one of its othertwo licences and remove or replace Concat's AGPL-licensed code accordingly;the two cannot be mixed.-Slint pulls in the renderer selected by the feature flags in-`src/crates/concat/Cargo.toml` — Skia by default, FemtoVG over wgpu under-`--features wgpu` — along with winit and their transitive crates, which are+Slint pulls in its Skia renderer (see `src/crates/concat/Cargo.toml`) along+with winit and their transitive crates, which arepredominantly MIT/Apache-2.0/BSD licensed. `cargo tree -p concat` gives theresolved set of any given build.diff --git a/flake.nix b/flake.nixindex 17641d37..04124e9b 100644--- a/flake.nix+++ b/flake.nix@@ -22,11 +22,13 @@# - ONNX Runtime (the cutout models) is likewise downloaded by its sys# crate. nixpkgs' onnxruntime is linked instead, through ORT_LIB_LOCATION,# dynamically, so the wrapper's rpath finds it.+ # - Skia, the window's renderer as on every other platform, links prebuilt+ # binaries that skia-bindings would download at build time. They are+ # fetched here too and handed over as a file:// SKIA_BINARIES_URL; with+ # a stale key or version the build falls back to compiling Skia from+ # source, which the sandbox cannot do, so a mismatch fails loudly.#- # The window is built with the FemtoVG-over-wgpu renderer (`--features- # wgpu`) rather than Skia: skia-bindings also downloads its binaries at- # build time, and the wgpu renderer is pure Rust. Vulkan is loaded at run- # time, hence the LD_LIBRARY_PATH on the wrapper.+ # Vulkan is loaded at run time, hence the LD_LIBRARY_PATH on the wrapper.description = "Concat - free and open source video editor";inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";@@ -68,6 +70,43 @@}];+ # Must match skia-bindings in src/Cargo.lock: the archive is named+ # after the crate version (the tag) and a key of rust-skia's commit,+ # the target and the Skia features i-slint-renderer-skia turns on for+ # Linux (gl, vulkan, plus skia-safe's defaults). A Slint or skia-safe+ # bump changes these; the new name is printed by skia-bindings' build+ # script as "TRYING TO DOWNLOAD AND INSTALL SKIA BINARIES: tag/key".+ skiaVersion = "0.153.3";+ skiaKeyFeatures = "ganesh-gl-jpegd-jpege-pdf-vulkan";+ skiaArchives = {+ x86_64-linux = {+ key = "b7f043e0b1e2a850e702-x86_64-unknown-linux-gnu-${skiaKeyFeatures}";+ hash = "sha256-nr5MRIzJ94m60kHL0Rc5zfdZ4n21cZwjp2NeCW1YB7M=";+ };+ aarch64-linux = {+ key = "b7f043e0b1e2a850e702-aarch64-unknown-linux-gnu-${skiaKeyFeatures}";+ hash = "sha256-gtoiVv0M6UGVJ/cspOmFihPBTSMHPaHmGNxZY5f2VWA=";+ };+ };+ # The URL template skia-bindings expands; {tag} and {key} are its own+ # placeholders, not Nix's.+ skiaBinariesUrl =+ pkgs:+ let+ archive = skiaArchives.${pkgs.stdenv.hostPlatform.system};+ name = "skia-binaries-${archive.key}.tar.gz";+ dir = pkgs.linkFarm "skia-binaries" [+ {+ inherit name;+ path = pkgs.fetchurl {+ url = "https://github.com/rust-skia/skia-binaries/releases/download/${skiaVersion}/${name}";+ inherit (archive) hash;+ };+ }+ ];+ in+ "file://${dir}/skia-binaries-{key}.tar.gz";+# Libraries the binary opens at run time rather than links: the Vulkan# loader for wgpu, and the windowing libraries winit dlopens.runtimeLibs =@@ -119,9 +158,6 @@cargoBuildFlags = ["-p""concat"- "--no-default-features"- "--features"- "wgpu"];# The workspace's tests generate their own media through the@@ -130,6 +166,7 @@doCheck = false;env.SHERPA_ONNX_ARCHIVE_DIR = sherpaArchiveDir pkgs;+ env.SKIA_BINARIES_URL = skiaBinariesUrl pkgs;env.ORT_LIB_LOCATION = "${pkgs.onnxruntime}/lib";env.ORT_PREFER_DYNAMIC_LINK = "1";@@ -188,12 +225,13 @@]);env.SHERPA_ONNX_ARCHIVE_DIR = sherpaArchiveDir pkgs;+ env.SKIA_BINARIES_URL = skiaBinariesUrl pkgs;env.ORT_LIB_LOCATION = "${pkgs.onnxruntime}/lib";env.ORT_PREFER_DYNAMIC_LINK = "1";LD_LIBRARY_PATH = pkgs.lib.makeLibraryPath (runtimeLibs pkgs);shellHook = ''- echo "Concat: cd src && cargo run -p concat --no-default-features --features wgpu"+ echo "Concat: cd src && cargo run -p concat"'';};});diff --git a/src/Cargo.lock b/src/Cargo.lockindex eb6a958c..ccfb3a29 100644--- a/src/Cargo.lock+++ b/src/Cargo.lock@@ -166,24 +166,6 @@ dependencies = ["memchr",]-[[package]]-name = "aligned"-version = "0.4.3"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "ee4508988c62edf04abd8d92897fca0c2995d907ce1dfeaf369dac3716a40685"-dependencies = [- "as-slice",-]--[[package]]-name = "aligned-vec"-version = "0.6.4"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "dc890384c8602f339876ded803c97ad529f3842aba97f6392b3dba0dd171769b"-dependencies = [- "equator",-]-[[package]]name = "allocator-api2"version = "0.2.21"@@ -370,14 +352,21 @@ dependencies = [][[package]]-name = "arg_enum_proc_macro"-version = "0.3.4"+name = "arboard"+version = "3.6.1"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "0ae92a5119aa49cdbcf6b9f893fe4e1d98b04ccbf82ee0584ad948a44a734dea"+checksum = "0348a1c054491f4bfe6ab86a7b6ab1e44e45d899005de92f58b3df180b36ddaf"dependencies = [- "proc-macro2",- "quote",- "syn 2.0.119",+ "clipboard-win",+ "log",+ "objc2 0.6.4",+ "objc2-app-kit 0.3.2",+ "objc2-foundation 0.3.2",+ "parking_lot",+ "percent-encoding",+ "windows-sys 0.59.0",+ "wl-clipboard-rs",+ "x11rb",][[package]]@@ -398,15 +387,6 @@ version = "1.0.1"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "175571dd1d178ced59193a6fc02dde1b972eb0bc56c892cde9beeceac5bf0f6b"-[[package]]-name = "as-slice"-version = "0.2.1"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "516b6b4f0e40d50dcda9365d53964ec74560ad4284da2e7fc97122cd83174516"-dependencies = [- "stable_deref_trait",-]-[[package]]name = "ash"version = "0.38.0+1.3.281"@@ -590,67 +570,12 @@ dependencies = ["zbus",]-[[package]]-name = "auto_enums"-version = "0.8.10"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "3091d68264354f211516b91dce6f71046e444fab1867716035f736667243affb"-dependencies = [- "derive_utils",- "proc-macro2",- "quote",- "syn 3.0.4",-]-[[package]]name = "autocfg"version = "1.5.1"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "f2032f911046de80f0a198e0901378627c33f59ea0ac00e363d481118bd70a53"-[[package]]-name = "av-scenechange"-version = "0.14.1"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "0f321d77c20e19b92c39e7471cf986812cbb46659d2af674adc4331ef3f18394"-dependencies = [- "aligned",- "anyhow",- "arg_enum_proc_macro",- "arrayvec",- "log",- "num-rational",- "num-traits",- "pastey 0.1.1",- "rayon",- "thiserror 2.0.20",- "v_frame",- "y4m",-]--[[package]]-name = "av1-grain"-version = "0.2.5"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "8cfddb07216410377231960af4fcab838eaa12e013417781b78bd95ee22077f8"-dependencies = [- "anyhow",- "arrayvec",- "log",- "nom 8.0.0",- "num-rational",- "v_frame",-]--[[package]]-name = "avif-serialize"-version = "0.8.9"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "e7178fe5f7d460b13895ebb9dcb28a3a6216d2df2574a0806cb51b555d297f38"-dependencies = [- "arrayvec",-]-[[package]]name = "axum"version = "0.8.9"@@ -772,6 +697,15 @@ dependencies = ["bit-vec 0.9.1",]+[[package]]+name = "bit-set"+version = "0.10.0"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "09ec2f926cc3060f09db9ebc5b52823d85268d24bb917e472c0c4bea35780a7d"+dependencies = [+ "bit-vec 0.9.1",+]+[[package]]name = "bit-vec"version = "0.8.0"@@ -784,12 +718,6 @@ version = "0.9.1"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "b71798fca2c1fe1086445a7258a4bc81e6e49dcd24c8d0dd9a1e57395b603f51"-[[package]]-name = "bit_field"-version = "0.10.3"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "1e4b40c7323adcfc0a41c4b88143ed58346ff65a288fc144329c5c45e05d70c6"-[[package]]name = "bitflags"version = "1.3.2"@@ -805,15 +733,6 @@ dependencies = ["serde_core",]-[[package]]-name = "bitstream-io"-version = "4.10.0"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "7eff00be299a18769011411c9def0d827e8f2d7bf0c3dbf53633147a8867fd1f"-dependencies = [- "no_std_io2",-]-[[package]]name = "block-buffer"version = "0.10.4"@@ -875,12 +794,6 @@ dependencies = ["serde_core",]-[[package]]-name = "built"-version = "0.8.1"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "5c0e531d93d39c34eef561e929e8a7f86d77a5af08aac4f6d6e39976c51858e9"-[[package]]name = "bumpalo"version = "3.20.3"@@ -1008,18 +921,6 @@ dependencies = ["wayland-client",]-[[package]]-name = "calloop-wayland-source"-version = "0.4.1"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "138efcf0940a02ebf0cc8d1eff41a1682a46b431630f4c52450d6265876021fa"-dependencies = [- "calloop 0.14.4",- "rustix 1.1.4",- "wayland-backend",- "wayland-client",-]-[[package]]name = "castaway"version = "0.2.4"@@ -1261,7 +1162,7 @@ dependencies = ["slint","slint-build","toml",- "wgpu",+ "wgpu 29.0.4",][[package]]@@ -1317,7 +1218,7 @@ version = "0.2.4"dependencies = ["concat-core","concat-project",- "naga",+ "naga 29.0.4","serde","thiserror 2.0.20","toml",@@ -1399,7 +1300,7 @@ dependencies = ["concat-effects","log","pollster",- "wgpu",+ "wgpu 29.0.4",][[package]]@@ -1441,7 +1342,7 @@ dependencies = [name = "concat-text"version = "0.2.4"dependencies = [- "fontdb",+ "fontdb 0.23.0","rustybuzz","tiny-skia 0.12.0","ttf-parser",@@ -1502,20 +1403,6 @@ dependencies = ["unicode-segmentation",]-[[package]]-name = "copypasta"-version = "0.10.2"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "3e6811e17f81fe246ef2bc553f76b6ee6ab41a694845df1d37e52a92b7bbd38a"-dependencies = [- "clipboard-win",- "objc2 0.5.2",- "objc2-app-kit 0.2.2",- "objc2-foundation 0.2.2",- "smithay-clipboard",- "x11-clipboard",-]-[[package]]name = "core-foundation"version = "0.9.4"@@ -1874,17 +1761,6 @@ dependencies = ["unicode-xid",]-[[package]]-name = "derive_utils"-version = "0.16.0"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "dc05a5d33db20c784f873e84934ad94bb209a090987ac5f62fede2c178234f23"-dependencies = [- "proc-macro2",- "quote",- "syn 3.0.4",-]-[[package]]name = "digest"version = "0.10.7"@@ -2044,26 +1920,6 @@ dependencies = ["regex",]-[[package]]-name = "equator"-version = "0.4.2"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "4711b213838dfee0117e3be6ac926007d7f433d7bbe33595975d4190cb07e6fc"-dependencies = [- "equator-macro",-]--[[package]]-name = "equator-macro"-version = "0.4.2"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "44f23cf4b44bfce11a86ace86f8a73ffdec849c9fd00a386a53d278bd9e81fb3"-dependencies = [- "proc-macro2",- "quote",- "syn 2.0.119",-]-[[package]]name = "equivalent"version = "1.0.2"@@ -2121,23 +1977,6 @@ dependencies = ["pin-project-lite",]-[[package]]-name = "exr"-version = "1.74.2"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "711fe42c9964295e01ee3fba3f9fe0e1d24b98886950d68efe81b1c76e21adf3"-dependencies = [- "bit_field",- "half",- "lebe",- "miniz_oxide 0.8.9",- "num-complex",- "pulp",- "rayon-core",- "smallvec",- "zune-inflate",-]-[[package]]name = "fancy-regex"version = "0.17.0"@@ -2155,12 +1994,6 @@ version = "2.5.0"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "da7c62ceae207dd37ea5b845da6a0696c799f85e97da1ab5b7910be3c1c80223"-[[package]]-name = "fax"-version = "0.2.7"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "caf1079563223d5d59d83c85886a56e586cfd5c1a26292e971a0fa266531ac5a"-[[package]]name = "fdeflate"version = "0.3.7"@@ -2170,27 +2003,6 @@ dependencies = ["simd-adler32",]-[[package]]-name = "femtovg"-version = "0.25.1"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "f43d05da42e81724c16d34a150fb7fda53d3f786e5a94673ee526ff8602f0f6a"-dependencies = [- "bitflags 2.13.1",- "bytemuck",- "fnv",- "glow",- "imgref",- "itertools 0.14.0",- "log",- "rgb",- "slotmap",- "swash",- "wasm-bindgen",- "web-sys",- "wgpu",-]-[[package]]name = "ffmpeg-sys-the-third"version = "6.0.0+ffmpeg-9.0"@@ -2294,15 +2106,6 @@ version = "0.2.0"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "77ce24cb58228fbb8aa041425bb1050850ac19177686ea6e0f41a70416f56fdb"-[[package]]-name = "font-types"-version = "0.11.3"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "5b38ad915f6dadd993ced50848a8291a543bd41ca62bc10740d5e64e2ab4cfd7"-dependencies = [- "bytemuck",-]-[[package]]name = "font-types"version = "0.12.4"@@ -2335,11 +2138,22 @@ dependencies = ["ttf-parser",]+[[package]]+name = "fontdb"+version = "0.24.0"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "2660c5e9157bf76d2db1294e4a9feba604ef610819a3b591088d0d8392a3290f"+dependencies = [+ "log",+ "slotmap",+ "tinyvec",+]+[[package]]name = "fontique"-version = "0.10.0"+version = "0.11.1"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "274fa4f0f0a926ae182c7c076c078cce8a38471d15e61a102a02cac984be9813"+checksum = "6688bc1294fe7117d788937b6c53480169b29c566954af490830d4c09da9516a"dependencies = ["hashbrown 0.17.1","linebender_resource_handle",@@ -2349,7 +2163,7 @@ dependencies = ["objc2-core-text","objc2-foundation 0.3.2","parlance",- "read-fonts 0.39.2",+ "read-fonts","roxmltree 0.21.1","smallvec","windows 0.62.2",@@ -2557,15 +2371,6 @@ dependencies = ["windows-link",]-[[package]]-name = "getopts"-version = "0.2.24"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "cfe4fbac503b8d1f88e6676011885f34b7174f46e59956bba534ba83abded4df"-dependencies = [- "unicode-width 0.2.2",-]-[[package]]name = "getrandom"version = "0.2.17"@@ -2641,6 +2446,18 @@ dependencies = ["web-sys",]+[[package]]+name = "glow"+version = "0.18.0"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "263218b0ba2b0715c3370fb04674f5f8aa331594b521c94ff0a8e4a8472d1386"+dependencies = [+ "js-sys",+ "slotmap",+ "wasm-bindgen",+ "web-sys",+]+[[package]]name = "glutin"version = "0.32.3"@@ -2780,13 +2597,13 @@ dependencies = [[[package]]name = "harfrust"-version = "0.8.4"+version = "0.12.0"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "d12c7c642d4ce8c2e784b4751a6634bd89583912265add4a679a8882d123fbcd"+checksum = "c03d949a14aa089bbb282f7dd76a498a7f684428e4257202efc119ec010376f9"dependencies = ["bitflags 2.13.1","bytemuck",- "read-fonts 0.39.2",+ "read-fonts","smallvec",]@@ -2978,9 +2795,9 @@ dependencies = [[[package]]name = "i-slint-backend-android-activity"-version = "1.17.1"+version = "1.18.1"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "9805bcdcbeea6626a0054347ee55d2424e0d5574b563472719d3fc7a11852242"+checksum = "70d538003a566d7312572ac1435be0704934e46a63d55abdabede513f72332cb"dependencies = ["android-activity 0.5.2","android-activity 0.6.1",@@ -2995,9 +2812,9 @@ dependencies = [[[package]]name = "i-slint-backend-linuxkms"-version = "1.17.1"+version = "1.18.1"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "68e76f2b13846ca54bba6b8eb3b5454b26879ad987396d0a2d8abedc31a6c469"+checksum = "0f519a8611a4982921e46e391015e5e40ceac5cc63813333ef91ada77df180d8"dependencies = ["bytemuck","calloop 0.14.4",@@ -3007,10 +2824,10 @@ dependencies = ["glutin","i-slint-common","i-slint-core",- "i-slint-renderer-femtovg","i-slint-renderer-skia","i-slint-renderer-software","input",+ "libseat","memmap2","nix","raw-window-handle",@@ -3019,9 +2836,9 @@ dependencies = [[[package]]name = "i-slint-backend-selector"-version = "1.17.1"+version = "1.18.1"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "2247a4590a02a466b2f4916cc789dfe66247f6af826f00eb84a2685259a45c1c"+checksum = "fb974705d61ba56034f6129ff61f3e6282a2c0c07752f25e6cb417d81c0f0958"dependencies = ["cfg-if","cfg_aliases",@@ -3032,15 +2849,14 @@ dependencies = ["i-slint-common","i-slint-core","i-slint-core-macros",- "i-slint-renderer-femtovg","i-slint-renderer-skia",][[package]]name = "i-slint-backend-testing"-version = "1.17.1"+version = "1.18.1"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "521e901e3d47ab829c0ef500c63155776208707cd93259e6a7803ed627fa2786"+checksum = "01943d6c5ea5bc913d497bdaa423c309e7627afff47a6794bfd13be5c564209f"dependencies = ["cfg_aliases","i-slint-common",@@ -3052,25 +2868,23 @@ dependencies = [[[package]]name = "i-slint-backend-winit"-version = "1.17.1"+version = "1.18.1"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "a27c7e8f53418d3017362465367b6612b6e439a68097d627d1b91c94b885f0a6"+checksum = "dae4fcf1b19e9cb109984d2af87d2b9485388c619265bff71dd523133888bee2"dependencies = ["accesskit","accesskit_winit",+ "arboard","block2 0.6.2","bytemuck","cfg-if","cfg_aliases",- "copypasta",- "derive_more","futures","glutin","glutin-winit","i-slint-common","i-slint-core","i-slint-core-macros",- "i-slint-renderer-femtovg","i-slint-renderer-skia","i-slint-renderer-software","imgref",@@ -3099,9 +2913,9 @@ dependencies = [[[package]]name = "i-slint-common"-version = "1.17.1"+version = "1.18.1"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "52e63f8ea55ba21e44567ae67d2b01a4f5d09bb1fab693b1e6c79d96bef9e456"+checksum = "68a578f3e4b681b2b9cbd326d3be19716e2fac51d00a8a5b00c0ef4ae923b5e6"dependencies = ["derive_more","fontique",@@ -3111,14 +2925,14 @@ dependencies = ["icu_provider","pulldown-cmark","resvg",- "skrifa 0.42.1",+ "skrifa",][[package]]name = "i-slint-compiler"-version = "1.17.1"+version = "1.18.1"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "45ea275b15a425c7f2f77481151e1f5f8f1ea83feae580273090ef6b9e192218"+checksum = "f55d48ebef05e2bf09ba5a1fc67bcb11033b9e12a2a50ed3105c7d25e2b539d0"dependencies = ["annotate-snippets","by_address",@@ -3126,9 +2940,10 @@ dependencies = ["derive_more","i-slint-common","icu_normalizer",+ "icu_properties","image",- "itertools 0.14.0",- "linked_hash_set",+ "indexmap",+ "itertools 0.15.0","lyon_extra","lyon_path","num_enum",@@ -3138,7 +2953,7 @@ dependencies = ["resvg","rowan","rspolib",- "skrifa 0.42.1",+ "skrifa","smol_str 0.3.6","strum","swash",@@ -3149,12 +2964,12 @@ dependencies = [[[package]]name = "i-slint-core"-version = "1.17.1"+version = "1.18.1"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "4e407dc2bd5385dcbdd9c1cf927213d2e4bacda667545abf8839c60f8290f754"+checksum = "ed2ea15059d70bc31b1a8b1eb4c34f2c5df04cb7e53f36179b43c0261231d646"dependencies = [+ "accesskit","async-channel",- "auto_enums","bitflags 2.13.1","cfg-if","chrono",@@ -3166,6 +2981,7 @@ dependencies = ["i-slint-core-macros","icu_normalizer","image",+ "js-sys","ksni","lyon_algorithms","lyon_extra",@@ -3184,7 +3000,7 @@ dependencies = ["resvg","rgb","scopeguard",- "skrifa 0.42.1",+ "skrifa","slab","strum","swash",@@ -3197,58 +3013,34 @@ dependencies = ["wasm-bindgen","web-sys","web-time",- "wgpu",+ "wgpu 29.0.4",+ "wgpu 30.0.1","windows 0.62.2",][[package]]name = "i-slint-core-macros"-version = "1.17.1"+version = "1.18.1"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "3a842640da4c4d0909d25cc5a51e1f9cde02bd48f7fdfa94df10d595d4e3c80a"+checksum = "73f5a8a076de52f53be80caa826599ed2107b54c9d4a421e66dc06cf893a984c"dependencies = ["quote","serde_json",- "syn 2.0.119",-]--[[package]]-name = "i-slint-renderer-femtovg"-version = "1.17.1"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "78d0d99a18d66738b684758fe8460743a0aa0f64a96e05940942231a340085b1"-dependencies = [- "cfg-if",- "const-field-offset",- "derive_more",- "femtovg",- "glow",- "i-slint-common",- "i-slint-core",- "i-slint-core-macros",- "imgref",- "lyon_path",- "pin-weak",- "rgb",- "wasm-bindgen",- "web-sys",- "wgpu",+ "syn 3.0.4",][[package]]name = "i-slint-renderer-skia"-version = "1.17.1"+version = "1.18.1"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "7b6eed7f3f0a9a3d3ca6e8b9d4ca233371d989351fdb2a7ab88ec368b99e7b57"+checksum = "dc9c1cf02385f1d26fc1f423544e52390a8e5c2d89420a8042aa94b4fe109d1f"dependencies = [- "ash","bytemuck","cfg-if","cfg_aliases","clru","const-field-offset",- "derive_more",- "glow",+ "glow 0.18.0","glutin","i-slint-common","i-slint-core",@@ -3262,15 +3054,17 @@ dependencies = ["objc2-quartz-core 0.3.2","pin-weak","raw-window-handle",- "raw-window-metal",- "read-fonts 0.39.2",+ "read-fonts","scoped-tls-hkt","skia-safe","softbuffer","spin_on","unicode-segmentation","vtable",- "wgpu",+ "wgpu 29.0.4",+ "wgpu 30.0.1",+ "wgpu-hal 29.0.4",+ "wgpu-hal 30.0.1","windows 0.62.2","windows-core 0.62.2","write-fonts",@@ -3278,9 +3072,9 @@ dependencies = [[[package]]name = "i-slint-renderer-software"-version = "1.17.1"+version = "1.18.1"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "73496f164f8e471877c35e0fadb996dcc674922712abd9c2be2cbe80c58859bd"+checksum = "2f8c641e138a2cc96537cac4481f5c7c8bb8dcc66d09acaed269329c8738628a"dependencies = ["bytemuck","clru",@@ -3288,10 +3082,9 @@ dependencies = ["euclid","i-slint-common","i-slint-core",- "integer-sqrt","lyon_path","num-traits",- "skrifa 0.42.1",+ "skrifa","swash","zeno",]@@ -3525,18 +3318,9 @@ checksum = "85ab80394333c02fe689eaf900ab500fbd0c2213da414687ebf995a65d5a6104"dependencies = ["bytemuck","byteorder-lite",- "color_quant",- "exr",- "gif",- "image-webp","moxcms","num-traits","png 0.18.1",- "qoi",- "ravif",- "rayon",- "rgb",- "tiff","zune-core","zune-jpeg",]@@ -3553,9 +3337,9 @@ dependencies = [[[package]]name = "imagesize"-version = "0.14.0"+version = "0.15.0"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "09e54e57b4c48b40f7aec75635392b12b3421fa26fe8b4332e63138ed278459c"+checksum = "65b27460c2c92b037f3f94c538ed9a3342f3fdf923606781629ccb35f82d042a"[[package]]name = "imgref"@@ -3601,26 +3385,6 @@ version = "1.19.0"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "36eee07d8e02bd95bf52b2e642cf13d33701b94c6e4b04fbf1d1fb07e9cb19e7"-[[package]]-name = "integer-sqrt"-version = "0.1.5"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "276ec31bcb4a9ee45f58bec6f9ec700ae4cf4f4f8f2fa7e06cb406bd5ffdd770"-dependencies = [- "num-traits",-]--[[package]]-name = "interpolate_name"-version = "0.2.4"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "c34819042dc3d3971c46c2190835914dfbe0c3c13f61449b2997f4e9722dfa60"-dependencies = [- "proc-macro2",- "quote",- "syn 2.0.119",-]-[[package]]name = "io-lifetimes"version = "1.0.11"@@ -3657,8 +3421,17 @@ dependencies = [][[package]]-name = "itoa"-version = "1.0.18"+name = "itertools"+version = "0.15.0"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "8b4baf93f58d4425749ca49a51c50ebab072c5df6994d08fed93541c331481dc"+dependencies = [+ "either",+]++[[package]]+name = "itoa"+version = "1.0.18"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "8f42a60cbdf9a97f5d2305f08a87dc4e09308d1276d28c869c684d7777685682"@@ -3797,7 +3570,7 @@ dependencies = ["futures-channel","futures-lite","futures-util",- "pastey 0.2.3",+ "pastey","serde","task-local","zbus",@@ -3821,12 +3594,6 @@ version = "1.5.0"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"-[[package]]-name = "lebe"-version = "0.5.3"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "7a79a3332a6609480d7d0c9eab957bca6b455b91bb84e66d19f5ff66294b85b8"-[[package]]name = "libbz2-rs-sys"version = "0.2.5"@@ -3839,16 +3606,6 @@ version = "0.2.189"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "3eaf3ede3fee6db1a4c2ee091bf8a8b4dccdc6d17f656fb07896ee72867612f2"-[[package]]-name = "libfuzzer-sys"-version = "0.4.13"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "a9fd2f41a1cba099f79a0b6b6c35656cf7c03351a7bae8ff0f28f25270f929d2"-dependencies = [- "arbitrary",- "cc",-]-[[package]]name = "libloading"version = "0.8.9"@@ -3877,6 +3634,26 @@ dependencies = ["redox_syscall 0.9.3",]+[[package]]+name = "libseat"+version = "0.2.4"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "6656c69b6e0366ffb83faa232f3e4fda5fc91161722d140f2c95ce2e90b1ef31"+dependencies = [+ "errno",+ "libseat-sys",+ "log",+]++[[package]]+name = "libseat-sys"+version = "0.2.0"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "e8a484fa48be5f62a8d3ffed767779d0ab808cfead91de98ef4362d469097dfb"+dependencies = [+ "pkg-config",+]+[[package]]name = "libudev-sys"version = "0.1.4"@@ -3893,21 +3670,6 @@ version = "0.1.1"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "d4a5ff6bcca6c4867b1c4fd4ef63e4db7436ef363e0ad7531d1558856bae64f4"-[[package]]-name = "linked-hash-map"-version = "0.5.6"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f"--[[package]]-name = "linked_hash_set"-version = "0.1.6"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "984fb35d06508d1e69fc91050cceba9c0b748f983e6739fa2c7a9237154c52c8"-dependencies = [- "linked-hash-map",-]-[[package]]name = "linux-raw-sys"version = "0.4.15"@@ -4019,15 +3781,6 @@ dependencies = ["logos-codegen 0.16.1",]-[[package]]-name = "loop9"-version = "0.1.5"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "0fae87c125b03c1d2c0150c90365d7d6bcc53fb73a9acaef207d2d065860f062"-dependencies = [- "imgref",-]-[[package]]name = "lyon_algorithms"version = "1.0.21"@@ -4112,7 +3865,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "b3ae8f6d608c795738406608304d30a2dfbdc8e58e44f7ba43236da5208ded3c"dependencies = ["macro_rules_attribute-proc_macro",- "pastey 0.2.3",+ "pastey",][[package]]@@ -4137,16 +3890,6 @@ dependencies = ["rawpointer",]-[[package]]-name = "maybe-rayon"-version = "0.1.1"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "8ea1f30cedd69f0a2954655f7188c6a834246d2bcf1e315e2ac40c4b24dc9519"-dependencies = [- "cfg-if",- "rayon",-]-[[package]]name = "memchr"version = "2.8.3"@@ -4319,6 +4062,44 @@ dependencies = ["unicode-ident",]+[[package]]+name = "naga"+version = "30.0.1"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "a616d2fb8c89516ac2723a581f69d6c18576046bed761bd6b305e5618e6ae130"+dependencies = [+ "arrayvec",+ "bit-set 0.10.0",+ "bitflags 2.13.1",+ "cfg-if",+ "cfg_aliases",+ "codespan-reporting",+ "half",+ "hashbrown 0.17.1",+ "indexmap",+ "libm",+ "log",+ "naga-types",+ "num-traits",+ "once_cell",+ "rustc-hash 1.1.0",+ "spirv",+ "thiserror 2.0.20",+ "unicode-ident",+]++[[package]]+name = "naga-types"+version = "30.0.1"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "590afbf58a6f4f62873cd5cff4468061844bafa1cdf399cc954537c22d768d49"+dependencies = [+ "hashbrown 0.17.1",+ "indexmap",+ "rustc-hash 1.1.0",+ "thiserror 2.0.20",+]+[[package]]name = "native-tls"version = "0.2.18"@@ -4410,12 +4191,6 @@ dependencies = ["jni-sys 0.3.1",]-[[package]]-name = "new_debug_unreachable"-version = "1.0.6"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086"-[[package]]name = "nix"version = "0.31.3"@@ -4428,15 +4203,6 @@ dependencies = ["libc",]-[[package]]-name = "no_std_io2"-version = "0.9.4"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "418abd1b6d34fbf6cae440dc874771b0525a604428704c76e48b29a5e67b8003"-dependencies = [- "memchr",-]-[[package]]name = "nom"version = "7.1.3"@@ -4456,12 +4222,6 @@ dependencies = ["memchr",]-[[package]]-name = "noop_proc_macro"-version = "0.3.0"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "0676bb32a98c1a483ce53e500a81ad9c3d5b3f7c920c28c24e9cb0980d0b5bc8"-[[package]]name = "normpath"version = "1.5.1"@@ -4471,23 +4231,12 @@ dependencies = ["windows-sys 0.61.2",]-[[package]]-name = "num-bigint"-version = "0.4.8"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "c89e69e7e0f03bea5ef08013795c25018e101932225a656383bd384495ecc367"-dependencies = [- "num-integer",- "num-traits",-]-[[package]]name = "num-complex"version = "0.4.6"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "73f88a1307638156682bada9d7604135552957b7818057dcef22705b4d509495"dependencies = [- "bytemuck","num-traits",]@@ -4517,17 +4266,6 @@ dependencies = ["num-traits",]-[[package]]-name = "num-rational"-version = "0.4.2"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824"-dependencies = [- "num-bigint",- "num-integer",- "num-traits",-]-[[package]]name = "num-traits"version = "0.2.19"@@ -4595,8 +4333,8 @@ dependencies = ["block2 0.5.1","libc","objc2 0.5.2",- "objc2-core-data 0.2.2",- "objc2-core-image 0.2.2",+ "objc2-core-data",+ "objc2-core-image","objc2-foundation 0.2.2","objc2-quartz-core 0.2.2",]@@ -4609,15 +4347,9 @@ checksum = "d49e936b501e5c5bf01fda3a9452ff86dc3ea98ad5f283e1455153142d97518c"dependencies = ["bitflags 2.13.1","block2 0.6.2",- "libc","objc2 0.6.4",- "objc2-cloud-kit 0.3.2",- "objc2-core-data 0.3.2","objc2-core-foundation","objc2-core-graphics",- "objc2-core-image 0.3.2",- "objc2-core-text",- "objc2-core-video","objc2-foundation 0.3.2","objc2-quartz-core 0.3.2",]@@ -4650,17 +4382,6 @@ dependencies = ["objc2-foundation 0.2.2",]-[[package]]-name = "objc2-cloud-kit"-version = "0.3.2"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "73ad74d880bb43877038da939b7427bba67e9dd42004a18b809ba7d87cee241c"-dependencies = [- "bitflags 2.13.1",- "objc2 0.6.4",- "objc2-foundation 0.3.2",-]-[[package]]name = "objc2-contacts"version = "0.2.2"@@ -4706,17 +4427,6 @@ dependencies = ["objc2-foundation 0.2.2",]-[[package]]-name = "objc2-core-data"-version = "0.3.2"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "0b402a653efbb5e82ce4df10683b6b28027616a2715e90009947d50b8dd298fa"-dependencies = [- "bitflags 2.13.1",- "objc2 0.6.4",- "objc2-foundation 0.3.2",-]-[[package]]name = "objc2-core-foundation"version = "0.3.2"@@ -4753,16 +4463,6 @@ dependencies = ["objc2-metal 0.2.2",]-[[package]]-name = "objc2-core-image"-version = "0.3.2"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "e5d563b38d2b97209f8e861173de434bd0214cf020e3423a52624cd1d989f006"-dependencies = [- "objc2 0.6.4",- "objc2-foundation 0.3.2",-]-[[package]]name = "objc2-core-location"version = "0.2.2"@@ -4782,22 +4482,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "0cde0dfb48d25d2b4862161a4d5fcc0e3c24367869ad306b0c9ec0073bfed92d"dependencies = ["bitflags 2.13.1",- "objc2 0.6.4",- "objc2-core-foundation",- "objc2-core-graphics",-]--[[package]]-name = "objc2-core-video"-version = "0.3.2"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "d425caf1df73233f29fd8a5c3e5edbc30d2d4307870f802d18f00d83dc5141a6"-dependencies = [- "bitflags 2.13.1",- "objc2 0.6.4","objc2-core-foundation",- "objc2-core-graphics",- "objc2-io-surface",][[package]]@@ -4900,6 +4585,7 @@ dependencies = ["bitflags 2.13.1","objc2 0.6.4","objc2-core-foundation",+ "objc2-core-graphics","objc2-foundation 0.3.2","objc2-metal 0.3.2",]@@ -4923,9 +4609,9 @@ dependencies = ["bitflags 2.13.1","block2 0.5.1","objc2 0.5.2",- "objc2-cloud-kit 0.2.2",- "objc2-core-data 0.2.2",- "objc2-core-image 0.2.2",+ "objc2-cloud-kit",+ "objc2-core-data",+ "objc2-core-image","objc2-core-location","objc2-foundation 0.2.2","objc2-link-presentation",@@ -5098,6 +4784,16 @@ dependencies = ["ureq 3.4.1",]+[[package]]+name = "os_pipe"+version = "1.2.3"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "7d8fae84b431384b68627d0f9b3b1245fcf9f46f6c0e3dc902e9dce64edd1967"+dependencies = [+ "libc",+ "windows-sys 0.61.2",+]+[[package]]name = "owned_ttf_parser"version = "0.25.1"@@ -5144,10 +4840,11 @@ checksum = "4b6937eda350acc1a5d05872c3cbf99fe78619c269096e2be3d4a350058639d5"[[package]]name = "parley"-version = "0.10.0"+version = "0.11.1"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "6b1cfcf399c774719fb1fa51bc6b91e86bdf003b03202a0902f1827ba6750746"+checksum = "22d2ff88bd3f7d68d1d9b09c7e6209f9a8e8c05088295140a2bcf2e9b17038c5"dependencies = [+ "accesskit","fontique","harfrust","hashbrown 0.17.1",@@ -5157,14 +4854,14 @@ dependencies = ["linebender_resource_handle","parlance","parley_data",- "skrifa 0.42.1",+ "skrifa",][[package]]name = "parley_data"-version = "0.10.0"+version = "0.11.1"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "d1d3755e2cc12c0625b0cd2f2773c6a37dd11d1531940c945ade4aeb78f2b145"+checksum = "1567535334d6ba2d3cde19221ba9a7bd0fabb3cbd99046ddfb10ae061cfcc889"dependencies = ["icu_properties",]@@ -5175,12 +4872,6 @@ version = "1.0.15"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"-[[package]]-name = "pastey"-version = "0.1.1"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "35fb2e5f958ec131621fdd531e9fc186ed768cbe395337403ae56c17a74c68ec"-[[package]]name = "pastey"version = "0.2.3"@@ -5471,19 +5162,6 @@ name = "profiling"version = "1.0.18"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "3d595e54a326bc53c1c197b32d295e14b169e3cfeaa8dc82b529f947fba6bcf5"-dependencies = [- "profiling-procmacros",-]--[[package]]-name = "profiling-procmacros"-version = "1.0.18"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "4488a4a36b9a4ba6b9334a32a39971f77c1436ec82c38707bce707699cc3bbcb"-dependencies = [- "quote",- "syn 2.0.119",-][[package]]name = "prost"@@ -5584,18 +5262,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "e9f068eba8e7071c5f9511831b44f32c740d5adf574e990f946ddb53db2f314e"dependencies = ["bitflags 2.13.1",- "getopts","memchr",- "pulldown-cmark-escape","unicase",]-[[package]]-name = "pulldown-cmark-escape"-version = "0.11.0"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "007d8adb5ddab6f8e3f491ac63566a7d5002cc7ed73901f72057943fa71ae1ae"-[[package]]name = "pulldown-cmark-to-cmark"version = "22.0.1"@@ -5605,44 +5275,12 @@ dependencies = ["pulldown-cmark",]-[[package]]-name = "pulp"-version = "0.22.3"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "046aa45b989642ec2e4717c8e72d677b13edd831a4d3b6cf37d9a3e54912496a"-dependencies = [- "bytemuck",- "cfg-if",- "libm",- "num-complex",- "paste",- "pulp-wasm-simd-flag",- "raw-cpuid",- "reborrow",- "version_check",-]--[[package]]-name = "pulp-wasm-simd-flag"-version = "0.1.1"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "1d8f70e07b9c3962945a74e59ca1c511bba65b6419468acc217c457d93f3c740"-[[package]]name = "pxfm"version = "0.1.30"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "d55d956fa96f5ec02be2e13af0e20391a5aa83d6a074e3ad368959d0fab299ea"-[[package]]-name = "qoi"-version = "0.4.1"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "7f6d64c71eb498fe9eae14ce4ec935c555749aef511cca85b5568910d6e48001"-dependencies = [- "bytemuck",-]-[[package]]name = "quick-error"version = "2.0.1"@@ -5714,65 +5352,6 @@ version = "0.1.5"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "ca45419789ae5a7899559e9512e58ca889e41f04f1f2445e9f4b290ceccd1d08"-[[package]]-name = "rav1e"-version = "0.8.1"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "43b6dd56e85d9483277cde964fd1bdb0428de4fec5ebba7540995639a21cb32b"-dependencies = [- "aligned-vec",- "arbitrary",- "arg_enum_proc_macro",- "arrayvec",- "av-scenechange",- "av1-grain",- "bitstream-io",- "built",- "cfg-if",- "interpolate_name",- "itertools 0.14.0",- "libc",- "libfuzzer-sys",- "log",- "maybe-rayon",- "new_debug_unreachable",- "noop_proc_macro",- "num-derive",- "num-traits",- "paste",- "profiling",- "rand",- "rand_chacha",- "simd_helpers",- "thiserror 2.0.20",- "v_frame",- "wasm-bindgen",-]--[[package]]-name = "ravif"-version = "0.13.0"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "e52310197d971b0f5be7fe6b57530dcd27beb35c1b013f29d66c1ad73fbbcc45"-dependencies = [- "avif-serialize",- "imgref",- "loop9",- "quick-error",- "rav1e",- "rayon",- "rgb",-]--[[package]]-name = "raw-cpuid"-version = "11.6.0"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "498cd0dc59d73224351ee52a95fee0f1a617a2eae0e7d9d720cc622c73a54186"-dependencies = [- "bitflags 2.13.1",-]-[[package]]name = "raw-window-handle"version = "0.6.2"@@ -5828,16 +5407,6 @@ dependencies = ["crossbeam-utils",]-[[package]]-name = "read-fonts"-version = "0.39.2"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "c4ed38b89c2c77ff968c524145ad65fb010f38af5c7a224b53b81d47ac2daa81"-dependencies = [- "bytemuck",- "font-types 0.11.3",-]-[[package]]name = "read-fonts"version = "0.41.0"@@ -5845,16 +5414,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "046a7d674daf459825b32f5062056d6882db0d2f5a479fbd76ccfc870ac18709"dependencies = ["bytemuck",- "font-types 0.12.4",+ "font-types","once_cell",]-[[package]]-name = "reborrow"-version = "0.5.5"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "03251193000f4bd3b042892be858ee50e8b3719f2b08e5833ac4353724632430"-[[package]]name = "redox_syscall"version = "0.4.1"@@ -5919,10 +5482,11 @@ checksum = "19b30a45b0cd0bcca8037f3d0dc3421eaf95327a17cad11964fb8179b4fc4832"[[package]]name = "resvg"-version = "0.47.0"+version = "0.48.1"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "9be183ad6a216aa96f33e4c8033b0988b8b3ea6fd2359d19af5bac4643fd8e81"+checksum = "67e3803f97b999e80cbf7c6ecdd07a8102204d92e1633cf48783720c521196bd"dependencies = [+ "bytemuck","gif","image-webp","log",@@ -5986,12 +5550,13 @@ dependencies = [[[package]]name = "rowan"-version = "0.16.1"+version = "0.17.0"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "417a3a9f582e349834051b8a10c8d71ca88da4211e4093528e36b9845f6b5f21"+checksum = "14b574c58582fa59fa43a2feb6608b8744184659f08a2e0117e4b8224d95ed61"dependencies = ["countme","hashbrown 0.14.5",+ "memoffset","rustc-hash 1.1.0","text-size",]@@ -6181,7 +5746,7 @@ dependencies = ["ab_glyph","log","memmap2",- "smithay-client-toolkit 0.19.2",+ "smithay-client-toolkit","tiny-skia 0.11.4",]@@ -6360,15 +5925,6 @@ dependencies = ["simdutf8",]-[[package]]-name = "simd_helpers"-version = "0.1.0"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "95890f873bec569a0362c235787f3aca6e1e887302ba4840839bcc6459c42da6"-dependencies = [- "quote",-]-[[package]]name = "simdutf8"version = "0.1.5"@@ -6392,9 +5948,9 @@ checksum = "8ee5873ec9cce0195efcb7a4e9507a04cd49aec9c83d0389df45b1ef7ba2e649"[[package]]name = "skia-bindings"-version = "0.99.0"+version = "0.153.3"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "3e2d1c3ebd697c0cbded0145e9204a38fa6b268446051b7196d0a096414ea7f3"+checksum = "eb325787c91b3f6c34a7c6f2b8a2297b20292d733ca53a08c233e5028aec49af"dependencies = ["bindgen","cc",@@ -6409,25 +5965,15 @@ dependencies = [[[package]]name = "skia-safe"-version = "0.99.0"+version = "0.153.3"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "9f512ac418a64194842dd05566320805dad1c957c521039db2486fd6368865bc"+checksum = "c61cb643dac43067f3eb76c866635a74377ac0abca0ff2590674e1e295514c3d"dependencies = ["bitflags 2.13.1","skia-bindings","windows 0.62.2",]-[[package]]-name = "skrifa"-version = "0.42.1"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "0c34617370ae968efb7161bb2beb517d9084659aae19e24b89e3db25b46e4564"-dependencies = [- "bytemuck",- "read-fonts 0.39.2",-]-[[package]]name = "skrifa"version = "0.44.0"@@ -6435,7 +5981,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "819ab7d62b1d3e72d9d9dea5650bac30424f9111364bb94928dbf5ecad1baa68"dependencies = ["bytemuck",- "read-fonts 0.41.0",+ "read-fonts",][[package]]@@ -6446,18 +5992,18 @@ checksum = "0c790de23124f9ab44544d7ac05d60440adc586479ce501c1d6d7da3cd8c9cf5"[[package]]name = "slint"-version = "1.17.1"+version = "1.18.1"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "ce12038f57f8f3a423564b0c9301a2ab3fda4246e4cbadd6b97acf9124bdc315"+checksum = "15e477d5ff6fec20909100ff8f7062432ebfbda7a62a0f37d0252aa126f38c83"dependencies = ["const-field-offset","i-slint-backend-android-activity",+ "i-slint-backend-linuxkms","i-slint-backend-selector","i-slint-backend-winit","i-slint-common","i-slint-core","i-slint-core-macros",- "i-slint-renderer-femtovg","i-slint-renderer-skia","i-slint-renderer-software","num-traits",@@ -6466,14 +6012,14 @@ dependencies = ["slint-macros","unicode-segmentation","vtable",- "wgpu",+ "wgpu 29.0.4",][[package]]name = "slint-build"-version = "1.17.1"+version = "1.18.1"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "76684c11441f775b10bbc7b0e6b3016a39f17efdd659ffca112f17cfd6bdaed1"+checksum = "3ea28d4e1ad47d829b91e227f17037fac07a8001668a93fee47ac04f88718ebc"dependencies = ["derive_more","fontique",@@ -6484,9 +6030,9 @@ dependencies = [[[package]]name = "slint-macros"-version = "1.17.1"+version = "1.18.1"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "9f2a763e72e1e53c496f571d36327e777da1eb0d9e58fceb83890c2a83ee7223"+checksum = "35e74b13d20884dc480ce37d0fabbf02cb4bc0df2a595434feac96ca7c2a0f15"dependencies = ["i-slint-compiler","proc-macro2",@@ -6517,7 +6063,7 @@ checksum = "3457dea1f0eb631b4034d61d4d8c32074caa6cd1ab2d59f2327bd8461e2c0016"dependencies = ["bitflags 2.13.1","calloop 0.13.0",- "calloop-wayland-source 0.3.0",+ "calloop-wayland-source","cursor-icon","libc","log",@@ -6534,44 +6080,6 @@ dependencies = ["xkeysym",]-[[package]]-name = "smithay-client-toolkit"-version = "0.20.0"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "0512da38f5e2b31201a93524adb8d3136276fa4fe4aafab4e1f727a82b534cc0"-dependencies = [- "bitflags 2.13.1",- "calloop 0.14.4",- "calloop-wayland-source 0.4.1",- "cursor-icon",- "libc",- "log",- "memmap2",- "rustix 1.1.4",- "thiserror 2.0.20",- "wayland-backend",- "wayland-client",- "wayland-csd-frame",- "wayland-cursor",- "wayland-protocols",- "wayland-protocols-experimental",- "wayland-protocols-misc",- "wayland-protocols-wlr",- "wayland-scanner",- "xkeysym",-]--[[package]]-name = "smithay-clipboard"-version = "0.7.3"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "71704c03f739f7745053bde45fa203a46c58d25bc5c4efba1d9a60e9dba81226"-dependencies = [- "libc",- "smithay-client-toolkit 0.20.0",- "wayland-backend",-]-[[package]]name = "smol_str"version = "0.2.2"@@ -6765,7 +6273,7 @@ version = "0.2.10"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "6c2499c2d826531388872b2268718aed907a39bd785ab0dcfe57fab26283f92e"dependencies = [- "skrifa 0.44.0",+ "skrifa","yazi","zeno",]@@ -6921,20 +6429,6 @@ dependencies = ["syn 3.0.4",]-[[package]]-name = "tiff"-version = "0.11.3"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "b63feaf3343d35b6ca4d50483f94843803b0f51634937cc2ec519fc32232bc52"-dependencies = [- "fax",- "flate2",- "half",- "quick-error",- "weezl",- "zune-jpeg",-]-[[package]]name = "time"version = "0.3.55"@@ -7311,6 +6805,17 @@ dependencies = ["once_cell",]+[[package]]+name = "tree_magic_mini"+version = "3.2.2"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "b8765b90061cba6c22b5831f675da109ae5561588290f9fa2317adab2714d5a6"+dependencies = [+ "memchr",+ "nom 8.0.0",+ "petgraph",+]+[[package]]name = "try-lock"version = "0.2.5"@@ -7531,26 +7036,26 @@ dependencies = [[[package]]name = "usvg"-version = "0.47.0"+version = "0.48.1"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "d46cf96c5f498d36b7a9693bc6a7075c0bb9303189d61b2249b0dc3d309c07de"+checksum = "977d0a4abdef933f424a99fe09f95576e089b90aebc6f016a3bc813762493e91"dependencies = [- "base64 0.22.1",+ "base64 0.23.1","data-url","flate2",- "fontdb",+ "fontdb 0.24.0",+ "harfrust","imagesize","kurbo","log","pico-args","roxmltree 0.21.1",- "rustybuzz","simplecss","siphasher",+ "skrifa","strict-num","svgtypes","tiny-skia-path 0.12.0",- "ttf-parser","unicode-bidi","unicode-script","unicode-vo",@@ -7586,17 +7091,6 @@ dependencies = ["wasm-bindgen",]-[[package]]-name = "v_frame"-version = "0.3.9"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "666b7727c8875d6ab5db9533418d7c764233ac9c0cff1d469aec8fa127597be2"-dependencies = [- "aligned-vec",- "num-traits",- "wasm-bindgen",-]-[[package]]name = "vcpkg"version = "0.2.15"@@ -7611,9 +7105,9 @@ checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"[[package]]name = "vtable"-version = "0.4.0"+version = "0.5.0"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "5ea953f65593feb5287b022b83c35046d1ff49c7417b6f5851a079d8a231fe31"+checksum = "515a4b5b1399cc46fb0dc4081436cb40a3852a2d3e94fd1fa50bb68a334896eb"dependencies = ["const-field-offset","portable-atomic",@@ -7623,13 +7117,13 @@ dependencies = [[[package]]name = "vtable-macro"-version = "0.4.0"+version = "0.5.0"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "482a37f9777480673d3a99c80ac2edc69f92382230440946855fa27ebc47cba6"+checksum = "8191d73ececf73fc94e65809bf0e667525a0bcff9aeeb8d042a4173a508332a1"dependencies = ["proc-macro2","quote",- "syn 2.0.119",+ "syn 3.0.4",][[package]]@@ -7781,32 +7275,6 @@ dependencies = ["wayland-scanner",]-[[package]]-name = "wayland-protocols-experimental"-version = "20250721.0.1"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "40a1f863128dcaaec790d7b4b396cc9b9a7a079e878e18c47e6c2d2c5a8dcbb1"-dependencies = [- "bitflags 2.13.1",- "wayland-backend",- "wayland-client",- "wayland-protocols",- "wayland-scanner",-]--[[package]]-name = "wayland-protocols-misc"-version = "0.3.12"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "6e9567599ef23e09b8dad6e429e5738d4509dfc46b3b21f32841a304d16b29c8"-dependencies = [- "bitflags 2.13.1",- "wayland-backend",- "wayland-client",- "wayland-protocols",- "wayland-scanner",-]-[[package]]name = "wayland-protocols-plasma"version = "0.3.12"@@ -7940,7 +7408,7 @@ dependencies = ["hashbrown 0.16.1","js-sys","log",- "naga",+ "naga 29.0.4","parking_lot","portable-atomic","profiling",@@ -7950,9 +7418,33 @@ dependencies = ["wasm-bindgen","wasm-bindgen-futures","web-sys",- "wgpu-core",- "wgpu-hal",- "wgpu-types",+ "wgpu-core 29.0.4",+ "wgpu-hal 29.0.4",+ "wgpu-types 29.0.4",+]++[[package]]+name = "wgpu"+version = "30.0.1"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "527ccdf43dd5b2e8676eed9984ce00e2bbb0a1b85b70c1969dcb6cd2eb55ab9e"+dependencies = [+ "arrayvec",+ "bitflags 2.13.1",+ "bytemuck",+ "cfg-if",+ "cfg_aliases",+ "document-features",+ "hashbrown 0.17.1",+ "log",+ "portable-atomic",+ "profiling",+ "raw-window-handle",+ "smallvec",+ "static_assertions",+ "wgpu-core 30.0.1",+ "wgpu-hal 30.0.1",+ "wgpu-types 30.0.1",][[package]]@@ -7971,7 +7463,7 @@ dependencies = ["hashbrown 0.16.1","indexmap","log",- "naga",+ "naga 29.0.4","once_cell","parking_lot","portable-atomic",@@ -7980,12 +7472,45 @@ dependencies = ["rustc-hash 1.1.0","smallvec","thiserror 2.0.20",- "wgpu-core-deps-apple",+ "wgpu-core-deps-apple 29.0.4","wgpu-core-deps-emscripten",- "wgpu-core-deps-windows-linux-android",- "wgpu-hal",- "wgpu-naga-bridge",- "wgpu-types",+ "wgpu-core-deps-windows-linux-android 29.0.4",+ "wgpu-hal 29.0.4",+ "wgpu-naga-bridge 29.0.4",+ "wgpu-types 29.0.4",+]++[[package]]+name = "wgpu-core"+version = "30.0.1"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "14c018fce9b6270aa203c2fdd56f3cce996713534bd757e4ea58c8560b121f14"+dependencies = [+ "arrayvec",+ "bit-set 0.10.0",+ "bit-vec 0.9.1",+ "bitflags 2.13.1",+ "bytemuck",+ "cfg_aliases",+ "document-features",+ "hashbrown 0.17.1",+ "indexmap",+ "log",+ "naga 30.0.1",+ "naga-types",+ "once_cell",+ "parking_lot",+ "portable-atomic",+ "profiling",+ "raw-window-handle",+ "rustc-hash 1.1.0",+ "smallvec",+ "thiserror 2.0.20",+ "wgpu-core-deps-apple 30.0.1",+ "wgpu-core-deps-windows-linux-android 30.0.1",+ "wgpu-hal 30.0.1",+ "wgpu-naga-bridge 30.0.1",+ "wgpu-types 30.0.1",][[package]]@@ -7994,7 +7519,16 @@ version = "29.0.4"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "f5e39e26c4c0e07589e67d18546cf79ff45383659fc72fca4dd293358a0347f3"dependencies = [- "wgpu-hal",+ "wgpu-hal 29.0.4",+]++[[package]]+name = "wgpu-core-deps-apple"+version = "30.0.1"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "061f3d319a40d39d00b1ecc2c33b89fe21d4e6fe01859df3500a3a8ecccd6b68"+dependencies = [+ "wgpu-hal 30.0.1",][[package]]@@ -8003,7 +7537,7 @@ version = "29.0.4"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "01e09be551dc939498bdd5f6b2c66e55ab275dad25825267a08605a80fc9f0af"dependencies = [- "wgpu-hal",+ "wgpu-hal 29.0.4",][[package]]@@ -8012,7 +7546,16 @@ version = "29.0.4"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "4e592c1bbef6ad047647ae6e666ebd8cee7a32bb4544d9700ec96cbf73230257"dependencies = [- "wgpu-hal",+ "wgpu-hal 29.0.4",+]++[[package]]+name = "wgpu-core-deps-windows-linux-android"+version = "30.0.1"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "7586165fd5f6d881cb9ce4bb71f40d6caab2c0f1837e3fc1d9788a197fb6004f"+dependencies = [+ "wgpu-hal 30.0.1",][[package]]@@ -8030,7 +7573,7 @@ dependencies = ["bytemuck","cfg-if","cfg_aliases",- "glow",+ "glow 0.17.0","glutin_wgl_sys","gpu-allocator","gpu-descriptor",@@ -8040,7 +7583,7 @@ dependencies = ["libc","libloading","log",- "naga",+ "naga 29.0.4","ndk-sys 0.6.0+11769913","objc2 0.6.4","objc2-core-foundation",@@ -8062,21 +7605,78 @@ dependencies = ["wasm-bindgen","wayland-sys","web-sys",- "wgpu-naga-bridge",- "wgpu-types",+ "wgpu-naga-bridge 29.0.4",+ "wgpu-types 29.0.4","windows 0.62.2","windows-core 0.62.2","windows-result 0.4.1",]+[[package]]+name = "wgpu-hal"+version = "30.0.1"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "b6b7fb58561a792bc237628ba0792e332de418fefe145f13b5ed8201e6d52f58"+dependencies = [+ "android_system_properties",+ "arrayvec",+ "ash",+ "bit-set 0.10.0",+ "bitflags 2.13.1",+ "block2 0.6.2",+ "bytemuck",+ "cfg-if",+ "cfg_aliases",+ "gpu-allocator",+ "hashbrown 0.17.1",+ "libc",+ "libloading",+ "log",+ "naga 30.0.1",+ "naga-types",+ "objc2 0.6.4",+ "objc2-core-foundation",+ "objc2-core-graphics",+ "objc2-foundation 0.3.2",+ "objc2-metal 0.3.2",+ "objc2-quartz-core 0.3.2",+ "once_cell",+ "ordered-float",+ "parking_lot",+ "portable-atomic",+ "portable-atomic-util",+ "profiling",+ "range-alloc",+ "raw-window-handle",+ "raw-window-metal",+ "renderdoc-sys",+ "smallvec",+ "static_assertions",+ "thiserror 2.0.20",+ "wgpu-naga-bridge 30.0.1",+ "wgpu-types 30.0.1",+ "windows 0.62.2",+ "windows-core 0.62.2",+]+[[package]]name = "wgpu-naga-bridge"version = "29.0.4"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "95226013f547544b223281cd16a4fb549aa9dcb562adbda0faae4c73ffbbc161"dependencies = [- "naga",- "wgpu-types",+ "naga 29.0.4",+ "wgpu-types 29.0.4",+]++[[package]]+name = "wgpu-naga-bridge"+version = "30.0.1"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "d2f62e73117bb7a62bfd9c5a5841438a823f6566c6442a808ee269d2d055c081"+dependencies = [+ "naga 30.0.1",+ "wgpu-types 30.0.1",][[package]]@@ -8093,6 +7693,20 @@ dependencies = ["web-sys",]+[[package]]+name = "wgpu-types"+version = "30.0.1"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "99dad6f1fbdbbdb4c278a6508b059d44688f5cebddf78d005a46a31340269286"+dependencies = [+ "bitflags 2.13.1",+ "bytemuck",+ "log",+ "naga-types",+ "raw-window-handle",+ "static_assertions",+]+[[package]]name = "whisper-rs"version = "0.16.0"@@ -8542,7 +8156,7 @@ dependencies = ["redox_syscall 0.4.1","rustix 0.38.44","sctk-adwaita",- "smithay-client-toolkit 0.19.2",+ "smithay-client-toolkit","smol_str 0.2.2","tracing","unicode-segmentation",@@ -8575,17 +8189,35 @@ version = "0.57.1"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "1ebf944e87a7c253233ad6766e082e3cd714b5d03812acc24c318f549614536e"+[[package]]+name = "wl-clipboard-rs"+version = "0.9.3"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "e9651471a32e87d96ef3a127715382b2d11cc7c8bb9822ded8a7cc94072eb0a3"+dependencies = [+ "libc",+ "log",+ "os_pipe",+ "rustix 1.1.4",+ "thiserror 2.0.20",+ "tree_magic_mini",+ "wayland-backend",+ "wayland-client",+ "wayland-protocols",+ "wayland-protocols-wlr",+]+[[package]]name = "write-fonts"-version = "0.48.1"+version = "0.50.0"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "cb731d4c4d93eacc69a1ad2f270f905788a98e4a3438267bcafbe08d3431c8d8"+checksum = "cae90d1d9f6d1d36ef116b0b1e651a6d7c12ba925439d4d06ff9adc94662a3d8"dependencies = [- "font-types 0.11.3",+ "font-types","indexmap","kurbo","log",- "read-fonts 0.39.2",+ "read-fonts",][[package]]@@ -8594,16 +8226,6 @@ version = "0.6.4"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "3ad82d2a33cdc9674dc7465672f271e096168fcdbe0f799d9e6db8c5892679dc"-[[package]]-name = "x11-clipboard"-version = "0.9.3"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "662d74b3d77e396b8e5beb00b9cad6a9eccf40b2ef68cc858784b14c41d535a3"-dependencies = [- "libc",- "x11rb",-]-[[package]]name = "x11-dl"version = "2.21.0"@@ -8703,12 +8325,6 @@ dependencies = ["lzma-sys",]-[[package]]-name = "y4m"-version = "0.8.0"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "7a5a4b21e1a62b67a2970e6831bc091d7b87e119e7f9791aef9702e3bef04448"-[[package]]name = "yazi"version = "0.2.1"@@ -9045,15 +8661,6 @@ version = "0.5.3"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "d56377fd46368984a170bc5aac5567e52ca5da874caa60bea39fcbca78fb658b"-[[package]]-name = "zune-inflate"-version = "0.2.54"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "73ab332fe2f6680068f3582b16a24f90ad7096d5d39b974d1c0aff0125116f02"-dependencies = [- "simd-adler32",-]-[[package]]name = "zune-jpeg"version = "0.5.15"diff --git a/src/README.md b/src/README.mdindex aa6dde71..67e71577 100644--- a/src/README.md+++ b/src/README.md@@ -57,9 +57,8 @@ are compiled in. A build needs the FFmpeg 7+ development libraries (headersand import libraries) - `brew install ffmpeg` on macOS, a BtbN `shared` buildunpacked and pointed at with `FFMPEG_DIR` on Windows and on Linuxdistributions whose packaged FFmpeg is older than 7 - plus cmake and a C++-toolchain for whisper.cpp. The window builds with Slint's-Skia renderer by default; `--no-default-features --features wgpu` swaps in-FemtoVG over wgpu, and the two are meant to be compared, not chosen once.+toolchain for whisper.cpp. The window draws with Slint's Skia renderer on+every platform, from prebuilt Skia binaries fetched at build time.On Linux, Skia needs the fontconfig and freetype headers at build time (see`.github/workflows/build-app.yml` for the package list).diff --git a/src/crates/concat-android/Cargo.toml b/src/crates/concat-android/Cargo.tomlindex 9ec5b0df..155f31f3 100644--- a/src/crates/concat-android/Cargo.toml+++ b/src/crates/concat-android/Cargo.toml@@ -16,7 +16,7 @@ crate-type = ["cdylib"]# window's own manifest for this target; this crate only names the# activity's entry point.concat.workspace = true-slint = { version = "1.17", default-features = false, features = [+slint = { version = "1.18", default-features = false, features = ["std","backend-android-activity-06","compat-1-2",diff --git a/src/crates/concat-render/Cargo.toml b/src/crates/concat-render/Cargo.tomlindex 5e6ebe7f..ff3ed1d7 100644--- a/src/crates/concat-render/Cargo.toml+++ b/src/crates/concat-render/Cargo.toml@@ -10,12 +10,6 @@ description = "Turning a timeline plus a timestamp into one finished frame."# The wgpu compositor. Off by default so the engine stays light to build; the# desktop app turns it on.gpu = ["dep:wgpu", "dep:pollster"]-# The same, under the name the window's renderer feature uses. Cargo checks-# a `--features` name against every member of the workspace, and refuses-# one that matches an optional dependency hidden behind `dep:`; without-# this alias, `cargo metadata --features wgpu` fails on this crate, and so-# does everything built on it (cargo-auditable, hence the Nix package).-wgpu = ["gpu"][dependencies]concat-core.workspace = truediff --git a/src/crates/concat/Cargo.toml b/src/crates/concat/Cargo.tomlindex 3f1cb648..3eb34187 100644--- a/src/crates/concat/Cargo.toml+++ b/src/crates/concat/Cargo.toml@@ -28,18 +28,26 @@ path = "src/main.rs"# entirely. The rest of this list is slint's default set, reproduced verbatim# minus that one renderer.#-# 1.17, not 1.14: renderer-femtovg-wgpu does not exist in 1.14.+# 1.18 at least: the iOS scene delegate that iOS 27 requires (see+# scripts/ios-app.sh).+#+# Skia is the one renderer, on every platform: its text is gamma-correct,+# and it takes the engine's wgpu 29 device (gpu.rs, `unstable-wgpu-29`).+# FemtoVG over wgpu was a second, opt-in variant until Slint 1.18 moved it+# to wgpu 30; nothing shipped it, and the Nix package, its one user, now+# links Skia's prebuilt binaries (flake.nix).## Three platforms, three feature sets. The desktop and iOS draw through the# winit backend, iOS without the system tray; Android draws through Slint's# android-activity backend, which owns the window and the renderer itself# (see platform.rs). The renderer and wgpu features are the same on all-# three, chosen by the `skia`/`wgpu` features below.+# three.[target.'cfg(not(any(target_os = "android", target_os = "ios")))'.dependencies]-slint = { version = "1.17", default-features = false, features = [+slint = { version = "1.18", default-features = false, features = ["std","backend-default","renderer-software",+ "renderer-skia","accessibility","compat-1-2","system-tray",@@ -58,10 +66,11 @@ rfd = "0.17"opener = { version = "0.8", features = ["reveal"] }[target.'cfg(target_os = "ios")'.dependencies]-slint = { version = "1.17", default-features = false, features = [+slint = { version = "1.18", default-features = false, features = ["std","backend-winit","renderer-software",+ "renderer-skia","accessibility","compat-1-2","unstable-winit-030",@@ -69,10 +78,11 @@ slint = { version = "1.17", default-features = false, features = [] }[target.'cfg(target_os = "android")'.dependencies]-slint = { version = "1.17", default-features = false, features = [+slint = { version = "1.18", default-features = false, features = ["std","backend-android-activity-06","renderer-software",+ "renderer-skia","accessibility","compat-1-2","unstable-wgpu-29",@@ -116,35 +126,8 @@ toml = "1.1"# JPEG encoding for the media artwork cache.image = { version = "0.25", default-features = false, features = ["jpeg"] }-# The renderer is picked by a feature here rather than by editing the-# dependency, so both variants build from one tree and can be compared:-#-# cargo build --release -p concat # skia-# cargo build --release -p concat --no-default-features --features wgpu # femtovg/wgpu-#-# Skia is the default. It has partial rendering machinery that FemtoVG lacks-# entirely - but Surface's use_partial_rendering() defaults to false and is-# overridden only by software_surface.rs, so it is OFF on Metal/D3D/Vulkan/GL.-# Measure before believing any CPU or power claim about it; the reason it is-# the default here is that its text rendering is gamma-correct, not that it is-# known to be cheaper.-#-# Theme.weight-body/weight-title are 400/500 to match. FemtoVG composites-# glyph coverage without gamma correction, which 500/600 compensates for, so-# use those if you build --features wgpu, or the text will be too light there.-#-# FemtoVG over wgpu rather than over OpenGL: same renderer, native graphics-# API underneath - Metal on macOS, D3D12 on Windows, Vulkan on Linux --# instead of OpenGL, which Apple deprecated and now emulates on top of Metal-# anyway. Still pure Rust, so cross-compiling needs nothing beyond-# `rustup target add`.-[features]-default = ["skia"]-wgpu = ["slint/renderer-femtovg-wgpu"]-skia = ["slint/renderer-skia"]-[build-dependencies]-slint-build = "1.17"+slint-build = "1.18"[lints]workspace = truediff --git a/src/crates/concat/build.rs b/src/crates/concat/build.rsindex f321cf41..4ce1e523 100644--- a/src/crates/concat/build.rs+++ b/src/crates/concat/build.rs@@ -17,7 +17,7 @@ fn main() {//// Not `EmbedForSoftwareRenderer`, which pre-decodes to raw pixels: that is// for MCUs with no filesystem, it is the only kind the software renderer- // can read, and Skia and FemtoVG cannot use it at all.+ // can read, and Skia cannot use it at all.//// On its own thread with a deep stack: the Slint compiler recurses over// the tree, and the tree has outgrown the megabyte a main thread getsdiff --git a/src/crates/concat/src/sysinfo.rs b/src/crates/concat/src/sysinfo.rsindex d9089693..b9a287ce 100644--- a/src/crates/concat/src/sysinfo.rs+++ b/src/crates/concat/src/sysinfo.rs@@ -80,18 +80,10 @@ pub fn system_facts() -> Vec<(String, String)> {t("Build"),format!("{} · {}", env!("BUILD_PROFILE"), env!("BUILD_TARGET")),),- // Which of the two renderers in Cargo.toml this binary was built- // with. The first question to ask about anything that looks wrong on- // screen, and the one nobody can answer by looking at the window.- (- t("Renderer"),- if cfg!(feature = "skia") {- "Skia"- } else {- "FemtoVG (wgpu)"- }- .into(),- ),+ // The renderer, the first question to ask about anything that looks+ // wrong on screen. One now, but a bug report outlives the build it+ // came from, and an older one may have drawn with FemtoVG.+ (t("Renderer"), "Skia".into()),// The adapter the window and the monitor draw on, and whether it is// a GPU at all. A machine that fell back to WARP looks like any// other in the window, and the difference was the whole story ofdiff --git a/src/crates/concat/ui/dialogs/relink.slint b/src/crates/concat/ui/dialogs/relink.slintindex cda6f7c9..3b92991d 100644--- a/src/crates/concat/ui/dialogs/relink.slint+++ b/src/crates/concat/ui/dialogs/relink.slint@@ -41,7 +41,7 @@ export component RelinkDialog inherits Modal {Flickable {height: 200px;- viewport-height: items-layout.preferred-height;+ content-height: items-layout.preferred-height;items-layout := VerticalLayout {spacing: 4px;diff --git a/src/crates/concat/ui/dialogs/speech.slint b/src/crates/concat/ui/dialogs/speech.slintindex 224575dd..1aade3aa 100644--- a/src/crates/concat/ui/dialogs/speech.slint+++ b/src/crates/concat/ui/dialogs/speech.slint@@ -148,7 +148,7 @@ component SamplePicker inherits Rectangle {clip: true;Flickable {- viewport-height: root.content-h;+ content-height: root.content-h;VerticalLayout {padding: 4px;diff --git a/src/crates/concat/ui/start.slint b/src/crates/concat/ui/start.slintindex cdf723c9..15a689e1 100644--- a/src/crates/concat/ui/start.slint+++ b/src/crates/concat/ui/start.slint@@ -976,8 +976,8 @@ export component StartScreen inherits Rectangle {// a finger, which a Flickable takes all of. It clamps its own// travel.flick := Flickable {- viewport-width: self.width;- viewport-height: Math.max(self.height,+ content-width: self.width;+ content-height: Math.max(self.height,column.height + root.pad-top + root.pad);interactive: column.height + root.pad-top + root.pad > self.height;@@ -1068,9 +1068,9 @@ export component StartScreen inherits Rectangle {y: 0;height: parent.height;viewport: parent.height;- content: flick.viewport-height;- offset: -flick.viewport-y;- scrolled(to) => { flick.viewport-y = -to; }+ content: flick.content-height;+ offset: -flick.content-y;+ scrolled(to) => { flick.content-y = -to; }}}}diff --git a/src/crates/concat/ui/theme/theme.slint b/src/crates/concat/ui/theme/theme.slintindex b56a8fc7..f1db2919 100644--- a/src/crates/concat/ui/theme/theme.slint+++ b/src/crates/concat/ui/theme/theme.slint@@ -109,16 +109,16 @@ export global Theme {// The weights the design actually calls for, uncompensated.//// Skia composites glyph coverage with gamma correction, so text comes out- // at the weight the tokens name. FemtoVG does not correct for it and thins- // small light-on-dark text, which a step up to 500/600 compensates for.- // Use those if you build --features wgpu; leave them alone otherwise, or- // the text is over-corrected and reads as too heavy.+ // at the weight the tokens name. Do not step these up to make text read+ // heavier on some screen: that is a renderer compensation (FemtoVG, which+ // the app no longer builds with, needed 500/600), and under Skia it reads+ // as too heavy.//// Weight is the one axis that can absorb a renderer difference without// touching a colour token, and every face is bundled, so it costs nothing// at runtime. Reach for it rather than nudging a surface to compensate.- out property <int> weight-body: 400; // 500 under --features wgpu- out property <int> weight-title: 500; // 600 under --features wgpu+ out property <int> weight-body: 400;+ out property <int> weight-title: 500;/// The launch screen's heading, and the wordmark in the title bar. The one/// weight above `title`, and the only place the type gets to be loud. Bold/// is bundled, so this names it exactly.diff --git a/src/crates/concat/ui/timeline/lanes.slint b/src/crates/concat/ui/timeline/lanes.slintindex cd1a6bf6..75fd0197 100644--- a/src/crates/concat/ui/timeline/lanes.slint+++ b/src/crates/concat/ui/timeline/lanes.slint@@ -224,8 +224,8 @@ component Clip inherits Rectangle {// suit. A clip element is as wide as its clip is long: ten minutes at// the default zoom is 12000px. `opacity` with children makes Slint// flatten the element into an offscreen layer that size in every- // renderer, and a rounded `clip` does the same under femtovg-wgpu (the- // `wgpu` feature; Skia clips a rounded rect in place). The GPU refuses+ // renderer. (A rounded `clip` did the same under FemtoVG; Skia, the one+ // renderer now, clips a rounded rect in place.) The GPU refuses// a texture past its limit - 8192 on the wgpu defaults - and the window// dies on the frame that draws it. The body and the filmstrip clip// themselves (square, so a scissor and not a layer); the outline is@@ -1301,9 +1301,9 @@ export component Lanes inherits Rectangle {width: Math.max(2px, root.drop.duration * root.px-per-second);height: Math.max(2px, root.tracks[root.drop.row].height - 10px);border-radius: Theme.r-sm;- // Alpha in the paints, not `opacity`, and no rounded `clip`- // either: both make Slint flatten this element into an- // offscreen layer (the clip only under femtovg-wgpu), and a+ // Alpha in the paints, not `opacity`: it makes Slint flatten+ // this element into an offscreen layer (as a rounded `clip` did+ // under FemtoVG, before the app was Skia only), and a// ghost is as wide as the clip it will make - a ten-minute drop// at the default zoom asks for a 12000px texture and the GPU// refuses past 8192. The children stay inside it on their own,diff --git a/src/scripts/ios-app.sh b/src/scripts/ios-app.shindex 99e1a828..6dcc3b82 100755--- a/src/scripts/ios-app.sh+++ b/src/scripts/ios-app.sh@@ -45,6 +45,12 @@ install_name_tool -add_rpath "@executable_path/Frameworks" "$app/Concat" 2>/dev/platform=iPhoneOS[ "$target" = aarch64-apple-ios-sim ] && platform=iPhoneSimulator+# The scene manifest opts into UIKit's scene lifecycle, which iOS 27 needs+# to launch the app at all; SlintWindowSceneDelegate is the delegate+# Slint's winit backend provides (Slint 1.18+). UIKit reads adoption from+# this file alone, so it cannot be installed at runtime instead.+# CADisableMinimumFrameDurationOnPhone lets an iPhone animate at a+# ProMotion display's 120Hz rather than capping it at 60.cat > "$app/Info.plist" <<PLIST<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">@@ -68,6 +74,21 @@ cat > "$app/Info.plist" <<PLIST<string>UIInterfaceOrientationLandscapeRight</string></array><key>UIRequiresFullScreen</key><true/>+ <key>UIApplicationSceneManifest</key>+ <dict>+ <key>UIApplicationSupportsMultipleScenes</key><false/>+ <key>UISceneConfigurations</key>+ <dict>+ <key>UIWindowSceneSessionRoleApplication</key>+ <array>+ <dict>+ <key>UISceneConfigurationName</key><string>Slint</string>+ <key>UISceneDelegateClassName</key><string>SlintWindowSceneDelegate</string>+ </dict>+ </array>+ </dict>+ </dict>+ <key>CADisableMinimumFrameDurationOnPhone</key><true/><key>LSApplicationCategoryType</key><string>public.app-category.video</string><key>NSPhotoLibraryUsageDescription</key><string>Concat imports the clips you pick.</string><key>NSMicrophoneUsageDescription</key><string>Concat records voice-over.</string>