Update upstream

diff --git a/debian/changelog b/debian/changelog
index 9bf4aa6d161e318d33082e761b186f15c58ef5ea..6a77a0b4f8e429bb3279a941b113af3799eef266 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+whisper.cpp (1.8.4-1) unstable; urgency=medium
+
+  * Update upstream
+
+ -- Mathieu Baudier <mbaudier@argeo.org>  Fri, 03 Apr 2026 12:51:50 +0000
+

 whisper.cpp (1.8.3+155-1) unstable; urgency=medium
 
   * Update upstream to commit 364c77f
 whisper.cpp (1.8.3+155-1) unstable; urgency=medium
 
   * Update upstream to commit 364c77f

diff --git a/debian/patches/0002-use-llama-cpp-library.patch b/debian/patches/0002-use-llama-cpp-library.patch
index 916edd31faecce4504237b0a265990e2fb1b6e71..6d3a7b6cd4e9129642f604cf56298aef5c4db58a 100644 (file)
--- a/debian/patches/0002-use-llama-cpp-library.patch
+++ b/debian/patches/0002-use-llama-cpp-library.patch
@@ -5,17 +5,20 @@ Subject: use-llama-cpp-library
 # Conflicts:
 #      examples/talk-llama/CMakeLists.txt
 
 # Conflicts:
 #      examples/talk-llama/CMakeLists.txt
 

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

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

- examples/talk-llama/CMakeLists.txt | 37 ++++---------------------------------
- 1 file changed, 4 insertions(+), 33 deletions(-)
+ examples/talk-llama/CMakeLists.txt | 38 ++++----------------------------------
+ 1 file changed, 4 insertions(+), 34 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 549842a..f86a338 100644
+index 1adeef8..e247de8 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

-@@ -2,42 +2,13 @@ if (WHISPER_SDL2)
+@@ -2,42 +2,12 @@ if (WHISPER_SDL2)

      set(CMAKE_CXX_STANDARD 17)
      set(CMAKE_CXX_STANDARD_REQUIRED ON)
  
      set(CMAKE_CXX_STANDARD 17)
      set(CMAKE_CXX_STANDARD_REQUIRED ON)
  


@@ -51,13 +54,13 @@ index 549842a..f86a338 100644
 -        unicode.cpp
 -        unicode-data.cpp
 -        ${SRC_MODELS})
 -        unicode.cpp
 -        unicode-data.cpp
 -        ${SRC_MODELS})

+-    target_include_directories(${TARGET} PRIVATE . ${SDL2_INCLUDE_DIRS})

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

-     target_include_directories(${TARGET} PRIVATE ${SDL2_INCLUDE_DIRS})
++    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})
  
 -    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)
  
      if(WIN32)
 +      install(TARGETS ${TARGET} RUNTIME)
  
      if(WIN32)