pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
llama.cpp: update to 0.0.2.10155.
Module Name: pkgsrc-wip
Committed By: Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By: wiz
Date: Tue Jul 28 10:26:02 2026 +0200
Changeset: d560dce5413aa9562f9b4099d26a2a338144da24
Modified Files:
llama.cpp/Makefile.common
llama.cpp/distinfo
Added Files:
llama.cpp/patches/patch-vendor_sheredom_subprocess.h
Removed Files:
llama.cpp/patches/patch-common_common.cpp
llama.cpp/patches/patch-src_llama-vocab.cpp
Log Message:
llama.cpp: update to 0.0.2.10155.
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=d560dce5413aa9562f9b4099d26a2a338144da24
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
llama.cpp/Makefile.common | 4 ++--
llama.cpp/distinfo | 15 ++++++-------
llama.cpp/patches/patch-common_common.cpp | 20 -----------------
llama.cpp/patches/patch-src_llama-vocab.cpp | 25 ----------------------
.../patches/patch-vendor_sheredom_subprocess.h | 16 ++++++++++++++
5 files changed, 25 insertions(+), 55 deletions(-)
diffs:
diff --git a/llama.cpp/Makefile.common b/llama.cpp/Makefile.common
index ed30eee08a..a9428b1854 100644
--- a/llama.cpp/Makefile.common
+++ b/llama.cpp/Makefile.common
@@ -9,5 +9,5 @@ GITHUB_PROJECT= llama.cpp
GITHUB_TAG= b${LLAMA_BUILD_NUMBER}
# embedded in version string in binary
-LLAMA_BUILD_NUMBER= 10068
-LLAMA_BUILD_COMMIT= 571d0d540df04f25298d0e159e520d9fc62ed121
+LLAMA_BUILD_NUMBER= 10155
+LLAMA_BUILD_COMMIT= 1cbfd1988311775425d36c0ce066590f7d3049cf
diff --git a/llama.cpp/distinfo b/llama.cpp/distinfo
index 9bd6f25770..e7e84374af 100644
--- a/llama.cpp/distinfo
+++ b/llama.cpp/distinfo
@@ -1,10 +1,9 @@
$NetBSD$
-BLAKE2s (llama-b10068-ui.tar.gz) = c5fb1cdde0d553a6648001e3daa57474b426c195c80ee118b4e9b0209b8e1410
-SHA512 (llama-b10068-ui.tar.gz) = 0932498f0259e5f46d2f5a14636560c5b2fc036d3b25bcd3e1807d3b7d1e67d962d5c2640a3f05345d6edc0d47baf34afd96520fef5eec5db028171e357d7cd3
-Size (llama-b10068-ui.tar.gz) = 2865832 bytes
-BLAKE2s (llama.cpp-b10068.tar.gz) = f2d99b9916a6dacd408b88ecd2f068a32976d581b4367878de17ff8057c87682
-SHA512 (llama.cpp-b10068.tar.gz) = b23d154942f8e57ba37f6edff94951940665024ff6bd6d10e658d9f1e065cd56266125994269a469af928324a55d4a4b2695b73731c3dff6d9a6276a4620cba4
-Size (llama.cpp-b10068.tar.gz) = 35932327 bytes
-SHA1 (patch-common_common.cpp) = b05147e49fceee8f54b3c40a6db120aa2c8fc9dd
-SHA1 (patch-src_llama-vocab.cpp) = cb99e8705a9c64fabc7bd4c70db0c5f5db919b0b
+BLAKE2s (llama-b10155-ui.tar.gz) = 5e0cb566b9471304a7335dd7e55e04030a62c940bbcfe769ec6074a2d34fb654
+SHA512 (llama-b10155-ui.tar.gz) = 35ae09b6bc7c07b0a360363b86d39331cc1aae26c80b3838da2112ccdbb26a983ad3641bd65ee281da6384dc6b2713878972ec8233ffcc5acaebc978ebc744c8
+Size (llama-b10155-ui.tar.gz) = 3055595 bytes
+BLAKE2s (llama.cpp-b10155.tar.gz) = ae77ea6035cb853f545b9b77f7763ffcd8ac3de8dd0800875a2ba4a6941d77af
+SHA512 (llama.cpp-b10155.tar.gz) = 5b144ab4338d899aff4a3bc6b2f19de068bddb3bdb9c2851f94e3eb20e10247b17fc938aa552d70d28491aba2d7050f05b86bdcac66b65582a966b031ef7979e
+Size (llama.cpp-b10155.tar.gz) = 36422045 bytes
+SHA1 (patch-vendor_sheredom_subprocess.h) = af56949ad770ec8f65b39651f2d6f621cf1b1fa4
diff --git a/llama.cpp/patches/patch-common_common.cpp b/llama.cpp/patches/patch-common_common.cpp
deleted file mode 100644
index 7f52b69931..0000000000
--- a/llama.cpp/patches/patch-common_common.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD$
-
-Fix ctype(3) usage.
-https://github.com/ggml-org/llama.cpp/pull/25888
-
---- common/common.cpp.orig 2026-05-29 05:46:11.000000000 +0000
-+++ common/common.cpp
-@@ -436,10 +436,10 @@ std::string string_format(const char * f
- std::string string_strip(const std::string & str) {
- size_t start = 0;
- size_t end = str.size();
-- while (start < end && std::isspace(str[start])) {
-+ while (start < end && std::isspace((unsigned char)(str[start]))) {
- start++;
- }
-- while (end > start && std::isspace(str[end - 1])) {
-+ while (end > start && std::isspace((unsigned char)(str[end - 1]))) {
- end--;
- }
- return str.substr(start, end - start);
diff --git a/llama.cpp/patches/patch-src_llama-vocab.cpp b/llama.cpp/patches/patch-src_llama-vocab.cpp
deleted file mode 100644
index 50261d4de4..0000000000
--- a/llama.cpp/patches/patch-src_llama-vocab.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD$
-
-Fix ctype(3) usage.
-https://github.com/ggml-org/llama.cpp/pull/25888
-
---- src/llama-vocab.cpp.orig 2025-05-16 09:52:44.723654390 +0000
-+++ src/llama-vocab.cpp
-@@ -2264,7 +2264,7 @@ void llama_vocab::impl::tokenizer_st_par
- int64_t left_reminder_length = match - raw_text_base_offset;
-
- if (data.attr & LLAMA_TOKEN_ATTR_LSTRIP) {
-- while (left_reminder_length > 0 && isspace(raw_text[left_reminder_offset + left_reminder_length - 1])) {
-+ while (left_reminder_length > 0 && isspace((unsigned char)(raw_text[left_reminder_offset + left_reminder_length - 1]))) {
- left_reminder_length--;
- }
- }
-@@ -2289,7 +2289,7 @@ void llama_vocab::impl::tokenizer_st_par
- int64_t right_reminder_length = raw_text_base_length - ((match - raw_text_base_offset) + text.length());
-
- if (data.attr & LLAMA_TOKEN_ATTR_RSTRIP) {
-- while (right_reminder_length > 0 && isspace(raw_text[right_reminder_offset])) {
-+ while (right_reminder_length > 0 && isspace((unsigned char)(raw_text[right_reminder_offset]))) {
- right_reminder_offset++;
- right_reminder_length--;
- }
diff --git a/llama.cpp/patches/patch-vendor_sheredom_subprocess.h b/llama.cpp/patches/patch-vendor_sheredom_subprocess.h
new file mode 100644
index 0000000000..232d64f5f7
--- /dev/null
+++ b/llama.cpp/patches/patch-vendor_sheredom_subprocess.h
@@ -0,0 +1,16 @@
+$NetBSD$
+
+Fix build on NetBSD.
+https://github.com/sheredom/subprocess.h/pull/102
+
+--- vendor/sheredom/subprocess.h.orig 2026-07-28 08:10:28.544619500 +0000
++++ vendor/sheredom/subprocess.h
+@@ -1205,7 +1205,7 @@ cleanup:
+
+ // Set working directory
+ if (process_cwd) {
+-#if defined(__APPLE__) && MAC_OS_X_VERSION_MIN_REQUIRED >= 260000
++#if defined(__NetBSD__) || (defined(__APPLE__) && MAC_OS_X_VERSION_MIN_REQUIRED >= 260000)
+ posix_error = posix_spawn_file_actions_addchdir(&actions, process_cwd);
+ #else
+ #if defined(__APPLE__) && defined(__clang__)
Home |
Main Index |
Thread Index |
Old Index