From: Mathieu Baudier Date: Mon, 4 May 2026 16:09:36 +0000 (+0200) Subject: Rename packages X-Git-Url: https://git.djapps.eu/?a=commitdiff_plain;h=f13c8a46c0371d9da13758fdc867eb272ec92bff;p=pkg%2Fggml%2Fsources%2Fwhisper.cpp Rename packages --- diff --git a/debian/argeo-libwhisper-dev.install b/debian/argeo-libwhisper-dev.install new file mode 100644 index 00000000..f447e60a --- /dev/null +++ b/debian/argeo-libwhisper-dev.install @@ -0,0 +1,7 @@ +/usr/include/whisper*.h +# unversioned symbolic link +/usr/lib/*/libwhisper.so + +/usr/lib/*/pkgconfig/whisper.pc + +/usr/lib/*/cmake/whisper/whisper-*.cmake diff --git a/debian/argeo-libwhisper1.install b/debian/argeo-libwhisper1.install new file mode 100644 index 00000000..df7eb36f --- /dev/null +++ b/debian/argeo-libwhisper1.install @@ -0,0 +1 @@ +/usr/lib/*/libwhisper.so.* diff --git a/debian/argeo-libwhisper1.lintian-overrides b/debian/argeo-libwhisper1.lintian-overrides new file mode 100644 index 00000000..e52c6ed5 --- /dev/null +++ b/debian/argeo-libwhisper1.lintian-overrides @@ -0,0 +1,3 @@ +# According to https://wiki.debian.org/UsingSymbolsFiles +# "For C++ libraries it is often better not to ship symbols files." +libwhisper1: no-symbols-control-file usr/lib/x86_64-linux-gnu/libwhisper.so.* diff --git a/debian/argeo-whisper.cpp-cli.install b/debian/argeo-whisper.cpp-cli.install new file mode 100644 index 00000000..cd8ea135 --- /dev/null +++ b/debian/argeo-whisper.cpp-cli.install @@ -0,0 +1,2 @@ +/usr/bin/whisper-cli +/usr/libexec/*/ggml/whisper-cli diff --git a/debian/argeo-whisper.cpp-stream.install b/debian/argeo-whisper.cpp-stream.install new file mode 100644 index 00000000..88d545c4 --- /dev/null +++ b/debian/argeo-whisper.cpp-stream.install @@ -0,0 +1,2 @@ +/usr/bin/whisper-stream +/usr/libexec/*/ggml/whisper-stream diff --git a/debian/argeo-whisper.cpp-talk-llama.install b/debian/argeo-whisper.cpp-talk-llama.install new file mode 100644 index 00000000..88ac61db --- /dev/null +++ b/debian/argeo-whisper.cpp-talk-llama.install @@ -0,0 +1,5 @@ +/usr/bin/whisper-talk-llama +/usr/libexec/*/ggml/whisper-talk-llama + +# wrapper to espeak to use for talk output +debian/whisper-speak /usr/bin diff --git a/debian/changelog b/debian/changelog index 6a77a0b4..c2c39716 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,43 +1,5 @@ -whisper.cpp (1.8.4-1) unstable; urgency=medium +argeo-whisper.cpp (1.8.4-1) unstable; urgency=medium - * Update upstream + * New package names - -- Mathieu Baudier Fri, 03 Apr 2026 12:51:50 +0000 - -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 - - -- Mathieu Baudier Tue, 03 Feb 2026 06:36:34 +0000 - -whisper.cpp (1.8.3-1) unstable; urgency=medium - - * Update upstream - - -- Mathieu Baudier 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 - * Remove load ggml backends patch - - -- Mathieu Baudier Sat, 03 Jan 2026 11:03:29 +0000 - -whisper.cpp (1.8.2-1) unstable; urgency=medium - - * Update upstream - - -- Mathieu Baudier Tue, 11 Nov 2025 09:31:12 +0000 - -whisper.cpp (1.8.0-1) unstable; urgency=medium - - * Align package names with Debian official - - -- Mathieu Baudier Sat, 18 Oct 2025 10:47:56 +0000 + -- Mathieu Baudier Mon, 04 May 2026 14:57:43 +0000 diff --git a/debian/control b/debian/control index d9890d9a..29580ca0 100644 --- a/debian/control +++ b/debian/control @@ -1,4 +1,4 @@ -Source: whisper.cpp +Source: argeo-whisper.cpp Section: science Priority: optional Maintainer: Mathieu Baudier @@ -6,15 +6,20 @@ Standards-Version: 4.7.2 Vcs-Browser: https://git.djapps.eu/?p=pkg/ggml/sources/whisper.cpp;a=summary Vcs-Git: https://git.djapps.eu/pkg/ggml/sources/whisper.cpp Homepage: https://github.com/ggml-org/whisper.cpp -Build-Depends: cmake, - debhelper-compat (= 13), +Build-Depends: debhelper-compat (= 13), + cmake, + clang, + lld, + llvm, + libc++-dev, libsdl2-dev, - libggml-dev, - libllama-dev, + argeo-libggml-dev, + argeo-libllama-dev, pkgconf, Rules-Requires-Root: no -Package: libwhisper1 +Package: argeo-libwhisper1 +Conflicts: libwhisper1 Section: libs Architecture: any Multi-Arch: same @@ -24,20 +29,22 @@ Description: Inference of Whisper in pure C/C++ (shared library) The shared library provides the core of whisper.cpp speech-to-text capabilities using a Whisper model. -Package: whisper.cpp-cli +Package: argeo-whisper.cpp-cli +Conflicts: whisper.cpp Architecture: any Multi-Arch: same -Depends: libggml0-backend-cpu, +Depends: argeo-libggml0-backend-cpu, ${misc:Depends}, ${shlibs:Depends} Description: Inference of Whisper in pure C/C++ (CLI) A versatile tool giving command line access to most whisper-cpp capabilities. -Package: whisper.cpp-stream +Package: argeo-whisper.cpp-stream +Conflicts: whisper.cpp Architecture: any Multi-Arch: same -Depends: libggml0-backend-cpu, +Depends: argeo-libggml0-backend-cpu, ${misc:Depends}, ${shlibs:Depends} Description: Inference of Whisper in pure C/C++ (stream) @@ -45,10 +52,10 @@ Description: Inference of Whisper in pure C/C++ (stream) The SDL sound input (typically a microphone) is transcribed as text to the standard output. -Package: whisper.cpp-talk-llama +Package: argeo-whisper.cpp-talk-llama Architecture: any Multi-Arch: same -Depends: libggml0-backend-cpu, +Depends: argeo-libggml0-backend-cpu, ${misc:Depends}, ${shlibs:Depends} Description: Inference of Whisper in pure C/C++ (talk-llama) @@ -57,12 +64,13 @@ Description: Inference of Whisper in pure C/C++ (talk-llama) The SDL input (typically from a microphone) is translated into text by whisper.cpp and sent to llama.cpp for processing. -Package: libwhisper-dev +Package: argeo-libwhisper-dev +Conflicts: libwhisper-dev Section: libdevel Architecture: any Multi-Arch: same -Depends: libwhisper1 (= ${binary:Version}), - libggml-dev, +Depends: argeo-libwhisper1 (= ${binary:Version}), + argeo-libggml-dev, ${misc:Depends} Description: Inference of Whisper in pure C/C++ (development files) Development files for using whisper.cpp as a shared library diff --git a/debian/copyright b/debian/copyright index cef6e23d..6793eb9b 100644 --- a/debian/copyright +++ b/debian/copyright @@ -4,7 +4,7 @@ Upstream-Contact: https://github.com/ggerganov/whisper.cpp/issues Source: https://github.com/ggerganov/whisper.cpp Files: * -Copyright: Copyright (c) 2023-2025 The whisper.cpp authors +Copyright: Copyright (c) 2023-2026 The whisper.cpp authors License: Expat Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -25,7 +25,7 @@ License: Expat SOFTWARE. Files: debian/* -Copyright: 2024 Mathieu Baudier +Copyright: 2024-2026 Mathieu Baudier License: GPL-2+ This package is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/debian/libwhisper-dev.install b/debian/libwhisper-dev.install deleted file mode 100644 index f447e60a..00000000 --- a/debian/libwhisper-dev.install +++ /dev/null @@ -1,7 +0,0 @@ -/usr/include/whisper*.h -# unversioned symbolic link -/usr/lib/*/libwhisper.so - -/usr/lib/*/pkgconfig/whisper.pc - -/usr/lib/*/cmake/whisper/whisper-*.cmake diff --git a/debian/libwhisper1.install b/debian/libwhisper1.install deleted file mode 100644 index df7eb36f..00000000 --- a/debian/libwhisper1.install +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/*/libwhisper.so.* diff --git a/debian/libwhisper1.lintian-overrides b/debian/libwhisper1.lintian-overrides deleted file mode 100644 index e52c6ed5..00000000 --- a/debian/libwhisper1.lintian-overrides +++ /dev/null @@ -1,3 +0,0 @@ -# According to https://wiki.debian.org/UsingSymbolsFiles -# "For C++ libraries it is often better not to ship symbols files." -libwhisper1: no-symbols-control-file usr/lib/x86_64-linux-gnu/libwhisper.so.* diff --git a/debian/rules b/debian/rules index b8714bb5..2561199c 100755 --- a/debian/rules +++ b/debian/rules @@ -4,6 +4,11 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=-all +# clang build +export CC = clang +export CXX = clang++ +export LD = ld.lld + # multiarch include /usr/share/dpkg/architecture.mk @@ -28,6 +33,13 @@ CMAKE_FLAGS = \ FLAGS_ARGEO=-O3 -g -DNDEBUG +# clang build +CMAKE_FLAGS += -DCMAKE_C_COMPILER=clang \ + -DCMAKE_CXX_COMPILER=clang++ \ + -DCMAKE_CXX_FLAGS=-stdlib=libc++ \ + -DCMAKE_LINKER_TYPE=LLD \ + + CMAKE_FLAGS += -DCMAKE_C_FLAGS_RELWITHDEBINFO="$(FLAGS_ARGEO)" \ -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(FLAGS_ARGEO)" \ @@ -54,5 +66,9 @@ override_dh_auto_install: mv $(install_lib)/pkgconfig/*.pc $(install_lib_multiarch)/pkgconfig override_dh_auto_test: + # Ignore tests # tests which depends on remote location are failing - dh_auto_test || true + #dh_auto_test || true + +override_dh_dwz: + # Skip dwz optimization when using clang diff --git a/debian/whisper.cpp-cli.install b/debian/whisper.cpp-cli.install deleted file mode 100644 index cd8ea135..00000000 --- a/debian/whisper.cpp-cli.install +++ /dev/null @@ -1,2 +0,0 @@ -/usr/bin/whisper-cli -/usr/libexec/*/ggml/whisper-cli diff --git a/debian/whisper.cpp-stream.install b/debian/whisper.cpp-stream.install deleted file mode 100644 index 88d545c4..00000000 --- a/debian/whisper.cpp-stream.install +++ /dev/null @@ -1,2 +0,0 @@ -/usr/bin/whisper-stream -/usr/libexec/*/ggml/whisper-stream diff --git a/debian/whisper.cpp-talk-llama.install b/debian/whisper.cpp-talk-llama.install deleted file mode 100644 index 88ac61db..00000000 --- a/debian/whisper.cpp-talk-llama.install +++ /dev/null @@ -1,5 +0,0 @@ -/usr/bin/whisper-talk-llama -/usr/libexec/*/ggml/whisper-talk-llama - -# wrapper to espeak to use for talk output -debian/whisper-speak /usr/bin