*: update llama.cpp & friends to b9722

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: *: update llama.cpp & friends to b9722
From: Thomas Klausner (via pkgsrc-wip) <commit-notify%pkgsrc.org@localhost>
Date: Fri, 19 Jun 2026 11:59:50 +0000
Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By:	wiz
Date:		Fri Jun 19 13:59:33 2026 +0200
Changeset:	68e53d522dd00d6833e2e7997409a92cbd686a17

Modified Files:
	llama.cpp/Makefile.common
	llama.cpp/PLIST
	llama.cpp/distinfo
	py-gguf/Makefile
	py-gguf/PLIST
	py-gguf/distinfo
	py-llama-cpp-scripts/Makefile
	py-llama-cpp-scripts/PLIST
	py-llama-cpp-scripts/distinfo

Log Message:
*: update llama.cpp & friends to b9722

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

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

diffstat:
 llama.cpp/Makefile.common     |  2 +-
 llama.cpp/PLIST               |  8 ++++----
 llama.cpp/distinfo            | 12 ++++++------
 py-gguf/Makefile              | 17 ++++++++++-------
 py-gguf/PLIST                 | 10 +++++-----
 py-gguf/distinfo              |  6 +++---
 py-llama-cpp-scripts/Makefile | 28 +++++++++++++---------------
 py-llama-cpp-scripts/PLIST    | 15 +++++++++------
 py-llama-cpp-scripts/distinfo |  6 +++---
 9 files changed, 54 insertions(+), 50 deletions(-)

diffs:
diff --git a/llama.cpp/Makefile.common b/llama.cpp/Makefile.common
index 23f896f3e8..06c7b50735 100644
--- a/llama.cpp/Makefile.common
+++ b/llama.cpp/Makefile.common
@@ -9,4 +9,4 @@
 DISTNAME=	llama.cpp-${GITHUB_TAG}
 MASTER_SITES=	${MASTER_SITE_GITHUB:=ggml-org/}
 GITHUB_PROJECT=	llama.cpp
-GITHUB_TAG=	b9405
+GITHUB_TAG=	b9722
diff --git a/llama.cpp/PLIST b/llama.cpp/PLIST
index 02f5e933eb..8cde5eb7ca 100644
--- a/llama.cpp/PLIST
+++ b/llama.cpp/PLIST
@@ -70,16 +70,16 @@ lib/cmake/llama/llama-config.cmake
 lib/cmake/llama/llama-version.cmake
 lib/libggml-base.so
 lib/libggml-base.so.0
-lib/libggml-base.so.0.13.0
+lib/libggml-base.so.0.15.2
 lib/libggml-blas.so
 lib/libggml-blas.so.0
-lib/libggml-blas.so.0.13.0
+lib/libggml-blas.so.0.15.2
 lib/libggml-cpu.so
 lib/libggml-cpu.so.0
-lib/libggml-cpu.so.0.13.0
+lib/libggml-cpu.so.0.15.2
 lib/libggml.so
 lib/libggml.so.0
-lib/libggml.so.0.13.0
+lib/libggml.so.0.15.2
 lib/libllama-batched-bench-impl.so
 lib/libllama-bench-impl.so
 lib/libllama-cli-impl.so
diff --git a/llama.cpp/distinfo b/llama.cpp/distinfo
index b5a8a7ca99..8046fcacbf 100644
--- a/llama.cpp/distinfo
+++ b/llama.cpp/distinfo
@@ -1,11 +1,11 @@
 $NetBSD$
 
