From 9935fdf8cc7387fba5bddcfa753e8d5a5d63e5bd Mon Sep 17 00:00:00 2001 From: Waozi Date: Thu, 19 Nov 2026 14:48:44 -0300 Subject: [PATCH] Preserve Practice transitions and align the signed ZX build --- CHANGELOG.md | 2 +- droid/app/src/main/cpp/CMakeLists.txt | 21 +++-- locales/changelog/cs.md | 2 +- locales/changelog/de.md | 2 +- locales/changelog/es.md | 2 +- locales/changelog/fr.md | 2 +- locales/changelog/ja.md | 2 +- locales/changelog/ko.md | 2 +- locales/changelog/pt.md | 2 +- locales/changelog/ru.md | 2 +- locales/changelog/zh.md | 2 +- mk/apps.mk | 10 +-- scripts/build-node-apps.sh | 2 +- src/app/application_frame.zi | 29 ++++-- src/apps/apps_controller.zi | 6 +- src/platform/host_frame.zi | 2 + ziran.lock | 122 +++++++++++++------------- ziran.toml | 18 ++-- 18 files changed, 128 insertions(+), 102 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9ceb577df..62aad7188 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,7 +7,7 @@ - Use the private Harmony Lumi chat from the owner's Android debug build. - Backspace and text corrections work again; recover unfinished practices and backups, add photos reliably and reset break timers after time away. -- Switch practices smoothly, pick an astral exercise and claim daily coins; account sync is now called Mesh. +- Switch practices smoothly, pick an astral exercise and claim daily coins; account sync is now called Mesh. Keep an active practice visible in picture-in-picture. - Read Tao Te Ching art on its own page; find Photos and Radio in Apps, with clearer feedback and appearance controls. ## [2.1.63] - 2026-11-05 diff --git a/droid/app/src/main/cpp/CMakeLists.txt b/droid/app/src/main/cpp/CMakeLists.txt index b2b59681e..45b5b242c 100644 --- a/droid/app/src/main/cpp/CMakeLists.txt +++ b/droid/app/src/main/cpp/CMakeLists.txt @@ -242,14 +242,17 @@ endforeach() # native compilation. Artwork changes must not reconfigure every native host. set(APP_BUNDLE_RUNTIME_DIR "${CMAKE_BINARY_DIR}/bundle-runtime") set(APP_BUNDLE_RUNTIME "${APP_BUNDLE_RUNTIME_DIR}/libziran.a") -execute_process(COMMAND "${HOST_PYTHON}" "${REPO_ROOT}/scripts/build-bundle-runtime.py" - --source "${ZIRAN_DIR}" --output "${APP_BUNDLE_RUNTIME_DIR}" - --cc "${CMAKE_C_COMPILER} --target=${CMAKE_C_COMPILER_TARGET} --sysroot=${CMAKE_SYSROOT}" - --ar "${CMAKE_AR}" --objcopy "${CMAKE_OBJCOPY}" - "--flags=-O2 -fPIC -ffunction-sections -fdata-sections" - WORKING_DIRECTORY "${REPO_ROOT}" COMMAND_ERROR_IS_FATAL ANY) -set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS - "${REPO_ROOT}/scripts/build-bundle-runtime.py" "${REPO_ROOT}/ziran.lock") +# Let Ziran's make check its complete runtime dependency graph on every build. +# A configure-time build leaves this archive stale after local runtime edits. +add_custom_target(app_bundle_runtime + BYPRODUCTS "${APP_BUNDLE_RUNTIME}" + COMMAND "${HOST_PYTHON}" "${REPO_ROOT}/scripts/build-bundle-runtime.py" + --source "${ZIRAN_DIR}" --output "${APP_BUNDLE_RUNTIME_DIR}" + --cc "${CMAKE_C_COMPILER} --target=${CMAKE_C_COMPILER_TARGET} --sysroot=${CMAKE_SYSROOT}" + --ar "${CMAKE_AR}" --objcopy "${CMAKE_OBJCOPY}" + "--flags=-O2 -fPIC -ffunction-sections -fdata-sections" + DEPENDS "${ZI2C_BIN}" "${REPO_ROOT}/scripts/build-bundle-runtime.py" + WORKING_DIRECTORY "${REPO_ROOT}" VERBATIM) set(APP_EMBEDDED_INPUTS apps/publishers.json @@ -310,7 +313,7 @@ target_link_options(main PRIVATE "$<$>:-flto=thin>") set(APP_COMPILER_LAUNCHER "${HOST_PYTHON}" "${REPO_ROOT}/scripts/relative-compile.py") list(APPEND APP_COMPILER_LAUNCHER ${CMAKE_C_COMPILER_LAUNCHER}) set_property(TARGET main PROPERTY C_COMPILER_LAUNCHER "${APP_COMPILER_LAUNCHER}") -add_dependencies(main app_ziran_generated app_clean_runtime_api app_build_laws app_zi_check) +add_dependencies(main app_ziran_generated app_clean_runtime_api app_build_laws app_zi_check app_bundle_runtime) target_include_directories(main PRIVATE "${ZIRAN_DIR}/include" diff --git a/locales/changelog/cs.md b/locales/changelog/cs.md index 2031cd252..1f8ca3042 100644 --- a/locales/changelog/cs.md +++ b/locales/changelog/cs.md @@ -3,7 +3,7 @@ ## [Unreleased] - Fotky z Aplikací; Lumi jednou ukáže úplný návrh ohlasu ze seznamu; Seznamy: delší úkoly a dokončení přejetím. -- Karty Cvičení už neposouvají obrazovku. Před startem vyber ze šesti astrálních cvičení. Rozhraní má deset jazyků. +- Karty Cvičení už neposouvají obrazovku. Před startem vyber ze šesti astrálních cvičení. Rozhraní má deset jazyků. Probíhající cvičení může zůstat viditelné v režimu obrazu v obraze. - Hlasové balíčky cvičení jsou asi o třetinu menší. V obchodě Návyků si každý den vyzvedněte mince. ## [2.1.63] - 2026-11-05 diff --git a/locales/changelog/de.md b/locales/changelog/de.md index 3c47906ee..ca5f9d090 100644 --- a/locales/changelog/de.md +++ b/locales/changelog/de.md @@ -3,7 +3,7 @@ ## [Unreleased] - Fotos aus Apps; Lumi zeigt Listenfeedback einmal komplett; Listen: längere Aufgaben, Erledigen per Wischen. -- Übungstabs verschieben den Bildschirm nicht mehr. Vor Start aus sechs Astralübungen wählen. Oberfläche in zehn Sprachen. +- Übungstabs verschieben den Bildschirm nicht mehr. Vor Start aus sechs Astralübungen wählen. Oberfläche in zehn Sprachen. Laufende Übungen bleiben im Bild-in-Bild-Modus sichtbar. - Sprachpakete für Übungen sind etwa ein Drittel kleiner. Im Gewohnheiten-Shop täglich Münzen abholen. ## [2.1.63] - 2026-11-05 diff --git a/locales/changelog/es.md b/locales/changelog/es.md index 059d0d415..d1df8c932 100644 --- a/locales/changelog/es.md +++ b/locales/changelog/es.md @@ -3,7 +3,7 @@ ## [Unreleased] - Fotos en Aplicaciones; Lumi: vista única de comentarios completos de listas; Listas: tareas largas, acabar deslizando. -- Las pestañas de Práctica ya no desplazan la pantalla. Elige entre seis ejercicios astrales al empezar. Diez idiomas. +- Las pestañas de Práctica ya no desplazan la pantalla. Elige entre seis ejercicios astrales al empezar. Diez idiomas. Mantén visible la práctica en curso en el modo de imagen en imagen. - Los paquetes de voz de las prácticas pesan un tercio menos. Reclama monedas cada día en la tienda de Hábitos. ## [2.1.63] - 2026-11-05 diff --git a/locales/changelog/fr.md b/locales/changelog/fr.md index 5d41c8c31..56c5f897f 100644 --- a/locales/changelog/fr.md +++ b/locales/changelog/fr.md @@ -3,7 +3,7 @@ ## [Unreleased] - Photos via Applications ; Lumi : retours de liste complets en un aperçu ; Listes : tâches longues, cochées par balayage. -- Les onglets Pratique ne décalent plus l’écran. Choisis parmi six exercices astraux avant de commencer. Dix langues. +- Les onglets Pratique ne décalent plus l’écran. Choisis parmi six exercices astraux avant de commencer. Dix langues. Garde la pratique en cours à l’écran en mode image dans l’image. - Packs de voix un tiers plus légers. Récupérez des pièces chaque jour dans la boutique Habitudes. ## [2.1.63] - 2026-11-05 diff --git a/locales/changelog/ja.md b/locales/changelog/ja.md index 26c58d9c6..d60c1f74e 100644 --- a/locales/changelog/ja.md +++ b/locales/changelog/ja.md @@ -3,7 +3,7 @@ ## [Unreleased] - 写真はアプリからダウンロードできます。Lumi はリストのフィードバック全文を一度だけ確認用に表示し、リストでは長いタスクとスワイプでの完了に対応しました。 -- サイドナビで練習のタブを切り替えても、画面がずれなくなりました。 開始前に6種類のアストラル練習から選べます。 インターフェースは10言語に対応しています。 +- サイドナビで練習のタブを切り替えても、画面がずれなくなりました。 開始前に6種類のアストラル練習から選べます。 インターフェースは10言語に対応しています。練習中はピクチャーインピクチャーで表示し続けられます。 - 練習の音声パックが約3分の1小さくなりました。習慣のショップで毎日コインを受け取れます。 ## [2.1.63] - 2026-11-05 diff --git a/locales/changelog/ko.md b/locales/changelog/ko.md index 0502558ee..9ccaeb4f4 100644 --- a/locales/changelog/ko.md +++ b/locales/changelog/ko.md @@ -3,7 +3,7 @@ ## [Unreleased] - 사진은 앱에서 다운로드합니다. Lumi는 목록의 전체 피드백 제안을 한 번만 표시하며, 목록은 더 긴 할 일과 밀어서 완료하기를 지원합니다. -- 사이드 내비게이션으로 연습 탭을 바꿔도 화면이 더 이상 밀리지 않습니다. 시작하기 전에 여섯 가지 유체 이탈 수련 중 하나를 선택하세요. 인터페이스는 10개 언어를 지원합니다. +- 사이드 내비게이션으로 연습 탭을 바꿔도 화면이 더 이상 밀리지 않습니다. 시작하기 전에 여섯 가지 유체 이탈 수련 중 하나를 선택하세요. 인터페이스는 10개 언어를 지원합니다. 진행 중인 연습을 화면 속 화면 모드로 계속 볼 수 있습니다. - 연습 음성 팩의 크기가 약 3분의 1 줄었습니다. 습관 상점에서 매일 코인을 받을 수 있어요. ## [2.1.63] - 2026-11-05 diff --git a/locales/changelog/pt.md b/locales/changelog/pt.md index af87519d6..03d067050 100644 --- a/locales/changelog/pt.md +++ b/locales/changelog/pt.md @@ -3,7 +3,7 @@ ## [Unreleased] - Fotos via Aplicações; Lumi: prévia única do retorno completo da lista; Listas: tarefas longas e conclusão ao deslizar. -- Abas de Prática não deslocam a tela. Escolha entre seis exercícios astrais antes de começar. Interface em dez idiomas. +- Abas de Prática não deslocam a tela. Escolha entre seis exercícios astrais antes de começar. Interface em dez idiomas. Mantenha a prática em andamento visível no modo picture-in-picture. - Pacotes de voz das práticas um terço menores. Resgate moedas todos os dias na loja de Hábitos. ## [2.1.63] - 2026-11-05 diff --git a/locales/changelog/ru.md b/locales/changelog/ru.md index b7852a79a..c495bcbd9 100644 --- a/locales/changelog/ru.md +++ b/locales/changelog/ru.md @@ -3,7 +3,7 @@ ## [Unreleased] - Фото из Приложений; Lumi: один полный предпросмотр отзыва по списку; Списки: длинные задачи и завершение смахиванием. -- Вкладки Практики не сдвигают экран. До старта выберите из шести астральных упражнений. Интерфейс на десяти языках. +- Вкладки Практики не сдвигают экран. До старта выберите из шести астральных упражнений. Интерфейс на десяти языках. Текущее упражнение остаётся на экране в режиме «картинка в картинке». - Голосовые пакеты практик стали на треть меньше. Забирайте монеты в магазине привычек каждый день. ## [2.1.63] - 2026-11-05 diff --git a/locales/changelog/zh.md b/locales/changelog/zh.md index 04a147f2a..4f66fa1cf 100644 --- a/locales/changelog/zh.md +++ b/locales/changelog/zh.md @@ -3,7 +3,7 @@ ## [Unreleased] - 照片可从应用中下载;Lumi 会一次性展示基于列表的完整反馈内容,列表支持更长的待办事项和滑动完成。 -- 用侧边导航切换练习标签时,屏幕不再移位。 开始前可选择六种星体练习之一。 界面支持十种语言。 +- 用侧边导航切换练习标签时,屏幕不再移位。 开始前可选择六种星体练习之一。 界面支持十种语言。进行中的练习可在画中画模式下继续显示。 - 练习语音包缩小了约三分之一。每天都能在习惯商店领取金币。 ## [2.1.63] - 2026-11-05 diff --git a/mk/apps.mk b/mk/apps.mk index e08fb6d2b..dccee6d4a 100644 --- a/mk/apps.mk +++ b/mk/apps.mk @@ -8,13 +8,13 @@ src/apps/app_codec.zi: scripts/generate-app-codec.py $(APP_CODEC_SCHEMAS) ENTITY_DIR := build/packages/entity ENTITY_SOURCES = $(wildcard $(ENTITY_DIR)/src/*.zi $(ENTITY_DIR)/assets/entity/*) -# The shared Apps controller is built from the locked Apps package with its -# own pinned graph, so its digest identifies the reviewed Apps release. +# The shared Apps controller uses this host's selected dependency graph. +# Its exact payload must match the independently reviewed native digest. APPS_DIR := build/packages/apps APPS_BUNDLE ?= build/apps-ui/apps.zx NODE_APP_NAMES := $(shell python3 -c 'import json; print(" ".join(json.load(open("apps/versions.json")).get("node_apps", {})))') NODE_APP_BUNDLES := $(addprefix $(BUILD_DIR)/node-apps/,$(addsuffix .zx,$(NODE_APP_NAMES))) -$(BUILD_DIR)/apps-ui/apps.zx: ziran.lock scripts/build-apps.py $(wildcard $(APPS_DIR)/ziran.lock $(APPS_DIR)/src/*.zi $(APPS_DIR)/ui/*.zi $(APPS_DIR)/ui/locales/*.json) +$(BUILD_DIR)/apps-ui/apps.zx: ziran.toml ziran.lock $(wildcard ziran.local.toml) $(ZIRAN_BIN) $(wildcard $(ZIRAN_BUILD_DIR)/bin/zi2zx) scripts/build-apps.py $(wildcard $(APPS_DIR)/ziran.lock $(APPS_DIR)/src/*.zi $(APPS_DIR)/ui/*.zi $(APPS_DIR)/ui/locales/*.json) env -u DISPLAY -u WAYLAND_DISPLAY PATH="$(abspath $(dir $(ZIRAN_BIN))):$$PATH" \ python3 scripts/build-apps.py --ziran $(abspath $(ZIRAN_BIN)) --output $(abspath $(dir $@)) .PHONY: apps @@ -27,8 +27,8 @@ $(APP_BUNDLES) $(INBE_BUNDLE) $(INBE_FULL_BUNDLE) &: $(ENTITY_SOURCES) $(APP_SOU sh scripts/build-apps.sh $(ZIRAN_BIN) $(BUILD_DIR)/apps $(APPS_BUNDLE) # Build node apps independently before selecting the small offline baselines. -$(NODE_APP_BUNDLES) &: $(APP_SOURCES) $(shell rg --files $(addprefix assets/,$(NODE_APP_NAMES)) 2>/dev/null) apps/versions.json scripts/build-node-apps.sh scripts/prepare-package-assets.py scripts/achievement_icons.py $(ZIRAN_BIN) - sh scripts/build-node-apps.sh $(ZIRAN_BIN) +$(NODE_APP_BUNDLES) &: $(APP_SOURCES) $(shell rg --files $(addprefix assets/,$(NODE_APP_NAMES)) 2>/dev/null) apps/versions.json scripts/build-node-apps.sh scripts/prepare-package-assets.py scripts/achievement_icons.py $(ZIRAN_BIN) $(APPS_BUNDLE) + APPS_BUNDLE="$(abspath $(APPS_BUNDLE))" sh scripts/build-node-apps.sh $(ZIRAN_BIN) .PHONY: node-apps node-apps: $(NODE_APP_BUNDLES) diff --git a/scripts/build-node-apps.sh b/scripts/build-node-apps.sh index 03ffd49d6..e813f8038 100644 --- a/scripts/build-node-apps.sh +++ b/scripts/build-node-apps.sh @@ -15,7 +15,7 @@ mkdir -p build "$output" exec 9>build/apps-build.lock flock 9 python3 scripts/check-package-versions.py -python3 scripts/prepare-package-assets.py +python3 scripts/prepare-package-assets.py --apps-controller "${APPS_BUNDLE:-build/apps-ui/apps.zx}" for name in $(python3 -c 'import json; print(" ".join(sorted(json.load(open("apps/versions.json")).get("node_apps", {}))))'); do assets=build/package-assets/$name/assets mkdir -p "$assets" diff --git a/src/app/application_frame.zi b/src/app/application_frame.zi index b5f92d6ad..e5e05325a 100644 --- a/src/app/application_frame.zi +++ b/src/app/application_frame.zi @@ -58,6 +58,9 @@ Layout :: #import "kryon/layout"; #import "kryon/tree" #import "frame_pacing" #import "frame_transition" +#if #defined(ANDROID_BUILD) { + AndroidFrame :: #import "android_runtime"; +} #import, file "application.zi"; #import, file "application_update.zi"; @@ -116,14 +119,28 @@ app_update_draw_last_content_w: s32 = -1; app_update_draw_last_log_time: float64 = -1.0; app_last_frame_status: s32; app_last_repeated_key: u64; -app_capture_route_transition :: (app: *InnerBreeze) { +app_capture_route_transition :: (app: *InnerBreeze, viewport: Rectangle) { + #if #defined(ANDROID_BUILD) { + // After a viewport change the backing pixels have already been + // cleared for the new surface, so there is no matching snapshot. + if !app.ui.retained_target_active { + app_route_transition_cancel(app) + return + } + } if !app.ui.route_transition_pending { return } surface: FrameSurface - #if !#defined(PLATFORM_WEB) { - // The native host owns the presented pixels; this copy is the app's. - surface = FramePreviousSnapshot() + #if #defined(ANDROID_BUILD) { + surface = AndroidFrame.AndroidFramePreviousViewportSnapshot(cast(s32)viewport.x, + cast(s32)viewport.y, cast(s32)viewport.width, cast(s32)viewport.height) + } else { + unused viewport + #if !#defined(PLATFORM_WEB) { + // The native host owns the presented pixels; this copy is the app's. + surface = FramePreviousSnapshot() + } } // Input can change the route while updateapp builds the destination. // Capture the last presented frame before app_finish_frame paints it. @@ -349,7 +366,7 @@ app_update_draw :: (vapp: *void, viewport: Rectangle) { profile_update_start = app_profile_now() updateapp(app) app_profile_record_update(profile_update_start) - app_capture_route_transition(app) + app_capture_route_transition(app, viewport) app_breaks_draw_toast(app, Rectangle.{0.0, 0.0, cast(float32)view_width, cast(float32)view_height}) app_route_transition_draw(app, logical_frame, HostSeconds()) @@ -369,7 +386,7 @@ app_update_draw :: (vapp: *void, viewport: Rectangle) { profile_update_start = app_profile_now() updateapp(app) app_profile_record_update(profile_update_start) - app_capture_route_transition(app) + app_capture_route_transition(app, viewport) app_breaks_draw_toast(app, Rectangle.{0.0, 0.0, cast(float32)view_width, cast(float32)view_height}) app_route_transition_draw(app, logical_frame, HostSeconds()) diff --git a/src/apps/apps_controller.zi b/src/apps/apps_controller.zi index 1a72cda2f..e303fa273 100644 --- a/src/apps/apps_controller.zi +++ b/src/apps/apps_controller.zi @@ -1,5 +1,5 @@ // Trusted shared Apps UI reviewed for this host. Containers may carry these // bytes, but cannot select or replace the host's controller trust anchor. -// Apps b95d1933 with the Mesh client adoption, reproduced with Breeze's -// locked Ziran 0.7.0 and Kryon 0.6.0 graph. -AppsControllerSha256 :: "68cb1b2800808190eab43a0b4267ca8efe0049662d355d196abc71464188ae66" +// Apps 15c64b44, reproduced with the locked Ziran 9432a110 and Kryon 45281311 +// graph and with the matching local development overrides. +AppsControllerSha256 :: "4003ab71f9fb60d6f391a434fe6e68eb14f90b84d82c5b94b37ffb7a66588fb6" diff --git a/src/platform/host_frame.zi b/src/platform/host_frame.zi index 7f689e2c6..6a54c3de4 100644 --- a/src/platform/host_frame.zi +++ b/src/platform/host_frame.zi @@ -14,6 +14,7 @@ Desktop :: #import "desktop_runtime"; Raster :: #import "Cairo"; } else #if #defined(ANDROID_BUILD) { + #import, file "android/android_picture_window.zi"; Runtime :: #import "android_runtime"; Pictures :: #import "pixmap_assets_android"; host_frame_target_fps: s32 = 60; @@ -49,6 +50,7 @@ HostRunFrame :: (procedure: HostFrameProcedure, argument: *void) -> bool { return true } HostFrameStarted() + Runtime.SetAndroidPausedSurfaceVisible((AndroidPictureWindowState() & 2) != 0) Runtime.BeginAndroidFrame() procedure(argument) presented := Runtime.EndAndroidFrame() diff --git a/ziran.lock b/ziran.lock index c779bad74..f2f860b30 100644 --- a/ziran.lock +++ b/ziran.lock @@ -11,13 +11,22 @@ "url": "https://github.com/LoupVaillant/Monocypher.git" }, { - "commit": "8d5d2e752a219674f993473c8410847ba42fad48", - "dependencies": {"audio": "p59deb49c7f103127", "avif": "pb203529d803e73a4", "image_codec": "p69c0e968ae5735d9", "libaom": "p74ab3cb6eb3b86fa", "libavif": "p57c0272208aae8db", "libwebp": "p3b3c785a0e17e605", "sdl3": "p16cd0434af3dff7b", "webp": "p2af20e0c835b1c63"}, - "dependency_refs": {"audio": "1b2f35b7b39df6fb9af7a52324b4b7cf18e98df2", "avif": "2611e727e226a2af22dfb7f10bf224bd2f1a3d30", "image_codec": "360553150917f352e49e1beb78917370792ccaef", "libaom": "b141d9c45db236335351c8a4b2a14b3ade27c937", "libavif": "1aadfad932c98c069a1204261b1856f81f3bc199", "libwebp": "1844042d1ca751e62e61df7617dba19c98588339", "sdl3": "829a65d769d935c4852f8159e964312c0957260a", "webp": "ec6ed304767e10c125ab2820f3b01d6fd773e147"}, - "id": "p09ea4e5550e9f459", - "name": "kryon", - "ref": "8d5d2e752a219674f993473c8410847ba42fad48", - "url": "https://github.com/kryonlabs/kryon.git" + "commit": "ef23109691311caf7768b71b0543ccd637d4a6c5", + "dependencies": {"kryon": "pe02c713a1b0b858a"}, + "dependency_refs": {"kryon": "452813114e40e2385485bf5f6bc555cb90371d16"}, + "id": "p07a23c63390cbec1", + "name": "Game2D", + "ref": "ef23109691311caf7768b71b0543ccd637d4a6c5", + "url": "https://github.com/kryonlabs/game2d.git" + }, + { + "commit": "ed46dead332a284142b303b2e44567fef0732ea2", + "dependencies": {"kryon": "pe02c713a1b0b858a"}, + "dependency_refs": {"kryon": "452813114e40e2385485bf5f6bc555cb90371d16"}, + "id": "p0adf818f59d309d0", + "name": "Css", + "ref": "ed46dead332a284142b303b2e44567fef0732ea2", + "url": "https://github.com/kryonlabs/css.git" }, { "commit": "c96f5e3de9c4488f4e6c97f59f5245f22fda22f7", @@ -55,13 +64,13 @@ "url": "https://github.com/ziranlang/webp.git" }, { - "commit": "b95d19334ab4338d3611ec9d44db62b50694e464", - "dependencies": {"crypto": "pc23fbf455e97614d", "kryon": "p09ea4e5550e9f459", "mesh_client": "p8204ae87a845c1c3"}, - "dependency_refs": {"crypto": "master", "kryon": "8d5d2e752a219674f993473c8410847ba42fad48", "mesh_client": "c1ac6095d01bcfdd4c5ae49c4636aaf9a0303449"}, - "id": "p333db0ddd841f1ec", - "name": "Apps", - "ref": "b95d19334ab4338d3611ec9d44db62b50694e464", - "url": "https://github.com/waozixyz/apps.git" + "commit": "49ac5ca6ed966340084a36f8b557779a70649e04", + "dependencies": {"kryon": "pe02c713a1b0b858a"}, + "dependency_refs": {"kryon": "452813114e40e2385485bf5f6bc555cb90371d16"}, + "id": "p2fddaa2b1bf9c6ab", + "name": "plot", + "ref": "49ac5ca6ed966340084a36f8b557779a70649e04", + "url": "https://github.com/kryonlabs/plot.git" }, { "commit": "1844042d1ca751e62e61df7617dba19c98588339", @@ -81,6 +90,15 @@ "source": true, "url": "https://github.com/waozixyz/arcade.git" }, + { + "commit": "f5f186bb13569ef13338f81366ff63fb9b9282f6", + "dependencies": {"av1": "p5d7d12505a42f7b3", "dav1d": "pb24767b9eb34d961", "image_codec": "p69c0e968ae5735d9", "libaom": "p74ab3cb6eb3b86fa", "libavif": "p57c0272208aae8db"}, + "dependency_refs": {"av1": "bd278217e2bac754d868b3d6502eac4257658d4b", "dav1d": "54706fc6bc0cdecab7e9593974a4039cc038fca7", "image_codec": "360553150917f352e49e1beb78917370792ccaef", "libaom": "b141d9c45db236335351c8a4b2a14b3ade27c937", "libavif": "1aadfad932c98c069a1204261b1856f81f3bc199"}, + "id": "p3ed49c5d0912e411", + "name": "avif", + "ref": "f5f186bb13569ef13338f81366ff63fb9b9282f6", + "url": "https://github.com/ziranlang/avif.git" + }, { "commit": "395d2aa8c7a0cf578b8086c6853baca9df56be5b", "dependencies": {}, @@ -126,15 +144,6 @@ "ref": "bd278217e2bac754d868b3d6502eac4257658d4b", "url": "https://github.com/ziranlang/av1.git" }, - { - "commit": "9ee24b3f70b9c7d776dc391cba15ba97533db227", - "dependencies": {"kryon": "p09ea4e5550e9f459"}, - "dependency_refs": {"kryon": "8d5d2e752a219674f993473c8410847ba42fad48"}, - "id": "p6269d7141b731fe4", - "name": "Css", - "ref": "9ee24b3f70b9c7d776dc391cba15ba97533db227", - "url": "https://github.com/kryonlabs/css.git" - }, { "commit": "360553150917f352e49e1beb78917370792ccaef", "dependencies": {}, @@ -170,15 +179,6 @@ "source": true, "url": "https://aomedia.googlesource.com/aom" }, - { - "commit": "2b971b1bbd26c7ce452a42b336c80d8a1d2c131e", - "dependencies": {"kryon": "p09ea4e5550e9f459"}, - "dependency_refs": {"kryon": "8d5d2e752a219674f993473c8410847ba42fad48"}, - "id": "p8044712e51631874", - "name": "plot", - "ref": "2b971b1bbd26c7ce452a42b336c80d8a1d2c131e", - "url": "https://github.com/kryonlabs/plot.git" - }, { "commit": "c1ac6095d01bcfdd4c5ae49c4636aaf9a0303449", "dependencies": {"crypto": "pc23fbf455e97614d", "oqs": "p7098ac9cd92f7e5f"}, @@ -197,6 +197,15 @@ "source": true, "url": "https://github.com/madler/zlib.git" }, + { + "commit": "15c64b44da54c6a1e9f3fae828da9ed90ad247eb", + "dependencies": {"crypto": "pc23fbf455e97614d", "kryon": "pe02c713a1b0b858a", "mesh_client": "p8204ae87a845c1c3"}, + "dependency_refs": {"crypto": "master", "kryon": "452813114e40e2385485bf5f6bc555cb90371d16", "mesh_client": "c1ac6095d01bcfdd4c5ae49c4636aaf9a0303449"}, + "id": "p8a5e95756c5caa6a", + "name": "Apps", + "ref": "15c64b44da54c6a1e9f3fae828da9ed90ad247eb", + "url": "https://github.com/waozixyz/apps.git" + }, { "commit": "19b299005fbe2d895f4ad525cfdae62a2220c3ea", "dependencies": {}, @@ -215,15 +224,6 @@ "source": true, "url": "https://github.com/raysan5/rini.git" }, - { - "commit": "2611e727e226a2af22dfb7f10bf224bd2f1a3d30", - "dependencies": {"av1": "p5d7d12505a42f7b3", "dav1d": "pb24767b9eb34d961", "image_codec": "p69c0e968ae5735d9", "libaom": "p74ab3cb6eb3b86fa", "libavif": "p57c0272208aae8db"}, - "dependency_refs": {"av1": "bd278217e2bac754d868b3d6502eac4257658d4b", "dav1d": "54706fc6bc0cdecab7e9593974a4039cc038fca7", "image_codec": "360553150917f352e49e1beb78917370792ccaef", "libaom": "b141d9c45db236335351c8a4b2a14b3ade27c937", "libavif": "1aadfad932c98c069a1204261b1856f81f3bc199"}, - "id": "pb203529d803e73a4", - "name": "avif", - "ref": "2611e727e226a2af22dfb7f10bf224bd2f1a3d30", - "url": "https://github.com/ziranlang/avif.git" - }, { "commit": "54706fc6bc0cdecab7e9593974a4039cc038fca7", "dependencies": {}, @@ -233,15 +233,6 @@ "source": true, "url": "https://github.com/videolan/dav1d.git" }, - { - "commit": "fc8f3d899dfc3d3e0b535006526485c6d8c8c279", - "dependencies": {"curl": "p8da229d15597ab5c", "kryon": "p09ea4e5550e9f459", "mesh_client": "p8204ae87a845c1c3", "monocypher": "p002f6ed23e3a3576", "oqs": "p7098ac9cd92f7e5f", "qrcode": "p0dfa70137405b096", "zlib": "p82dbc05081cd4d96"}, - "dependency_refs": {"curl": "19b299005fbe2d895f4ad525cfdae62a2220c3ea", "kryon": "8d5d2e752a219674f993473c8410847ba42fad48", "mesh_client": "c1ac6095d01bcfdd4c5ae49c4636aaf9a0303449", "monocypher": "master", "oqs": "master", "qrcode": "master", "zlib": "51b7f2abdade71cd9bb0e7a373ef2610ec6f9daf"}, - "id": "pb3958804740a96f2", - "name": "Entity", - "ref": "fc8f3d899dfc3d3e0b535006526485c6d8c8c279", - "url": "https://github.com/waozixyz/entity.git" - }, { "commit": "58626f682afbc2e3467e8c2e5b37f7f29d89ed99", "dependencies": {}, @@ -260,13 +251,13 @@ "url": "https://github.com/ziranlang/crypto.git" }, { - "commit": "fcacb49c1e128e9eb100884e6029b24b4e608d38", - "dependencies": {"kryon": "p09ea4e5550e9f459"}, - "dependency_refs": {"kryon": "8d5d2e752a219674f993473c8410847ba42fad48"}, - "id": "pcad095808686987d", - "name": "Game2D", - "ref": "fcacb49c1e128e9eb100884e6029b24b4e608d38", - "url": "https://github.com/kryonlabs/game2d.git" + "commit": "452813114e40e2385485bf5f6bc555cb90371d16", + "dependencies": {"audio": "p59deb49c7f103127", "avif": "p3ed49c5d0912e411", "image_codec": "p69c0e968ae5735d9", "libaom": "p74ab3cb6eb3b86fa", "libavif": "p57c0272208aae8db", "libwebp": "p3b3c785a0e17e605", "sdl3": "p16cd0434af3dff7b", "webp": "p2af20e0c835b1c63"}, + "dependency_refs": {"audio": "1b2f35b7b39df6fb9af7a52324b4b7cf18e98df2", "avif": "f5f186bb13569ef13338f81366ff63fb9b9282f6", "image_codec": "360553150917f352e49e1beb78917370792ccaef", "libaom": "b141d9c45db236335351c8a4b2a14b3ade27c937", "libavif": "1aadfad932c98c069a1204261b1856f81f3bc199", "libwebp": "1844042d1ca751e62e61df7617dba19c98588339", "sdl3": "829a65d769d935c4852f8159e964312c0957260a", "webp": "ec6ed304767e10c125ab2820f3b01d6fd773e147"}, + "id": "pe02c713a1b0b858a", + "name": "kryon", + "ref": "452813114e40e2385485bf5f6bc555cb90371d16", + "url": "https://github.com/kryonlabs/kryon.git" }, { "commit": "9cc6872f75447c3a24c16764f9829d0f58751cb0", @@ -293,16 +284,25 @@ "ref": "893e5b6f58aae7450a5f68ec153cfe1ee3f84c8d", "source": true, "url": "https://github.com/waozixyz/practices.git" + }, + { + "commit": "e576e2187ac52418848eb001f33075cbc45a38d8", + "dependencies": {"curl": "p8da229d15597ab5c", "kryon": "pe02c713a1b0b858a", "mesh_client": "p8204ae87a845c1c3", "monocypher": "p002f6ed23e3a3576", "oqs": "p7098ac9cd92f7e5f", "qrcode": "p0dfa70137405b096", "zlib": "p82dbc05081cd4d96"}, + "dependency_refs": {"curl": "19b299005fbe2d895f4ad525cfdae62a2220c3ea", "kryon": "452813114e40e2385485bf5f6bc555cb90371d16", "mesh_client": "c1ac6095d01bcfdd4c5ae49c4636aaf9a0303449", "monocypher": "master", "oqs": "master", "qrcode": "master", "zlib": "51b7f2abdade71cd9bb0e7a373ef2610ec6f9daf"}, + "id": "pf88907b8085b83ef", + "name": "Entity", + "ref": "e576e2187ac52418848eb001f33075cbc45a38d8", + "url": "https://github.com/waozixyz/entity.git" } ], "root": { - "dependencies": {"apps": "p333db0ddd841f1ec", "arcade": "p3bbb7ef5867e6b62", "audio": "p59deb49c7f103127", "crypto": "pc23fbf455e97614d", "css": "p6269d7141b731fe4", "curl": "p739f5b821e102505", "entity": "pb3958804740a96f2", "game2d": "pcad095808686987d", "kryon": "p09ea4e5550e9f459", "liboqs": "p5c52c96443a2bf32", "mesh_client": "p8204ae87a845c1c3", "mingcute": "pe1027b9d16704793", "monocypher": "p002f6ed23e3a3576", "oqs": "p7098ac9cd92f7e5f", "plot": "p8044712e51631874", "practices": "pf6b6695162f3781e", "qrcode": "p0dfa70137405b096", "rini": "p8ea355e8cb04093e", "sqlite": "pb6abbb780a670e17"}, - "dependency_refs": {"apps": "b95d19334ab4338d3611ec9d44db62b50694e464", "arcade": "712e99ed57a0b1f03ddb21dcd02d9ecd8b7d82e7", "audio": "1b2f35b7b39df6fb9af7a52324b4b7cf18e98df2", "crypto": "master", "css": "9ee24b3f70b9c7d776dc391cba15ba97533db227", "curl": "master", "entity": "fc8f3d899dfc3d3e0b535006526485c6d8c8c279", "game2d": "fcacb49c1e128e9eb100884e6029b24b4e608d38", "kryon": "8d5d2e752a219674f993473c8410847ba42fad48", "liboqs": "7bf154f197696f5bf04be2ea4c576db86bb6a238", "mesh_client": "c1ac6095d01bcfdd4c5ae49c4636aaf9a0303449", "mingcute": "master", "monocypher": "master", "oqs": "master", "plot": "2b971b1bbd26c7ce452a42b336c80d8a1d2c131e", "practices": "893e5b6f58aae7450a5f68ec153cfe1ee3f84c8d", "qrcode": "master", "rini": "main", "sqlite": "master"}, + "dependencies": {"apps": "p8a5e95756c5caa6a", "arcade": "p3bbb7ef5867e6b62", "audio": "p59deb49c7f103127", "avif": "p3ed49c5d0912e411", "crypto": "pc23fbf455e97614d", "css": "p0adf818f59d309d0", "curl": "p739f5b821e102505", "entity": "pf88907b8085b83ef", "game2d": "p07a23c63390cbec1", "kryon": "pe02c713a1b0b858a", "liboqs": "p5c52c96443a2bf32", "mesh_client": "p8204ae87a845c1c3", "mingcute": "pe1027b9d16704793", "monocypher": "p002f6ed23e3a3576", "oqs": "p7098ac9cd92f7e5f", "plot": "p2fddaa2b1bf9c6ab", "practices": "pf6b6695162f3781e", "qrcode": "p0dfa70137405b096", "rini": "p8ea355e8cb04093e", "sqlite": "pb6abbb780a670e17"}, + "dependency_refs": {"apps": "15c64b44da54c6a1e9f3fae828da9ed90ad247eb", "arcade": "712e99ed57a0b1f03ddb21dcd02d9ecd8b7d82e7", "audio": "1b2f35b7b39df6fb9af7a52324b4b7cf18e98df2", "avif": "f5f186bb13569ef13338f81366ff63fb9b9282f6", "crypto": "master", "css": "ed46dead332a284142b303b2e44567fef0732ea2", "curl": "master", "entity": "e576e2187ac52418848eb001f33075cbc45a38d8", "game2d": "ef23109691311caf7768b71b0543ccd637d4a6c5", "kryon": "452813114e40e2385485bf5f6bc555cb90371d16", "liboqs": "7bf154f197696f5bf04be2ea4c576db86bb6a238", "mesh_client": "c1ac6095d01bcfdd4c5ae49c4636aaf9a0303449", "mingcute": "master", "monocypher": "master", "oqs": "master", "plot": "49ac5ca6ed966340084a36f8b557779a70649e04", "practices": "893e5b6f58aae7450a5f68ec153cfe1ee3f84c8d", "qrcode": "master", "rini": "main", "sqlite": "master"}, "name": "Inbe" }, "toolchain": { - "commit": "55b0176800d42c829db098a2ef8b0705ea339509", - "ref": "55b0176800d42c829db098a2ef8b0705ea339509", + "commit": "9432a110709c4a4f72c4f732fcfc368e15213a54", + "ref": "9432a110709c4a4f72c4f732fcfc368e15213a54", "url": "https://github.com/ziranlang/ziran.git" } } diff --git a/ziran.toml b/ziran.toml index 24c6d767f..3a334b052 100644 --- a/ziran.toml +++ b/ziran.toml @@ -5,11 +5,11 @@ module_roots = ["src", "src/apps", "src/app", "src/core", "src/habits", "src/pra [toolchain] git = "https://github.com/ziranlang/ziran.git" -ref = "55b0176800d42c829db098a2ef8b0705ea339509" +ref = "9432a110709c4a4f72c4f732fcfc368e15213a54" [dependencies.kryon] git = "https://github.com/kryonlabs/kryon.git" -ref = "8d5d2e752a219674f993473c8410847ba42fad48" +ref = "452813114e40e2385485bf5f6bc555cb90371d16" # Ogg Opus for Ziran's std audio, at the commit Kryon locks. [dependencies.audio] @@ -18,7 +18,11 @@ ref = "1b2f35b7b39df6fb9af7a52324b4b7cf18e98df2" [dependencies.css] git = "https://github.com/kryonlabs/css.git" -ref = "9ee24b3f70b9c7d776dc391cba15ba97533db227" +ref = "ed46dead332a284142b303b2e44567fef0732ea2" + +[dependencies.avif] +git = "https://github.com/ziranlang/avif.git" +ref = "f5f186bb13569ef13338f81366ff63fb9b9282f6" [dependencies.oqs] git = "https://github.com/ziranlang/oqs.git" @@ -26,7 +30,7 @@ ref = "master" [dependencies.game2d] git = "https://github.com/kryonlabs/game2d.git" -ref = "fcacb49c1e128e9eb100884e6029b24b4e608d38" +ref = "ef23109691311caf7768b71b0543ccd637d4a6c5" [dependencies.mesh_client] git = "https://github.com/ziranlang/mesh-client.git" @@ -63,7 +67,7 @@ ref = "master" [dependencies.plot] git = "https://github.com/kryonlabs/plot.git" -ref = "2b971b1bbd26c7ce452a42b336c80d8a1d2c131e" +ref = "49ac5ca6ed966340084a36f8b557779a70649e04" [dependencies.mingcute] git = "https://github.com/kryonlabs/mingcute.git" @@ -71,7 +75,7 @@ ref = "master" [dependencies.entity] git = "https://github.com/waozixyz/entity.git" -ref = "fc8f3d899dfc3d3e0b535006526485c6d8c8c279" +ref = "e576e2187ac52418848eb001f33075cbc45a38d8" [dependencies.crypto] git = "https://github.com/ziranlang/crypto.git" @@ -79,7 +83,7 @@ ref = "master" [dependencies.apps] git = "https://github.com/waozixyz/apps.git" -ref = "b95d19334ab4338d3611ec9d44db62b50694e464" +ref = "15c64b44da54c6a1e9f3fae828da9ed90ad247eb" # The practices' pictures, course data and recordings (scripts/practice_media.py). [dependencies.practices]