From: Sergey Matveev <stargrave@stargrave.org>
Date: Thu, 9 Jan 2025 10:50:12 +0000 (+0300)
Subject: Update whisper.cpp
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=9249947945915ac48fb96f4e45f17c7810d2ec48ac9f3cd486d567a1e904497f;p=bass.git

Update whisper.cpp
---

diff --git a/build/distfiles/.gitignore b/build/distfiles/.gitignore
index 4a564f3..7d7e801 100644
--- a/build/distfiles/.gitignore
+++ b/build/distfiles/.gitignore
@@ -246,7 +246,7 @@
 /wavpack-5.7.0.tar.xz
 /webkitgtk-2.34.6.tar.xz
 /wget-1.25.0.tar.lz
-/whisper.cpp-1.6.2.tar.zst
+/whisper.cpp-1.7.4.tar.zst
 /whisper.cpp.git
 /wireshark-4.2.5.tar.xz
 /x264-2024-05-12.tar.zst
diff --git a/build/distfiles/whisper.cpp-1.6.2.tar.zst.do b/build/distfiles/whisper.cpp-1.7.4.tar.zst.do
similarity index 86%
rename from build/distfiles/whisper.cpp-1.6.2.tar.zst.do
rename to build/distfiles/whisper.cpp-1.7.4.tar.zst.do
index 9c649e9..c68e86c 100644
--- a/build/distfiles/whisper.cpp-1.6.2.tar.zst.do
+++ b/build/distfiles/whisper.cpp-1.7.4.tar.zst.do
@@ -2,6 +2,6 @@
 sname=$1.do . "$BASS_ROOT"/lib/rc
 [ -d whisper.cpp.git ] || git clone --depth 1 --bare https://github.com/ggerganov/whisper.cpp >&2
 cd whisper.cpp.git
-commit=c7b6988678779901d02ceba1a8212d2c9908956e
+commit=8a9ad7844d6e2a10cddf4b92de4089d7ac2b14a9
 git fetch origin $commit >&2
 git archive --prefix=${1%.tar.zst}/ $commit | $COMPRESSOR
diff --git a/build/skel/misc/whisper.cpp-1.6.2.do b/build/skel/misc/whisper.cpp-1.7.4.do
similarity index 61%
rename from build/skel/misc/whisper.cpp-1.6.2.do
rename to build/skel/misc/whisper.cpp-1.7.4.do
index 8b6afcc..963b0cf 100644
--- a/build/skel/misc/whisper.cpp-1.6.2.do
+++ b/build/skel/misc/whisper.cpp-1.7.4.do
@@ -2,7 +2,7 @@
 sname=$1.do . "$BASS_ROOT"/lib/rc
 . "$BASS_ROOT"/build/skel/common.rc
 
-bdeps="rc-paths stow archivers/zstd devel/gmake-4.4.1"
+bdeps="rc-paths stow archivers/zstd devel/cmake-3.28.3"
 redo-ifchange $bdeps "$DISTFILES"/$NAME.tar.zst
 hsh=$("$BASS_ROOT"/build/bin/cksum $BASS_REV $SPATH)
 . "$BASS_ROOT"/build/lib/create-tmp-for-build.rc
@@ -12,9 +12,11 @@ $TAR xf "$DISTFILES"/$NAME.tar.zst
 "$BASS_ROOT"/bin/rm-r "$SKELBINS"/$ARCH/$NAME-$hsh
 
 cd $NAME
-gmake -j$MAKE_JOBS >&2
-mkdir -p "$SKELBINS"/$ARCH/$NAME-$hsh/bin
-mv main "$SKELBINS"/$ARCH/$NAME-$hsh/bin/whisper.cpp
+cmake -B build >&2
+cmake --build build --config Release >&2
+mkdir -p "$SKELBINS"/$ARCH/$NAME-$hsh/bin "$SKELBINS"/$ARCH/$NAME-$hsh/lib
+mv build/bin/whisper-cli "$SKELBINS"/$ARCH/$NAME-$hsh/bin
+mv build/src/*.so* build/ggml/src/*.so "$SKELBINS"/$ARCH/$NAME-$hsh/lib
 
 cd "$SKELBINS"/$ARCH
 "$BASS_ROOT"/build/lib/mk-pkg $NAME-$hsh