git: ee6af351a7f7 - main - misc/ollama: update 0.30.7 → 0.30.9

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Yuri Victorovich <yuri_at_FreeBSD.org>
Date: Wed, 17 Jun 2026 15:29:03 UTC
The branch main has been updated by yuri:

URL: https://cgit.FreeBSD.org/ports/commit/?id=ee6af351a7f7dd0b438994ca2517a12da711ca10

commit ee6af351a7f7dd0b438994ca2517a12da711ca10
Author:     Yuri Victorovich <yuri@FreeBSD.org>
AuthorDate: 2026-06-17 15:28:17 +0000
Commit:     Yuri Victorovich <yuri@FreeBSD.org>
CommitDate: 2026-06-17 15:28:56 +0000

    misc/ollama: update 0.30.7 → 0.30.9
---
 misc/ollama/Makefile | 29 +++++++++++++++++++----------
 misc/ollama/distinfo | 28 +++++++++++++++-------------
 2 files changed, 34 insertions(+), 23 deletions(-)

diff --git a/misc/ollama/Makefile b/misc/ollama/Makefile
index aac33797aeba..e1309d6f57ca 100644
--- a/misc/ollama/Makefile
+++ b/misc/ollama/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	ollama
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.30.7
+DISTVERSION=	0.30.9
 CATEGORIES=	misc # machine-learning
 
 MAINTAINER=	yuri@FreeBSD.org
@@ -27,14 +27,16 @@ GO_MODULE=	github.com/yurivict/${PORTNAME} # fork with FreeBSD patches
 GO_TARGET=	.
 GO_ENV+=	CGO_CXXFLAGS="${CXXFLAGS}"
 
-LLAMA_CPP_VERSION=	b9509 # from the LLAMA_CPP_VERSION file in the llama.cpp repo
-GGML_SO_VERSION=	0.13.1	# tied to LLAMA_CPP_VERSION; update when llama.cpp changes
+LLAMA_CPP_VERSION=	b9626 # from the LLAMA_CPP_VERSION file in the llama.cpp repo
+GGML_SO_VERSION=	0.15.1	# tied to LLAMA_CPP_VERSION; update when llama.cpp changes
 MLX_CORE_VERSION=	0.31.2
 MLX_C_VERSION=		fba4470b89073180056c9ea46c443051375f7399
 JSON_VERSION=		3.11.3
 
-DISTFILES+=	${LLAMA_CPP_VERSION}.tar.gz:llamasrc
-MASTER_SITES+=	https://github.com/ggml-org/llama.cpp/archive/refs/tags/:llamasrc
+DISTFILES+=	${LLAMA_CPP_VERSION}.tar.gz:llamasrc \
+		llama-${LLAMA_CPP_VERSION}-ui.tar.gz:llamasrc
+MASTER_SITES+=	https://github.com/ggml-org/llama.cpp/archive/refs/tags/:llamasrc \
+		https://github.com/ggml-org/llama.cpp/releases/download/${LLAMA_CPP_VERSION}/:llamasrc
 
 PLIST_FILES=	bin/${PORTNAME} \
 		bin/ollama-limit-gpu-layers
@@ -116,15 +118,22 @@ MASTER_SITES+=	https://github.com/ml-explore/mlx/archive/refs/tags/:mlxsrc \
 		https://github.com/nlohmann/json/releases/download/v${JSON_VERSION}/:jsonsrc
 .endif
 
