Skip to content

QVAC-3975 version set 0.6.3 for addon cpp for other logger PR#25

Merged
jpgaribotti merged 1 commit into
tetherto:mainfrom
kartiksain:version
Aug 22, 2025
Merged

QVAC-3975 version set 0.6.3 for addon cpp for other logger PR#25
jpgaribotti merged 1 commit into
tetherto:mainfrom
kartiksain:version

Conversation

@kartiksain

@kartiksain kartiksain commented Aug 21, 2025

Copy link
Copy Markdown
Contributor

This PR is required for QVAC-3975 and sets version 0.6.3 for addon cpp for other logger PR

@jpgaribotti jpgaribotti merged commit 8285d3f into tetherto:main Aug 22, 2025
Zbig9000 added a commit to Zbig9000/qvac-registry-vcpkg that referenced this pull request May 19, 2026
@Zbig9000 @cursoragent
whisper-cpp: drop port patches, repoint to QVAC-18993 branch (QVAC-18…
965f5e5 
…993)

The two patches the port carried in tetherto#2 (0001-ggml-allow-backend-dl-with-
static-core, 0002-ggml-android-cpu-variant-dlopen-fallback) are now
upstream-equivalent commits on the whisper.cpp fork at
Zbig9000/qvac-ext-lib-whisper.cpp@QVAC-18993-bundled-ggml-android-
dynamic-backend (PR tetherto#26 on tetherto/qvac-ext-lib-whisper.cpp). The
port can therefore stop maintaining a patch tree.

REF flips 47784b9e -> 14620c88 (the QVAC-18993 branch HEAD, which is
QVAC-18991's HEAD plus 3 commits: ggml CMakeLists allow-DL-with-static
+ ggml-backend Android per-arch CPU fallback + tts-cpp chatterbox
<atomic> include fix). SHA512 recomputed from the GitHub tarball.

Bumps port-version 2 -> 3. The build output is bit-identical to tetherto#2's
patched build (verified by running the same NDK r29 cross-compile
recipe: all 7 per-arch libggml-cpu-android_armv*_*.so files match
byte-for-byte) so this is a pure refactor — patches in vendor-tree
vs commits on the upstreamable fork.

Drops the whole ports/whisper-cpp/patches/ directory.

After whisper-cpp PR tetherto#26 + PR tetherto#25 (QVAC-18991) land on
tetherto/master + a v1.8.4.3 tag is published, the port's REF can
flip Zbig9000 -> tetherto and v1.8.4.3 (no other changes needed).

Co-authored-by: Cursor <cursoragent@cursor.com>
This was referenced May 19, 2026
Merged
Closed
Zbig9000 added a commit to Zbig9000/qvac-registry-vcpkg that referenced this pull request May 20, 2026
@Zbig9000 @cursoragent
whisper-cpp: bump REF to QVAC-18991 upstream-sync HEAD (validation only)
f844a5c 
Bumps the whisper-cpp port to consume the QVAC-18991 upstream-sync
commit on the Zbig9000 fork (https://github.com/tetherto/qvac-ext-lib-
whisper.cpp/pull/25), so the transcription-whispercpp on-PR workflow
in qvac monorepo can run against the upstream-sync content in
isolation (no QVAC-18300 / 18992 / 18993 changes mixed in).

Single-purpose validation port:
  - REF: tetherto v1.8.4.2 -> Zbig9000 47784b9e (PR tetherto#25 HEAD)
  - SHA512 recomputed from the GitHub tarball
  - HEAD_REF -> QVAC-18991-pull-latest-whisper-cpp-upstream
  - version: 1.8.4.2#1 -> 1.8.4.3#0
  - No feature changes, no patches, no Android-side configuration
    changes -- the port is identical in shape to 1.8.4.2#1 except
    for the source version.

This PR is NOT meant to merge to main long-term; it exists to feed
a CI run on tetherto/qvac#TBD (QVAC-18991 validation bump of
transcription-whispercpp). After CI proves the upstream-sync source
is buildable + addon CI is green, this PR is closeable. Production
consumption of 1.8.4.3 will go through whisper-cpp PR tetherto#28 + tetherto#27 +
this port's regular tetherto#1, tetherto#2, ... port-version chain landing via
qvac-registry-vcpkg PR tetherto#152.

Refs QVAC-18991 (Asana).

Co-authored-by: Cursor <cursoragent@cursor.com>
Zbig9000 added a commit to Zbig9000/qvac-registry-vcpkg that referenced this pull request May 20, 2026
@Zbig9000 @cursoragent
whisper-cpp: bump REF to QVAC-18991 upstream-sync HEAD (validation only)
56f1586 
Bumps the whisper-cpp port to consume the QVAC-18991 upstream-sync
commit on the Zbig9000 fork (https://github.com/tetherto/qvac-ext-lib-
whisper.cpp/pull/25), so the transcription-whispercpp on-PR workflow
in qvac monorepo can run against the upstream-sync content in
isolation (no QVAC-18300 / 18992 / 18993 changes mixed in).

Single-purpose validation port:
  - REF: tetherto v1.8.4.2 -> Zbig9000 47784b9e (PR tetherto#25 HEAD)
  - SHA512 recomputed from the GitHub tarball
  - HEAD_REF -> QVAC-18991-pull-latest-whisper-cpp-upstream
  - version: 1.8.4.2#1 -> 1.8.4.3#0
  - No feature changes, no patches, no Android-side configuration
    changes -- the port is identical in shape to 1.8.4.2#1 except
    for the source version.

This PR is NOT meant to merge to main long-term; it exists to feed
a CI run on tetherto/qvac#TBD (QVAC-18991 validation bump of
transcription-whispercpp). After CI proves the upstream-sync source
is buildable + addon CI is green, this PR is closeable. Production
consumption of 1.8.4.3 will go through whisper-cpp PR tetherto#28 + tetherto#27 +
this port's regular tetherto#1, tetherto#2, ... port-version chain landing via
qvac-registry-vcpkg PR tetherto#152.

Refs QVAC-18991 (Asana).

Co-authored-by: Cursor <cursoragent@cursor.com>
Zbig9000 added a commit to Zbig9000/qvac-registry-vcpkg that referenced this pull request May 20, 2026
@Zbig9000 @cursoragent
whisper-cpp: drop port patches, repoint to QVAC-18993 branch (QVAC-18…
dffaaf6 
…993)

The two patches the port carried in tetherto#2 (0001-ggml-allow-backend-dl-with-
static-core, 0002-ggml-android-cpu-variant-dlopen-fallback) are now
upstream-equivalent commits on the whisper.cpp fork at
Zbig9000/qvac-ext-lib-whisper.cpp@QVAC-18993-bundled-ggml-android-
dynamic-backend (PR tetherto#26 on tetherto/qvac-ext-lib-whisper.cpp). The
port can therefore stop maintaining a patch tree.

REF flips 47784b9e -> 14620c88 (the QVAC-18993 branch HEAD, which is
QVAC-18991's HEAD plus 3 commits: ggml CMakeLists allow-DL-with-static
+ ggml-backend Android per-arch CPU fallback + tts-cpp chatterbox
<atomic> include fix). SHA512 recomputed from the GitHub tarball.

Bumps port-version 2 -> 3. The build output is bit-identical to tetherto#2's
patched build (verified by running the same NDK r29 cross-compile
recipe: all 7 per-arch libggml-cpu-android_armv*_*.so files match
byte-for-byte) so this is a pure refactor — patches in vendor-tree
vs commits on the upstreamable fork.

Drops the whole ports/whisper-cpp/patches/ directory.

After whisper-cpp PR tetherto#26 + PR tetherto#25 (QVAC-18991) land on
tetherto/master + a v1.8.4.3 tag is published, the port's REF can
flip Zbig9000 -> tetherto and v1.8.4.3 (no other changes needed).

Co-authored-by: Cursor <cursoragent@cursor.com>
Zbig9000 added a commit to Zbig9000/qvac-registry-vcpkg that referenced this pull request May 20, 2026
@Zbig9000 @cursoragent
whisper-cpp: bump to 1.8.4.3 with Android OpenCL + dynamic-backend + …
8c6ca18 
…spirv-headers (QVAC-18300, QVAC-18992, QVAC-18993)

Brings the whisper-cpp port up to the upstream-sync snapshot at
v1.8.4.3 (QVAC-18991, merged into tetherto/qvac-ext-lib-whisper.cpp
master via PR tetherto#25) plus the Android speech-stack flags landed for
QVAC-18300 + QVAC-18992 + QVAC-18993:

  - opencl feature (QVAC-18300): Android-only enable-path,
    OpenCL/Vulkan side-by-side, COOPMAT[2] disabled to keep
    Adreno-class GPUs healthy.
  - Android dynamic-backend mode (QVAC-18993):
    GGML_BACKEND_DL=ON, GGML_CPU_ALL_VARIANTS=ON, GGML_CPU_REPACK=ON.
    Static dispatcher + per-microarch CPU .so + GPU .so files side
    by side, picked by ggml's HWCAP-aware loader at runtime.
  - spirv-headers dependency for the vulkan feature (QVAC-18992):
    the upstream ggml-org v0.10.2 sync pulled in ggml-vulkan.cpp code
    that uses spv::* enums unconditionally for SPIR-V capability
    injection (RTE rounding-mode); Vulkan-Headers no longer bundles
    spirv.hpp, so the standalone SPIRV-Headers tree must be on the
    include path. Inject via CMAKE_CXX_FLAGS=-isystem since
    ggml-vulkan's CMakeLists doesn't find_package(SpirvHeaders).

REF currently pins Zbig9000/qvac-ext-lib-whisper.cpp @ 14620c88
which is the tree-equivalent of merged PR tetherto#25 (upstream sync) +
merged PR tetherto#27 (tts-cpp <atomic>) + still-open PR tetherto#28 (bundled-ggml
Android dynamic-backend fixes). After PR tetherto#28 lands on tetherto/master
and a v1.8.4.x tag is published, flip REPO -> tetherto and the
tag/SHA (no other port changes needed).

The previous port-version 2's two patch files
(0001-ggml-allow-backend-dl-with-static-core.patch,
0002-ggml-android-cpu-variant-dlopen-fallback.patch) are now
upstream-equivalent commits on whisper.cpp PR tetherto#28 --- ports is
patch-free.

SHA512 = 733effd6... matches the github.com/Zbig9000/qvac-ext-lib-whisper.cpp/archive/14620c88....tar.gz tarball verified via independent download + sha512sum.

version       1.8.4.2 --> 1.8.4.3
port-version  1       --> 3 (continues after the previous port-version 2 patch-based recipe)

Co-authored-by: Cursor <cursoragent@cursor.com>
Zbig9000 added a commit to Zbig9000/qvac-registry-vcpkg that referenced this pull request May 21, 2026
@Zbig9000 @cursoragent
whisper-cpp: bump to 1.8.4.3 with Android OpenCL + dynamic-backend + …
378b14f 
…spirv-headers (QVAC-18300, QVAC-18992, QVAC-18993)

Brings the whisper-cpp port up to the upstream-sync snapshot at
v1.8.4.3 (QVAC-18991, merged into tetherto/qvac-ext-lib-whisper.cpp
master via PR tetherto#25) plus the Android speech-stack flags landed for
QVAC-18300 + QVAC-18992 + QVAC-18993:

  - opencl feature (QVAC-18300): Android-only enable-path,
    OpenCL/Vulkan side-by-side, COOPMAT[2] disabled to keep
    Adreno-class GPUs healthy.
  - Android dynamic-backend mode (QVAC-18993):
    GGML_BACKEND_DL=ON, GGML_CPU_ALL_VARIANTS=ON, GGML_CPU_REPACK=ON.
    Static dispatcher + per-microarch CPU .so + GPU .so files side
    by side, picked by ggml's HWCAP-aware loader at runtime.
  - spirv-headers dependency for the vulkan feature (QVAC-18992):
    the upstream ggml-org v0.10.2 sync pulled in ggml-vulkan.cpp code
    that uses spv::* enums unconditionally for SPIR-V capability
    injection (RTE rounding-mode); Vulkan-Headers no longer bundles
    spirv.hpp, so the standalone SPIRV-Headers tree must be on the
    include path. Inject via CMAKE_CXX_FLAGS=-isystem since
    ggml-vulkan's CMakeLists doesn't find_package(SpirvHeaders).

REF currently pins Zbig9000/qvac-ext-lib-whisper.cpp @ 14620c88
which is the tree-equivalent of merged PR tetherto#25 (upstream sync) +
merged PR tetherto#27 (tts-cpp <atomic>) + still-open PR tetherto#28 (bundled-ggml
Android dynamic-backend fixes). After PR tetherto#28 lands on tetherto/master
and a v1.8.4.x tag is published, flip REPO -> tetherto and the
tag/SHA (no other port changes needed).

The previous port-version 2's two patch files
(0001-ggml-allow-backend-dl-with-static-core.patch,
0002-ggml-android-cpu-variant-dlopen-fallback.patch) are now
upstream-equivalent commits on whisper.cpp PR tetherto#28 --- ports is
patch-free.

SHA512 = 733effd6... matches the github.com/Zbig9000/qvac-ext-lib-whisper.cpp/archive/14620c88....tar.gz tarball verified via independent download + sha512sum.

version       1.8.4.2 --> 1.8.4.3
port-version  1       --> 3 (continues after the previous port-version 2 patch-based recipe)

Co-authored-by: Cursor <cursoragent@cursor.com>
Zbig9000 added a commit to Zbig9000/qvac-registry-vcpkg that referenced this pull request May 21, 2026
@Zbig9000 @cursoragent
whisper-cpp: bump to 1.8.4.3#5 — repoint to tetherto/master after PR t…
f287037 
…etherto#28 merge (QVAC-18993, QVAC-19071)

`tetherto/qvac-ext-lib-whisper.cpp` PR tetherto#28 merged today (2026-05-21,
merge commit `f3102199`), completing the Group-1/2 merge chain on
`tetherto/master`:

  - PR tetherto#25 (QVAC-18991) merged 2026-05-20 — upstream whisper.cpp sync
  - PR tetherto#27 (QVAC-18966) merged 2026-05-20 — tts-cpp chatterbox <atomic> fix
  - PR tetherto#28 (QVAC-18993) merged 2026-05-21 — ggml-backend Android dynamic
                                            backend + per-arch CPU dlopen fallback

