Adapt to ggml changes

diff --git a/debian/changelog b/debian/changelog
index 4d19da3204c9d18e9bbee218c319ebdd26780b38..e4bdb3b3b20f234aa852c222d1c6c00b1d076a01 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+whisper.cpp (1.8.2-2) unstable; urgency=medium
+
+  * Adapt to breaking changes in ggml v0.9.5
+  * Remove load ggml backends patch
+
+ -- Mathieu Baudier <mbaudier@argeo.org>  Sat, 03 Jan 2026 11:03:29 +0000
+
 whisper.cpp (1.8.2-1) unstable; urgency=medium
 
   * Update upstream

diff --git a/debian/cmake/debian-whisper.cpp.cmake b/debian/cmake/debian-whisper.cpp.cmake
new file mode 100644 (file)
index 0000000..74530a3
--- /dev/null
+++ b/debian/cmake/debian-whisper.cpp.cmake
@@ -0,0 +1,3 @@
+# Workaround for GGML macro removed between v0.9.4 and v0.9.5
+# until whisper.cpp is updated from v1.8.2
+add_compile_definitions(GGML_KQ_MASK_PAD=64)

diff --git a/debian/patches/0003-load-ggml-backends-cli.patch b/debian/patches/0003-load-ggml-backends-cli.patch
deleted file mode 100644 (file)
index 530bc12..0000000
--- a/debian/patches/0003-load-ggml-backends-cli.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Mathieu Baudier <mbaudier@argeo.org>
-Date: Tue, 11 Mar 2025 16:22:18 +0100
-Subject: load-ggml-backends-cli
-
----
- examples/cli/cli.cpp | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/examples/cli/cli.cpp b/examples/cli/cli.cpp
-index 9a54742..624eac5 100644
---- a/examples/cli/cli.cpp
-+++ b/examples/cli/cli.cpp
-@@ -928,6 +928,9 @@ int main(int argc, char ** argv) {
-     SetConsoleOutputCP(CP_UTF8);
- #endif
- 
-+      // make sure GGML backends are loaded
-+      ggml_backend_load_all();
-+
-     whisper_params params;
- 
-     // If the only argument starts with "@", read arguments line-by-line

diff --git a/debian/patches/series b/debian/patches/series
index 676e523615dcd099a4b51bcf2d8fbc9e117cd039..86cf8d361759a112fc824624efd9c7b630fffd0d 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 0001-disable-some-examples.patch
 0002-use-llama-cpp-library.patch
-0003-load-ggml-backends-cli.patch

diff --git a/debian/rules b/debian/rules
index b951772583709ebffab4f4318d1eba90095e35b2..f06290dae6c630adee9604d942fb2b2392d26f10 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -23,6 +23,8 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
 override_dh_auto_configure:
        dh_auto_configure -- \
+       -DCMAKE_PROJECT_whisper.cpp_INCLUDE=debian/cmake/debian-whisper.cpp.cmake \
+       \
        -DCMAKE_LIBRARY_ARCHITECTURE="$(DEB_HOST_MULTIARCH)" \
        -DCMAKE_BUILD_TYPE=RelWithDebInfo \
        \