From nobody Sun Sep 22 06:26:09 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XBGNL0WHPz5XRcD; Sun, 22 Sep 2024 06:26:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XBGNK6QnTz3xMQ; Sun, 22 Sep 2024 06:26:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1726986369; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tdYfs7d8nL5r/rrr/jQAU7W6P8b3afz19Sux6efGrfA=; b=YUNSgKYH9MAt/nQpFzBuhXc8gn6/I9Jpg+kIfY2e9+6amOb7zLuvCxMenMh/xH8ncgUSHx GE64LeMH/uAnGunwNr2NTzb8ZqPNCDTSxGgXFxPXUoEJHvBIldhFqPCbng8YwrA9LjGPNE POGxCtdCL4nvonXlEn0w2sz1WAz8mORNG90gWFfZ0syZ4b2H5LeeXQOxC3gcVexjAdtQIH kmi75nmIeiw0hcYpjOl1D6lTV4B9O12HdFCwh64LoSM3P/ujEMNUNA2iMEG1JuwRsxkNX1 cNiDQD2Bm0CjLwASV3Ets3Qh47zGNcJCXsP1VnOUjkVr83ZEL9Xqtxh0HJGSCw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1726986369; a=rsa-sha256; cv=none; b=AICsYNNc6qG2JkxC5SeUt5863IXE0WBXCDDxCE432ccBWVjOdjLw19UUuzumDAt1HAXV4A 6Y6jf+RiYGgFiPi0DRcsKkASO9OloPZ77G+1NMhlKyQ8xQS9L7NLKNqUhVK3h72W5r13h4 uDqzlTnA1AbS2qqHIrJPSzCDQhDftmNV0AHwAkeR9jvoymSS1N4hQv0eJ5Fd2aOG8EAe+u ZgYtRmIF19mCUVwgF5LXhFoazufB085Z0MQA2o3nj6rLkL9A14YegceUYWl0Hk33x29EMG +WmPx1ExthoAqNcnrjDAXU0mhvkhrVLXmqU6Zhwb4umkgx0I1pJ4yIPlN/oEeg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1726986369; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tdYfs7d8nL5r/rrr/jQAU7W6P8b3afz19Sux6efGrfA=; b=EvWFMV9zctgvFpSFHvfFl99PaSzfn9xdo7UTOFKuDh08arERK1a3CsxlIE5YIP3dHJYn2v Ili9uFVu7nR/ZbYp4STZguSHBMlQqN9oBUzF1rRfro7g3miohAc3CPBcRU79mSYHj7FQtM Qg0f/p/VRuHSUgDOkqMpfj2bjv1Vd1rEzCcMWCBVwTkVeKnPQ2fy5IF2XuVadrcMTP7mui 18VPsR3pbNtcNCODSS3qBNHk0F/v5/HMT2Hfxxu3sMY9HdnKfMGXde//dDZTfEXs36IkkS WWeqjWDmK/4TY+eYzS1HSYmaQjJuOMuvrvBRSx3Gmc585aPAxpghUOOFnpKz0A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XBGNK62GWz15fY; Sun, 22 Sep 2024 06:26:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48M6Q96b077921; Sun, 22 Sep 2024 06:26:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48M6Q97i077918; Sun, 22 Sep 2024 06:26:09 GMT (envelope-from git) Date: Sun, 22 Sep 2024 06:26:09 GMT Message-Id: <202409220626.48M6Q97i077918@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: d7c3f73d7296 - main - misc/koboldcpp: update 1.74 =?utf-8?Q?=E2=86=92?= 1.75.1 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d7c3f73d7296f4a22bc0e06f7f6afa7211c35ba2 Auto-Submitted: auto-generated The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=d7c3f73d7296f4a22bc0e06f7f6afa7211c35ba2 commit d7c3f73d7296f4a22bc0e06f7f6afa7211c35ba2 Author: Yuri Victorovich AuthorDate: 2024-09-22 06:25:58 +0000 Commit: Yuri Victorovich CommitDate: 2024-09-22 06:25:58 +0000 misc/koboldcpp: update 1.74 → 1.75.1 Reported by: portscout --- misc/koboldcpp/Makefile | 6 +++--- misc/koboldcpp/distinfo | 6 +++--- misc/koboldcpp/files/patch-koboldcpp.py | 31 ------------------------------- misc/koboldcpp/pkg-plist | 1 - 4 files changed, 6 insertions(+), 38 deletions(-) diff --git a/misc/koboldcpp/Makefile b/misc/koboldcpp/Makefile index 29d56f39ebd3..37acc5b85de8 100644 --- a/misc/koboldcpp/Makefile +++ b/misc/koboldcpp/Makefile @@ -1,6 +1,6 @@ PORTNAME= koboldcpp DISTVERSIONPREFIX= v -DISTVERSION= 1.74 +DISTVERSION= 1.75.1 CATEGORIES= misc # machine-learning MAINTAINER= yuri@FreeBSD.org @@ -18,7 +18,7 @@ LIB_DEPENDS= libopenblas.so:math/openblas \ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}customtkinter>0:x11-toolkits/py-customtkinter@${PY_FLAVOR} -USES= gmake localbase:ldflags python shebangfix +USES= compiler:c++11-lang gmake localbase:ldflags python shebangfix USE_GITHUB= yes GH_ACCOUNT= LostRuins @@ -38,7 +38,7 @@ do-install: ${RLN} ${STAGEDIR}${DATADIR}/koboldcpp.py ${STAGEDIR}${PREFIX}/bin/koboldcpp # libraries .for lib in koboldcpp_default.so koboldcpp_failsafe.so koboldcpp_noavx2.so \ - koboldcpp_openblas.so koboldcpp_vulkan.so koboldcpp_vulkan_noavx2.so + koboldcpp_vulkan.so koboldcpp_vulkan_noavx2.so ${INSTALL_LIB} ${WRKSRC}/${lib} ${STAGEDIR}${DATADIR} .endfor # embd files diff --git a/misc/koboldcpp/distinfo b/misc/koboldcpp/distinfo index 1e81634075cc..1fd15dd6ad71 100644 --- a/misc/koboldcpp/distinfo +++ b/misc/koboldcpp/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1725179865 -SHA256 (LostRuins-koboldcpp-v1.74_GH0.tar.gz) = 10f99515eec5a34659d4f0b1d160404a6ca0cbf3054e77663c3f038ff4c7c08c -SIZE (LostRuins-koboldcpp-v1.74_GH0.tar.gz) = 28510760 +TIMESTAMP = 1726978161 +SHA256 (LostRuins-koboldcpp-v1.75.1_GH0.tar.gz) = 08cd63a71fbab02511b0dfed40412f1604f6212e9e9a23b7f606a7d9ef2d24ab +SIZE (LostRuins-koboldcpp-v1.75.1_GH0.tar.gz) = 22707800 diff --git a/misc/koboldcpp/files/patch-koboldcpp.py b/misc/koboldcpp/files/patch-koboldcpp.py deleted file mode 100644 index bad178aa0cc6..000000000000 --- a/misc/koboldcpp/files/patch-koboldcpp.py +++ /dev/null @@ -1,31 +0,0 @@ -- submitted here: https://github.com/LostRuins/koboldcpp/issues/1110 - ---- koboldcpp.py.orig 2024-09-01 15:51:59 UTC -+++ koboldcpp.py -@@ -4159,8 +4159,9 @@ def main(launch_args,start_server=True): - - - #load embedded lite -+ basepath = os.path.abspath(os.path.dirname(os.path.realpath(__file__))) -+ - try: -- basepath = os.path.abspath(os.path.dirname(__file__)) - with open(os.path.join(basepath, "klite.embd"), mode='rb') as f: - embedded_kailite = f.read() - # patch it with extra stuff -@@ -4174,7 +4175,6 @@ def main(launch_args,start_server=True): - print("Could not find KoboldAI Lite. Embedded KoboldAI Lite will not be available.") - - try: -- basepath = os.path.abspath(os.path.dirname(__file__)) - with open(os.path.join(basepath, "kcpp_docs.embd"), mode='rb') as f: - embedded_kcpp_docs = f.read() - print("Embedded API docs loaded.") -@@ -4182,7 +4182,6 @@ def main(launch_args,start_server=True): - print("Could not find Embedded KoboldCpp API docs.") - - try: -- basepath = os.path.abspath(os.path.dirname(__file__)) - with open(os.path.join(basepath, "kcpp_sdui.embd"), mode='rb') as f: - embedded_kcpp_sdui = f.read() - if args.sdmodel: diff --git a/misc/koboldcpp/pkg-plist b/misc/koboldcpp/pkg-plist index 8efacd4bc51e..f4f740d331c1 100644 --- a/misc/koboldcpp/pkg-plist +++ b/misc/koboldcpp/pkg-plist @@ -6,7 +6,6 @@ bin/koboldcpp %%DATADIR%%/koboldcpp_default.so %%DATADIR%%/koboldcpp_failsafe.so %%DATADIR%%/koboldcpp_noavx2.so -%%DATADIR%%/koboldcpp_openblas.so %%DATADIR%%/koboldcpp_vulkan.so %%DATADIR%%/koboldcpp_vulkan_noavx2.so %%DATADIR%%/rwkv_vocab.embd