From 6e1f653168c10b360a2b2120dcb2b759496970c1 Mon Sep 17 00:00:00 2001 From: ymote <151983+ymote@users.noreply.github.com> Date: Mon, 14 Sep 2026 23:14:33 -0700 Subject: [PATCH 1/7] shell: the status clock is formatted in-process, not by forking `date` The status sampler thread forked `date` twice every second. On the phone that fork+exec out of a 250 MB app process cost 11% of a core on its own, more than half of an idle screen's CPU. `localtime_r` + `strftime` read the same tz data with the same formats in microseconds. Idle home on the OnePlus 6T: 19.2% -> 7.6% of one core. Co-Authored-By: Claude Opus 5 (1M context) --- Cargo.toml | 2 ++ src/shell/bar.rs | 30 +++++++++++++++++++++++++----- 2 files changed, 27 insertions(+), 5 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 92481673..065c8623 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -37,6 +37,8 @@ name = "octosense" path = "src/main.rs" [dependencies] +# The status clock is formatted in-process (localtime_r + strftime), not by forking `date`. +libc = "0.2" # `appcard,maps`: the Octoscript-AppCard widget set (kit, text roles, weather, # finance, matplot) and the map navigation layer the appcard module renders. makepad-widgets = { git = "https://github.com/OctoSense-org/makepad.git", rev = "ad8f3729d2c24ba5a3bda5c8865a2b8366480147", features = ["appcard", "maps"] } diff --git a/src/shell/bar.rs b/src/shell/bar.rs index 880c43da..874dda3e 100644 --- a/src/shell/bar.rs +++ b/src/shell/bar.rs @@ -225,12 +225,32 @@ fn run(cmd: &str, args: &[&str]) -> Option { } } -/// `date +"%A %H:%M"` — omarchy's `dddd HH:mm`. +/// `date +"%A %H:%M"` — omarchy's `dddd HH:mm` — formatted in-process from +/// the C library's local time (`localtime_r` + `strftime`, the same tz data +/// `date` reads). Forking `date` twice a second cost an idle phone 11% of a +/// core on this thread alone. pub fn sample_clock(alt: bool) -> String { - let fmt = if alt { "+%-d %B W%V %Y" } else { "+%A %H:%M" }; - run("date", &[fmt]) - .map(|s| s.trim().to_string()) - .unwrap_or_default() + let fmt: &std::ffi::CStr = if alt { c"%-d %B W%V %Y" } else { c"%A %H:%M" }; + #[cfg(unix)] + { + let mut buf = [0u8; 64]; + let written = unsafe { + let now = libc::time(std::ptr::null_mut()); + let mut tm: libc::tm = std::mem::zeroed(); + if libc::localtime_r(&now, &mut tm).is_null() { + return String::new(); + } + libc::strftime(buf.as_mut_ptr() as *mut libc::c_char, buf.len(), fmt.as_ptr(), &tm) + }; + String::from_utf8_lossy(&buf[..written]).trim().to_string() + } + #[cfg(not(unix))] + { + let fmt = format!("+{}", fmt.to_str().unwrap_or_default()); + run("date", &[&fmt]) + .map(|s| s.trim().to_string()) + .unwrap_or_default() + } } /// Everything the bar reads from the OS, gathered OFF the main thread. From 372d6743260441910912b4a0fb78577e1712ecc6 Mon Sep 17 00:00:00 2001 From: ymote <151983+ymote@users.noreply.github.com> Date: Mon, 14 Sep 2026 23:27:19 -0700 Subject: [PATCH 2/7] mobile: drop the GL gauss-scene override, the fork samples top-left targets `octosense/android_rendering.rs` overrode `DrawGaussScene` to ignore the V flip the pinned makepad asked for on Android. The fork now returns no flip for any backend (OctoSense-org/makepad fix/android-idle-repaint), which also fixes what the override could not reach: the glass shaders sampled the pyramid with the flip, so the frosted backdrop under the shade and Recents was upside down. Co-Authored-By: Claude Opus 5 (1M context) --- src/main.rs | 2 -- src/octosense/android_rendering.rs | 23 ----------------------- src/octosense/mod.rs | 2 -- 3 files changed, 27 deletions(-) delete mode 100644 src/octosense/android_rendering.rs diff --git a/src/main.rs b/src/main.rs index 0769b44d..7b8e53dd 100644 --- a/src/main.rs +++ b/src/main.rs @@ -4307,8 +4307,6 @@ impl AppMain for App { host::set_child_env("MAKEPAD_HOME", octosense::paths::home().as_os_str()); desktop_style::install(vm,desktop_style::StyleSheet::load(desktop_style::DesktopStyle::Omarchy)); crate::makepad_widgets::script_mod(vm); - #[cfg(target_os = "android")] - octosense::android_rendering::script_mod(vm); // The theme: evaluated before any module that reads // mod.wm_theme. This IS the theming system — splash. diff --git a/src/octosense/android_rendering.rs b/src/octosense/android_rendering.rs deleted file mode 100644 index b64f8d0f..00000000 --- a/src/octosense/android_rendering.rs +++ /dev/null @@ -1,23 +0,0 @@ -//! Compatibility with the pinned Makepad GL backend, which stores 2D render -//! targets with top-left rows. Its older GaussStack consumer still requests a -//! Y flip on Android; sampling those targets directly keeps pixels and hits -//! aligned. Remove this override when the upstream compositor is corrected. -use makepad_widgets::{window::DrawGaussScene, *}; - -script_mod! { - use mod.prelude.widgets_internal.* - - set_type_default() do #(DrawGaussScene::script_shader(vm)) { - ..mod.draw.DrawQuad - scene_texture: texture_2d(float) - // Retain the uniform expected by GaussStack, but use the backend's - // already normalized texture orientation. - source_y_flip: uniform(0.0) - source_offset: uniform(vec2(0.0, 0.0)) - source_scale: uniform(vec2(1.0, 1.0)) - pixel: fn() { - let uv = self.source_offset + self.pos * self.source_scale - return self.scene_texture.sample_as_bgra(clamp(uv, vec2(0.0, 0.0), vec2(1.0, 1.0))) - } - } -} diff --git a/src/octosense/mod.rs b/src/octosense/mod.rs index 45a0bc9c..1c2494f8 100644 --- a/src/octosense/mod.rs +++ b/src/octosense/mod.rs @@ -1,7 +1,5 @@ pub mod catalog; pub mod style; -#[cfg(target_os = "android")] -pub mod android_rendering; pub mod paths; pub mod policy; pub mod retired_passes; From 9e00b7b0d61f25ca6f000874d1b949c168f6b252 Mon Sep 17 00:00:00 2001 From: ymote <151983+ymote@users.noreply.github.com> Date: Mon, 14 Sep 2026 23:27:19 -0700 Subject: [PATCH 3/7] mobile: a hosted module's glass blurs its own capture, not the whole window `WindowFrame` scoped a module's overlays to its capture pass but not its gauss requests, so the AppCard kit's glass asked for the WM WINDOW's pyramid: every frame that recorded a module re-routed the whole window through a full-screen gauss scene pass, a copy and a six-level pyramid (the whole open animation and every idle App-screen tick; `gauss_mip_*` on the window in the census hot list). The frame now carries a `CaptureGauss`, as the fork's WM `WindowFrame` does: the pyramid is built from the capture while something inside asks. Co-Authored-By: Claude Opus 5 (1M context) --- src/dock_warp.rs | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/src/dock_warp.rs b/src/dock_warp.rs index 18bc3fb2..117aefe2 100644 --- a/src/dock_warp.rs +++ b/src/dock_warp.rs @@ -65,11 +65,20 @@ pub struct DrawDockWarp { /// in the WM window's overlay: painted last of all, over the shell's shade, /// keyboard and home page, unclipped, and kept on screen after the tile was /// no longer drawn — the module "painting over the whole window". +/// +/// The gauss pyramid a module's glass asks for is the capture's own too +/// (`CaptureGauss`): built from this texture while something inside asks, +/// nothing otherwise. Without it `request_window_gauss` resolved to the WM +/// window: every frame that recorded a module re-routed the whole window +/// through a full-screen gauss scene pass, a copy and a six-level pyramid +/// (on the phone: the whole open-app animation and every idle App tick). pub struct WindowFrame { pass: DrawPass, list: DrawList2d, overlay: Overlay, overlay_scope: Option, + gauss: makepad_widgets::gauss_view::CaptureGauss, + rect: Rect, texture: Texture, _depth: Texture, frozen: bool, @@ -105,6 +114,8 @@ impl WindowFrame { list: DrawList2d::new(cx), overlay: Overlay { draw_list: DrawList::new(cx) }, overlay_scope: None, + gauss: makepad_widgets::gauss_view::CaptureGauss::new(cx), + rect: Rect::default(), texture, _depth: depth, frozen: false, @@ -130,10 +141,18 @@ impl WindowFrame { cx.begin_pass(&self.pass, Some(dpi)); self.list.begin_always(cx); cx.begin_root_turtle(root_size, Layout::flow_overlay()); - // From here to `end`, overlays belong to this pass (see the type doc). - self.overlay_scope = Some(self.overlay.begin_nested_for_pass(cx, self.pass.draw_pass_id())); + // From here to `end`, overlays and gauss requests belong to this pass + // (see the type doc). + self.rect = rect; + let pass = self.pass.draw_pass_id(); + self.overlay_scope = Some(self.overlay.begin_nested_for_pass(cx, pass)); + self.gauss.begin(cx, pass, rect.pos, rect.size, root_size); } pub fn end(&mut self, cx: &mut Cx2d) { + let pass = self.pass.draw_pass_id(); + // The scene (when a pyramid was built) goes under the overlays, the + // overlays last — the window's own order. + let gauss_changed = self.gauss.end(cx, pass, self.rect); // The overlay composites into the frame's own list, last, and the // enclosing frame's overlay state comes back exactly as it was. if let Some(scope) = self.overlay_scope.take() { @@ -142,6 +161,9 @@ impl WindowFrame { cx.end_pass_sized_turtle(); self.list.end(cx); cx.end_pass(&self.pass); + if gauss_changed { + cx.repaint_pass_and_child_passes(pass); + } if std::env::var_os("MAKEPAD_WM_TRACE_WARP").is_some() { log!("warp: capture end"); } From 80998ceab0e5f877d632fde8a34b75c63e47420b Mon Sep 17 00:00:00 2001 From: ymote <151983+ymote@users.noreply.github.com> Date: Mon, 14 Sep 2026 23:27:19 -0700 Subject: [PATCH 4/7] mobile: the opening app zooms its last capture, re-recorded once it settles The foreground app's full capture was re-recorded on every scene frame while `screen == App`, which is true from the first frame of the open animation: a full-screen module draw and its capture pass under a quad that only moves. On the OnePlus 6T the open animation's frames were GPU-bound (eglSwapBuffers 25 ms mean, GPU-ready p50 94 ms). The capture now refreshes every frame only once openness and overview have settled; while zooming, the last capture (or the first one, recorded on arrival or when stale) is the animation's source. Co-Authored-By: Claude Opus 5 (1M context) --- src/desk/phone.rs | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/desk/phone.rs b/src/desk/phone.rs index 150a4e78..51a363dd 100644 --- a/src/desk/phone.rs +++ b/src/desk/phone.rs @@ -315,7 +315,13 @@ impl WmDesk { let radius=((1.0-phone.openness).max(phone.overview)*26.0)as f32; match stored.full.take() { Some(mut capture)=>{ - let refresh=full_ready && (foreground && phone.screen==PhoneScreen::App || self.client_arriving(client) || capture.stale(app.size,style,dark)); + // The foreground app is re-recorded every scene frame once it is + // settled on screen. While it zooms open the last capture is the + // animation's source: re-recording a full-screen module (and its + // own glass pyramid) under a moving quad cost a whole GPU frame + // per animation frame on the phone. + let settled=phone.openness>=0.999 && phone.overview<=0.001; + let refresh=full_ready && (foreground && phone.screen==PhoneScreen::App && settled || self.client_arriving(client) || capture.stale(app.size,style,dark)); if refresh { self.record_capture(cx,scope,client,&mut capture,app,true); capture.settle(app.size,style,dark); From 0848f6438fefd6bc705d5a17926c090c796842d6 Mon Sep 17 00:00:00 2001 From: ymote <151983+ymote@users.noreply.github.com> Date: Mon, 14 Sep 2026 23:27:19 -0700 Subject: [PATCH 5/7] mobile: the wallpaper shader computes one style per pixel The phone wallpaper computed both the iOS ribbons and the Android petals for every pixel and mixed one away at weight zero: roughly ten exp/pow/sin terms plus atan2 and length, full screen (1080x2340), on every Home and transition frame and again in the compositor's gauss scene when glass is up. It now branches on the style and returns. Co-Authored-By: Claude Opus 5 (1M context) --- src/mobile_surface.rs | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/src/mobile_surface.rs b/src/mobile_surface.rs index 28ab80c2..29e1fba1 100644 --- a/src/mobile_surface.rs +++ b/src/mobile_surface.rs @@ -73,6 +73,21 @@ script_mod! { let t=self.phase let aspect=self.rect_size.x/max(self.rect_size.y,1.0) let q=(p-0.5)*vec2(aspect,1.0) + let dim=1.0-self.dark*0.64 + // One style per pixel: the other's terms were computed and + // mixed away at weight zero, full screen, every frame. + if self.android > 0.5 { + // Material-style cut-paper petals with soft depth and living color. + let angle=atan2(q.y,q.x)+t*0.035 + let petals=0.31+0.065*cos(angle*4.0+sin(t*0.07)*0.5) + let radius=length(q-vec2(sin(t*0.055)*0.08,cos(t*0.04)*0.06)) + let shape=1.0-smoothstep(petals-0.012,petals+0.012,radius) + let shadow=1.0-smoothstep(petals,petals+0.07,radius) + let inner=1.0-smoothstep(0.12,0.16,length(q+vec2(0.06,0.09))) + let paper=mix(vec3(0.88,0.82,0.96),vec3(0.63,0.79,0.89),p.y)*mix(1.0,0.90,shadow) + let petal=mix(vec3(0.39,0.43,0.72),vec3(0.66,0.54,0.79),clamp(p.y+sin(t*0.08)*0.15,0.0,1.0)) + return vec4(mix(mix(paper,petal,shape),vec3(0.95,0.71,0.63),inner)*dim,1.0) + } // Slowly drifting translucent ribbons; no per-pixel loop. let bend=sin(p.y*4.2+t*0.11)*0.19+sin(p.y*8.0-t*0.07)*0.045 let ribbon=exp(-pow((p.x+bend-0.30-sin(t*0.08)*0.12)*3.3,2.0)) @@ -81,18 +96,7 @@ script_mod! { let warm=exp(-pow((p.x-bend-0.84+sin(t*0.05)*0.12)*3.8,2.0)) let ios=vec3(0.025,0.085,0.24)+vec3(0.05,0.48,0.57)*ribbon +vec3(0.17,0.30,0.33)*edge+vec3(0.34,0.04,0.25)*warm+vec3(0.06,0.10,0.14)*bloom - // Material-style cut-paper petals with soft depth and living color. - let angle=atan2(q.y,q.x)+t*0.035 - let petals=0.31+0.065*cos(angle*4.0+sin(t*0.07)*0.5) - let radius=length(q-vec2(sin(t*0.055)*0.08,cos(t*0.04)*0.06)) - let shape=1.0-smoothstep(petals-0.012,petals+0.012,radius) - let shadow=1.0-smoothstep(petals,petals+0.07,radius) - let inner=1.0-smoothstep(0.12,0.16,length(q+vec2(0.06,0.09))) - let paper=mix(vec3(0.88,0.82,0.96),vec3(0.63,0.79,0.89),p.y)*mix(1.0,0.90,shadow) - let petal=mix(vec3(0.39,0.43,0.72),vec3(0.66,0.54,0.79),clamp(p.y+sin(t*0.08)*0.15,0.0,1.0)) - let android=mix(mix(paper,petal,shape),vec3(0.95,0.71,0.63),inner) - let color=mix(ios,android,self.android)*(1.0-self.dark*0.64) - return vec4(color,1.0) + return vec4(ios*dim,1.0) } } } From c4449ab19fa5fd86abdccb7c26eae25181ff68d6 Mon Sep 17 00:00:00 2001 From: ymote <151983+ymote@users.noreply.github.com> Date: Mon, 14 Sep 2026 23:37:57 -0700 Subject: [PATCH 6/7] deps: makepad pin to fix/android-idle-repaint (OctoSense-org/makepad#6) f1db9eb: the GL completion fence is polled and Android serves retirement debt without painting (an idle phone presents ~1 frame/s instead of ~56), glass samples GL render targets right side up, a parallel-compile driver reads the program cache, and Android's frame monitor gets draw/wait/gc. `octos-app` (Octoscript-AppCard @ 4f1ac61) still pins makepad ad8f372 in its own manifest. A patch cannot point a git source at another rev of itself, so every crate of the OctoSense-org/makepad URL resolves through the www host alias of the same repository at this pin, with exact versions: one makepad lineage (no ad8f372 left in Cargo.lock, one makepad-widgets). The alias can go once Octoscript-AppCard moves to this rev. Co-Authored-By: Claude Opus 5 (1M context) --- Cargo.lock | 301 +++++++++++++++++++------------------- Cargo.toml | 155 ++++++++++++++++++-- apps/appcard/Cargo.toml | 4 +- apps/reference/Cargo.toml | 4 +- 4 files changed, 296 insertions(+), 168 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 5f2bba76..00739806 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5,7 +5,7 @@ version = 4 [[package]] name = "ab_glyph_rasterizer" version = "0.1.8" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=ad8f3729d2c24ba5a3bda5c8865a2b8366480147#ad8f3729d2c24ba5a3bda5c8865a2b8366480147" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" [[package]] name = "addr2line" @@ -282,7 +282,7 @@ checksum = "76a2e8124351fda1ef8aaaa3bbd7ebbcb486bbcd4225aca0aa0d84bb2db8fecb" [[package]] name = "arrayvec" version = "0.7.6" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=ad8f3729d2c24ba5a3bda5c8865a2b8366480147#ad8f3729d2c24ba5a3bda5c8865a2b8366480147" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" [[package]] name = "arrayvec" @@ -299,9 +299,9 @@ checksum = "d92bec98840b8f03a5ff5413de5293bfcd8bf96467cf5452609f939ec6f5de16" [[package]] name = "ash" version = "0.38.0+1.3.281" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=ad8f3729d2c24ba5a3bda5c8865a2b8366480147#ad8f3729d2c24ba5a3bda5c8865a2b8366480147" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" dependencies = [ - "libloading 0.8.9 (git+https://github.com/OctoSense-org/makepad.git?rev=ad8f3729d2c24ba5a3bda5c8865a2b8366480147)", + "libloading 0.8.9 (git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f)", ] [[package]] @@ -551,7 +551,7 @@ dependencies = [ [[package]] name = "bit-set" version = "0.8.0" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=ad8f3729d2c24ba5a3bda5c8865a2b8366480147#ad8f3729d2c24ba5a3bda5c8865a2b8366480147" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" dependencies = [ "bit-vec", ] @@ -559,7 +559,7 @@ dependencies = [ [[package]] name = "bit-vec" version = "0.8.0" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=ad8f3729d2c24ba5a3bda5c8865a2b8366480147#ad8f3729d2c24ba5a3bda5c8865a2b8366480147" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" [[package]] name = "bitflags" @@ -570,7 +570,7 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" version = "2.10.0" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=ad8f3729d2c24ba5a3bda5c8865a2b8366480147#ad8f3729d2c24ba5a3bda5c8865a2b8366480147" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" [[package]] name = "bitflags" @@ -705,7 +705,7 @@ checksum = "175812e0be2bccb6abe50bb8d566126198344f707e304f45c648fd8f2cc0365e" [[package]] name = "bytemuck" version = "1.25.0" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=ad8f3729d2c24ba5a3bda5c8865a2b8366480147#ad8f3729d2c24ba5a3bda5c8865a2b8366480147" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" [[package]] name = "bytemuck" @@ -722,7 +722,7 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "byteorder" version = "1.5.0" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=ad8f3729d2c24ba5a3bda5c8865a2b8366480147#ad8f3729d2c24ba5a3bda5c8865a2b8366480147" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" [[package]] name = "byteorder-lite" @@ -800,12 +800,12 @@ checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801" [[package]] name = "cfg-if" version = "1.0.4" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=ad8f3729d2c24ba5a3bda5c8865a2b8366480147#ad8f3729d2c24ba5a3bda5c8865a2b8366480147" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" [[package]] name = "cfg_aliases" version = "0.2.1" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=ad8f3729d2c24ba5a3bda5c8865a2b8366480147#ad8f3729d2c24ba5a3bda5c8865a2b8366480147" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" [[package]] name = "cfg_aliases" @@ -1275,7 +1275,7 @@ checksum = "a31eee39dddec8330830986fcd7625edb5a24ec90ea038215273bbc3adb08ac6" [[package]] name = "crunchy" version = "0.2.4" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=ad8f3729d2c24ba5a3bda5c8865a2b8366480147#ad8f3729d2c24ba5a3bda5c8865a2b8366480147" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" [[package]] name = "crypto-common" @@ -1548,7 +1548,7 @@ dependencies = [ [[package]] name = "downcast-rs" version = "1.2.1" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=ad8f3729d2c24ba5a3bda5c8865a2b8366480147#ad8f3729d2c24ba5a3bda5c8865a2b8366480147" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" [[package]] name = "dunce" @@ -1674,7 +1674,7 @@ checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f" [[package]] name = "equivalent" version = "1.0.2" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=ad8f3729d2c24ba5a3bda5c8865a2b8366480147#ad8f3729d2c24ba5a3bda5c8865a2b8366480147" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" [[package]] name = "errno" @@ -1849,7 +1849,7 @@ checksum = "77ce24cb58228fbb8aa041425bb1050850ac19177686ea6e0f41a70416f56fdb" [[package]] name = "foldhash" version = "0.2.0" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=ad8f3729d2c24ba5a3bda5c8865a2b8366480147#ad8f3729d2c24ba5a3bda5c8865a2b8366480147" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" [[package]] name = "fontconfig-parser" @@ -2022,9 +2022,9 @@ dependencies = [ [[package]] name = "fxhash" version = "0.2.1" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=ad8f3729d2c24ba5a3bda5c8865a2b8366480147#ad8f3729d2c24ba5a3bda5c8865a2b8366480147" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" dependencies = [ - "byteorder 1.5.0 (git+https://github.com/OctoSense-org/makepad.git?rev=ad8f3729d2c24ba5a3bda5c8865a2b8366480147)", + "byteorder 1.5.0 (git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f)", ] [[package]] @@ -2905,9 +2905,9 @@ dependencies = [ [[package]] name = "hashbrown" version = "0.16.1" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=ad8f3729d2c24ba5a3bda5c8865a2b8366480147#ad8f3729d2c24ba5a3bda5c8865a2b8366480147" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" dependencies = [ - "foldhash 0.2.0 (git+https://github.com/OctoSense-org/makepad.git?rev=ad8f3729d2c24ba5a3bda5c8865a2b8366480147)", + "foldhash 0.2.0 (git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f)", ] [[package]] @@ -2956,7 +2956,7 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] name = "hexf-parse" version = "0.2.1" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=ad8f3729d2c24ba5a3bda5c8865a2b8366480147#ad8f3729d2c24ba5a3bda5c8865a2b8366480147" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" [[package]] name = "hilog-sys" @@ -3153,17 +3153,17 @@ dependencies = [ [[package]] name = "i_float" version = "3.0.0" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=ad8f3729d2c24ba5a3bda5c8865a2b8366480147#ad8f3729d2c24ba5a3bda5c8865a2b8366480147" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" [[package]] name = "i_key_sort" version = "0.11.0" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=ad8f3729d2c24ba5a3bda5c8865a2b8366480147#ad8f3729d2c24ba5a3bda5c8865a2b8366480147" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" [[package]] name = "i_overlay" version = "7.0.3" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=ad8f3729d2c24ba5a3bda5c8865a2b8366480147#ad8f3729d2c24ba5a3bda5c8865a2b8366480147" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" dependencies = [ "i_float", "i_key_sort", @@ -3174,7 +3174,7 @@ dependencies = [ [[package]] name = "i_shape" version = "3.0.0" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=ad8f3729d2c24ba5a3bda5c8865a2b8366480147#ad8f3729d2c24ba5a3bda5c8865a2b8366480147" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" dependencies = [ "i_float", ] @@ -3182,7 +3182,7 @@ dependencies = [ [[package]] name = "i_tree" version = "0.19.0" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=ad8f3729d2c24ba5a3bda5c8865a2b8366480147#ad8f3729d2c24ba5a3bda5c8865a2b8366480147" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" [[package]] name = "iana-time-zone" @@ -3394,10 +3394,10 @@ dependencies = [ [[package]] name = "indexmap" version = "2.13.0" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=ad8f3729d2c24ba5a3bda5c8865a2b8366480147#ad8f3729d2c24ba5a3bda5c8865a2b8366480147" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" dependencies = [ - "equivalent 1.0.2 (git+https://github.com/OctoSense-org/makepad.git?rev=ad8f3729d2c24ba5a3bda5c8865a2b8366480147)", - "hashbrown 0.16.1 (git+https://github.com/OctoSense-org/makepad.git?rev=ad8f3729d2c24ba5a3bda5c8865a2b8366480147)", + "equivalent 1.0.2 (git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f)", + "hashbrown 0.16.1 (git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f)", ] [[package]] @@ -3711,10 +3711,10 @@ dependencies = [ [[package]] name = "libloading" version = "0.8.9" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=ad8f3729d2c24ba5a3bda5c8865a2b8366480147#ad8f3729d2c24ba5a3bda5c8865a2b8366480147" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" dependencies = [ - "cfg-if 1.0.4 (git+https://github.com/OctoSense-org/makepad.git?rev=ad8f3729d2c24ba5a3bda5c8865a2b8366480147)", - "windows-link 0.2.1 (git+https://github.com/OctoSense-org/makepad.git?rev=ad8f3729d2c24ba5a3bda5c8865a2b8366480147)", + "cfg-if 1.0.4 (git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f)", + "windows-link 0.2.1 (git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f)", ] [[package]] @@ -3864,7 +3864,7 @@ dependencies = [ [[package]] name = "makepad-ai" version = "1.0.0" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=ad8f3729d2c24ba5a3bda5c8865a2b8366480147#ad8f3729d2c24ba5a3bda5c8865a2b8366480147" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" dependencies = [ "makepad-live-id", "makepad-micro-serde", @@ -3874,7 +3874,7 @@ dependencies = [ [[package]] name = "makepad-ai-services" version = "0.1.0" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=ad8f3729d2c24ba5a3bda5c8865a2b8366480147#ad8f3729d2c24ba5a3bda5c8865a2b8366480147" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" dependencies = [ "makepad-micro-serde", "makepad-platform", @@ -3884,7 +3884,7 @@ dependencies = [ [[package]] name = "makepad-aichat" version = "0.1.0" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=ad8f3729d2c24ba5a3bda5c8865a2b8366480147#ad8f3729d2c24ba5a3bda5c8865a2b8366480147" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" dependencies = [ "makepad-ai-services", "makepad-strict-json", @@ -3905,7 +3905,7 @@ dependencies = [ [[package]] name = "makepad-app-module" version = "0.1.0" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=ad8f3729d2c24ba5a3bda5c8865a2b8366480147#ad8f3729d2c24ba5a3bda5c8865a2b8366480147" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" dependencies = [ "makepad-ai-services", "makepad-strict-json", @@ -3915,7 +3915,7 @@ dependencies = [ [[package]] name = "makepad-apple-sys" version = "1.0.0" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=ad8f3729d2c24ba5a3bda5c8865a2b8366480147#ad8f3729d2c24ba5a3bda5c8865a2b8366480147" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" dependencies = [ "makepad-objc-sys", ] @@ -3923,12 +3923,12 @@ dependencies = [ [[package]] name = "makepad-byteorder-lite" version = "0.1.0" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=ad8f3729d2c24ba5a3bda5c8865a2b8366480147#ad8f3729d2c24ba5a3bda5c8865a2b8366480147" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" [[package]] name = "makepad-code-editor" version = "2.0.0" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=ad8f3729d2c24ba5a3bda5c8865a2b8366480147#ad8f3729d2c24ba5a3bda5c8865a2b8366480147" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" dependencies = [ "makepad-widgets", ] @@ -3936,7 +3936,7 @@ dependencies = [ [[package]] name = "makepad-derive-wasm-bridge" version = "1.0.0" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=ad8f3729d2c24ba5a3bda5c8865a2b8366480147#ad8f3729d2c24ba5a3bda5c8865a2b8366480147" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" dependencies = [ "makepad-micro-proc-macro", ] @@ -3944,7 +3944,7 @@ dependencies = [ [[package]] name = "makepad-derive-widget" version = "2.0.0" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=ad8f3729d2c24ba5a3bda5c8865a2b8366480147#ad8f3729d2c24ba5a3bda5c8865a2b8366480147" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" dependencies = [ "makepad-live-id", "makepad-micro-proc-macro", @@ -3964,7 +3964,7 @@ dependencies = [ [[package]] name = "makepad-draw" version = "2.0.0" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=ad8f3729d2c24ba5a3bda5c8865a2b8366480147#ad8f3729d2c24ba5a3bda5c8865a2b8366480147" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" dependencies = [ "ab_glyph_rasterizer", "fxhash", @@ -3981,7 +3981,7 @@ dependencies = [ "rustybuzz 0.18.0", "sdfer", "ttf-parser 0.24.1", - "unicode-bidi 0.3.18 (git+https://github.com/OctoSense-org/makepad.git?rev=ad8f3729d2c24ba5a3bda5c8865a2b8366480147)", + "unicode-bidi 0.3.18 (git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f)", "unicode-linebreak", "unicode-segmentation 1.12.0", ] @@ -3989,7 +3989,7 @@ dependencies = [ [[package]] name = "makepad-error-log" version = "1.0.0" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=ad8f3729d2c24ba5a3bda5c8865a2b8366480147#ad8f3729d2c24ba5a3bda5c8865a2b8366480147" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" dependencies = [ "makepad-micro-serde", ] @@ -3997,12 +3997,12 @@ dependencies = [ [[package]] name = "makepad-fast-inflate" version = "0.1.0" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=ad8f3729d2c24ba5a3bda5c8865a2b8366480147#ad8f3729d2c24ba5a3bda5c8865a2b8366480147" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" [[package]] name = "makepad-filesystem-watcher" version = "0.1.0" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=ad8f3729d2c24ba5a3bda5c8865a2b8366480147#ad8f3729d2c24ba5a3bda5c8865a2b8366480147" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" dependencies = [ "makepad-git", ] @@ -4010,25 +4010,25 @@ dependencies = [ [[package]] name = "makepad-futures" version = "1.0.0" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=ad8f3729d2c24ba5a3bda5c8865a2b8366480147#ad8f3729d2c24ba5a3bda5c8865a2b8366480147" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" [[package]] name = "makepad-futures-legacy" version = "1.0.0" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=ad8f3729d2c24ba5a3bda5c8865a2b8366480147#ad8f3729d2c24ba5a3bda5c8865a2b8366480147" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" [[package]] name = "makepad-gif" version = "0.1.0" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=ad8f3729d2c24ba5a3bda5c8865a2b8366480147#ad8f3729d2c24ba5a3bda5c8865a2b8366480147" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" dependencies = [ - "weezl 0.1.12 (git+https://github.com/OctoSense-org/makepad.git?rev=ad8f3729d2c24ba5a3bda5c8865a2b8366480147)", + "weezl 0.1.12 (git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f)", ] [[package]] name = "makepad-git" version = "0.1.0" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=ad8f3729d2c24ba5a3bda5c8865a2b8366480147#ad8f3729d2c24ba5a3bda5c8865a2b8366480147" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" dependencies = [ "makepad-fast-inflate", ] @@ -4036,9 +4036,9 @@ dependencies = [ [[package]] name = "makepad-half" version = "2.7.1" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=ad8f3729d2c24ba5a3bda5c8865a2b8366480147#ad8f3729d2c24ba5a3bda5c8865a2b8366480147" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" dependencies = [ - "cfg-if 1.0.4 (git+https://github.com/OctoSense-org/makepad.git?rev=ad8f3729d2c24ba5a3bda5c8865a2b8366480147)", + "cfg-if 1.0.4 (git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f)", "crunchy", "num-traits 0.2.20", "zerocopy 0.8.39", @@ -4047,7 +4047,7 @@ dependencies = [ [[package]] name = "makepad-html" version = "1.0.0" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=ad8f3729d2c24ba5a3bda5c8865a2b8366480147#ad8f3729d2c24ba5a3bda5c8865a2b8366480147" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" dependencies = [ "makepad-live-id", ] @@ -4055,7 +4055,7 @@ dependencies = [ [[package]] name = "makepad-image-tiles" version = "0.1.0" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=ad8f3729d2c24ba5a3bda5c8865a2b8366480147#ad8f3729d2c24ba5a3bda5c8865a2b8366480147" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" dependencies = [ "makepad-network", "makepad-platform-video", @@ -4072,7 +4072,7 @@ checksum = "9775cbec5fa0647500c3e5de7c850280a88335d1d2d770e5aa2332b801ba7064" [[package]] name = "makepad-latex-math" version = "0.1.0" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=ad8f3729d2c24ba5a3bda5c8865a2b8366480147#ad8f3729d2c24ba5a3bda5c8865a2b8366480147" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" dependencies = [ "ttf-parser 0.24.1", ] @@ -4080,7 +4080,7 @@ dependencies = [ [[package]] name = "makepad-live-id" version = "1.0.0" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=ad8f3729d2c24ba5a3bda5c8865a2b8366480147#ad8f3729d2c24ba5a3bda5c8865a2b8366480147" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" dependencies = [ "makepad-live-id-macros", ] @@ -4088,7 +4088,7 @@ dependencies = [ [[package]] name = "makepad-live-id-macros" version = "1.0.0" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=ad8f3729d2c24ba5a3bda5c8865a2b8366480147#ad8f3729d2c24ba5a3bda5c8865a2b8366480147" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" dependencies = [ "makepad-micro-proc-macro", ] @@ -4096,7 +4096,7 @@ dependencies = [ [[package]] name = "makepad-live-reload-core" version = "0.1.0" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=ad8f3729d2c24ba5a3bda5c8865a2b8366480147#ad8f3729d2c24ba5a3bda5c8865a2b8366480147" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" dependencies = [ "makepad-filesystem-watcher", ] @@ -4104,7 +4104,7 @@ dependencies = [ [[package]] name = "makepad-math" version = "1.0.0" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=ad8f3729d2c24ba5a3bda5c8865a2b8366480147#ad8f3729d2c24ba5a3bda5c8865a2b8366480147" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" dependencies = [ "makepad-micro-serde", ] @@ -4112,7 +4112,7 @@ dependencies = [ [[package]] name = "makepad-mbtile-reader" version = "1.0.0" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=ad8f3729d2c24ba5a3bda5c8865a2b8366480147#ad8f3729d2c24ba5a3bda5c8865a2b8366480147" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" dependencies = [ "brotli", "makepad-fast-inflate", @@ -4122,12 +4122,12 @@ dependencies = [ [[package]] name = "makepad-micro-proc-macro" version = "1.0.0" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=ad8f3729d2c24ba5a3bda5c8865a2b8366480147#ad8f3729d2c24ba5a3bda5c8865a2b8366480147" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" [[package]] name = "makepad-micro-serde" version = "1.0.0" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=ad8f3729d2c24ba5a3bda5c8865a2b8366480147#ad8f3729d2c24ba5a3bda5c8865a2b8366480147" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" dependencies = [ "makepad-live-id", "makepad-micro-serde-derive", @@ -4136,7 +4136,7 @@ dependencies = [ [[package]] name = "makepad-micro-serde-derive" version = "1.0.0" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=ad8f3729d2c24ba5a3bda5c8865a2b8366480147#ad8f3729d2c24ba5a3bda5c8865a2b8366480147" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" dependencies = [ "makepad-micro-proc-macro", ] @@ -4144,7 +4144,7 @@ dependencies = [ [[package]] name = "makepad-network" version = "1.0.0" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=ad8f3729d2c24ba5a3bda5c8865a2b8366480147#ad8f3729d2c24ba5a3bda5c8865a2b8366480147" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" dependencies = [ "makepad-apple-sys", "makepad-error-log", @@ -4152,18 +4152,18 @@ dependencies = [ "makepad-live-id", "makepad-micro-serde", "makepad-script", - "windows 0.62.2 (git+https://github.com/OctoSense-org/makepad.git?rev=ad8f3729d2c24ba5a3bda5c8865a2b8366480147)", + "windows 0.62.2 (git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f)", ] [[package]] name = "makepad-objc-sys" version = "1.0.0" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=ad8f3729d2c24ba5a3bda5c8865a2b8366480147#ad8f3729d2c24ba5a3bda5c8865a2b8366480147" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" [[package]] name = "makepad-pdf-parse" version = "1.0.0" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=ad8f3729d2c24ba5a3bda5c8865a2b8366480147#ad8f3729d2c24ba5a3bda5c8865a2b8366480147" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" dependencies = [ "makepad-zune-inflate", ] @@ -4171,7 +4171,7 @@ dependencies = [ [[package]] name = "makepad-photos" version = "0.1.0" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=ad8f3729d2c24ba5a3bda5c8865a2b8366480147#ad8f3729d2c24ba5a3bda5c8865a2b8366480147" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" dependencies = [ "makepad-ai-services", "makepad-app-module", @@ -4184,7 +4184,7 @@ dependencies = [ [[package]] name = "makepad-platform" version = "2.0.0" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=ad8f3729d2c24ba5a3bda5c8865a2b8366480147#ad8f3729d2c24ba5a3bda5c8865a2b8366480147" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" dependencies = [ "ash", "bitflags 2.10.0", @@ -4214,30 +4214,30 @@ dependencies = [ "wayland-client", "wayland-egl", "wayland-protocols", - "windows 0.62.2 (git+https://github.com/OctoSense-org/makepad.git?rev=ad8f3729d2c24ba5a3bda5c8865a2b8366480147)", - "windows-core 0.62.2 (git+https://github.com/OctoSense-org/makepad.git?rev=ad8f3729d2c24ba5a3bda5c8865a2b8366480147)", + "windows 0.62.2 (git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f)", + "windows-core 0.62.2 (git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f)", "windows-targets 0.52.6", ] [[package]] name = "makepad-platform-video" version = "1.0.0" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=ad8f3729d2c24ba5a3bda5c8865a2b8366480147#ad8f3729d2c24ba5a3bda5c8865a2b8366480147" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" dependencies = [ "makepad-apple-sys", "makepad-objc-sys", - "windows 0.62.2 (git+https://github.com/OctoSense-org/makepad.git?rev=ad8f3729d2c24ba5a3bda5c8865a2b8366480147)", + "windows 0.62.2 (git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f)", ] [[package]] name = "makepad-regex" version = "0.1.0" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=ad8f3729d2c24ba5a3bda5c8865a2b8366480147#ad8f3729d2c24ba5a3bda5c8865a2b8366480147" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" [[package]] name = "makepad-script" version = "1.0.0" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=ad8f3729d2c24ba5a3bda5c8865a2b8366480147#ad8f3729d2c24ba5a3bda5c8865a2b8366480147" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" dependencies = [ "makepad-error-log", "makepad-html", @@ -4252,7 +4252,7 @@ dependencies = [ [[package]] name = "makepad-script-derive" version = "1.0.0" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=ad8f3729d2c24ba5a3bda5c8865a2b8366480147#ad8f3729d2c24ba5a3bda5c8865a2b8366480147" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" dependencies = [ "makepad-micro-proc-macro", ] @@ -4260,7 +4260,7 @@ dependencies = [ [[package]] name = "makepad-script-std" version = "1.0.0" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=ad8f3729d2c24ba5a3bda5c8865a2b8366480147#ad8f3729d2c24ba5a3bda5c8865a2b8366480147" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" dependencies = [ "makepad-network", "makepad-script", @@ -4269,12 +4269,12 @@ dependencies = [ [[package]] name = "makepad-shared-bytes" version = "1.0.0" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=ad8f3729d2c24ba5a3bda5c8865a2b8366480147#ad8f3729d2c24ba5a3bda5c8865a2b8366480147" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" [[package]] name = "makepad-sheets" version = "0.1.0" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=ad8f3729d2c24ba5a3bda5c8865a2b8366480147#ad8f3729d2c24ba5a3bda5c8865a2b8366480147" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" dependencies = [ "makepad-ai-services", "makepad-app-module", @@ -4285,22 +4285,22 @@ dependencies = [ [[package]] name = "makepad-sqlite" version = "1.0.0" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=ad8f3729d2c24ba5a3bda5c8865a2b8366480147#ad8f3729d2c24ba5a3bda5c8865a2b8366480147" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" [[package]] name = "makepad-stitch" version = "0.1.0" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=ad8f3729d2c24ba5a3bda5c8865a2b8366480147#ad8f3729d2c24ba5a3bda5c8865a2b8366480147" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" [[package]] name = "makepad-strict-json" version = "0.1.0" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=ad8f3729d2c24ba5a3bda5c8865a2b8366480147#ad8f3729d2c24ba5a3bda5c8865a2b8366480147" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" [[package]] name = "makepad-studio-protocol" version = "0.1.0" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=ad8f3729d2c24ba5a3bda5c8865a2b8366480147#ad8f3729d2c24ba5a3bda5c8865a2b8366480147" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" dependencies = [ "bitflags 2.10.0", "makepad-error-log", @@ -4312,7 +4312,7 @@ dependencies = [ [[package]] name = "makepad-svg" version = "1.0.0" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=ad8f3729d2c24ba5a3bda5c8865a2b8366480147#ad8f3729d2c24ba5a3bda5c8865a2b8366480147" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" dependencies = [ "makepad-html", "makepad-live-id", @@ -4321,7 +4321,7 @@ dependencies = [ [[package]] name = "makepad-tsdf" version = "0.1.0" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=ad8f3729d2c24ba5a3bda5c8865a2b8366480147#ad8f3729d2c24ba5a3bda5c8865a2b8366480147" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" dependencies = [ "makepad-math", "makepad-micro-serde", @@ -4330,7 +4330,7 @@ dependencies = [ [[package]] name = "makepad-wasm-bridge" version = "1.0.0" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=ad8f3729d2c24ba5a3bda5c8865a2b8366480147#ad8f3729d2c24ba5a3bda5c8865a2b8366480147" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" dependencies = [ "makepad-derive-wasm-bridge", "makepad-live-id", @@ -4339,7 +4339,7 @@ dependencies = [ [[package]] name = "makepad-webp" version = "0.2.4" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=ad8f3729d2c24ba5a3bda5c8865a2b8366480147#ad8f3729d2c24ba5a3bda5c8865a2b8366480147" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" dependencies = [ "makepad-byteorder-lite", ] @@ -4347,7 +4347,7 @@ dependencies = [ [[package]] name = "makepad-widgets" version = "2.0.0" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=ad8f3729d2c24ba5a3bda5c8865a2b8366480147#ad8f3729d2c24ba5a3bda5c8865a2b8366480147" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" dependencies = [ "i_overlay", "makepad-derive-widget", @@ -4367,7 +4367,7 @@ dependencies = [ [[package]] name = "makepad-wm-api" version = "0.1.0" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=ad8f3729d2c24ba5a3bda5c8865a2b8366480147#ad8f3729d2c24ba5a3bda5c8865a2b8366480147" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" dependencies = [ "makepad-widgets", ] @@ -4375,7 +4375,7 @@ dependencies = [ [[package]] name = "makepad-wm-theme" version = "0.1.0" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=ad8f3729d2c24ba5a3bda5c8865a2b8366480147#ad8f3729d2c24ba5a3bda5c8865a2b8366480147" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" dependencies = [ "makepad-widgets", ] @@ -4383,7 +4383,7 @@ dependencies = [ [[package]] name = "makepad-zune-bmp" version = "0.5.2" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=ad8f3729d2c24ba5a3bda5c8865a2b8366480147#ad8f3729d2c24ba5a3bda5c8865a2b8366480147" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" dependencies = [ "makepad-error-log", "makepad-zune-core", @@ -4392,7 +4392,7 @@ dependencies = [ [[package]] name = "makepad-zune-core" version = "0.5.1" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=ad8f3729d2c24ba5a3bda5c8865a2b8366480147#ad8f3729d2c24ba5a3bda5c8865a2b8366480147" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" dependencies = [ "makepad-error-log", ] @@ -4400,7 +4400,7 @@ dependencies = [ [[package]] name = "makepad-zune-inflate" version = "0.2.54" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=ad8f3729d2c24ba5a3bda5c8865a2b8366480147#ad8f3729d2c24ba5a3bda5c8865a2b8366480147" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" dependencies = [ "simd-adler32 0.3.9", ] @@ -4408,7 +4408,7 @@ dependencies = [ [[package]] name = "makepad-zune-jpeg" version = "0.5.15" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=ad8f3729d2c24ba5a3bda5c8865a2b8366480147#ad8f3729d2c24ba5a3bda5c8865a2b8366480147" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" dependencies = [ "makepad-zune-core", ] @@ -4416,7 +4416,7 @@ dependencies = [ [[package]] name = "makepad-zune-png" version = "0.5.2" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=ad8f3729d2c24ba5a3bda5c8865a2b8366480147#ad8f3729d2c24ba5a3bda5c8865a2b8366480147" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" dependencies = [ "makepad-fast-inflate", "makepad-zune-core", @@ -4426,7 +4426,7 @@ dependencies = [ [[package]] name = "makepad-zune-qoi" version = "0.5.2" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=ad8f3729d2c24ba5a3bda5c8865a2b8366480147#ad8f3729d2c24ba5a3bda5c8865a2b8366480147" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" dependencies = [ "makepad-zune-core", ] @@ -4493,7 +4493,7 @@ dependencies = [ [[package]] name = "memchr" version = "2.7.6" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=ad8f3729d2c24ba5a3bda5c8865a2b8366480147#ad8f3729d2c24ba5a3bda5c8865a2b8366480147" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" [[package]] name = "memchr" @@ -4678,14 +4678,14 @@ checksum = "743fb55ba31b18fb1ecef6bdc9aa2743314978ac084044301a7eee33fb99a20d" [[package]] name = "naga" version = "27.0.3" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=ad8f3729d2c24ba5a3bda5c8865a2b8366480147#ad8f3729d2c24ba5a3bda5c8865a2b8366480147" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" dependencies = [ "arrayvec 0.7.6", "bit-set", "bitflags 2.10.0", - "cfg-if 1.0.4 (git+https://github.com/OctoSense-org/makepad.git?rev=ad8f3729d2c24ba5a3bda5c8865a2b8366480147)", + "cfg-if 1.0.4 (git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f)", "cfg_aliases 0.2.1", - "hashbrown 0.16.1 (git+https://github.com/OctoSense-org/makepad.git?rev=ad8f3729d2c24ba5a3bda5c8865a2b8366480147)", + "hashbrown 0.16.1 (git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f)", "hexf-parse", "indexmap 2.13.0", "makepad-error-log", @@ -4879,7 +4879,7 @@ dependencies = [ [[package]] name = "num-traits" version = "0.2.20" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=ad8f3729d2c24ba5a3bda5c8865a2b8366480147#ad8f3729d2c24ba5a3bda5c8865a2b8366480147" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" [[package]] name = "num_cpus" @@ -5461,6 +5461,7 @@ dependencies = [ name = "octosense" version = "0.1.0" dependencies = [ + "libc", "makepad-ai-services", "makepad-aichat", "makepad-app-module", @@ -5503,7 +5504,7 @@ checksum = "8d380ab6c951261a0e44306245bc960b3b3367f099a7da7156bd1a3cacaf783c" [[package]] name = "once_cell" version = "1.21.3" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=ad8f3729d2c24ba5a3bda5c8865a2b8366480147#ad8f3729d2c24ba5a3bda5c8865a2b8366480147" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" [[package]] name = "once_cell" @@ -5757,7 +5758,7 @@ dependencies = [ [[package]] name = "pkg-config" version = "0.3.32" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=ad8f3729d2c24ba5a3bda5c8865a2b8366480147#ad8f3729d2c24ba5a3bda5c8865a2b8366480147" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" [[package]] name = "pkg-config" @@ -5917,11 +5918,11 @@ dependencies = [ [[package]] name = "pulldown-cmark" version = "0.12.2" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=ad8f3729d2c24ba5a3bda5c8865a2b8366480147#ad8f3729d2c24ba5a3bda5c8865a2b8366480147" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" dependencies = [ "bitflags 2.10.0", "memchr 2.7.6", - "unicase 2.9.0 (git+https://github.com/OctoSense-org/makepad.git?rev=ad8f3729d2c24ba5a3bda5c8865a2b8366480147)", + "unicase 2.9.0 (git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f)", ] [[package]] @@ -6579,7 +6580,7 @@ checksum = "b74b56ffa8bb2830709a538c2cbcae9aa062db0d2a42563bfb09bdaae44020eb" [[package]] name = "rustc-hash" version = "1.1.0" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=ad8f3729d2c24ba5a3bda5c8865a2b8366480147#ad8f3729d2c24ba5a3bda5c8865a2b8366480147" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" [[package]] name = "rustc-hash" @@ -6747,7 +6748,7 @@ dependencies = [ [[package]] name = "rustybuzz" version = "0.18.0" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=ad8f3729d2c24ba5a3bda5c8865a2b8366480147#ad8f3729d2c24ba5a3bda5c8865a2b8366480147" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" dependencies = [ "bitflags 2.10.0", "bytemuck 1.25.0", @@ -6756,8 +6757,8 @@ dependencies = [ "ttf-parser 0.24.1", "unicode-bidi-mirroring 0.3.0", "unicode-ccc 0.3.0", - "unicode-properties 0.1.4 (git+https://github.com/OctoSense-org/makepad.git?rev=ad8f3729d2c24ba5a3bda5c8865a2b8366480147)", - "unicode-script 0.5.8 (git+https://github.com/OctoSense-org/makepad.git?rev=ad8f3729d2c24ba5a3bda5c8865a2b8366480147)", + "unicode-properties 0.1.4 (git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f)", + "unicode-script 0.5.8 (git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f)", ] [[package]] @@ -6865,7 +6866,7 @@ dependencies = [ [[package]] name = "scoped-tls" version = "1.0.1" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=ad8f3729d2c24ba5a3bda5c8865a2b8366480147#ad8f3729d2c24ba5a3bda5c8865a2b8366480147" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" [[package]] name = "scopeguard" @@ -6876,7 +6877,7 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "sdfer" version = "0.2.1" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=ad8f3729d2c24ba5a3bda5c8865a2b8366480147#ad8f3729d2c24ba5a3bda5c8865a2b8366480147" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" [[package]] name = "secrecy" @@ -7148,7 +7149,7 @@ dependencies = [ [[package]] name = "simd-adler32" version = "0.3.9" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=ad8f3729d2c24ba5a3bda5c8865a2b8366480147#ad8f3729d2c24ba5a3bda5c8865a2b8366480147" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" [[package]] name = "simd-adler32" @@ -7229,7 +7230,7 @@ dependencies = [ [[package]] name = "smallvec" version = "1.15.1" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=ad8f3729d2c24ba5a3bda5c8865a2b8366480147#ad8f3729d2c24ba5a3bda5c8865a2b8366480147" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" [[package]] name = "smallvec" @@ -7256,7 +7257,7 @@ checksum = "3763264f6b73151db08c50ff20d7d8a0b8796e021cdea7ceedad07b80155fa0e" [[package]] name = "spirv" version = "0.3.0+sdk-1.3.268.0" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=ad8f3729d2c24ba5a3bda5c8865a2b8366480147#ad8f3729d2c24ba5a3bda5c8865a2b8366480147" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" dependencies = [ "bitflags 2.10.0", ] @@ -7511,7 +7512,7 @@ dependencies = [ [[package]] name = "thiserror" version = "2.0.18" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=ad8f3729d2c24ba5a3bda5c8865a2b8366480147#ad8f3729d2c24ba5a3bda5c8865a2b8366480147" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" dependencies = [ "thiserror-impl 2.0.18", ] @@ -7539,7 +7540,7 @@ dependencies = [ [[package]] name = "thiserror-impl" version = "2.0.18" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=ad8f3729d2c24ba5a3bda5c8865a2b8366480147#ad8f3729d2c24ba5a3bda5c8865a2b8366480147" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" dependencies = [ "makepad-micro-proc-macro", ] @@ -8009,7 +8010,7 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] name = "ttf-parser" version = "0.24.1" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=ad8f3729d2c24ba5a3bda5c8865a2b8366480147#ad8f3729d2c24ba5a3bda5c8865a2b8366480147" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" [[package]] name = "ttf-parser" @@ -8125,7 +8126,7 @@ checksum = "dbc4bc3a9f746d862c45cb89d705aa10f187bb96c76001afab07a0d35ce60142" [[package]] name = "unicase" version = "2.9.0" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=ad8f3729d2c24ba5a3bda5c8865a2b8366480147#ad8f3729d2c24ba5a3bda5c8865a2b8366480147" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" [[package]] name = "unicode-bidi" @@ -8136,12 +8137,12 @@ checksum = "5c1cb5db39152898a79168971543b1cb5020dff7fe43c8dc468b0885f5e29df5" [[package]] name = "unicode-bidi" version = "0.3.18" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=ad8f3729d2c24ba5a3bda5c8865a2b8366480147#ad8f3729d2c24ba5a3bda5c8865a2b8366480147" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" [[package]] name = "unicode-bidi-mirroring" version = "0.3.0" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=ad8f3729d2c24ba5a3bda5c8865a2b8366480147#ad8f3729d2c24ba5a3bda5c8865a2b8366480147" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" [[package]] name = "unicode-bidi-mirroring" @@ -8158,7 +8159,7 @@ checksum = "7eec5d1121208364f6793f7d2e222bf75a915c19557537745b195b253dd64217" [[package]] name = "unicode-ccc" version = "0.3.0" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=ad8f3729d2c24ba5a3bda5c8865a2b8366480147#ad8f3729d2c24ba5a3bda5c8865a2b8366480147" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" [[package]] name = "unicode-ccc" @@ -8169,7 +8170,7 @@ checksum = "ce61d488bcdc9bc8b5d1772c404828b17fc481c0a582b5581e95fb233aef503e" [[package]] name = "unicode-ident" version = "1.0.22" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=ad8f3729d2c24ba5a3bda5c8865a2b8366480147#ad8f3729d2c24ba5a3bda5c8865a2b8366480147" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" [[package]] name = "unicode-ident" @@ -8180,7 +8181,7 @@ checksum = "e6e4313cd5fcd3dad5cafa179702e2b244f760991f45397d14d4ebf38247da75" [[package]] name = "unicode-linebreak" version = "0.1.5" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=ad8f3729d2c24ba5a3bda5c8865a2b8366480147#ad8f3729d2c24ba5a3bda5c8865a2b8366480147" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" [[package]] name = "unicode-normalization" @@ -8200,7 +8201,7 @@ checksum = "7df058c713841ad818f1dc5d3fd88063241cc61f49f5fbea4b951e8cf5a8d71d" [[package]] name = "unicode-properties" version = "0.1.4" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=ad8f3729d2c24ba5a3bda5c8865a2b8366480147#ad8f3729d2c24ba5a3bda5c8865a2b8366480147" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" [[package]] name = "unicode-script" @@ -8211,12 +8212,12 @@ checksum = "383ad40bb927465ec0ce7720e033cb4ca06912855fc35db31b5755d0de75b1ee" [[package]] name = "unicode-script" version = "0.5.8" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=ad8f3729d2c24ba5a3bda5c8865a2b8366480147#ad8f3729d2c24ba5a3bda5c8865a2b8366480147" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" [[package]] name = "unicode-segmentation" version = "1.12.0" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=ad8f3729d2c24ba5a3bda5c8865a2b8366480147#ad8f3729d2c24ba5a3bda5c8865a2b8366480147" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" [[package]] name = "unicode-segmentation" @@ -8464,7 +8465,7 @@ dependencies = [ [[package]] name = "wayland-backend" version = "0.3.12" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=ad8f3729d2c24ba5a3bda5c8865a2b8366480147#ad8f3729d2c24ba5a3bda5c8865a2b8366480147" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" dependencies = [ "downcast-rs", "scoped-tls", @@ -8475,7 +8476,7 @@ dependencies = [ [[package]] name = "wayland-client" version = "0.31.12" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=ad8f3729d2c24ba5a3bda5c8865a2b8366480147#ad8f3729d2c24ba5a3bda5c8865a2b8366480147" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" dependencies = [ "bitflags 2.10.0", "wayland-backend", @@ -8485,7 +8486,7 @@ dependencies = [ [[package]] name = "wayland-egl" version = "0.32.9" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=ad8f3729d2c24ba5a3bda5c8865a2b8366480147#ad8f3729d2c24ba5a3bda5c8865a2b8366480147" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" dependencies = [ "wayland-backend", "wayland-sys", @@ -8494,7 +8495,7 @@ dependencies = [ [[package]] name = "wayland-protocols" version = "0.32.10" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=ad8f3729d2c24ba5a3bda5c8865a2b8366480147#ad8f3729d2c24ba5a3bda5c8865a2b8366480147" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" dependencies = [ "bitflags 2.10.0", "wayland-backend", @@ -8504,7 +8505,7 @@ dependencies = [ [[package]] name = "wayland-sys" version = "0.31.8" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=ad8f3729d2c24ba5a3bda5c8865a2b8366480147#ad8f3729d2c24ba5a3bda5c8865a2b8366480147" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" dependencies = [ "makepad-error-log", "pkg-config 0.3.32", @@ -8585,7 +8586,7 @@ checksum = "a28ac98ddc8b9274cb41bb4d9d4d5c425b6020c50c46f25559911905610b4a88" [[package]] name = "weezl" version = "0.1.12" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=ad8f3729d2c24ba5a3bda5c8865a2b8366480147#ad8f3729d2c24ba5a3bda5c8865a2b8366480147" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" [[package]] name = "which" @@ -8689,11 +8690,11 @@ dependencies = [ [[package]] name = "windows" version = "0.62.2" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=ad8f3729d2c24ba5a3bda5c8865a2b8366480147#ad8f3729d2c24ba5a3bda5c8865a2b8366480147" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" dependencies = [ - "windows-collections 0.3.2 (git+https://github.com/OctoSense-org/makepad.git?rev=ad8f3729d2c24ba5a3bda5c8865a2b8366480147)", - "windows-core 0.62.2 (git+https://github.com/OctoSense-org/makepad.git?rev=ad8f3729d2c24ba5a3bda5c8865a2b8366480147)", - "windows-future 0.3.2 (git+https://github.com/OctoSense-org/makepad.git?rev=ad8f3729d2c24ba5a3bda5c8865a2b8366480147)", + "windows-collections 0.3.2 (git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f)", + "windows-core 0.62.2 (git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f)", + "windows-future 0.3.2 (git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f)", ] [[package]] @@ -8708,9 +8709,9 @@ dependencies = [ [[package]] name = "windows-collections" version = "0.3.2" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=ad8f3729d2c24ba5a3bda5c8865a2b8366480147#ad8f3729d2c24ba5a3bda5c8865a2b8366480147" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" dependencies = [ - "windows-core 0.62.2 (git+https://github.com/OctoSense-org/makepad.git?rev=ad8f3729d2c24ba5a3bda5c8865a2b8366480147)", + "windows-core 0.62.2 (git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f)", ] [[package]] @@ -8753,11 +8754,11 @@ dependencies = [ [[package]] name = "windows-core" version = "0.62.2" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=ad8f3729d2c24ba5a3bda5c8865a2b8366480147#ad8f3729d2c24ba5a3bda5c8865a2b8366480147" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" dependencies = [ - "windows-link 0.2.1 (git+https://github.com/OctoSense-org/makepad.git?rev=ad8f3729d2c24ba5a3bda5c8865a2b8366480147)", - "windows-result 0.4.1 (git+https://github.com/OctoSense-org/makepad.git?rev=ad8f3729d2c24ba5a3bda5c8865a2b8366480147)", - "windows-strings 0.5.1 (git+https://github.com/OctoSense-org/makepad.git?rev=ad8f3729d2c24ba5a3bda5c8865a2b8366480147)", + "windows-link 0.2.1 (git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f)", + "windows-result 0.4.1 (git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f)", + "windows-strings 0.5.1 (git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f)", ] [[package]] @@ -8774,9 +8775,9 @@ dependencies = [ [[package]] name = "windows-future" version = "0.3.2" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=ad8f3729d2c24ba5a3bda5c8865a2b8366480147#ad8f3729d2c24ba5a3bda5c8865a2b8366480147" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" dependencies = [ - "windows-core 0.62.2 (git+https://github.com/OctoSense-org/makepad.git?rev=ad8f3729d2c24ba5a3bda5c8865a2b8366480147)", + "windows-core 0.62.2 (git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f)", ] [[package]] @@ -8854,7 +8855,7 @@ checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5" [[package]] name = "windows-link" version = "0.2.1" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=ad8f3729d2c24ba5a3bda5c8865a2b8366480147#ad8f3729d2c24ba5a3bda5c8865a2b8366480147" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" [[package]] name = "windows-numerics" @@ -8898,9 +8899,9 @@ dependencies = [ [[package]] name = "windows-result" version = "0.4.1" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=ad8f3729d2c24ba5a3bda5c8865a2b8366480147#ad8f3729d2c24ba5a3bda5c8865a2b8366480147" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" dependencies = [ - "windows-link 0.2.1 (git+https://github.com/OctoSense-org/makepad.git?rev=ad8f3729d2c24ba5a3bda5c8865a2b8366480147)", + "windows-link 0.2.1 (git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f)", ] [[package]] @@ -8915,9 +8916,9 @@ dependencies = [ [[package]] name = "windows-strings" version = "0.5.1" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=ad8f3729d2c24ba5a3bda5c8865a2b8366480147#ad8f3729d2c24ba5a3bda5c8865a2b8366480147" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" dependencies = [ - "windows-link 0.2.1 (git+https://github.com/OctoSense-org/makepad.git?rev=ad8f3729d2c24ba5a3bda5c8865a2b8366480147)", + "windows-link 0.2.1 (git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f)", ] [[package]] @@ -9323,7 +9324,7 @@ dependencies = [ [[package]] name = "zerocopy" version = "0.8.39" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=ad8f3729d2c24ba5a3bda5c8865a2b8366480147#ad8f3729d2c24ba5a3bda5c8865a2b8366480147" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" [[package]] name = "zerocopy" diff --git a/Cargo.toml b/Cargo.toml index 065c8623..de7ada6d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -41,19 +41,19 @@ path = "src/main.rs" libc = "0.2" # `appcard,maps`: the Octoscript-AppCard widget set (kit, text roles, weather, # finance, matplot) and the map navigation layer the appcard module renders. -makepad-widgets = { git = "https://github.com/OctoSense-org/makepad.git", rev = "ad8f3729d2c24ba5a3bda5c8865a2b8366480147", features = ["appcard", "maps"] } -makepad-studio-protocol = { git = "https://github.com/OctoSense-org/makepad.git", rev = "ad8f3729d2c24ba5a3bda5c8865a2b8366480147" } -makepad-network = { git = "https://github.com/OctoSense-org/makepad.git", rev = "ad8f3729d2c24ba5a3bda5c8865a2b8366480147" } -makepad-wm-api = { git = "https://github.com/OctoSense-org/makepad.git", rev = "ad8f3729d2c24ba5a3bda5c8865a2b8366480147" } +makepad-widgets = { git = "https://github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", features = ["appcard", "maps"] } +makepad-studio-protocol = { git = "https://github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f" } +makepad-network = { git = "https://github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f" } +makepad-wm-api = { git = "https://github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f" } # The AI services wire only: the WM relays frames between the aichat child and the apps. -makepad-ai-services = { git = "https://github.com/OctoSense-org/makepad.git", rev = "ad8f3729d2c24ba5a3bda5c8865a2b8366480147" } -makepad-strict-json = { git = "https://github.com/OctoSense-org/makepad.git", rev = "ad8f3729d2c24ba5a3bda5c8865a2b8366480147" } +makepad-ai-services = { git = "https://github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f" } +makepad-strict-json = { git = "https://github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f" } # In-process hosting (aicontrol §3): the module contract, the palette applied # into each instance's isolate, and the modules this build links. -makepad-app-module = { git = "https://github.com/OctoSense-org/makepad.git", rev = "ad8f3729d2c24ba5a3bda5c8865a2b8366480147" } -makepad-wm-theme = { git = "https://github.com/OctoSense-org/makepad.git", rev = "ad8f3729d2c24ba5a3bda5c8865a2b8366480147" } -makepad-sheets = { git = "https://github.com/OctoSense-org/makepad.git", rev = "ad8f3729d2c24ba5a3bda5c8865a2b8366480147", default-features = false, optional = true } -makepad-photos = { git = "https://github.com/OctoSense-org/makepad.git", rev = "ad8f3729d2c24ba5a3bda5c8865a2b8366480147", default-features = false, optional = true } +makepad-app-module = { git = "https://github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f" } +makepad-wm-theme = { git = "https://github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f" } +makepad-sheets = { git = "https://github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", default-features = false, optional = true } +makepad-photos = { git = "https://github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", default-features = false, optional = true } octosense-reference = { path = "apps/reference", optional = true } # The whole Octoscript-AppCard app hosted in a tile, in-process (Phase B of # the AppCard port): octos-app's AppShell — routing brain, cards, kernel agent. @@ -61,15 +61,15 @@ octosense-appcard = { path = "apps/appcard", optional = true } # The assistant as a module, seated in the pane in-process: the web build's # only chat, a desktop option. Without the engine feature: no model runtime, # NoModel and the tool console (the child process keeps the real models). -makepad-aichat = { git = "https://github.com/OctoSense-org/makepad.git", rev = "ad8f3729d2c24ba5a3bda5c8865a2b8366480147", default-features = false, optional = true } +makepad-aichat = { git = "https://github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", default-features = false, optional = true } # A phone cannot spawn the desktop catalog's Cargo binaries. Link the # available modules into native mobile builds without requiring CLI flags. [target.'cfg(any(target_os = "android", target_os = "ios"))'.dependencies] octosense-reference = { path = "apps/reference" } octosense-appcard = { path = "apps/appcard" } -makepad-sheets = { git = "https://github.com/OctoSense-org/makepad.git", rev = "ad8f3729d2c24ba5a3bda5c8865a2b8366480147", default-features = false } -makepad-photos = { git = "https://github.com/OctoSense-org/makepad.git", rev = "ad8f3729d2c24ba5a3bda5c8865a2b8366480147", default-features = false } +makepad-sheets = { git = "https://github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", default-features = false } +makepad-photos = { git = "https://github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", default-features = false } [features] default = [] @@ -104,7 +104,7 @@ opt-level = 1 # one makepad lineage this workspace pins, so the graph has a single # makepad-widgets (a second one would make every widget type mismatch). [patch."https://github.com/ZhangHanDong/makepad.git"] -makepad-widgets = { git = "https://github.com/OctoSense-org/makepad.git", rev = "ad8f3729d2c24ba5a3bda5c8865a2b8366480147" } +makepad-widgets = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f" } [profile.release] # cargo-makepad builds Android with `-C prefer-dynamic` (libstd as a bundled @@ -114,3 +114,130 @@ makepad-widgets = { git = "https://github.com/OctoSense-org/makepad.git", rev = # Octoscript-AppCard's app/Cargo.toml documents. lto = false panic = "unwind" + +# One makepad lineage. `octos-app` (Octoscript-AppCard) pins makepad ad8f372 in +# its own manifest; a patch cannot point a source at another rev of itself, so +# every crate of this URL (the workspace's and octos-app's) resolves through the +# www host alias of the same repository, at the workspace pin. +[patch."https://github.com/OctoSense-org/makepad.git"] +ab_glyph_rasterizer = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=0.1.8" } +arrayvec = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=0.7.6" } +ash = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=0.38.0+1.3.281" } +bit-set = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=0.8.0" } +bit-vec = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=0.8.0" } +bitflags = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=2.10.0" } +bytemuck = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=1.25.0" } +byteorder = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=1.5.0" } +cfg-if = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=1.0.4" } +cfg_aliases = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=0.2.1" } +crunchy = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=0.2.4" } +downcast-rs = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=1.2.1" } +equivalent = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=1.0.2" } +foldhash = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=0.2.0" } +fxhash = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=0.2.1" } +hashbrown = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=0.16.1" } +hexf-parse = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=0.2.1" } +i_float = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=3.0.0" } +i_key_sort = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=0.11.0" } +i_overlay = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=7.0.3" } +i_shape = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=3.0.0" } +i_tree = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=0.19.0" } +indexmap = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=2.13.0" } +libloading = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=0.8.9" } +makepad-ai = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=1.0.0" } +makepad-ai-services = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=0.1.0" } +makepad-aichat = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=0.1.0" } +makepad-app-module = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=0.1.0" } +makepad-apple-sys = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=1.0.0" } +makepad-byteorder-lite = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=0.1.0" } +makepad-code-editor = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=2.0.0" } +makepad-derive-wasm-bridge = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=1.0.0" } +makepad-derive-widget = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=2.0.0" } +makepad-draw = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=2.0.0" } +makepad-error-log = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=1.0.0" } +makepad-fast-inflate = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=0.1.0" } +makepad-filesystem-watcher = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=0.1.0" } +makepad-futures = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=1.0.0" } +makepad-futures-legacy = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=1.0.0" } +makepad-gif = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=0.1.0" } +makepad-git = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=0.1.0" } +makepad-half = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=2.7.1" } +makepad-html = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=1.0.0" } +makepad-image-tiles = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=0.1.0" } +makepad-latex-math = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=0.1.0" } +makepad-live-id = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=1.0.0" } +makepad-live-id-macros = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=1.0.0" } +makepad-live-reload-core = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=0.1.0" } +makepad-math = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=1.0.0" } +makepad-mbtile-reader = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=1.0.0" } +makepad-micro-proc-macro = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=1.0.0" } +makepad-micro-serde = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=1.0.0" } +makepad-micro-serde-derive = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=1.0.0" } +makepad-network = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=1.0.0" } +makepad-objc-sys = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=1.0.0" } +makepad-pdf-parse = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=1.0.0" } +makepad-photos = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=0.1.0" } +makepad-platform = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=2.0.0" } +makepad-platform-video = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=1.0.0" } +makepad-regex = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=0.1.0" } +makepad-script = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=1.0.0" } +makepad-script-derive = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=1.0.0" } +makepad-script-std = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=1.0.0" } +makepad-shared-bytes = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=1.0.0" } +makepad-sheets = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=0.1.0" } +makepad-sqlite = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=1.0.0" } +makepad-stitch = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=0.1.0" } +makepad-strict-json = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=0.1.0" } +makepad-studio-protocol = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=0.1.0" } +makepad-svg = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=1.0.0" } +makepad-tsdf = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=0.1.0" } +makepad-wasm-bridge = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=1.0.0" } +makepad-webp = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=0.2.4" } +makepad-widgets = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=2.0.0" } +makepad-wm-api = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=0.1.0" } +makepad-wm-theme = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=0.1.0" } +makepad-zune-bmp = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=0.5.2" } +makepad-zune-core = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=0.5.1" } +makepad-zune-inflate = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=0.2.54" } +makepad-zune-jpeg = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=0.5.15" } +makepad-zune-png = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=0.5.2" } +makepad-zune-qoi = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=0.5.2" } +memchr = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=2.7.6" } +naga = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=27.0.3" } +num-traits = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=0.2.20" } +once_cell = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=1.21.3" } +pkg-config = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=0.3.32" } +pulldown-cmark = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=0.12.2" } +rustc-hash = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=1.1.0" } +rustybuzz = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=0.18.0" } +scoped-tls = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=1.0.1" } +sdfer = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=0.2.1" } +simd-adler32 = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=0.3.9" } +smallvec = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=1.15.1" } +spirv = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=0.3.0+sdk-1.3.268.0" } +thiserror = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=2.0.18" } +thiserror-impl = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=2.0.18" } +ttf-parser = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=0.24.1" } +unicase = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=2.9.0" } +unicode-bidi = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=0.3.18" } +unicode-bidi-mirroring = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=0.3.0" } +unicode-ccc = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=0.3.0" } +unicode-ident = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=1.0.22" } +unicode-linebreak = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=0.1.5" } +unicode-properties = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=0.1.4" } +unicode-script = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=0.5.8" } +unicode-segmentation = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=1.12.0" } +wayland-backend = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=0.3.12" } +wayland-client = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=0.31.12" } +wayland-egl = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=0.32.9" } +wayland-protocols = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=0.32.10" } +wayland-sys = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=0.31.8" } +weezl = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=0.1.12" } +windows = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=0.62.2" } +windows-collections = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=0.3.2" } +windows-core = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=0.62.2" } +windows-future = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=0.3.2" } +windows-link = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=0.2.1" } +windows-result = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=0.4.1" } +windows-strings = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=0.5.1" } +zerocopy = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=0.8.39" } diff --git a/apps/appcard/Cargo.toml b/apps/appcard/Cargo.toml index 120a1c17..e3037f0d 100644 --- a/apps/appcard/Cargo.toml +++ b/apps/appcard/Cargo.toml @@ -5,8 +5,8 @@ edition = "2021" publish = false [dependencies] -makepad-widgets = { git = "https://github.com/OctoSense-org/makepad.git", rev = "ad8f3729d2c24ba5a3bda5c8865a2b8366480147", features = ["appcard", "maps"] } -makepad-app-module = { git = "https://github.com/OctoSense-org/makepad.git", rev = "ad8f3729d2c24ba5a3bda5c8865a2b8366480147" } +makepad-widgets = { git = "https://github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", features = ["appcard", "maps"] } +makepad-app-module = { git = "https://github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f" } # The whole Octoscript-AppCard app as a library: routing brain, card store and # transport, L0 lowering, sessions, composer, kernel agent — mounted here as # its `AppShell` widget. No default features: the app's own entry points diff --git a/apps/reference/Cargo.toml b/apps/reference/Cargo.toml index 96cb2b8a..cb9c6012 100644 --- a/apps/reference/Cargo.toml +++ b/apps/reference/Cargo.toml @@ -5,5 +5,5 @@ edition = "2021" publish = false [dependencies] -makepad-widgets = { git = "https://github.com/OctoSense-org/makepad.git", rev = "ad8f3729d2c24ba5a3bda5c8865a2b8366480147" } -makepad-app-module = { git = "https://github.com/OctoSense-org/makepad.git", rev = "ad8f3729d2c24ba5a3bda5c8865a2b8366480147" } +makepad-widgets = { git = "https://github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f" } +makepad-app-module = { git = "https://github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f" } From f9e254c617e3686bbe521b6435584b3cbe83e733 Mon Sep 17 00:00:00 2001 From: ymote <151983+ymote@users.noreply.github.com> Date: Mon, 14 Sep 2026 23:42:35 -0700 Subject: [PATCH 7/7] docs: a third column, the makepad idle fix and the transition fixes Root cause of the ~56 presents/s on an idle phone (the unpolled GL completion fence), the forked `date` behind the idle CPU, the upside-down backdrop, the Android draw/wait/gc split of the transition frames, the per-scenario tables (burst-aware SurfaceFlinger stats with GPU-ready latency, monitor channels), and the A/B evidence of what still blocks 55 fps on the shade and swipes. Co-Authored-By: Claude Opus 5 (1M context) --- docs/perf-mobile-shell.md | 188 +++++++++++++++++++++++++++++++++++++- 1 file changed, 184 insertions(+), 4 deletions(-) diff --git a/docs/perf-mobile-shell.md b/docs/perf-mobile-shell.md index 4293b737..87f451e8 100644 --- a/docs/perf-mobile-shell.md +++ b/docs/perf-mobile-shell.md @@ -1,4 +1,4 @@ -# Mobile shell perf — baseline vs perf (OnePlus 6T) +# Mobile shell perf — baseline vs perf vs the idle-repaint fix (OnePlus 6T) Device: OnePlus 6T (ONEPLUS A6013), Snapdragon 845, 1080×2340 @ 60 Hz, over USB (`bf0a4730`). Both builds sit on `fix/hosted-appcard-mobile` @ fedd802 (PR #24): @@ -91,7 +91,7 @@ scenes/s = phone scenes the shell drew; repaints/s = window repaints the rendere - Neither does drawing a single flat quad for the whole scene (desktop repro). - No drawn shader reads the pass time. -This is **upstream** (the makepad fork) and unresolved here. +This is **upstream** (the makepad fork). Resolved in the third column below. ### What the shell controls **The cost of each forced repaint.** @@ -99,7 +99,11 @@ This is **upstream** (the makepad fork) and unresolved here. - **Perf:** the window pass alone. The census's hot list on idle Home is `pass#15/window` only. ### Why the 66 ms frames on the App screen remain -The idle App screen (17–18 presents/s, every interval ≥ 33 ms) is the hosted AppCard presenting on its own. Its frames are in makepad's repaint path, not the shell's (1 scene/s on both builds). +The idle App screen (17–18 presents/s, every interval ≥ 33 ms) looked like the hosted AppCard presenting on its own. The shell drew 1 scene/s on both builds. + +**Corrected by the third column.** These frames were makepad's forced repaint, not the module: +- **Every forced repaint re-encoded the whole window's gauss pyramid.** The module's kit glass had requested it. +- **Idle App screen with the idle fix:** 1.0 presents/s at 3 % CPU. ## Visual check Home, shade (pulled open) and Recents were captured on both builds with the monitor off: @@ -108,7 +112,183 @@ Home, shade (pulled open) and Recents were captured on both builds with the moni They match, apart from the wallpaper's drift position. -**A flip that is not a regression.** On both builds the frosted backdrop under the shade and the Recents overview samples the scene **upside down**: a mirrored clock and mirrored tiles show through at the bottom. It is identical on the baseline, so it predates these commits. It is the GL snapshot orientation the desk code already notes ("the final-glass snapshot is upside down on GL"), and it is left for a separate fix. +**A flip that is not a regression.** On both builds the frosted backdrop under the shade and the Recents overview samples the scene **upside down**: a mirrored clock and mirrored tiles show through at the bottom. It is identical on the baseline, so it predates these commits. It is the GL snapshot orientation the desk code already notes ("the final-glass snapshot is upside down on GL"). Fixed in the third column below. + +## Third column — the makepad idle fix and the transition fixes (`perf/android-idle-repaint`) + +The third build is `perf/mobile-shell` plus: +- the makepad fork at `fix/android-idle-repaint` (OctoSense-org/makepad#6); +- five shell commits: the in-process clock, the fork-side flip replacing the GL override, a module's glass scoped to its capture, the capture freeze while an app zooms open, and a one-branch wallpaper shader. + +It is measured with `perf_scenarios3.sh round3`, the same 13 scenarios with the monitor verified on. Raw data is in `scratchpad/perf-round3.txt` and `perf-round3/`, and the tables come from `perf_tables3.py`. + +### Why the display kept getting ~56 frames/s: the unpolled GL completion fence +The completed-serial counter on GL only moves when `poll_texture_lifetimes` polls the completion fence, and the GL render path never called it. Its only callers were `frame_completion_serial()` and texture release. + +**The effect, step by step.** +1. Every released retained-upload allocation record (`submitted > completed`) stayed in the ledger forever. +2. `has_pending_instance_retirements()` never went false. +3. `render_view` set `demo_time_repaint` on every render (`platform/src/os/linux/opengl.rs:409` at ad8f372). +4. Every live pass repainted on the next vsync. + +**Why macOS settles.** Metal command-buffer completion handlers advance the counter on their own. + +**A diagnostic build on the phone.** After 953 submissions of an idle Home: `completed=0 records=598 terms=allocations fence_fns=false`. The fence functions had never been resolved. + +**The fix.** +- `render_view` polls the fence. +- `eglGetCurrentContext` comes from libEGL, because Android's `eglGetProcAddress` resolves extension entry points only. +- On Android, retirement debt is served on an idle vsync beat without painting, like the macOS maintenance beat. + +**Result.** +| screen | before | after | +|---|---|---| +| idle Home | 56 presents/s | 1.0 presents/s (the clock tick) | +| idle hosted-AppCard screen (17.5 fps with every frame > 33 ms before; not the module's own cost) | 18.6 presents/s | 1.0 presents/s | +| idle Recents | 33.7 presents/s | 1.2 presents/s | +| idle group | 44.1 presents/s | 1.0 presents/s | + +### Idle CPU: a forked `date` +**After the renderer fix, idle Home still used 19 % of a core.** Per-thread `/proc` ticks put 11 % on `wm-status`: the status sampler forked `date` twice a second. `localtime_r` + `strftime` replace it. + +**Idle Home CPU:** +| stage | CPU | +|---|---| +| perf | 43 % | +| fork fix alone | 19 % | +| with the clock fix | 3–8 % | + +The rest is the main loop waking on every Choreographer vsync to find nothing to paint (~5 %) and the Java UI thread (~2 %). + +### The frosted backdrop was upside down +The fork's GL backend has rendered offscreen passes top-left since d1a0eb1cb. `gauss_render_texture_y_flip_for_os` still returned a V flip of 1.0 on Android, so every glass shader sampled the pyramid mirrored. + +**Fixed in the fork.** The flip is 0 on every backend. The shell's `DrawGaussScene` override (`octosense/android_rendering.rs`) is gone. + +**Verified.** The clock behind the shade and Recents reads upright (`scratchpad/perf-round2/visual-{shade,recents}.png`). + +### What the transition frames were made of +Android had no platform channels, so the fork adds `draw` (pass encode), `wait` (`eglSwapBuffers`) and `gc` to the frame monitor. SurfaceFlinger's third `--latency` column (the acquire fence) gives a GPU-ready latency per frame. + +**On the idle-fix build, transitions are GPU-bound, not CPU-bound.** +| scenario | burst fps | CPU draw (ms, mean) | CPU shell (ms, mean) | eglSwapBuffers wait (ms, mean / worst) | GPU-ready p50 | +|---|---|---|---|---|---| +| open-app | 17–20 | 9.8 | home 11.6, module 14 | 25.5 / 124 | 94 ms | +| shade | 25–30 | 5.9 | shade 1.9 | 15.3 / 92 | — | +| Recents hold | 33 | — | — | — | 41 ms | + +`draw` is the pass encode and the shell columns are its own channels; all of them are CPU time. + +**Two costs the census exposed.** +- **The hosted module's kit glass requested the whole WM window's gauss pyramid.** `gauss_mip_*` on the window appeared in the hot list on open-app and on every idle App tick: a full-screen scene pass, a copy and six levels. `WindowFrame` now carries a `CaptureGauss`, as the fork's own WM does. +- **The foreground app's full capture was re-recorded on every frame of the zoom-open animation.** It now zooms its last capture and refreshes once settled. +- **Also:** the wallpaper shader computed both styles per pixel, full screen, and now branches. + +**Open-app improved from 17–20 fps to 31.5** (p50 16.6 ms). Every other transition is still short of the ≥ 55 fps / p95 ≤ 20 ms target; see below. + +## Table 3 — SurfaceFlinger, perf (Table 1) vs round3 + +Burst stats exclude intervals of 250 ms or more (idle gaps and the 1 s clock tick): once an idle screen presents ~1/s, whole-window stats measure the idle gap, not the animation. GPU-ready = queue → acquire-fence signal, per burst frame. + +| scenario | perf presents/s | perf p50/p95 ms | perf >16.7 / >33 | round3 presents/s | round3 burst fps | round3 burst p50/p95/max ms | round3 >16.7 / >33 | round3 GPU-ready p50/p95 ms | +|---|---|---|---|---|---|---|---|---| +| idle-home | 56.2 | 16.6 / 33.1 | 24/448 · 5/448 | 1.0 | — | no burst | — | — | +| open-app(tap AppCard icon) | 27.3 | 16.7 / 66.6 | 46/108 · 43/108 | 6.0 | 31.5 | 16.6 / 49.9 / 199.6 | 6/22 · 5/22 | 17.2 / 121.4 | +| idle-app-screen | 18.6 | 49.9 / 66.9 | 147/147 · 146/147 | 1.0 | — | no burst | — | — | +| swipe-up-home | 40.6 | 16.6 / 66.4 | 36/161 · 30/161 | 7.5 | 40.1 | 16.7 / 33.3 / 66.5 | 11/26 · 1/26 | 37.5 / 44.7 | +| shade-pull+close | 41.1 | 16.7 / 50.0 | 66/204 · 27/204 | 10.2 | 33.7 | 33.3 / 49.9 / 99.8 | 24/46 · 8/46 | 39.8 / 123.7 | +| page-swipe(right then back) | 55.3 | 16.6 / 16.8 | 9/275 · 7/275 | 7.0 | 50.1 | 16.6 / 16.8 / 116.4 | 1/30 · 1/30 | 17.3 / 21.6 | +| recents(swipe-up-hold) | 39.9 | 16.7 / 33.6 | 81/198 · 7/198 | 15.6 | 36.0 | 33.3 / 33.3 / 83.2 | 46/73 · 1/73 | 37.2 / 48.4 | +| recents-idle | 33.7 | 33.3 / 49.9 | 92/133 · 10/133 | 1.2 | 60.1 | 16.6 / 16.6 / 16.6 | 0/1 · 0/1 | 77.4 / 77.4 | +| recents-to-home | 48.6 | 16.6 / 33.5 | 36/193 · 6/193 | 6.2 | 34.1 | 16.6 / 33.3 / 149.7 | 9/21 · 1/21 | 30.1 / 81.2 | +| island-demo(triple-tap clock) | 52.9 | 16.6 / 33.3 | 22/316 · 9/316 | 5.5 | 55.7 | 16.6 / 33.2 / 33.3 | 2/25 · 0/25 | 18.3 / 24.3 | +| group-open(tap Work) | 47.3 | 16.6 / 33.5 | 38/188 · 6/188 | 26.8 | 52.6 | 16.6 / 33.3 / 49.9 | 13/105 · 2/105 | 22.5 / 39.2 | +| group-idle | 44.1 | 16.6 / 49.9 | 46/175 · 11/175 | 1.0 | — | no burst | — | — | +| group-close(tap scrim) | 53.7 | 16.6 / 33.3 | 18/160 · 1/160 | 6.0 | 37.6 | 16.6 / 83.2 / 83.2 | 5/15 · 2/15 | 17.0 / 56.6 | + +CPU after *idle-home*: perf 43.0 % · round3 3.0 % +CPU after *idle-app-screen*: perf 34.0 % · round3 3.0 % + +## Table 4 — frame monitor channels on round3 (busy windows, mean/worst ms per shell frame) + +| scenario | gap p50/p95/max ms (>16.7·>33) | channels | +|---|---|---| +| idle-home | idle | idle | +| open-app(tap AppCard icon) | 16.7 / 168.2 / 176.5 (8·5) | event 13.0/247, draw 9.0/15, wait 11.0/122, home 1.8/5, module 6.1/139, overlay 0.1/1 | +| idle-app-screen | idle | idle | +| swipe-up-home | 23.5 / 142.2 / 293.5 (24·2) | event 3.1/24, draw 3.1/6, wait 13.2/21, home 2.2/4, module 0.0/0, glass 0.0/0, overlay 0.3/3 | +| shade-pull+close | 39.0 / 45.5 / 104.2 (27·23) | event 6.4/48, draw 5.7/10, wait 14.9/92, home 3.9/10, glass 0.0/0, overlay 0.1/0, shade 1.6/32 | +| page-swipe(right then back) | 15.6 / 28.8 / 120.4 (9·1) | event 8.9/61, draw 3.9/8, wait 2.9/9, home 2.8/20, overlay 0.0/0 | +| recents(swipe-up-hold) | 27.4 / 233.1 / 466.8 (75·3) | event 11.3/53, draw 6.1/15, wait 10.5/63, home 1.0/4, glass 0.1/1, overlay 0.6/2, groups 0.1/10 | +| recents-idle | 29.9 / 29.9 / 29.9 (1·0) | event 38.6/53, draw 7.0/9, wait 1.4/2, home 6.4/12, glass 0.2/0, overlay 1.5/3, groups 0.1/0 | +| recents-to-home | 23.9 / 78.9 / 166.1 (20·2) | event 12.7/52, draw 4.4/9, wait 8.5/64, home 4.1/7, glass 0.1/0, overlay 0.7/4, groups 0.0/0 | +| island-demo(triple-tap clock) | 18.5 / 313.2 / 364.0 (9·2) | event 13.4/56, draw 4.3/7, wait 2.7/14, home 4.6/10, overlay 0.6/11 | +| group-open(tap Work) | 20.6 / 58.7 / 58.7 (59·4) | event 5.0/53, draw 3.6/8, wait 5.6/42, home 3.6/9, glass 0.0/0, overlay 0.4/1, groups 0.3/11 | +| group-idle | idle | idle | +| group-close(tap scrim) | 17.8 / 99.2 / 99.2 (8·5) | event 13.2/60, draw 6.5/14, wait 4.0/19, home 5.5/10, glass 0.0/0, overlay 0.5/1, groups 1.0/2 | + +### What still blocks 55 fps on shade, Recents and the swipe home +**The A/B test.** A temporary build read \`debug.octosense.ab\` on every scene draw, so parts of the frame could be switched off from adb: +- \`flatwall\`: a flat fill instead of the wallpaper shader; +- \`noglass\`: no compositor, so no gauss scene, copy or pyramid; +- \`nohome\`: no home page. + +**Results.** Fresh launch, empty Recents, two repetitions per set; burst fps with p95 in ms. + +| switches | shade | Recents hold | Recents → Home | +|---|---|---|---| +| none | 25–43 (50–150) | 48–56 (17–33) | 35–44 (33–50) | +| flatwall | 41–43 (50–67) | 53–56 (33) | 46 (33) | +| noglass | 32–42 (50–133) | 52–56 (33) | 44–46 (33) | +| nohome | 42–43 (50) | 55–57 (17–33) | 28–48 (33–216) | +| flatwall + noglass | 37–44 (50–83) | 51–56 (33) | 41–46 (33–50) | + +**Full-screen GPU content is not what holds these frames.** Removing the wallpaper shader, the whole backdrop compositor, or the home page moves nothing beyond run-to-run noise. + +**Second run, with the AppCard card in Recents** (as in the harness), monitor off: + +| switches | Recents hold | Recents → Home | shade | +|---|---|---|---| +| none (twice) | 52–56 (33) | 23–46 (33–216) | 33–44 (50) | +| flatwall | 51–56 (33) | 44–45 (33) | 38–41 (50–67) | +| noglass | 51–54 (33) | 34–44 (33–50) | 27–43 (33–233) | +| nohome | 53–53 (33) | 47–48 (33) | 44 (33–50) | +| flatwall + noglass | 54 (33) | 34–44 (33–50) | 31–42 (67–133) | + +The card changes nothing either. + +**The monitor distorts one scenario.** With the monitor off, the Recents hold runs at 52–56 fps, against 36 fps in round 3, where the monitor and PerfGraph were on. PerfGraph asks for a next frame on every draw and adds its own full-width graph, so the round-3 Recents-hold column understates the monitor-off build. + +**The shade doesn't have that excuse.** It stays at 33–44 fps with p95 50 ms, monitor on or off, with or without GPU content. + +**Where the slow frames sit.** Per-frame intervals from \`perf-round3/*.presents\`: +- **Animation-driven phases already present at 16.6 ms:** the shade's settle, Home after a swipe, the island, the group window. +- **The first frame of a transition** is 67–150 ms, sometimes two frames. +- **The finger phase** runs 33/33/50 ms on the shade pull, or alternating 16.7/33 ms on the swipe home and the Recents hold. + +**Each alternating frame misses the vsync on the main thread, not on the GPU.** The frame monitor on round 3 during the Recents hold: + +| channel | ms per frame (mean) | +|---|---| +| \`event\` (the shell's event and draw recording) | 11.3 | +| \`draw\` (pass encode) | 6.1 | +| \`wait\` (\`eglSwapBuffers\`) | 10.5 | +| **total** | **≈ 28**, against a 16.7 ms budget | + +The shell's own draw channels account for only ~2 ms of \`event\` (home 1.0, overlay 0.6, glass 0.1), so ~9 ms of per-frame scene recording is unattributed. + +**Next step:** a CPU profile of that recording plus the swap, which needs a debuggable build for \`simpleperf\`; the release APK's perf events are denied. The first-frame spikes line up with the monitor's worst \`event\` (48–80 ms) and \`wait\` (63–122 ms) frames at a transition's start. + +**Targets met on round 3:** +- idle Home, Recents and group windows: ≈ 1 present/s; +- open-app: p50 16.6 ms (31.5 fps, p95 50 ms); +- page swipe: 50 fps, p95 16.8 ms. + +**Targets not met:** +- shade: 34 fps, p95 50 ms; +- Recents hold: 36 fps, p95 33 ms, with the AppCard card present; +- swipe home: 40 fps, p95 33 ms; +- Recents → Home: 34 fps, p95 33 ms. ## Device housekeeping - **What the run changed.** It set `svc power stayon true` and `settings put system screen_off_timeout 1800000`.