llama.cpp: Update to b6959

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: llama.cpp: Update to b6959
From: Atsushi Toyokura (via pkgsrc-wip) <commit-notify%pkgsrc.org@localhost>
Date: Sat, 15 Nov 2025 08:48:55 +0000
Module Name:	pkgsrc-wip
Committed By:	Atsushi Toyokura <asteria.at%gmail.com@localhost>
Pushed By:	steleto
Date:		Sat Nov 15 17:27:24 2025 +0900
Changeset:	eea03fe790be89258d504e0f354d2a128de333f3

Modified Files:
	llama.cpp/Makefile
	llama.cpp/PLIST
	llama.cpp/distinfo
	llama.cpp/patches/patch-common_common.cpp
Added Files:
	llama.cpp/patches/patch-vendor_minja_minja.hpp
Removed Files:
	llama.cpp/patches/patch-common_minja_minja.hpp
	llama.cpp/patches/patch-src_llama-chat.cpp

Log Message:
llama.cpp: Update to b6959

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=eea03fe790be89258d504e0f354d2a128de333f3

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 llama.cpp/Makefile                             |  2 +-
 llama.cpp/PLIST                                | 10 ++++++----
 llama.cpp/distinfo                             | 11 +++++------
 llama.cpp/patches/patch-common_common.cpp      |  8 ++++----
 llama.cpp/patches/patch-common_minja_minja.hpp | 22 ----------------------
 llama.cpp/patches/patch-src_llama-chat.cpp     | 17 -----------------
 llama.cpp/patches/patch-vendor_minja_minja.hpp | 22 ++++++++++++++++++++++
 7 files changed, 38 insertions(+), 54 deletions(-)

diffs:
diff --git a/llama.cpp/Makefile b/llama.cpp/Makefile
index be08082752..aa60167836 100644
--- a/llama.cpp/Makefile
+++ b/llama.cpp/Makefile
@@ -4,7 +4,7 @@ DISTNAME=	llama.cpp-${GITHUB_TAG}
 PKGNAME=	${DISTNAME:S/-b/-0.0.2./}
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GITHUB:=ggml-org/}
-GITHUB_TAG=	b5541
+GITHUB_TAG=	b6959
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	https://github.com/ggerganov/llama.cpp/
diff --git a/llama.cpp/PLIST b/llama.cpp/PLIST
index 937d6629d0..1a15bfae88 100644
--- a/llama.cpp/PLIST
+++ b/llama.cpp/PLIST
@@ -6,6 +6,7 @@ bin/llama-bench
 bin/llama-cli
 bin/llama-convert-llama2c-to-ggml
 bin/llama-cvector-generator
+bin/llama-diffusion-cli
 bin/llama-embedding
 bin/llama-eval-callback
 bin/llama-export-lora
@@ -14,8 +15,8 @@ bin/llama-gen-docs
 bin/llama-gguf
 bin/llama-gguf-hash
 bin/llama-gguf-split
-bin/llama-gritlm
 bin/llama-imatrix
+bin/llama-logits
 bin/llama-lookahead
 bin/llama-lookup
 bin/llama-lookup-create
@@ -43,16 +44,18 @@ include/ggml-cann.h
 include/ggml-cpp.h
 include/ggml-cpu.h
 include/ggml-cuda.h
-include/ggml-kompute.h
 include/ggml-metal.h
 include/ggml-opt.h
 include/ggml-rpc.h
 include/ggml-sycl.h
 include/ggml-vulkan.h
+include/ggml-webgpu.h
 include/ggml.h
 include/gguf.h
 include/llama-cpp.h
 include/llama.h
+include/mtmd-helper.h
+include/mtmd.h
 lib/cmake/ggml/ggml-config.cmake
 lib/cmake/ggml/ggml-version.cmake
 lib/cmake/llama/llama-config.cmake
@@ -62,6 +65,5 @@ lib/libggml-blas.so
 lib/libggml-cpu.so
 lib/libggml.so
 lib/libllama.so