-BLAKE2s (llama-b9405-ui.tar.gz) = 810b2ee6813411f4272c3efe9a1c9e620d3076f0ed1d872197c4c03dfa29e850
-SHA512 (llama-b9405-ui.tar.gz) = 2465cfe8350a028bfaff368d3442639a7b577d375f508632e2473ee2a058279c36c05ccb2a8a8f747bd25d5fe2e0d7cdac81437fcb2ac2e09fbebf2d6a01107a
-Size (llama-b9405-ui.tar.gz) = 1872983 bytes
-BLAKE2s (llama.cpp-b9405.tar.gz) = e3c17cae193e0199f48739e4c2a7b93814b5468105e7adab3c07ea5a834e4c62
-SHA512 (llama.cpp-b9405.tar.gz) = b973ca115041710fa759c056c1768b30f63d9870eb35e227ece451502eec45efdf98b8706b07ebe44f61166317104ca29f1ab978ad5caf1968b305c86d11d0be
-Size (llama.cpp-b9405.tar.gz) = 33963595 bytes
+BLAKE2s (llama-b9722-ui.tar.gz) = e89a68895c58e8fc0c9e3f9e766cd90381c21537ce4c7f74ca745d46d78eb0dc
+SHA512 (llama-b9722-ui.tar.gz) = 4b3fc3fd746fc8e6a15e1fc9667cb12168575529b2625685792003205cda0c09b286f9ed5e0c8d7c1d4e89bcf10393744ba963da74df233e479f7deb3e538b18
+Size (llama-b9722-ui.tar.gz) = 2728009 bytes
+BLAKE2s (llama.cpp-b9722.tar.gz) = ce23ac9de8ebf8cb7f80ec48bf70465ffda66d10345279aad0da43bd11d114f5
+SHA512 (llama.cpp-b9722.tar.gz) = f70a73a085b7afba5b5018ad63d48feddf91418f92fb3e267e88ce7590d7cc1c748b296e122e4692728a7626b74ed4a614a504787c285965a49d131d7a7ac270
+Size (llama.cpp-b9722.tar.gz) = 34949970 bytes
 SHA1 (patch-common_common.cpp) = 57a375ff17c8c97cfadd4196b3a368b6abd65ce6
 SHA1 (patch-ggml_src_ggml-cpu_ggml-cpu.cpp) = cc5f9840919818b824eb52585a3c5a8ee40a2835
 SHA1 (patch-src_llama-vocab.cpp) = b97f36b85855ccf1385dfdd9fd5417e1abf77024
diff --git a/py-gguf/Makefile b/py-gguf/Makefile
index 52d739d9eb..8fb1193e54 100644
--- a/py-gguf/Makefile
+++ b/py-gguf/Makefile
@@ -2,25 +2,28 @@
 
 .include "../../wip/llama.cpp/Makefile.common"
 
+GGUF_VER=	0.19.0
 PKGNAME=	${PYPKGPREFIX}-gguf-${GITHUB_TAG:S/b/${GGUF_VER}./}
 CATEGORIES=	devel
-GGUF_VER=	0.19.0
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	https://pypi.org/project/gguf/
 COMMENT=	Read and write ML models in GGUF for GGML
 LICENSE=	mit
 
-USE_LANGUAGES=	# none
+TOOL_DEPENDS+=	${PYPKGPREFIX}-poetry-core>=1.0.0:../../devel/py-poetry-core
+DEPENDS+=	${PYPKGPREFIX}-numpy>=1.17:../../math/py-numpy
+DEPENDS+=	${PYPKGPREFIX}-yaml>=5.1:../../textproc/py-yaml
 
