Update upstream

diff --git a/debian/changelog b/debian/changelog
index e4bdb3b3b20f234aa852c222d1c6c00b1d076a01..8f60438c99546a1d200e2329dc23f854715a97f4 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+whisper.cpp (1.8.3-1) unstable; urgency=medium
+
+  * Update upstream
+
+ -- Mathieu Baudier <mbaudier@argeo.org>  Fri, 23 Jan 2026 11:03:35 +0000
+

 whisper.cpp (1.8.2-2) unstable; urgency=medium
 
   * Adapt to breaking changes in ggml v0.9.5
 whisper.cpp (1.8.2-2) unstable; urgency=medium
 
   * Adapt to breaking changes in ggml v0.9.5

diff --git a/debian/cmake/debian-whisper.cpp.cmake b/debian/cmake/debian-whisper.cpp.cmake
deleted file mode 100644 (file)
index 74530a3..0000000
--- a/debian/cmake/debian-whisper.cpp.cmake
+++ /dev/null
@@ -1,3 +0,0 @@
-# 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/not-installed b/debian/not-installed
index 7979e569a7f8ac1d43222f932da50b0c2f8ab31b..876dbbd5009ec50bcea2d9e3fa5eb47b7b275e09 100644 (file)
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -1,4 +1,5 @@
 /usr/bin/whisper-command
 /usr/libexec/*/ggml/whisper-command
 
 /usr/bin/whisper-command
 /usr/libexec/*/ggml/whisper-command
 

-/usr/bin/vad-speech-segments
+/usr/bin/whisper-vad-speech-segments
+/usr/libexec/*/ggml/whisper-vad-speech-segments

diff --git a/debian/patches/0002-use-llama-cpp-library.patch b/debian/patches/0002-use-llama-cpp-library.patch
index 48997df719c5762ef577cdbf8e418797c89e43db..639695cce79abc314ef22cfb839693e8c25eb25a 100644 (file)
--- a/debian/patches/0002-use-llama-cpp-library.patch
+++ b/debian/patches/0002-use-llama-cpp-library.patch
@@ -2,17 +2,22 @@ From: Mathieu Baudier <mbaudier@argeo.org>
 Date: Tue, 11 Mar 2025 15:40:11 +0100
 Subject: use-llama-cpp-library
 
 Date: Tue, 11 Mar 2025 15:40:11 +0100
 Subject: use-llama-cpp-library
 

+# Conflicts:
+#      examples/talk-llama/CMakeLists.txt

 ---
 ---

- examples/talk-llama/CMakeLists.txt | 32 ++++----------------------------
- 1 file changed, 4 insertions(+), 28 deletions(-)
+ examples/talk-llama/CMakeLists.txt | 36 ++++--------------------------------
+ 1 file changed, 4 insertions(+), 32 deletions(-)

 
 diff --git a/examples/talk-llama/CMakeLists.txt b/examples/talk-llama/CMakeLists.txt
 
 diff --git a/examples/talk-llama/CMakeLists.txt b/examples/talk-llama/CMakeLists.txt

-index 182114c..f86a338 100644
+index cac4670..f86a338 100644

 --- a/examples/talk-llama/CMakeLists.txt
 +++ b/examples/talk-llama/CMakeLists.txt
 --- a/examples/talk-llama/CMakeLists.txt
 +++ b/examples/talk-llama/CMakeLists.txt

-@@ -3,36 +3,12 @@ if (WHISPER_SDL2)
+@@ -2,41 +2,13 @@ if (WHISPER_SDL2)
+     set(CMAKE_CXX_STANDARD 17)

      set(CMAKE_CXX_STANDARD_REQUIRED ON)
  
      set(CMAKE_CXX_STANDARD_REQUIRED ON)
  

+-    file(GLOB SRC_MODELS models/*.cpp)
+-

      set(TARGET whisper-talk-llama)
 -    add_executable(${TARGET} talk-llama.cpp
 -        llama.cpp
      set(TARGET whisper-talk-llama)
 -    add_executable(${TARGET} talk-llama.cpp
 -        llama.cpp


@@ -40,11 +45,13 @@ index 182114c..f86a338 100644
 -        llama-sampling.cpp
 -        llama-vocab.cpp
 -        unicode.cpp
 -        llama-sampling.cpp
 -        llama-vocab.cpp
 -        unicode.cpp

--        unicode-data.cpp)
+-        unicode-data.cpp
+-        ${SRC_MODELS})

 +    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})
 +    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})

+-    install(TARGETS ${TARGET} RUNTIME)

 +    target_link_libraries(${TARGET} PRIVATE common common-sdl whisper llama ${SDL2_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
 +
 +      install(TARGETS ${TARGET} RUNTIME)
 +    target_link_libraries(${TARGET} PRIVATE common common-sdl whisper llama ${SDL2_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
 +
 +      install(TARGETS ${TARGET} RUNTIME)

diff --git a/debian/rules b/debian/rules
index f06290dae6c630adee9604d942fb2b2392d26f10..b951772583709ebffab4f4318d1eba90095e35b2 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -23,8 +23,6 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
 override_dh_auto_configure:
        dh_auto_configure -- \
 
 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 \
        \
        -DCMAKE_LIBRARY_ARCHITECTURE="$(DEB_HOST_MULTIARCH)" \
        -DCMAKE_BUILD_TYPE=RelWithDebInfo \
        \