So `tetherto/master` now carries every commit this port previously
pinned from `Zbig9000/qvac-ext-lib-whisper.cpp@14620c8857fc2893`.
Repoints the `vcpkg_from_github` call:

  REPO    Zbig9000/qvac-ext-lib-whisper.cpp  ->  tetherto/qvac-ext-lib-whisper.cpp
  REF     14620c8857fc289313a3b0a82c9ce69a   ->  f3102199642e78bb2beee6b9e9537604
  SHA512  733effd6f77de859bd9f1cf1b6dfe492…  ->  64b102677abae7825985c946b1103cda…
  HEAD_REF QVAC-18993-bundled-ggml-android-…  ->  master

`diff -rq` of the two source tarballs is empty outside `parakeet-cpp/`
and `tts-cpp/` (separate vcpkg ports — not consumed by this port).
The whisper-cpp source itself is byte-identical between `14620c88` and
`f3102199`, so this is a REF-only port-version bump: same recipe, same
features, same patches list (still empty), same build output.

Also drops the "TEMPORARY pinning to Zbig9000 fork" block from the top
of `portfile.cmake` --- no longer applicable now that the upstream PR
chain has landed.

Closes the registry-side half of [QVAC-19071](https://tetherapp.atlassian.net/browse/QVAC-19071)
("Update qvac-registry-vcpkg and addon with new port versions") for
this release cycle. Consumer-side half (re-pinning
`packages/transcription-whispercpp/vcpkg-configuration.json`) goes
into qvac PR #2124 in a follow-up commit.

[QVAC-18993][QVAC-19071]

Co-authored-by: Cursor <cursoragent@cursor.com>
GustavoA1604 pushed a commit that referenced this pull request May 21, 2026
@Zbig9000 @cursoragent
whisper-cpp: bump to 1.8.4.3 with Android OpenCL + dynamic backends +…
a9d7e92 
… MSVC fix (QVAC-18300, QVAC-18993) (#152)

* whisper-cpp: bump to 1.8.4.3 with Android OpenCL + dynamic-backend + spirv-headers (QVAC-18300, QVAC-18992, QVAC-18993)

Brings the whisper-cpp port up to the upstream-sync snapshot at
v1.8.4.3 (QVAC-18991, merged into tetherto/qvac-ext-lib-whisper.cpp
master via PR #25) plus the Android speech-stack flags landed for
QVAC-18300 + QVAC-18992 + QVAC-18993:

  - opencl feature (QVAC-18300): Android-only enable-path,
    OpenCL/Vulkan side-by-side, COOPMAT[2] disabled to keep
    Adreno-class GPUs healthy.
  - Android dynamic-backend mode (QVAC-18993):
    GGML_BACKEND_DL=ON, GGML_CPU_ALL_VARIANTS=ON, GGML_CPU_REPACK=ON.
    Static dispatcher + per-microarch CPU .so + GPU .so files side
    by side, picked by ggml's HWCAP-aware loader at runtime.
  - spirv-headers dependency for the vulkan feature (QVAC-18992):
    the upstream ggml-org v0.10.2 sync pulled in ggml-vulkan.cpp code
    that uses spv::* enums unconditionally for SPIR-V capability
    injection (RTE rounding-mode); Vulkan-Headers no longer bundles
    spirv.hpp, so the standalone SPIRV-Headers tree must be on the
    include path. Inject via CMAKE_CXX_FLAGS=-isystem since
    ggml-vulkan's CMakeLists doesn't find_package(SpirvHeaders).

REF currently pins Zbig9000/qvac-ext-lib-whisper.cpp @ 14620c88
which is the tree-equivalent of merged PR #25 (upstream sync) +
merged PR #27 (tts-cpp <atomic>) + still-open PR #28 (bundled-ggml
Android dynamic-backend fixes). After PR #28 lands on tetherto/master
and a v1.8.4.x tag is published, flip REPO -> tetherto and the
tag/SHA (no other port changes needed).

The previous port-version 2's two patch files
(0001-ggml-allow-backend-dl-with-static-core.patch,
0002-ggml-android-cpu-variant-dlopen-fallback.patch) are now
upstream-equivalent commits on whisper.cpp PR #28 --- ports is
patch-free.

SHA512 = 733effd6... matches the github.com/Zbig9000/qvac-ext-lib-whisper.cpp/archive/14620c88....tar.gz tarball verified via independent download + sha512sum.

version       1.8.4.2 --> 1.8.4.3
port-version  1       --> 3 (continues after the previous port-version 2 patch-based recipe)

Co-authored-by: Cursor <cursoragent@cursor.com>

* whisper-cpp: fix spirv-headers -isystem shim on MSVC (QVAC-18993)

cl.exe does not understand the GCC/Clang `-isystem` flag --- it treats it
as a positional argument (a source file path), then tries to open the
following include directory path as a source file and dies with:

    c1xx: fatal error C1083: Cannot open source file:
    'C:/.../x64-windows/include': No such file or directory

Surfaced on tetherto/qvac/pull/2124 prebuild / win32-x64 against
whisper-cpp[vulkan].

The include shim now emits `/I<path>` on MSVC (and the legacy `/I` form,
no space, for maximal cl-flavour compatibility) and keeps `-isystem
<path>` on GCC/Clang.

Note: this PR previously also carried the ggml-speech port bump
(b4cf7b2) and the matching ggml-speech-side MSVC shim. Both have been
dropped because the consumer-side migration to ggml-speech
(QVAC-18992) is staying behind PR #13 / PR #28 for now; only the
whisper-cpp bits are required to land for the Android dynamic-backend
work on PR #2124.

Co-authored-by: Cursor <cursoragent@cursor.com>

* whisper-cpp: bump to 1.8.4.3#5 — repoint to tetherto/master after PR #28 merge (QVAC-18993, QVAC-19071)

`tetherto/qvac-ext-lib-whisper.cpp` PR #28 merged today (2026-05-21,
merge commit `f3102199`), completing the Group-1/2 merge chain on
`tetherto/master`:

  - PR #25 (QVAC-18991) merged 2026-05-20 — upstream whisper.cpp sync
  - PR #27 (QVAC-18966) merged 2026-05-20 — tts-cpp chatterbox <atomic> fix
  - PR #28 (QVAC-18993) merged 2026-05-21 — ggml-backend Android dynamic
                                            backend + per-arch CPU dlopen fallback

So `tetherto/master` now carries every commit this port previously
pinned from `Zbig9000/qvac-ext-lib-whisper.cpp@14620c8857fc2893`.
Repoints the `vcpkg_from_github` call:

  REPO    Zbig9000/qvac-ext-lib-whisper.cpp  ->  tetherto/qvac-ext-lib-whisper.cpp
  REF     14620c8857fc289313a3b0a82c9ce69a   ->  f3102199642e78bb2beee6b9e9537604
  SHA512  733effd6f77de859bd9f1cf1b6dfe492…  ->  64b102677abae7825985c946b1103cda…
  HEAD_REF QVAC-18993-bundled-ggml-android-…  ->  master

`diff -rq` of the two source tarballs is empty outside `parakeet-cpp/`
and `tts-cpp/` (separate vcpkg ports — not consumed by this port).
The whisper-cpp source itself is byte-identical between `14620c88` and
`f3102199`, so this is a REF-only port-version bump: same recipe, same
features, same patches list (still empty), same build output.

Also drops the "TEMPORARY pinning to Zbig9000 fork" block from the top
of `portfile.cmake` --- no longer applicable now that the upstream PR
chain has landed.

Closes the registry-side half of [QVAC-19071](https://tetherapp.atlassian.net/browse/QVAC-19071)
("Update qvac-registry-vcpkg and addon with new port versions") for
this release cycle. Consumer-side half (re-pinning
`packages/transcription-whispercpp/vcpkg-configuration.json`) goes
into qvac PR #2124 in a follow-up commit.

[QVAC-18993][QVAC-19071]

Co-authored-by: Cursor <cursoragent@cursor.com>

* whisper-cpp: address Gustavo PR #152 review (1.8.4.3#0, drop history, drop comment block)

Review comments from @GustavoA1604 on PR #152
(#152):

1. `ports/whisper-cpp/portfile.cmake`: "Dont add these comments"
   -> dropped the 19-line header that explained the REF history /
   tetherto vs Zbig9000 fork relation / future-bump notes.
2. `ports/whisper-cpp/vcpkg.json`: "Port version should start from 0,
   not 5" -> reset `port-version` 5 -> 0.
3. `versions/w-/whisper-cpp.json`: "Add only one entry here, version
   '1.8.4.3', port-version 0" -> collapsed the three historical
   `1.8.4.3` entries (port-versions 3, 4, 5 -- intermediate states
   that were never consumed off-fork) into a single entry at
   port-version 0 with the new git-tree
   `b4962d7acd7ce05fce118792a167e7aee36f1eba`. Older versions
   (1.8.4.2, 1.8.4.1, 1.7.x) untouched.

Also synced `versions/baseline.json` whisper-cpp port-version to 0.

REPO + REF + SHA512 (tetherto/qvac-ext-lib-whisper.cpp@f3102199, the
PR #28 merge commit) unchanged from the previous HEAD `f287037`.

[QVAC-18993][QVAC-19071]

Co-authored-by: Cursor <cursoragent@cursor.com>

---------

Co-authored-by: Cursor <cursoragent@cursor.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@jpgaribotti jpgaribotti jpgaribotti approved these changes

@yuranich yuranich yuranich approved these changes

@GustavoA1604 GustavoA1604 GustavoA1604 approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@kartiksain @jpgaribotti @yuranich @GustavoA1604