-lib/libmtmd_helper_shared.so
-lib/libmtmd_shared.so
+lib/libmtmd.so
 lib/pkgconfig/llama.pc
diff --git a/llama.cpp/distinfo b/llama.cpp/distinfo
index 4ab4ab89f4..0ade573a52 100644
--- a/llama.cpp/distinfo
+++ b/llama.cpp/distinfo
@@ -1,10 +1,9 @@
 $NetBSD$
 
-BLAKE2s (llama.cpp-b5541.tar.gz) = 7cab4b75c1165ab20af40c6f877fb3e767c8e0cf79a9c9c2d742920bc8b2aabf
-SHA512 (llama.cpp-b5541.tar.gz) = ae9cc84182a06f48ec2d298370518972adea5ff68999ab8ade07703f0ddf77dc01de3b6c903da5b8c4f5e7544d6b3ddda07970fa7d8fbab4d622a9a6c63019a9
-Size (llama.cpp-b5541.tar.gz) = 24929231 bytes
-SHA1 (patch-common_common.cpp) = 1655bf8b58bdddb5e9f6d2e00a23ad92869d305d
-SHA1 (patch-common_minja_minja.hpp) = 70e9079a80c840534633e980697ae86233a392c3
+BLAKE2s (llama.cpp-b6959.tar.gz) = 2fc857bd5c6a2e53f79cbcd30e0d445e619f9801b337b483331561f865707289
+SHA512 (llama.cpp-b6959.tar.gz) = 2fccb2771664fc355cc0d23baf9d037ec6ac553a4e08cb3697f06e9226f8afac6ed8fb266b44fdd7017fa1012171d78bafea72637215e5cd468da36d2f6fc5a0
+Size (llama.cpp-b6959.tar.gz) = 26422088 bytes
+SHA1 (patch-common_common.cpp) = 6ae76ef4008e634dbdd2aa3cb5e3ecbc1a359302
 SHA1 (patch-ggml_src_ggml-cpu_ggml-cpu.cpp) = cc5f9840919818b824eb52585a3c5a8ee40a2835
-SHA1 (patch-src_llama-chat.cpp) = ec70b79842f448472142f65205ebbbc9728b07b6
 SHA1 (patch-src_llama-vocab.cpp) = b97f36b85855ccf1385dfdd9fd5417e1abf77024
+SHA1 (patch-vendor_minja_minja.hpp) = 39f95e903d10801256e65cb40ca9e7be26b92049
diff --git a/llama.cpp/patches/patch-common_common.cpp b/llama.cpp/patches/patch-common_common.cpp
index 98a3fd0311..86a6ce5996 100644
--- a/llama.cpp/patches/patch-common_common.cpp
+++ b/llama.cpp/patches/patch-common_common.cpp
@@ -1,8 +1,8 @@
 $NetBSD$
 
---- common/common.cpp.orig	2025-05-30 10:24:37.000000000 +0000
+--- common/common.cpp.orig	2025-09-28 06:38:37.000000000 +0000
 +++ common/common.cpp
-@@ -401,10 +401,10 @@ std::string string_format(const char * f
+@@ -410,10 +410,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();
@@ -15,7 +15,7 @@ $NetBSD$
          end--;
      }
      return str.substr(start, end - start);
