]> git.djapps.eu Git - pkg/ggml/sources/whisper.cpp/commitdiff
Add patch removing obsolete build-time configuration of backends
authorMathieu Baudier <redacted>
Tue, 3 Feb 2026 06:38:08 +0000 (07:38 +0100)
committerMathieu Baudier <redacted>
Tue, 3 Feb 2026 06:38:08 +0000 (07:38 +0100)
debian/changelog
debian/patches/0003-cmake-Drop-obsolete-build-time-configuration-of-back.patch [new file with mode: 0644]
debian/patches/series

index 8f60438c99546a1d200e2329dc23f854715a97f4..22a0a75e05d9874c03bacfbe1e0a6c489b1eeab5 100644 (file)
@@ -1,3 +1,9 @@
+whisper.cpp (1.8.3-2) unstable; urgency=medium
+
+  * Add patch removing obsolete build-time configuration of backends
+
+ -- Mathieu Baudier <mbaudier@argeo.org>  Tue, 03 Feb 2026 06:36:34 +0000
+
 whisper.cpp (1.8.3-1) unstable; urgency=medium
 
   * Update upstream
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
new file mode 100644 (file)
index 0000000..a0f4702
--- /dev/null
@@ -0,0 +1,78 @@
+From: Mathieu Baudier <mbaudier@argeo.org>
+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
index 86cf8d361759a112fc824624efd9c7b630fffd0d..526a4dcc7cf49f3cb89f832b7aa9e91a4673eef4 100644 (file)
@@ -1,2 +1,3 @@
 0001-disable-some-examples.patch
 0002-use-llama-cpp-library.patch
+0003-cmake-Drop-obsolete-build-time-configuration-of-back.patch