pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

llama.cpp: update to 0.2.0 and switch to release versions



Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By:	wiz
Date:		Sun Aug 23 10:50:36 2026 +0200
Changeset:	43ef703d871b76621fbc66f99abd8cf98ab1fd08

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

Log Message:
llama.cpp: update to 0.2.0 and switch to release versions

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

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

diffstat:
 llama.cpp/Makefile            | 12 +++---------
 llama.cpp/Makefile.common     | 11 ++++++-----
 llama.cpp/PLIST               |  6 +++---
 llama.cpp/distinfo            | 12 ++++++------
 py-llama-cpp-scripts/Makefile |  3 +--
 5 files changed, 19 insertions(+), 25 deletions(-)

diffs:
diff --git a/llama.cpp/Makefile b/llama.cpp/Makefile
index 19494aecf3..de22635c74 100644
--- a/llama.cpp/Makefile
+++ b/llama.cpp/Makefile
@@ -2,12 +2,9 @@
 
 .include "../../wip/llama.cpp/Makefile.common"
 
-PKGNAME=	${DISTNAME:S/-b/-${LLAMA_CPP_VAR}./}
 CATEGORIES=	devel
-# because 'b' is the second letter of the alphabet
-LLAMA_CPP_VAR=	0.0.2
-DISTFILES=	${DEFAULT_DISTFILES} llama-${GITHUB_TAG}-ui.tar.gz
-SITES.llama-${GITHUB_TAG}-ui.tar.gz=	https://github.com/ggml-org/llama.cpp/releases/download/${GITHUB_TAG}/
+DISTFILES=	${DEFAULT_DISTFILES} llama-b${LLAMA_BUILD_NUMBER}-ui.tar.gz
+SITES.llama-b${LLAMA_BUILD_NUMBER}-ui.tar.gz=	https://github.com/ggml-org/llama.cpp/releases/download/b${LLAMA_BUILD_NUMBER}/
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	https://github.com/ggerganov/llama.cpp/
@@ -25,11 +22,8 @@ CMAKE_CONFIGURE_ARGS+=	-DLLAMA_BUILD_COMMIT=${LLAMA_BUILD_COMMIT}
 CMAKE_CONFIGURE_ARGS+=	-DLLAMA_BUILD_TESTS=NO
 CMAKE_CONFIGURE_ARGS+=	-DLLAMA_USE_SYSTEM_GGML=YES
 
-PRINT_PLIST_AWK+=	/lib\/.*\.so/ { sub(/${LLAMA_BUILD_NUMBER}/, "$${LLAMA_BUILD_NUMBER}") }
-PLIST_SUBST+=		LLAMA_BUILD_NUMBER=${LLAMA_BUILD_NUMBER}
-
 post-extract:
-	${LN} -s ${WRKDIR}/llama-${GITHUB_TAG} ${WRKSRC}/tools/ui/dist
+	${LN} -s ${WRKDIR}/llama-b${LLAMA_BUILD_NUMBER} ${WRKSRC}/tools/ui/dist
 
 .include "../../www/curl/buildlink3.mk"
 .include "../../math/ggml/buildlink3.mk"
diff --git a/llama.cpp/Makefile.common b/llama.cpp/Makefile.common
index c74d235bbf..272366875e 100644
--- a/llama.cpp/Makefile.common
+++ b/llama.cpp/Makefile.common
@@ -3,11 +3,12 @@
 # used by wip/llama.cpp/Makefile
 # used by wip/py-llama-cpp-scripts/Makefile
 
-DISTNAME=	llama.cpp-${GITHUB_TAG}
+DISTNAME=	llama.cpp-${LLAMA_VERSION}
 MASTER_SITES=	${MASTER_SITE_GITHUB:=ggml-org/}
 GITHUB_PROJECT=	llama.cpp
-GITHUB_TAG=	b${LLAMA_BUILD_NUMBER}
+GITHUB_TAG=	v${PKGVERSION_NOREV}
 
