mirror of
https://github.com/mudler/LocalAI.git
synced 2026-07-30 09:57:57 -04:00
chore: ⬆️ Update CrispStrobe/CrispASR to a38cb89f7b9a743db2e8e50869fa646f91dc7f08 (#10873)
* ⬆️ Update CrispStrobe/CrispASR Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * fix(crispasr): rewrite c2pa-audio submodule path for subproject builds CrispASR a38cb89 adds a crispasr_c2pa_native static library whose sources live in the new third_party/c2pa-audio git submodule, located via CMAKE_SOURCE_DIR in src/CMakeLists.txt. That variable assumes CrispASR is the top-level CMake project; LocalAI embeds it via add_subdirectory, so the path resolved to backend/go/crispasr/third_party/c2pa-audio and every build variant failed at CMake generate with 'Cannot find source file: c2pa_native.cpp'. Extend the existing talk-llama sed workaround to also rewrite the c2pa-audio reference to PROJECT_SOURCE_DIR, which is correct both standalone and as a subproject. The submodule itself is already checked out by the recursive submodule init. Verified locally: the exact CI error reproduces with CMAKE_SOURCE_DIR, and with the rewrite CMake configure, crispasr_c2pa_native, and crispasr-lib all build cleanly on a CPU-only fallback configuration. Signed-off-by: Ettore Di Giacinto <mudler@localai.io> Assisted-by: Claude Code:claude-opus-4-8 --------- Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Signed-off-by: Ettore Di Giacinto <mudler@localai.io> Co-authored-by: mudler <2420543+mudler@users.noreply.github.com> Co-authored-by: Ettore Di Giacinto <mudler@localai.io>
This commit is contained in:
@@ -8,7 +8,7 @@ JOBS?=$(shell nproc --ignore=1)
|
||||
|
||||
# CrispASR version (release tag)
|
||||
CRISPASR_REPO?=https://github.com/CrispStrobe/CrispASR
|
||||
CRISPASR_VERSION?=5b38179a4a3281fcdba4220ff285f32e80df43a8
|
||||
CRISPASR_VERSION?=a38cb89f7b9a743db2e8e50869fa646f91dc7f08
|
||||
SO_TARGET?=libgocrispasr.so
|
||||
|
||||
CMAKE_ARGS+=-DBUILD_SHARED_LIBS=OFF
|
||||
@@ -62,12 +62,17 @@ sources/CrispASR:
|
||||
git checkout $(CRISPASR_VERSION) && \
|
||||
git submodule update --init --recursive --depth 1 --single-branch
|
||||
# CrispASR's src/CMakeLists.txt locates its vendored llama.cpp
|
||||
# (crispasr-llama-core, used by the chat C-ABI) via ${CMAKE_SOURCE_DIR},
|
||||
# which assumes CrispASR is the top-level CMake project. We add_subdirectory
|
||||
# it, so ${CMAKE_SOURCE_DIR} is THIS backend dir and the talk-llama sources
|
||||
# aren't found. Rewrite to ${PROJECT_SOURCE_DIR} (the crispasr project root),
|
||||
# which is correct both standalone and as a subproject. Idempotent.
|
||||
sed -i.bak 's#\$${CMAKE_SOURCE_DIR}/examples/talk-llama#\$${PROJECT_SOURCE_DIR}/examples/talk-llama#' sources/CrispASR/src/CMakeLists.txt && rm -f sources/CrispASR/src/CMakeLists.txt.bak
|
||||
# (crispasr-llama-core, used by the chat C-ABI) and the c2pa-audio
|
||||
# submodule (crispasr_c2pa_native, the pure-C++ C2PA signer) via
|
||||
# ${CMAKE_SOURCE_DIR}, which assumes CrispASR is the top-level CMake
|
||||
# project. We add_subdirectory it, so ${CMAKE_SOURCE_DIR} is THIS backend
|
||||
# dir and those sources aren't found. Rewrite to ${PROJECT_SOURCE_DIR}
|
||||
# (the crispasr project root), which is correct both standalone and as a
|
||||
# subproject. Idempotent.
|
||||
sed -i.bak \
|
||||
-e 's#\$${CMAKE_SOURCE_DIR}/examples/talk-llama#\$${PROJECT_SOURCE_DIR}/examples/talk-llama#' \
|
||||
-e 's#\$${CMAKE_SOURCE_DIR}/third_party/c2pa-audio#\$${PROJECT_SOURCE_DIR}/third_party/c2pa-audio#' \
|
||||
sources/CrispASR/src/CMakeLists.txt && rm -f sources/CrispASR/src/CMakeLists.txt.bak
|
||||
|
||||
# Detect OS
|
||||
UNAME_S := $(shell uname -s)
|
||||
|
||||
Reference in New Issue
Block a user