From: Mathieu Baudier Date: Mon, 16 Feb 2026 07:14:44 +0000 (+0100) Subject: Update upstream X-Git-Url: https://git.djapps.eu/?a=commitdiff_plain;p=pkg%2Fggml%2Fsources%2Fwhisper.cpp Update upstream --- diff --git a/debian/changelog b/debian/changelog index 22a0a75e..9bf4aa6d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +whisper.cpp (1.8.3+155-1) unstable; urgency=medium + + * Update upstream to commit 364c77f + * Improve packaging + + -- Mathieu Baudier Mon, 16 Feb 2026 07:13:50 +0000 + whisper.cpp (1.8.3-2) unstable; urgency=medium * Add patch removing obsolete build-time configuration of backends diff --git a/debian/control b/debian/control index 1d074e92..d9890d9a 100644 --- a/debian/control +++ b/debian/control @@ -18,8 +18,7 @@ Package: libwhisper1 Section: libs Architecture: any Multi-Arch: same -Depends: libggml0 - ${misc:Depends}, +Depends: ${misc:Depends}, ${shlibs:Depends} Description: Inference of Whisper in pure C/C++ (shared library) The shared library provides the core of whisper.cpp @@ -28,7 +27,7 @@ Description: Inference of Whisper in pure C/C++ (shared library) Package: whisper.cpp-cli Architecture: any Multi-Arch: same -Depends: libwhisper1, +Depends: libggml0-backend-cpu, ${misc:Depends}, ${shlibs:Depends} Description: Inference of Whisper in pure C/C++ (CLI) @@ -38,8 +37,7 @@ Description: Inference of Whisper in pure C/C++ (CLI) Package: whisper.cpp-stream Architecture: any Multi-Arch: same -Depends: libwhisper1, - libsdl2-2.0-0, +Depends: libggml0-backend-cpu, ${misc:Depends}, ${shlibs:Depends} Description: Inference of Whisper in pure C/C++ (stream) @@ -50,13 +48,7 @@ Description: Inference of Whisper in pure C/C++ (stream) Package: whisper.cpp-talk-llama Architecture: any Multi-Arch: same -Depends: libwhisper1, - libllama0, - espeak-ng, - libswresample4, - libavcodec59, - libavformat59, - libsdl2-2.0-0, +Depends: libggml0-backend-cpu, ${misc:Depends}, ${shlibs:Depends} Description: Inference of Whisper in pure C/C++ (talk-llama) diff --git a/debian/patches/0002-use-llama-cpp-library.patch b/debian/patches/0002-use-llama-cpp-library.patch index 639695cc..916edd31 100644 --- a/debian/patches/0002-use-llama-cpp-library.patch +++ b/debian/patches/0002-use-llama-cpp-library.patch @@ -2,17 +2,20 @@ From: Mathieu Baudier Date: Tue, 11 Mar 2025 15:40:11 +0100 Subject: use-llama-cpp-library +# Conflicts: +# examples/talk-llama/CMakeLists.txt + # Conflicts: # examples/talk-llama/CMakeLists.txt --- - examples/talk-llama/CMakeLists.txt | 36 ++++-------------------------------- - 1 file changed, 4 insertions(+), 32 deletions(-) + examples/talk-llama/CMakeLists.txt | 37 ++++--------------------------------- + 1 file changed, 4 insertions(+), 33 deletions(-) diff --git a/examples/talk-llama/CMakeLists.txt b/examples/talk-llama/CMakeLists.txt -index cac4670..f86a338 100644 +index 549842a..f86a338 100644 --- a/examples/talk-llama/CMakeLists.txt +++ b/examples/talk-llama/CMakeLists.txt -@@ -2,41 +2,13 @@ if (WHISPER_SDL2) +@@ -2,42 +2,13 @@ if (WHISPER_SDL2) set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) @@ -36,13 +39,14 @@ index cac4670..f86a338 100644 - llama-kv-cache-iswa.cpp - llama-memory-recurrent.cpp - llama-memory-hybrid.cpp +- llama-memory-hybrid-iswa.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-sampler.cpp - llama-vocab.cpp - unicode.cpp - unicode-data.cpp diff --git a/debian/patches/0003-cmake-Drop-obsolete-build-time-configuration-of-back.patch b/debian/patches/0003-cmake-Drop-obsolete-build-time-configuration-of-back.patch deleted file mode 100644 index a0f47028..00000000 --- a/debian/patches/0003-cmake-Drop-obsolete-build-time-configuration-of-back.patch +++ /dev/null @@ -1,78 +0,0 @@ -From: Mathieu Baudier -Date: Tue, 3 Feb 2026 07:34:47 +0100 -Subject: cmake: Drop obsolete build-time configuration of backends - ---- - cmake/whisper-config.cmake.in | 45 +++++-------------------------------------- - 1 file changed, 5 insertions(+), 40 deletions(-) - -diff --git a/cmake/whisper-config.cmake.in b/cmake/whisper-config.cmake.in -index 6a3fa22..b70c1e5 100644 ---- a/cmake/whisper-config.cmake.in -+++ b/cmake/whisper-config.cmake.in -@@ -3,60 +3,25 @@ set(WHISPER_BUILD_COMMIT @WHISPER_BUILD_COMMIT@) - set(WHISPER_BUILD_NUMBER @WHISPER_BUILD_NUMBER@) - set(WHISPER_SHARED_LIB @BUILD_SHARED_LIBS@) - --set(GGML_BLAS @GGML_BLAS@) --set(GGML_CUDA @GGML_CUDA@) --set(GGML_METAL @GGML_METAL@) --set(GGML_HIPBLAS @GGML_HIPBLAS@) --set(GGML_ACCELERATE @GGML_ACCELERATE@) -- - @PACKAGE_INIT@ - - set_and_check(WHISPER_INCLUDE_DIR "@PACKAGE_WHISPER_INCLUDE_INSTALL_DIR@") - set_and_check(WHISPER_LIB_DIR "@PACKAGE_WHISPER_LIB_INSTALL_DIR@") - set_and_check(WHISPER_BIN_DIR "@PACKAGE_WHISPER_BIN_INSTALL_DIR@") - --# Ensure transient dependencies satisfied -- --find_package(Threads REQUIRED) -- --if (APPLE AND GGML_ACCELERATE) -- find_library(ACCELERATE_FRAMEWORK Accelerate REQUIRED) --endif() -- --if (GGML_BLAS) -- find_package(BLAS REQUIRED) --endif() -- --if (GGML_CUDA) -- find_package(CUDAToolkit REQUIRED) --endif() -- --if (GGML_METAL) -- find_library(FOUNDATION_LIBRARY Foundation REQUIRED) -- find_library(METAL_FRAMEWORK Metal REQUIRED) -- find_library(METALKIT_FRAMEWORK MetalKit REQUIRED) --endif() -- --if (GGML_HIPBLAS) -- find_package(hip REQUIRED) -- find_package(hipblas REQUIRED) -- find_package(rocblas REQUIRED) --endif() -+find_package(ggml REQUIRED HINTS ${LLAMA_LIB_DIR}/cmake) - - find_library(whisper_LIBRARY whisper - REQUIRED -- HINTS ${WHISPER_LIB_DIR}) -- --set(_whisper_link_deps "Threads::Threads" "@WHISPER_EXTRA_LIBS@") --set(_whisper_transient_defines "@WHISPER_TRANSIENT_DEFINES@") -+ HINTS ${WHISPER_LIB_DIR} -+ NO_CMAKE_FIND_ROOT_PATH -+) - - add_library(whisper UNKNOWN IMPORTED) -- - set_target_properties(whisper - PROPERTIES - INTERFACE_INCLUDE_DIRECTORIES "${WHISPER_INCLUDE_DIR}" -- INTERFACE_LINK_LIBRARIES "${_whisper_link_deps}" -- INTERFACE_COMPILE_DEFINITIONS "${_whisper_transient_defines}" -+ INTERFACE_LINK_LIBRARIES "ggml::ggml;ggml::ggml-base;" - IMPORTED_LINK_INTERFACE_LANGUAGES "CXX" - IMPORTED_LOCATION "${whisper_LIBRARY}" - INTERFACE_COMPILE_FEATURES cxx_std_11 diff --git a/debian/patches/series b/debian/patches/series index 526a4dcc..86cf8d36 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,2 @@ 0001-disable-some-examples.patch 0002-use-llama-cpp-library.patch -0003-cmake-Drop-obsolete-build-time-configuration-of-back.patch diff --git a/debian/rules b/debian/rules index b9517725..b8714bb5 100755 --- a/debian/rules +++ b/debian/rules @@ -2,6 +2,8 @@ # See debhelper(7) (uncomment to enable) #export DH_VERBOSE = 1 +export DEB_BUILD_MAINT_OPTIONS = hardening=-all + # multiarch include /usr/share/dpkg/architecture.mk @@ -11,29 +13,30 @@ install_lib=debian/tmp/usr/lib install_lib_multiarch=debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH) install_libexec_multiarch=debian/tmp/usr/libexec/$(DEB_HOST_MULTIARCH) -# parallelism -DEB_BUILD_OPTIONS ?= parallel=8 +CMAKE_FLAGS = \ + -DCMAKE_LIBRARY_ARCHITECTURE="$(DEB_HOST_MULTIARCH)" \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + \ + -DBUILD_SHARED_LIBS=ON \ + -DWHISPER_USE_SYSTEM_GGML=ON \ + -DCMAKE_LIBRARY_PATH=/usr/libexec/$(DEB_HOST_MULTIARCH)/ggml \ + \ + -DWHISPER_BUILD_TESTS=OFF \ + -DWHISPER_BUILD_EXAMPLES=ON \ + -DWHISPER_FFMPEG=OFF \ + -DWHISPER_SDL2=ON \ + +FLAGS_ARGEO=-O3 -g -DNDEBUG -# hardening -export DEB_BUILD_MAINT_OPTIONS = hardening=+all +CMAKE_FLAGS += -DCMAKE_C_FLAGS_RELWITHDEBINFO="$(FLAGS_ARGEO)" \ + -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(FLAGS_ARGEO)" \ %: # Use build/ for output, so that it is in the .gitignore of upstream dh $@ --buildsystem=cmake --builddirectory=$(build_multiarch) override_dh_auto_configure: - dh_auto_configure -- \ - -DCMAKE_LIBRARY_ARCHITECTURE="$(DEB_HOST_MULTIARCH)" \ - -DCMAKE_BUILD_TYPE=RelWithDebInfo \ - \ - -DBUILD_SHARED_LIBS=ON \ - -DWHISPER_USE_SYSTEM_GGML=ON \ - -DCMAKE_LIBRARY_PATH=/usr/libexec/$(DEB_HOST_MULTIARCH)/ggml \ - \ - -DWHISPER_BUILD_TESTS=OFF \ - -DWHISPER_BUILD_EXAMPLES=ON \ - -DWHISPER_FFMPEG=OFF \ - -DWHISPER_SDL2=ON \ + dh_auto_configure -- $(CMAKE_FLAGS) override_dh_auto_install: dh_auto_install