-@@ -849,7 +849,7 @@ std::string fs_get_cache_directory() {
+@@ -867,7 +867,7 @@ std::string fs_get_cache_directory() {
      if (getenv("LLAMA_CACHE")) {
          cache_directory = std::getenv("LLAMA_CACHE");
      } else {
@@ -23,4 +23,4 @@ $NetBSD$
 +#if defined(__linux__) || defined(__FreeBSD__) || defined(_AIX) || defined(__OpenBSD__) || defined(__NetBSD__)
          if (std::getenv("XDG_CACHE_HOME")) {
              cache_directory = std::getenv("XDG_CACHE_HOME");
-         } else {
+         } else if (std::getenv("HOME")) {
diff --git a/llama.cpp/patches/patch-common_minja_minja.hpp b/llama.cpp/patches/patch-common_minja_minja.hpp
deleted file mode 100644
index 6d49c75fae..0000000000
--- a/llama.cpp/patches/patch-common_minja_minja.hpp
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD$
-
---- common/minja/minja.hpp.orig	2025-05-16 09:49:49.097392207 +0000
-+++ common/minja/minja.hpp
-@@ -1524,7 +1524,7 @@ public:
-             vargs.expectArgs("title method", {0, 0}, {0, 0});
-             auto res = str;
-             for (size_t i = 0, n = res.size(); i < n; ++i) {
--              if (i == 0 || std::isspace(res[i - 1])) res[i] = std::toupper(res[i]);
-+              if (i == 0 || std::isspace((unsigned char)(res[i - 1]))) res[i] = std::toupper(res[i]);
-               else res[i] = std::tolower(res[i]);
-             }
-             return res;
-@@ -1602,7 +1602,7 @@ private:
- 
-     bool consumeSpaces(SpaceHandling space_handling = SpaceHandling::Strip) {
-       if (space_handling == SpaceHandling::Strip) {
--        while (it != end && std::isspace(*it)) ++it;
-+        while (it != end && std::isspace((unsigned char)(*it))) ++it;
-       }
-       return true;
-     }
diff --git a/llama.cpp/patches/patch-src_llama-chat.cpp b/llama.cpp/patches/patch-src_llama-chat.cpp
deleted file mode 100644
index a767ff36f7..0000000000
--- a/llama.cpp/patches/patch-src_llama-chat.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
---- src/llama-chat.cpp.orig	2025-05-16 09:52:08.885488932 +0000
-+++ src/llama-chat.cpp
-@@ -16,10 +16,10 @@
- static std::string trim(const std::string & str) {
-     size_t start = 0;
-     size_t end = str.size();
--    while (start < end && isspace(str[start])) {
-+    while (start < end && isspace((unsigned char)(str[start]))) {
-         start += 1;
-     }
--    while (end > start && isspace(str[end - 1])) {
-+    while (end > start && isspace((unsigned char)(str[end - 1]))) {
-         end -= 1;
-     }
-     return str.substr(start, end - start);
diff --git a/llama.cpp/patches/patch-vendor_minja_minja.hpp b/llama.cpp/patches/patch-vendor_minja_minja.hpp
new file mode 100644
index 0000000000..1a1f9347d7
--- /dev/null
+++ b/llama.cpp/patches/patch-vendor_minja_minja.hpp
@@ -0,0 +1,22 @@
+$NetBSD$
+
+--- vendor/minja/minja.hpp.orig	2025-09-28 09:41:48.334745421 +0000
++++ vendor/minja/minja.hpp
+@@ -1571,7 +1571,7 @@ public:
+             vargs.expectArgs("title method", {0, 0}, {0, 0});
+             auto res = str;
+             for (size_t i = 0, n = res.size(); i < n; ++i) {
+-              if (i == 0 || std::isspace(res[i - 1])) res[i] = std::toupper(res[i]);
++              if (i == 0 || std::isspace(static_cast<unsigned char>(res[i - 1]))) res[i] = std::toupper(res[i]);
+               else res[i] = std::tolower(res[i]);
+             }
+             return res;
+@@ -1662,7 +1662,7 @@ private:
+ 
+     bool consumeSpaces(SpaceHandling space_handling = SpaceHandling::Strip) {
+       if (space_handling == SpaceHandling::Strip) {
+-        while (it != end && std::isspace(*it)) ++it;
++        while (it != end && std::isspace(static_cast<unsigned char>(*it))) ++it;
+       }
+       return true;
+     }
Prev by Date: gvfs: Fix typo in hacks.mk
Next by Date: py-gguf: Import py-gguf-0.17.1.6959 as wip/py-gguf
Previous by Thread: gvfs: Fix typo in hacks.mk
Next by Thread: py-gguf: Import py-gguf-0.17.1.6959 as wip/py-gguf
Indexes:
Home | Main Index | Thread Index | Old Index