From: Mathieu Baudier <redacted>
Date: Fri, 10 Oct 2025 14:12:25 +0000 (+0200)
Subject: Merge tag 'upstream/1.8.0' into debian/latest
X-Git-Tag: debian/1.8.2-1~3
X-Git-Url: https://git.djapps.eu/?a=commitdiff_plain;h=5d9ba4f4db30b73cacdbdc22721b3cff435b4a52;p=pkg%2Fggml%2Fsources%2Fwhisper.cpp

Merge tag 'upstream/1.8.0' into debian/latest

Upstream release
---

5d9ba4f4db30b73cacdbdc22721b3cff435b4a52
diff --cc debian/changelog
index ffca047d,00000000..2e1d335f
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,5 -1,0 +1,12 @@@
++whisper-cpp (1.8.0-1) unstable; urgency=medium
++
++  * Update upstream
++
++ -- Mathieu Baudier <mbaudier@argeo.org>  Fri, 10 Oct 2025 14:19:55 +0000
++
 +whisper-cpp (1.7.6-1) unstable; urgency=medium
 +
 +  * Update upstream
 +
 + -- Mathieu Baudier <mbaudier@argeo.org>  Fri, 15 Aug 2025 18:33:41 +0000
++ 
diff --cc debian/patches/0001-disable-some-examples.patch
index c7ddeafa,00000000..862d721a
mode 100644,000000..100644
--- a/debian/patches/0001-disable-some-examples.patch
+++ b/debian/patches/0001-disable-some-examples.patch
@@@ -1,43 -1,0 +1,43 @@@
 +From: Mathieu Baudier <mbaudier@argeo.org>
 +Date: Mon, 27 Jan 2025 08:08:56 +0100
 +Subject: disable-some-examples
 +
 +Disable some unused examples
 +---
 + examples/CMakeLists.txt | 12 ++++++------
 + 1 file changed, 6 insertions(+), 6 deletions(-)
 +
 +diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
- index c37a2e6..f2588b0 100644
++index b202ca0..1e0c9f6 100644
 +--- a/examples/CMakeLists.txt
 ++++ b/examples/CMakeLists.txt
- @@ -102,17 +102,17 @@ elseif(CMAKE_JS_VERSION)
++@@ -103,17 +103,17 @@ elseif(CMAKE_JS_VERSION)
 +     add_subdirectory(addon.node)
 + else()
 +     add_subdirectory(cli)
 +-    add_subdirectory(bench)
 +-    add_subdirectory(server)
 +-    add_subdirectory(quantize)
 ++    #add_subdirectory(bench)
 ++    #add_subdirectory(server)
 ++    #add_subdirectory(quantize)
 +     add_subdirectory(vad-speech-segments)
 +     if (WHISPER_SDL2)
 +         add_subdirectory(stream)
 +         add_subdirectory(command)
 +         add_subdirectory(talk-llama)
 +-        add_subdirectory(lsp)
 ++        #add_subdirectory(lsp)
 +         if (GGML_SYCL)
 +-            add_subdirectory(sycl)
 ++            #add_subdirectory(sycl)
 +         endif()
 +     endif (WHISPER_SDL2)
 + 
- @@ -120,5 +120,5 @@ else()
++@@ -121,5 +121,5 @@ else()
 + endif()
 + 
 + if (WHISPER_SDL2)
 +-    add_subdirectory(wchess)
 ++    #add_subdirectory(wchess)
 + endif (WHISPER_SDL2)
diff --cc debian/patches/0002-use-llama-cpp-library.patch
index 24ba64fb,00000000..48997df7
mode 100644,000000..100644
--- a/debian/patches/0002-use-llama-cpp-library.patch
+++ b/debian/patches/0002-use-llama-cpp-library.patch
@@@ -1,53 -1,0 +1,53 @@@
 +From: Mathieu Baudier <mbaudier@argeo.org>
 +Date: Tue, 11 Mar 2025 15:40:11 +0100
 +Subject: use-llama-cpp-library
 +
 +---
 + examples/talk-llama/CMakeLists.txt | 32 ++++----------------------------
 + 1 file changed, 4 insertions(+), 28 deletions(-)
 +
 +diff --git a/examples/talk-llama/CMakeLists.txt b/examples/talk-llama/CMakeLists.txt
- index 13ecced..f86a338 100644
++index 182114c..f86a338 100644
 +--- a/examples/talk-llama/CMakeLists.txt
 ++++ b/examples/talk-llama/CMakeLists.txt
 +@@ -3,36 +3,12 @@ if (WHISPER_SDL2)
 +     set(CMAKE_CXX_STANDARD_REQUIRED ON)
 + 
 +     set(TARGET whisper-talk-llama)
 +-    add_executable(${TARGET} talk-llama.cpp
 +-        llama.cpp
 +-        llama-adapter.cpp
 +-        llama-arch.cpp
 +-        llama-batch.cpp
 +-        llama-chat.cpp
 +-        llama-context.cpp
 +-        llama-cparams.cpp
 +-        llama-grammar.cpp
 +-        llama-graph.cpp
 +-        llama-hparams.cpp
 +-        llama-impl.cpp
 +-        llama-io.cpp
- -        llama-kv-cache-unified.cpp
- -        llama-kv-cache-unified-iswa.cpp
++-        llama-kv-cache.cpp
++-        llama-kv-cache-iswa.cpp
 +-        llama-memory-recurrent.cpp
 +-        llama-memory-hybrid.cpp
 +-        llama-memory.cpp
 +-        llama-mmap.cpp
 +-        llama-model-loader.cpp
 +-        llama-model-saver.cpp
 +-        llama-model.cpp
 +-        llama-quant.cpp
 +-        llama-sampling.cpp
 +-        llama-vocab.cpp
 +-        unicode.cpp
 +-        unicode-data.cpp)
 ++    add_executable(${TARGET} talk-llama.cpp)
 +     target_include_directories(${TARGET} PRIVATE ${SDL2_INCLUDE_DIRS})
 + 
 +-    target_link_libraries(${TARGET} PRIVATE common common-sdl whisper ${SDL2_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
 ++    target_link_libraries(${TARGET} PRIVATE common common-sdl whisper llama ${SDL2_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
 ++
 ++	install(TARGETS ${TARGET} RUNTIME)
 + 
 +     if(WIN32)
 +         # It requires Windows 8.1 or later for PrefetchVirtualMemory
diff --cc debian/patches/0003-load-ggml-backends-cli.patch
index 903787af,00000000..511c0fcb
mode 100644,000000..100644
--- a/debian/patches/0003-load-ggml-backends-cli.patch
+++ b/debian/patches/0003-load-ggml-backends-cli.patch
@@@ -1,22 -1,0 +1,22 @@@
 +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 f73ed9a..4640bdd 100644
++index 457a1ff..04cacc9 100644
 +--- a/examples/cli/cli.cpp
 ++++ b/examples/cli/cli.cpp
- @@ -918,6 +918,9 @@ int main(int argc, char ** argv) {
++@@ -920,6 +920,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