Date: Fri, 27 Mar 2026 00:59:27 +0000 From: Yuri Victorovich <yuri@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 0b0d78212d02 - main - misc/ollama: update 0.18.=?utf-8?Q?2 =E2=86=92 0.?=18.3 Message-ID: <69c5d66f.475ab.643bd038@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=0b0d78212d02b81fc4400d295d2039fad18c0f80 commit 0b0d78212d02b81fc4400d295d2039fad18c0f80 Author: Yuri Victorovich <yuri@FreeBSD.org> AuthorDate: 2026-03-27 00:59:09 +0000 Commit: Yuri Victorovich <yuri@FreeBSD.org> CommitDate: 2026-03-27 00:59:24 +0000 misc/ollama: update 0.18.2 → 0.18.3 --- misc/ollama/Makefile | 6 ++--- misc/ollama/distinfo | 22 +++++++-------- ...h-ml_backend_ggml_ggml_src_ggml-backend-reg.cpp | 6 ++--- misc/ollama/files/patch-ml_path.go | 6 ++--- .../files/patch-x_imagegen_mlx_CMakeLists.txt | 31 ++++++++++++++++++++++ 5 files changed, 51 insertions(+), 20 deletions(-) diff --git a/misc/ollama/Makefile b/misc/ollama/Makefile index 1a3552c87d85..c8778fe3d2da 100644 --- a/misc/ollama/Makefile +++ b/misc/ollama/Makefile @@ -1,7 +1,6 @@ PORTNAME= ollama DISTVERSIONPREFIX= v -DISTVERSION= 0.18.2 -PORTREVISION= 1 +DISTVERSION= 0.18.3 CATEGORIES= misc # machine-learning MAINTAINER= yuri@FreeBSD.org @@ -34,7 +33,7 @@ PLIST_FILES= bin/${PORTNAME} \ OPTIONS_GROUP= BACKENDS OPTIONS_GROUP_BACKENDS= CPU VULKAN MLX -OPTIONS_DEFAULT= CPU VULKAN MLX +OPTIONS_DEFAULT= CPU VULKAN #MLX CPU_DESC= Build CPU backend shared libraries for various SIMD instruction sets CPU_PLIST_FILES= lib/ollama/libggml-base.so \ @@ -57,6 +56,7 @@ MLX_BUILD_DEPENDS= ${LOCALBASE}/lib/cmake/fmt/fmt-config.cmake:devel/libfmt MLX_LIB_DEPENDS= libopenblas.so:math/openblas MLX_PLIST_FILES= lib/ollama/libmlx.so \ lib/ollama/libmlxc.so +MLX_BROKEN= build fails in 1.18.3 _CMAKE_FLAGS= -DCMAKE_BUILD_TYPE=Release -DGGML_BACKEND_DL=ON -DGGML_BACKEND_DIR=${PREFIX}/lib/ollama diff --git a/misc/ollama/distinfo b/misc/ollama/distinfo index e709a9fc964b..089f57d96267 100644 --- a/misc/ollama/distinfo +++ b/misc/ollama/distinfo @@ -1,11 +1,11 @@ -TIMESTAMP = 1774149327 -SHA256 (go/misc_ollama/ollama-v0.18.2/v0.18.2.mod) = e660ffa37ad33611a4c1248967204e578f07ada9941e63ffe6a6fe3e95ac5039 -SIZE (go/misc_ollama/ollama-v0.18.2/v0.18.2.mod) = 4757 -SHA256 (go/misc_ollama/ollama-v0.18.2/v0.18.2.zip) = 2ad77971884d45d35ba80db3d610cdfb93e7a2f390ea68fe1745085ebf73da4a -SIZE (go/misc_ollama/ollama-v0.18.2/v0.18.2.zip) = 23468279 -SHA256 (go/misc_ollama/ollama-v0.18.2/v0.30.6.tar.gz) = 04d8e3c5d3c3ae748145ffe51d3ad8b72493e1e8597fc0f9dc631ed620b12618 -SIZE (go/misc_ollama/ollama-v0.18.2/v0.30.6.tar.gz) = 4138686 -SHA256 (go/misc_ollama/ollama-v0.18.2/v0.5.0.tar.gz) = dcfc404d7004e6da70170c669dbc920913cb25a59c9f7dac781caf92e524cc86 -SIZE (go/misc_ollama/ollama-v0.18.2/v0.5.0.tar.gz) = 169957 -SHA256 (go/misc_ollama/ollama-v0.18.2/json.tar.xz) = d6c65aca6b1ed68e7a182f4757257b107ae403032760ed6ef121c9d55e81757d -SIZE (go/misc_ollama/ollama-v0.18.2/json.tar.xz) = 110988 +TIMESTAMP = 1774561377 +SHA256 (go/misc_ollama/ollama-v0.18.3/v0.30.6.tar.gz) = 04d8e3c5d3c3ae748145ffe51d3ad8b72493e1e8597fc0f9dc631ed620b12618 +SIZE (go/misc_ollama/ollama-v0.18.3/v0.30.6.tar.gz) = 4138686 +SHA256 (go/misc_ollama/ollama-v0.18.3/v0.5.0.tar.gz) = dcfc404d7004e6da70170c669dbc920913cb25a59c9f7dac781caf92e524cc86 +SIZE (go/misc_ollama/ollama-v0.18.3/v0.5.0.tar.gz) = 169957 +SHA256 (go/misc_ollama/ollama-v0.18.3/json.tar.xz) = d6c65aca6b1ed68e7a182f4757257b107ae403032760ed6ef121c9d55e81757d +SIZE (go/misc_ollama/ollama-v0.18.3/json.tar.xz) = 110988 +SHA256 (go/misc_ollama/ollama-v0.18.3/v0.18.3.mod) = e660ffa37ad33611a4c1248967204e578f07ada9941e63ffe6a6fe3e95ac5039 +SIZE (go/misc_ollama/ollama-v0.18.3/v0.18.3.mod) = 4757 +SHA256 (go/misc_ollama/ollama-v0.18.3/v0.18.3.zip) = ef81db55a2230537be59fdcc5b358738bc410c9fb8270bfbd3131e4d654556d5 +SIZE (go/misc_ollama/ollama-v0.18.3/v0.18.3.zip) = 23566929 diff --git a/misc/ollama/files/patch-ml_backend_ggml_ggml_src_ggml-backend-reg.cpp b/misc/ollama/files/patch-ml_backend_ggml_ggml_src_ggml-backend-reg.cpp index 17d3116f0faa..c18b4d4f4090 100644 --- a/misc/ollama/files/patch-ml_backend_ggml_ggml_src_ggml-backend-reg.cpp +++ b/misc/ollama/files/patch-ml_backend_ggml_ggml_src_ggml-backend-reg.cpp @@ -1,6 +1,6 @@ ---- ml/backend/ggml/ggml/src/ggml-backend-reg.cpp.orig 2025-11-29 00:42:10.354754000 -0800 -+++ ml/backend/ggml/ggml/src/ggml-backend-reg.cpp 2025-11-29 00:42:20.531699000 -0800 -@@ -538,11 +538,13 @@ +--- ml/backend/ggml/ggml/src/ggml-backend-reg.cpp.orig 1979-11-30 08:00:00 UTC ++++ ml/backend/ggml/ggml/src/ggml-backend-reg.cpp +@@ -545,11 +545,13 @@ static ggml_backend_reg_t ggml_backend_load_best(const std::vector<fs::path> search_paths; if (user_search_path == nullptr) { #ifdef GGML_BACKEND_DIR diff --git a/misc/ollama/files/patch-ml_path.go b/misc/ollama/files/patch-ml_path.go index c9a0ef4dfb8f..a35427626861 100644 --- a/misc/ollama/files/patch-ml_path.go +++ b/misc/ollama/files/patch-ml_path.go @@ -1,6 +1,6 @@ ---- ml/path.go.orig 2025-11-29 01:38:34.298472000 -0800 -+++ ml/path.go 2025-11-29 01:39:10.084873000 -0800 -@@ -27,7 +27,7 @@ +--- ml/path.go.orig 1979-11-30 08:00:00 UTC ++++ ml/path.go +@@ -27,7 +27,7 @@ var LibOllamaPath string = func() string { switch runtime.GOOS { case "windows": libPath = filepath.Join(filepath.Dir(exe), "lib", "ollama") diff --git a/misc/ollama/files/patch-x_imagegen_mlx_CMakeLists.txt b/misc/ollama/files/patch-x_imagegen_mlx_CMakeLists.txt new file mode 100644 index 000000000000..2ebbf324d1a1 --- /dev/null +++ b/misc/ollama/files/patch-x_imagegen_mlx_CMakeLists.txt @@ -0,0 +1,31 @@ +--- x/imagegen/mlx/CMakeLists.txt.orig 2026-03-27 00:01:53 UTC ++++ x/imagegen/mlx/CMakeLists.txt +@@ -98,28 +98,6 @@ file(COPY ${_mlx_c_hdrs} DESTINATION "${CMAKE_SOURCE_D + file(GLOB _mlx_c_hdrs "${mlx-c_SOURCE_DIR}/mlx/c/*.h") + file(COPY ${_mlx_c_hdrs} DESTINATION "${CMAKE_SOURCE_DIR}/x/mlxrunner/mlx/include/mlx/c/") + +-# Regenerate Go/C shim wrappers from the (possibly updated) headers. +-find_program(GO_EXECUTABLE go REQUIRED) +-message(STATUS "Regenerating MLX Go wrappers") +- +-# Go's cgo splits CC on whitespace, so a CC like "C:/Program Files/…/cl.exe" +-# (set by cmake on Windows) breaks with "C:/Program" not found. Clear CC +-# when it contains spaces so cgo falls back to its default (gcc). +-if(WIN32 AND "$ENV{CC}" MATCHES " ") +- set(_SAVE_CC "$ENV{CC}") +- set(ENV{CC} "") +-endif() +- +-execute_process( +- COMMAND ${GO_EXECUTABLE} generate ./x/... +- WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} +- COMMAND_ERROR_IS_FATAL ANY +-) +- +-if(DEFINED _SAVE_CC) +- set(ENV{CC} "${_SAVE_CC}") +-endif() +- + # For local dev builds, override MLX_VERSION with git describe output + if(TARGET mlx_version AND DEFINED FETCHCONTENT_SOURCE_DIR_MLX) + execute_process(home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69c5d66f.475ab.643bd038>