-BUILD_DEPENDS+=	${PYPKGPREFIX}-poetry-core>=1.0.0:../../devel/py-poetry-core
+REPLACE_PYTHON+=		gguf-py/gguf/*.py
+REPLACE_PYTHON+=		gguf-py/gguf/scripts/*.py
 
-WRKSRC=		${WRKDIR}/${DISTNAME}
-PYSETUPSUBDIR=	gguf-py
+USE_LANGUAGES=	# none
 
-PRINT_PLIST_AWK+=	{gsub(/${GGUF_VER}/, "$${GGUF_VER}");}
+PYSETUPSUBDIR=	gguf-py
 
-PLIST_SUBST+=	GGUF_VER=${GGUF_VER:Q}
+WHEEL_NAME=	gguf-${GGUF_VER}
 
+.include "../../lang/python/application.mk"
 .include "../../lang/python/wheel.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-gguf/PLIST b/py-gguf/PLIST
index 215cc684f3..f8c1090d43 100644
--- a/py-gguf/PLIST
+++ b/py-gguf/PLIST
@@ -4,11 +4,11 @@ bin/gguf-dump
 bin/gguf-editor-gui
 bin/gguf-new-metadata
 bin/gguf-set-metadata
-${PYSITELIB}/gguf-${GGUF_VER}.dist-info/METADATA
-${PYSITELIB}/gguf-${GGUF_VER}.dist-info/RECORD
-${PYSITELIB}/gguf-${GGUF_VER}.dist-info/WHEEL
-${PYSITELIB}/gguf-${GGUF_VER}.dist-info/entry_points.txt
-${PYSITELIB}/gguf-${GGUF_VER}.dist-info/licenses/LICENSE
+${PYSITELIB}/${WHEEL_INFODIR}/METADATA
+${PYSITELIB}/${WHEEL_INFODIR}/RECORD
+${PYSITELIB}/${WHEEL_INFODIR}/WHEEL
+${PYSITELIB}/${WHEEL_INFODIR}/entry_points.txt
+${PYSITELIB}/${WHEEL_INFODIR}/licenses/LICENSE
 ${PYSITELIB}/gguf/__init__.py
 ${PYSITELIB}/gguf/__init__.pyc
 ${PYSITELIB}/gguf/__init__.pyo
diff --git a/py-gguf/distinfo b/py-gguf/distinfo
index f50ad1b859..4222086719 100644
--- a/py-gguf/distinfo
+++ b/py-gguf/distinfo
@@ -1,5 +1,5 @@
 $NetBSD$
 
-BLAKE2s (llama.cpp-b9405.tar.gz) = e3c17cae193e0199f48739e4c2a7b93814b5468105e7adab3c07ea5a834e4c62
-SHA512 (llama.cpp-b9405.tar.gz) = b973ca115041710fa759c056c1768b30f63d9870eb35e227ece451502eec45efdf98b8706b07ebe44f61166317104ca29f1ab978ad5caf1968b305c86d11d0be
-Size (llama.cpp-b9405.tar.gz) = 33963595 bytes
+BLAKE2s (llama.cpp-b9722.tar.gz) = ce23ac9de8ebf8cb7f80ec48bf70465ffda66d10345279aad0da43bd11d114f5
+SHA512 (llama.cpp-b9722.tar.gz) = f70a73a085b7afba5b5018ad63d48feddf91418f92fb3e267e88ce7590d7cc1c748b296e122e4692728a7626b74ed4a614a504787c285965a49d131d7a7ac270
+Size (llama.cpp-b9722.tar.gz) = 34949970 bytes
diff --git a/py-llama-cpp-scripts/Makefile b/py-llama-cpp-scripts/Makefile
index 4b2440fd34..cf1b9663f1 100644
--- a/py-llama-cpp-scripts/Makefile
+++ b/py-llama-cpp-scripts/Makefile
@@ -11,31 +11,29 @@ HOMEPAGE=	https://github.com/ggerganov/llama.cpp/
 COMMENT=	Scripts that ship with llama.cpp
 LICENSE=	mit
 
-USE_LANGUAGES=	# none
-
-BUILD_DEPENDS+=	${PYPKGPREFIX}-poetry-core>=1.0.0:../../devel/py-poetry-core
-
+TOOL_DEPENDS+=	${PYPKGPREFIX}-poetry-core>=1.0.0:../../devel/py-poetry-core
 DEPENDS+=	${PYPKGPREFIX}-numpy>=1.26.4:../../math/py-numpy
 DEPENDS+=	${PYPKGPREFIX}-sentencepiece>=0.1.98:../../textproc/py-sentencepiece
 DEPENDS+=	${PYPKGPREFIX}-transformers>=0.1.98:../../wip/py-transformers
 DEPENDS+=	${PYPKGPREFIX}-protobuf>=4.21.0:../../devel/py-protobuf
 DEPENDS+=	${PYPKGPREFIX}-torch>=2.6.0:../../math/py-torch
 DEPENDS+=	${PYPKGPREFIX}-gguf-[0-9]*:../../wip/py-gguf
+TEST_DEPENDS+=	${PYPKGPREFIX}-requests-[0-9]*:../../devel/py-requests
+# also needs wget and appium modules, currently unpackaged
+
+USE_LANGUAGES=	# none
 
-SCRIPTS=	llama-convert-hf-to-gguf \
-		llama-convert-llama-ggml-to-gguf \
-		llama-convert-lora-to-gguf \
-		llama-ggml-vk-generate-shaders
+PYTHON_VERSIONS_INCOMPATIBLE=	310 314 # py-torch
 
-post-install:
-.for script in ${SCRIPTS}
-	cd ${DESTDIR}${PREFIX}/bin && \
-		${MV} ${script} ${script}-${PYVERSSUFFIX}
-.endfor
+PY_RENAME_BINARIES+=	llama-convert-hf-to-gguf
+PY_RENAME_BINARIES+=	llama-convert-llama-ggml-to-gguf
+PY_RENAME_BINARIES+=	llama-convert-lora-to-gguf
+PY_RENAME_BINARIES+=	llama-ggml-vk-generate-shaders
 
-PRINT_PLIST_AWK+=	{gsub(/${LLAMA_VER}/, "$${LLAMA_VER}");}
+REPLACE_PYTHON+=	*.py
 
-PLIST_SUBST+=	LLAMA_VER=${LLAMA_VER:Q}
+WHEEL_NAME=	llama_cpp_scripts-${LLAMA_VER}
 
+.include "../../lang/python/application.mk"
 .include "../../lang/python/wheel.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-llama-cpp-scripts/PLIST b/py-llama-cpp-scripts/PLIST
index 047c16b3ca..c9974b0008 100644
--- a/py-llama-cpp-scripts/PLIST
+++ b/py-llama-cpp-scripts/PLIST
@@ -147,6 +147,9 @@ ${PYSITELIB}/conversion/maincoder.pyo
 ${PYSITELIB}/conversion/mamba.py
 ${PYSITELIB}/conversion/mamba.pyc
 ${PYSITELIB}/conversion/mamba.pyo
+${PYSITELIB}/conversion/mellum.py
+${PYSITELIB}/conversion/mellum.pyc
+${PYSITELIB}/conversion/mellum.pyo
 ${PYSITELIB}/conversion/mimo.py
 ${PYSITELIB}/conversion/mimo.pyc
 ${PYSITELIB}/conversion/mimo.pyo
@@ -255,9 +258,9 @@ ${PYSITELIB}/convert_llama_ggml_to_gguf.pyo
 ${PYSITELIB}/convert_lora_to_gguf.py
 ${PYSITELIB}/convert_lora_to_gguf.pyc
 ${PYSITELIB}/convert_lora_to_gguf.pyo
-${PYSITELIB}/llama_cpp_scripts-${LLAMA_VER}.dist-info/METADATA
-${PYSITELIB}/llama_cpp_scripts-${LLAMA_VER}.dist-info/RECORD
-${PYSITELIB}/llama_cpp_scripts-${LLAMA_VER}.dist-info/WHEEL
-${PYSITELIB}/llama_cpp_scripts-${LLAMA_VER}.dist-info/entry_points.txt
-${PYSITELIB}/llama_cpp_scripts-${LLAMA_VER}.dist-info/licenses/AUTHORS
-${PYSITELIB}/llama_cpp_scripts-${LLAMA_VER}.dist-info/licenses/LICENSE
+${PYSITELIB}/${WHEEL_INFODIR}/METADATA
+${PYSITELIB}/${WHEEL_INFODIR}/RECORD
+${PYSITELIB}/${WHEEL_INFODIR}/WHEEL
+${PYSITELIB}/${WHEEL_INFODIR}/entry_points.txt
+${PYSITELIB}/${WHEEL_INFODIR}/licenses/AUTHORS
+${PYSITELIB}/${WHEEL_INFODIR}/licenses/LICENSE
diff --git a/py-llama-cpp-scripts/distinfo b/py-llama-cpp-scripts/distinfo
index f50ad1b859..4222086719 100644
--- a/py-llama-cpp-scripts/distinfo
+++ b/py-llama-cpp-scripts/distinfo
@@ -1,5 +1,5 @@
 $NetBSD$
 
-BLAKE2s (llama.cpp-b9405.tar.gz) = e3c17cae193e0199f48739e4c2a7b93814b5468105e7adab3c07ea5a834e4c62
-SHA512 (llama.cpp-b9405.tar.gz) = b973ca115041710fa759c056c1768b30f63d9870eb35e227ece451502eec45efdf98b8706b07ebe44f61166317104ca29f1ab978ad5caf1968b305c86d11d0be
-Size (llama.cpp-b9405.tar.gz) = 33963595 bytes
+BLAKE2s (llama.cpp-b9722.tar.gz) = ce23ac9de8ebf8cb7f80ec48bf70465ffda66d10345279aad0da43bd11d114f5
+SHA512 (llama.cpp-b9722.tar.gz) = f70a73a085b7afba5b5018ad63d48feddf91418f92fb3e267e88ce7590d7cc1c748b296e122e4692728a7626b74ed4a614a504787c285965a49d131d7a7ac270
+Size (llama.cpp-b9722.tar.gz) = 34949970 bytes
Prev by Date: llama.cpp: include the (pre-built) web ui
Next by Date: chromium: update to 149.0.7827.155
Previous by Thread: llama.cpp: include the (pre-built) web ui
Next by Thread: chromium: update to 149.0.7827.155
Indexes:
Home | Main Index | Thread Index | Old Index