diff --git a/ports/ggml-speech/portfile.cmake b/ports/ggml-speech/portfile.cmake index eadf8ce..c34efbe 100644 --- a/ports/ggml-speech/portfile.cmake +++ b/ports/ggml-speech/portfile.cmake @@ -1,11 +1,22 @@ -# ggml-speech: tetherto/qvac-ext-ggml@speech with the consolidated speech-stack -# patch series and a `qvac-speech-` lib filename prefix. +# ggml-speech: tetherto/qvac-ext-ggml@speech, including the iOS Metal +# NULL-safety hardening from +# https://github.com/tetherto/qvac-ext-ggml/pull/10 (PR-10's 3 commits +# f21ff9a0 + b7dc01c7 + 0f54d9f7) now merged into the speech branch +# as PR-10 merge 08d39f0c (`Merge pull request #10 from +# ishanvohra2/fix/metal-ios-null-propagation`). +# +# The Android backend stack still uses the GGML_CPU_ALL_VARIANTS=ON +# + GGML_CPU_REPACK=ON shape introduced in port-version 3 (per-arch +# CPU dlopen variants on top of the Vulkan / OpenCL MODULE .so files); +# only the Apple Metal path changes versus port-version 3, courtesy +# of PR-10's NULL-safety hardening on `ggml_metal_device_init` / +# `ggml_metal_buffer_init` etc. vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO tetherto/qvac-ext-ggml - REF 9562ed04757934cbe108bd40334027e26513509e - SHA512 78cd62947035fecd971b275e4abb2942d64d53e2b205d01c7e86daab7cb43851f0795db61138bba8de153d7e73aa4f66f32f7ec8b96667fddbc0f2b73c2ea104 + REF 08d39f0c + SHA512 0e681f60ba0ad49b1cebda914ee065c0b29f301617970b968054089830029153f1be28012dfe2ced9c1014fe8605647ca68208544e9564b5d5f1c68dfd1e82e9 HEAD_REF speech ) diff --git a/ports/ggml-speech/vcpkg.json b/ports/ggml-speech/vcpkg.json index fd15972..a031ec4 100644 --- a/ports/ggml-speech/vcpkg.json +++ b/ports/ggml-speech/vcpkg.json @@ -1,8 +1,8 @@ { "name": "ggml-speech", "version-date": "2026-04-09", - "port-version": 3, - "description": "Speech-stack flavour of ggml from tetherto/qvac-ext-ggml@speech. Library filenames are prefixed libqvac-speech-ggml-* so they coexist with libqvac-ggml-* (fabric/llm) and libqvac-diffusion-ggml-* on the same Android device. Mutually exclusive with the regular ggml port in the same triplet -- pick one per build.", + "port-version": 4, + "description": "Speech-stack flavour of ggml from tetherto/qvac-ext-ggml@speech, including the iOS Metal NULL-safety hardening from PR #10. Library filenames are prefixed libqvac-speech-ggml-* so they coexist with libqvac-ggml-* (fabric/llm) and libqvac-diffusion-ggml-* on the same Android device. Mutually exclusive with the regular ggml port in the same triplet -- pick one per build.", "homepage": "https://github.com/tetherto/qvac-ext-ggml/tree/speech", "license": "MIT", "dependencies": [ diff --git a/ports/tts-cpp/portfile.cmake b/ports/tts-cpp/portfile.cmake index 4cc355a..2e047b1 100644 --- a/ports/tts-cpp/portfile.cmake +++ b/ports/tts-cpp/portfile.cmake @@ -1,6 +1,12 @@ # tts-cpp: Resemble Chatterbox + Supertonic TTS in pure C++/ggml. -# Sourced from the tts-cpp/ subfolder of tetherto/qvac-ext-lib-whisper.cpp; +# Sourced from the tts-cpp/ subfolder of qvac-ext-lib-whisper.cpp; # consumes the ggml-speech port. +# +# Pinned at tetherto/qvac-ext-lib-whisper.cpp@master HEAD 60dc1504 +# (`Merge pull request #29 from GustavoA1604/master`), which lands +# 907f3151 -- the "tts-cpp: Add dynamic backend selection for android" +# change: registry-only `init_gpu_backend()` + Adreno tier policy +# + EngineOptions::backends_dir / opencl_cache_dir. set(VCPKG_POLICY_MISMATCHED_NUMBER_OF_BINARIES enabled) set(VCPKG_BUILD_TYPE release) @@ -8,8 +14,8 @@ set(VCPKG_BUILD_TYPE release) vcpkg_from_github( OUT_SOURCE_PATH WHISPER_CPP_SRC REPO tetherto/qvac-ext-lib-whisper.cpp - REF f5f914b9714bc1a48ef63cc9e79d082fd63eb085 - SHA512 5bd99c053b94909346ffec07ba882240fb1120770c0d2177e0df70bf39841136baeb72dda312465d2bd3fd2367f3cea49003bb6b9e17b22411b2905a8e1fa8d3 + REF 60dc1504 + SHA512 2273e95bb7fa9a4db757f675627529094d8665baffc0c1c1783a65c7670222b779ae39667325fe870dccd92037faacb44502700e923bde73149eac08e6ab8eff HEAD_REF master ) diff --git a/ports/tts-cpp/vcpkg.json b/ports/tts-cpp/vcpkg.json index 1026428..c80a266 100644 --- a/ports/tts-cpp/vcpkg.json +++ b/ports/tts-cpp/vcpkg.json @@ -1,14 +1,13 @@ { "name": "tts-cpp", - "version-date": "2026-05-07", - "port-version": 1, - "description": "Text-to-speech inference in pure C++/ggml. Ships Resemble Chatterbox (Turbo + Multilingual variants) and Supertonic engines under a unified Engine API. Sourced from tetherto/qvac-ext-lib-whisper.cpp's tts-cpp/ subfolder; consumes the ggml-speech port.", + "version-date": "2026-05-20", + "description": "Text-to-speech inference in pure C++/ggml. Ships Resemble Chatterbox (Turbo + Multilingual variants) and Supertonic engines under a unified Engine API. Sourced from tetherto/qvac-ext-lib-whisper.cpp's tts-cpp/ subfolder (including the Android dynamic backend selection landed in PR #29); consumes the ggml-speech port.", "homepage": "https://github.com/tetherto/qvac-ext-lib-whisper.cpp/tree/master/tts-cpp", "license": "MIT", "dependencies": [ { "name": "ggml-speech", - "version>=": "2026-04-09#1" + "version>=": "2026-04-09#4" }, { "name": "vcpkg-cmake", diff --git a/versions/baseline.json b/versions/baseline.json index 8fe26fa..dc342dd 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -22,7 +22,7 @@ }, "ggml-speech": { "baseline": "2026-04-09", - "port-version": 3 + "port-version": 4 }, "intgemm": { "baseline": "1.0.0", @@ -105,8 +105,8 @@ "port-version": 2 }, "tts-cpp": { - "baseline": "2026-05-07", - "port-version": 1 + "baseline": "2026-05-20", + "port-version": 0 }, "vcpkg-cmake": { "baseline": "2024-04-23", diff --git a/versions/g-/ggml-speech.json b/versions/g-/ggml-speech.json index c02c09f..8a962a5 100644 --- a/versions/g-/ggml-speech.json +++ b/versions/g-/ggml-speech.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b9dab610a65a30450a9779870879a864efe3308a", + "version-date": "2026-04-09", + "port-version": 4 + }, { "git-tree": "aee4ede215db602f9ab95eea6d50a1a36ef8f8e0", "version-date": "2026-04-09", diff --git a/versions/t-/tts-cpp.json b/versions/t-/tts-cpp.json index d0bed43..87857c3 100644 --- a/versions/t-/tts-cpp.json +++ b/versions/t-/tts-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fffb35210a3fdc7ef5407f87ca3616b584aa6531", + "version-date": "2026-05-20", + "port-version": 0 + }, { "git-tree": "084b9b1423945040791a94be810897ce565ab5ec", "version-date": "2026-05-07",