+post-extract:
+	# Copy pre-built UI assets into llama.cpp source tree so the build
+	# can embed them without running npm or downloading from Hugging Face.
+	@${MKDIR} ${WRKDIR}/llama.cpp-${LLAMA_CPP_VERSION}/tools/ui/dist && \
+		${CP} -r ${WRKDIR}/llama-${LLAMA_CPP_VERSION}/* \
+		${WRKDIR}/llama.cpp-${LLAMA_CPP_VERSION}/tools/ui/dist/
+
 post-patch:
-	# Apply llama.cpp compat hooks patch so the llama-server build has Ollama hooks
-	@${PATCH} -d ${WRKDIR}/llama.cpp-${LLAMA_CPP_VERSION} -p1 \
-		< ${WRKSRC}/llama/compat/llama-cpp-hooks.patch
 	# Apply llama.cpp laguna model patch (adds llama_model_laguna class)
 	@${PATCH} -d ${WRKDIR}/llama.cpp-${LLAMA_CPP_VERSION} -p1 \
-		< ${WRKSRC}/llama/compat/models/llama-cpp-laguna.patch
+		< ${WRKSRC}/llama/compat/models/003-llama-cpp-laguna.patch
+	# Fix llama-ui-embed crash when called without asset_dir argument
+	@${REINPLACE_CMD} -e 's|const std::string asset_dir = argv\[3\];|const std::string asset_dir = (argc > 3) ? argv[3] : "";|g' \
+		${WRKDIR}/llama.cpp-${LLAMA_CPP_VERSION}/tools/ui/embed.cpp
 	# FreeBSD: copy llm/llm_freebsd.go for LlamaServerSysProcAttr
-		@${CP} ${FILESDIR}/llm_freebsd.go ${WRKSRC}/llm/
+	@${CP} ${FILESDIR}/llm_freebsd.go ${WRKSRC}/llm/
 	# update version in version.go
 	@${REINPLACE_CMD} -e 's|var Version string = "0.0.0"|var Version string = "${PORTVERSION}"|g' \
 		${WRKSRC}/version/version.go
diff --git a/misc/ollama/distinfo b/misc/ollama/distinfo
index 951ab22d56c7..d0f422b3e1d2 100644
--- a/misc/ollama/distinfo
+++ b/misc/ollama/distinfo
@@ -1,13 +1,15 @@
-TIMESTAMP = 1781031114
-SHA256 (go/misc_ollama/ollama-v0.30.7/b9509.tar.gz) = 6a90bab3a581dad1dc3ab7bfffcd3711177d8cd41739a2b841a7c5ca2f94c393
-SIZE (go/misc_ollama/ollama-v0.30.7/b9509.tar.gz) = 34056090
-SHA256 (go/misc_ollama/ollama-v0.30.7/v0.31.2.tar.gz) = bdb9b619f80962dd00c0bffb65e59c53f565c2b550f189a1467f8bc6089401ab
-SIZE (go/misc_ollama/ollama-v0.30.7/v0.31.2.tar.gz) = 4251596
-SHA256 (go/misc_ollama/ollama-v0.30.7/fba4470b89073180056c9ea46c443051375f7399.tar.gz) = 398d3d4c6458679dfc9061a3ba56101358279790bc038f60d1f534eac420d552
-SIZE (go/misc_ollama/ollama-v0.30.7/fba4470b89073180056c9ea46c443051375f7399.tar.gz) = 174039
-SHA256 (go/misc_ollama/ollama-v0.30.7/json.tar.xz) = d6c65aca6b1ed68e7a182f4757257b107ae403032760ed6ef121c9d55e81757d
-SIZE (go/misc_ollama/ollama-v0.30.7/json.tar.xz) = 110988
-SHA256 (go/misc_ollama/ollama-v0.30.7/v0.30.7.mod) = 8af0b8b8e4961b46dfef05b055207b1ab7e7831368c1704a5a5bfb4626d6895d
-SIZE (go/misc_ollama/ollama-v0.30.7/v0.30.7.mod) = 4650
-SHA256 (go/misc_ollama/ollama-v0.30.7/v0.30.7.zip) = 559c0fb51a1855b9bc7adf0de349f87c1fe415294ada11b813e8c0a857323b13
-SIZE (go/misc_ollama/ollama-v0.30.7/v0.30.7.zip) = 29488391
+TIMESTAMP = 1781674990
+SHA256 (go/misc_ollama/ollama-v0.30.9/b9626.tar.gz) = cf36d952970b91192dd8dbf5817995bf50a0907391005954f2debd230daad8e0
+SIZE (go/misc_ollama/ollama-v0.30.9/b9626.tar.gz) = 34860847
+SHA256 (go/misc_ollama/ollama-v0.30.9/llama-b9626-ui.tar.gz) = bc57a65271edf15f22257d02acb58e6dced245ed9b2412f0a98af051af16281e
+SIZE (go/misc_ollama/ollama-v0.30.9/llama-b9626-ui.tar.gz) = 2721739
+SHA256 (go/misc_ollama/ollama-v0.30.9/v0.31.2.tar.gz) = bdb9b619f80962dd00c0bffb65e59c53f565c2b550f189a1467f8bc6089401ab
+SIZE (go/misc_ollama/ollama-v0.30.9/v0.31.2.tar.gz) = 4251596
+SHA256 (go/misc_ollama/ollama-v0.30.9/fba4470b89073180056c9ea46c443051375f7399.tar.gz) = 398d3d4c6458679dfc9061a3ba56101358279790bc038f60d1f534eac420d552
+SIZE (go/misc_ollama/ollama-v0.30.9/fba4470b89073180056c9ea46c443051375f7399.tar.gz) = 174039
+SHA256 (go/misc_ollama/ollama-v0.30.9/json.tar.xz) = d6c65aca6b1ed68e7a182f4757257b107ae403032760ed6ef121c9d55e81757d
+SIZE (go/misc_ollama/ollama-v0.30.9/json.tar.xz) = 110988
+SHA256 (go/misc_ollama/ollama-v0.30.9/v0.30.9.mod) = 8af0b8b8e4961b46dfef05b055207b1ab7e7831368c1704a5a5bfb4626d6895d
+SIZE (go/misc_ollama/ollama-v0.30.9/v0.30.9.mod) = 4650
+SHA256 (go/misc_ollama/ollama-v0.30.9/v0.30.9.zip) = fe0a3ddf85433a5d6ca0dbd718f588883e82780595826cd43fe3adb0d012bc7e
+SIZE (go/misc_ollama/ollama-v0.30.9/v0.30.9.zip) = 29517888