From: Mathieu Baudier Date: Mon, 4 May 2026 13:04:22 +0000 (+0200) Subject: Rename packages X-Git-Url: https://git.djapps.eu/?a=commitdiff_plain;h=cee196a82037e565eef87795ed5ab6049e0aa725;p=pkg%2Fggml%2Fsources%2Fllama.cpp Rename packages --- diff --git a/debian/argeo-libllama-dev.install b/debian/argeo-libllama-dev.install new file mode 100644 index 000000000..ffb4be37a --- /dev/null +++ b/debian/argeo-libllama-dev.install @@ -0,0 +1,10 @@ +/usr/include/llama*.h +include/llama-cpp.h /usr/include/ +/usr/include/mtmd*.h + +# Symbolic links +/usr/lib/*/libllama.so +/usr/lib/*/libmtmd.so + +/usr/lib/*/pkgconfig/*.pc +/usr/lib/*/cmake/llama/llama-*.cmake diff --git a/debian/argeo-libllama0.install b/debian/argeo-libllama0.install new file mode 100644 index 000000000..b091b2a48 --- /dev/null +++ b/debian/argeo-libllama0.install @@ -0,0 +1 @@ +/usr/lib/*/libllama.so.* diff --git a/debian/argeo-libllama0.lintian-overrides b/debian/argeo-libllama0.lintian-overrides new file mode 100644 index 000000000..1db8017b7 --- /dev/null +++ b/debian/argeo-libllama0.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." +libllama0: no-symbols-control-file usr/lib/x86_64-linux-gnu/libllama.so.* diff --git a/debian/argeo-libmtmd0.install b/debian/argeo-libmtmd0.install new file mode 100644 index 000000000..8e15aa099 --- /dev/null +++ b/debian/argeo-libmtmd0.install @@ -0,0 +1 @@ +/usr/lib/*/libmtmd.so.* diff --git a/debian/argeo-llama.cpp-rpc.install b/debian/argeo-llama.cpp-rpc.install new file mode 100644 index 000000000..0760fb5c4 --- /dev/null +++ b/debian/argeo-llama.cpp-rpc.install @@ -0,0 +1,2 @@ +/usr/bin/ggml-rpc-server +/usr/libexec/*/ggml/ggml-rpc-server diff --git a/debian/argeo-llama.cpp-tools.bash-completion b/debian/argeo-llama.cpp-tools.bash-completion new file mode 100644 index 000000000..cf7d2de64 --- /dev/null +++ b/debian/argeo-llama.cpp-tools.bash-completion @@ -0,0 +1,5 @@ +completions/llama-completion +# completions/llama-quantize does not actually use these options +completions/llama-bench +completions/llama-mtmd-cli +completions/llama-server diff --git a/debian/argeo-llama.cpp-tools.install b/debian/argeo-llama.cpp-tools.install new file mode 100644 index 000000000..1bffbe159 --- /dev/null +++ b/debian/argeo-llama.cpp-tools.install @@ -0,0 +1,17 @@ +/usr/bin/llama-completion +/usr/libexec/*/ggml/llama-completion + +/usr/bin/llama-quantize +/usr/libexec/*/ggml/llama-quantize + +/usr/bin/llama-bench +/usr/libexec/*/ggml/llama-bench + +/usr/bin/llama-cli +/usr/libexec/*/ggml/llama-cli + +/usr/bin/llama-mtmd-cli +/usr/libexec/*/ggml/llama-mtmd-cli + +/usr/bin/llama-server +/usr/libexec/*/ggml/llama-server diff --git a/debian/changelog b/debian/changelog index c5518dd26..5cfef4e72 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,57 +1,5 @@ -llama.cpp (0.0.8681-1) unstable; urgency=medium +argeo-llama.cpp (0.0.8681-1) unstable; urgency=medium - * Update upstream + * Rename packages - -- Mathieu Baudier Tue, 07 Apr 2026 07:14:37 +0000 - -llama.cpp (0.0.8611-1) unstable; urgency=medium - - * Update upstream - - -- Mathieu Baudier Fri, 03 Apr 2026 12:27:17 +0000 - -llama.cpp (0.0.8067-1) unstable; urgency=medium - - * Update upstream - * Introduce ggml RPC server - - -- Mathieu Baudier Mon, 16 Feb 2026 06:10:48 +0000 - -llama.cpp (0.0.7721-2) unstable; urgency=medium - - * Remove libmtmd-dev in order to improve compatibility with official packages - - -- Mathieu Baudier Tue, 27 Jan 2026 10:46:56 +0000 - -llama.cpp (0.0.7721-1) unstable; urgency=medium - - * Update upstream - - -- Mathieu Baudier Fri, 23 Jan 2026 10:44:28 +0000 - -llama.cpp (0.0.7599-1) unstable; urgency=medium - - * Update upstream - * Drop .so version patch, now provided by upstream - - -- Mathieu Baudier Sat, 03 Jan 2026 10:43:52 +0000 - -llama.cpp (0.0.7446-1) unstable; urgency=medium - - * Update upstream - - -- Mathieu Baudier Sat, 27 Dec 2025 11:01:11 +0000 - -llama.cpp (0.0.7011-1) unstable; urgency=medium - - * Update upstream - - -- Mathieu Baudier Tue, 11 Nov 2025 09:22:31 +0000 - -llama.cpp (0.0.6764-1) unstable; urgency=medium - - * Update upstream - * Align package names with Debian official - - -- Mathieu Baudier Sat, 18 Oct 2025 08:51:56 +0000 - \ No newline at end of file + -- Mathieu Baudier Mon, 04 May 2026 10:06:54 +0000 diff --git a/debian/control b/debian/control index f62866369..f4f2c77be 100644 --- a/debian/control +++ b/debian/control @@ -1,4 +1,4 @@ -Source: llama.cpp +Source: argeo-llama.cpp Section: science Priority: optional Maintainer: Mathieu Baudier @@ -7,15 +7,20 @@ Vcs-Browser: https://git.djapps.eu/?p=pkg/ggml/sources/llama.cpp;a=summary Vcs-Git: https://git.djapps.eu/pkg/ggml/sources/llama.cpp Homepage: https://github.com/ggml-org/llama.cpp/ Build-Depends: dh-sequence-bash-completion, - cmake, - lsb-release, debhelper-compat (= 13), - libcurl4-openssl-dev, - libggml-dev, + lsb-release, + cmake, + clang, + lld, + llvm, + libc++-dev, + libssl-dev, + argeo-libggml-dev, pkgconf, Rules-Requires-Root: no -Package: libllama0 +Package: argeo-libllama0 +Conflicts: libllama0 Section: libs Architecture: any Multi-Arch: same @@ -26,23 +31,25 @@ Description: Inference of large language models in pure C/C++ (shared library) llama.cpp leverages the ggml tensor library in order to run large language models (LLMs) provided in the GGUF file format. -Package: libmtmd0 +Package: argeo-libmtmd0 +Conflicts: libmtmd0 Section: libs Architecture: any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} -Depends: libllama0 (= ${binary:Version}), +Depends: argeo-libllama0 (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}, Description: Inference of large language models in pure C/C++ (multimodal library) mtmd provides multimodal inference. # We only distribute a few useful tools, with stable CLI options -Package: llama.cpp-tools +Package: argeo-llama.cpp-tools +Conflicts: llama.cpp-tools Architecture: any -Depends: libggml0-backend-cpu, - libllama0 (= ${binary:Version}), - libmtmd0 (= ${binary:Version}), +Depends: argeo-libggml0-backend-cpu, + argeo-libllama0 (= ${binary:Version}), + argeo-libmtmd0 (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}, Description: Inference of large language models in pure C/C++ (tools) @@ -64,21 +71,22 @@ Description: Inference of large language models in pure C/C++ (tools) llama-server: HTTP server support. # This should actually be in ggml -Package: llama.cpp-rpc +Package: argeo-llama.cpp-rpc Architecture: any -Depends: libggml0-backend-rpc, +Depends: argeo-libggml0-backend-rpc, ${misc:Depends}, ${shlibs:Depends}, Description: Inference of large language models in pure C/C++ (RPC server) ggml-rpc-server: ggml RPC server. -Package: libllama-dev +Package: argeo-libllama-dev +Conflicts: libllama-dev Section: libdevel Architecture: any Multi-Arch: same -Depends: libllama0 (= ${binary:Version}), - libmtmd0 (= ${binary:Version}), - libggml-dev, +Depends: argeo-libllama0 (= ${binary:Version}), + argeo-libmtmd0 (= ${binary:Version}), + argeo-libggml-dev, ${misc:Depends}, Description: Inference of large language models in pure C/C++ (development files) Development files required for building software based on the diff --git a/debian/copyright b/debian/copyright index f236ff03c..80b341544 100644 --- a/debian/copyright +++ b/debian/copyright @@ -2,20 +2,9 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: llama.cpp Upstream-Contact: https://github.com/ggml-org/llama.cpp/issues Source: https://github.com/ggml-org/llama.cpp -#Files-Excluded: -# models/* -# ggml/* -# ggml/src/ggml-kompute/kompute/* -# usr/share/doc/llama-cpp-dev/examples/llama.android/gradlew -#Comment: The models/ directory contains the "vocabularies" (mapping between token id and strings) -# used by some publicly available large language models, most of them being -# not DFSG compliant. -# We use the version of ggml packaged separately and -# thus consider ggml/ as third-party code here. -# Other excludes are third-party code (which is not used here). Files: * -Copyright: Copyright (c) 2023-2025 The llama.cpp authors +Copyright: Copyright (c) 2023-2026 The llama.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 @@ -36,7 +25,7 @@ License: Expat SOFTWARE. Files: debian/* -Copyright: 2024-2025 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/libllama-dev.install b/debian/libllama-dev.install deleted file mode 100644 index ffb4be37a..000000000 --- a/debian/libllama-dev.install +++ /dev/null @@ -1,10 +0,0 @@ -/usr/include/llama*.h -include/llama-cpp.h /usr/include/ -/usr/include/mtmd*.h - -# Symbolic links -/usr/lib/*/libllama.so -/usr/lib/*/libmtmd.so - -/usr/lib/*/pkgconfig/*.pc -/usr/lib/*/cmake/llama/llama-*.cmake diff --git a/debian/libllama0.install b/debian/libllama0.install deleted file mode 100644 index b091b2a48..000000000 --- a/debian/libllama0.install +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/*/libllama.so.* diff --git a/debian/libllama0.lintian-overrides b/debian/libllama0.lintian-overrides deleted file mode 100644 index 1db8017b7..000000000 --- a/debian/libllama0.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." -libllama0: no-symbols-control-file usr/lib/x86_64-linux-gnu/libllama.so.* diff --git a/debian/libmtmd0.install b/debian/libmtmd0.install deleted file mode 100644 index 8e15aa099..000000000 --- a/debian/libmtmd0.install +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/*/libmtmd.so.* diff --git a/debian/llama.cpp-rpc.install b/debian/llama.cpp-rpc.install deleted file mode 100644 index 0760fb5c4..000000000 --- a/debian/llama.cpp-rpc.install +++ /dev/null @@ -1,2 +0,0 @@ -/usr/bin/ggml-rpc-server -/usr/libexec/*/ggml/ggml-rpc-server diff --git a/debian/llama.cpp-tools.bash-completion b/debian/llama.cpp-tools.bash-completion deleted file mode 100644 index cf7d2de64..000000000 --- a/debian/llama.cpp-tools.bash-completion +++ /dev/null @@ -1,5 +0,0 @@ -completions/llama-completion -# completions/llama-quantize does not actually use these options -completions/llama-bench -completions/llama-mtmd-cli -completions/llama-server diff --git a/debian/llama.cpp-tools.install b/debian/llama.cpp-tools.install deleted file mode 100644 index 1bffbe159..000000000 --- a/debian/llama.cpp-tools.install +++ /dev/null @@ -1,17 +0,0 @@ -/usr/bin/llama-completion -/usr/libexec/*/ggml/llama-completion - -/usr/bin/llama-quantize -/usr/libexec/*/ggml/llama-quantize - -/usr/bin/llama-bench -/usr/libexec/*/ggml/llama-bench - -/usr/bin/llama-cli -/usr/libexec/*/ggml/llama-cli - -/usr/bin/llama-mtmd-cli -/usr/libexec/*/ggml/llama-mtmd-cli - -/usr/bin/llama-server -/usr/libexec/*/ggml/llama-server diff --git a/debian/rules b/debian/rules index c21e0e1be..077d4e872 100755 --- a/debian/rules +++ b/debian/rules @@ -3,6 +3,11 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=-all +# clang build +export CC = clang +export CXX = clang++ +export LD = ld.lld + # Derivative distribution := $(shell lsb_release --id --short) distrel := $(shell lsb_release --codename --short) @@ -26,7 +31,7 @@ CMAKE_FLAGS = \ \ -DCMAKE_LIBRARY_PATH=/usr/libexec/$(DEB_TARGET_MULTIARCH)/ggml \ \ - -DLLAMA_CURL=ON \ + -DLLAMA_OPENSSL=ON \ -DLLAMA_BUILD_TOOLS=ON \ -DLLAMA_BUILD_EXAMPLES=OFF \ -DLLAMA_BUILD_TESTS=OFF \ @@ -34,6 +39,12 @@ 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)" \ @@ -71,3 +82,6 @@ execute_after_dh_auto_install-arch: # No tests for now, as many need some kind of model we don't have override_dh_auto_test: : + +override_dh_dwz: + # Skip dwz optimization when using clang