-# embedded in version string in binary
-LLAMA_BUILD_NUMBER=	10488
-LLAMA_BUILD_COMMIT=	9d77fa17254e1dee4b9e92504c91611a60b1359f
+# embedded in version string in binary, and used for downloading UI assets
+LLAMA_VERSION=		0.2.0
+LLAMA_BUILD_NUMBER=	10566
+LLAMA_BUILD_COMMIT=	bb4caa7540188872173c44d161602d9271386413
diff --git a/llama.cpp/PLIST b/llama.cpp/PLIST
index c917b5c111..e8d50745f2 100644
--- a/llama.cpp/PLIST
+++ b/llama.cpp/PLIST
@@ -53,7 +53,7 @@ lib/libllama-bench-impl.so
 lib/libllama-cli-impl.so
 lib/libllama-common.so
 lib/libllama-common.so.0
-lib/libllama-common.so.0.1.2
+lib/libllama-common.so.0.2.0
 lib/libllama-completion-impl.so
 lib/libllama-fit-params-impl.so
 lib/libllama-perplexity-impl.so
@@ -61,8 +61,8 @@ lib/libllama-quantize-impl.so
 lib/libllama-server-impl.so
 lib/libllama.so
 lib/libllama.so.0
-lib/libllama.so.0.1.2
+lib/libllama.so.0.2.0
 lib/libmtmd.so
 lib/libmtmd.so.0
-lib/libmtmd.so.0.1.2
+lib/libmtmd.so.0.2.0
 lib/pkgconfig/llama.pc
diff --git a/llama.cpp/distinfo b/llama.cpp/distinfo
index 1b6af9ed6c..7d29d6ebf3 100644
--- a/llama.cpp/distinfo
+++ b/llama.cpp/distinfo
@@ -1,8 +1,8 @@
 $NetBSD$
 
-BLAKE2s (llama-b10488-ui.tar.gz) = f6d0f7c2265a346d1df2a04a316d57dba483b367c3d6a1fa4e7c18e5b9676a7c
-SHA512 (llama-b10488-ui.tar.gz) = 8c3fc845255e1cffaca934055c0d3b4108b5dae880d04f53d103a62d552e2b536857907088784598c0c26cd1ff5a0b7b131cc08bd886a0ce2e6feb18afeeb283
-Size (llama-b10488-ui.tar.gz) = 3077700 bytes
-BLAKE2s (llama.cpp-b10488.tar.gz) = 390816e6d5e74126f426046b4fb80b6e952964dd1feddf0edb5a09d738f9701b
-SHA512 (llama.cpp-b10488.tar.gz) = ef6119f88dfcdefc27f62a69889f6c84b2091cdbac9bf800873fb849c582a71698063ce84577ae79a62d6c153b6d3e50fdd1eeef7924e7fdca754af8b40f40cd
-Size (llama.cpp-b10488.tar.gz) = 36853739 bytes
+BLAKE2s (llama-b10566-ui.tar.gz) = b23fbd1569024c1eab76fe9606389ba509066ab61a840fd46fa62247ad0ed324
+SHA512 (llama-b10566-ui.tar.gz) = 5e662ddd5382ae8cf97ee9fa9c72b5304137973311b18d85987d1a7741280a74a0acd3359ba88038bde776b38387fe85466f31f0e578076e402edb1f486bd637
+Size (llama-b10566-ui.tar.gz) = 3081744 bytes
+BLAKE2s (llama.cpp-0.2.0.tar.gz) = 824ba6e7e52cd82577cc8c459ad594611c18f935a065d055d8f74e0eda3389b8
+SHA512 (llama.cpp-0.2.0.tar.gz) = dd62cfe29aa374da822c3b74ba8030d99debd9dfabdf2ab9299e0cc2ec9118d75b73d7cab04fe9d111ff40f113c993d4404fe90a7feff865c9f7a7b563138048
+Size (llama.cpp-0.2.0.tar.gz) = 36879187 bytes
diff --git a/py-llama-cpp-scripts/Makefile b/py-llama-cpp-scripts/Makefile
index 115955df11..fac8b50c0d 100644
--- a/py-llama-cpp-scripts/Makefile
+++ b/py-llama-cpp-scripts/Makefile
@@ -2,9 +2,8 @@
 
 .include "../../wip/llama.cpp/Makefile.common"
 
-PKGNAME=	${PYPKGPREFIX}-llama-cpp-scripts-${GITHUB_TAG:S/b/${LLAMA_VER}./}
+PKGNAME=	${PYPKGPREFIX}-llama-cpp-scripts-${LLAMA_VERSION}
 CATEGORIES=	devel
-LLAMA_VER=	0.0.0
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	https://github.com/ggerganov/llama.cpp/


Home | Main Index | Thread Index | Old Index