From nobody Sun Sep 01 17:40:26 2024 X-Original-To: dev-commits-ports-all@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 4WxfL33l33z5MffK; Sun, 01 Sep 2024 17:40:27 +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 4WxfL31SyFz4qCQ; Sun, 1 Sep 2024 17:40:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725212427; 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=KmYFX96QaEouvngeUVFNak4gJoxdgkLXOHimy+ojAyw=; b=lE6BTNcOF89kj88lep3BLTiX1uYJsJaoaLcVWesFEOvU5WFMH930jVsH25Z6acp00MAngX kzXMOVCiU6EyCu8Ia5ZCPOZFVZj7bCQyucveJ9QrkoAk7v+GdzCeU7Wr8V5tmQWX3UswB/ DXMuBRJOF8dv2K4BbseS2l7S077sW7NRND5FMf6hBjd42HDlRinvZ5hdwk2AK2oFtnSV6e /kiAtqgd5JhrhrBt26KsOqs94JibSPW/c1aoEHv9Lbpm0WogMAlzM7wuPvJG5itQG6w++v uz1EeM62BWlqrZ/YOmrDazZmIj0fZddQH7GoAtB6BEwLW1dukhHs+ZP70JeD5w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725212427; a=rsa-sha256; cv=none; b=DVQHxwoItN9Q7bQPQXFCl+o0HTDBUrPpm4kGhS4/a6Hlza82NcYYoP0Ujk4iCZqEMS1QdK EJuEmzLTHKKmnC6zT1OG2Prf+9dJo00UJYQOcQL0bmtl74NWa3ycbkYr3t7ufS8Z2udL6Y KOwMvyvhoUogp3wNSRlmntNe4cujxaLRuyMtyhftIK4WQfoeWm/7p8J2u9izy0N5zCHdAX AHPXb8cj0n/tb08k2kts/m8kDEw8gO0E0tlUG8mirwxQiuz6An1b/Se9SL0aE9FJI0pWW/ vwSRL4g4st+nkWeNzN/4aiBqzfkKPWD7NrrJTR+1oof0F2+bCxHZEoY4eabRpA== 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=1725212427; 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=KmYFX96QaEouvngeUVFNak4gJoxdgkLXOHimy+ojAyw=; b=Mby5StPAfJ6gpVvHfkOLYshqF2Nf8t+tNLhL3jjwEXTbB2OBOzetJgveL4EiPTstgjnjIu UMvZuMmrbDGM7WQntsJo3v7PsTB5pGKa4zCTNFJ5Ez7mOjSfu3rqx1lCp5TXeDt1SEXTNX 8D4QelxhSNgVr8kY8JMvnEQrt93PjT+KhOqRupgmKvrx2leRBtpnGGBI/MfrUoUsXNf+8H mNEkxjbB+/Y7/8zgTuIu0TSgZhyD5qfxz7RosRBosAuGBdhDbxj7FxetwFD5QbI9pAE/yx bRaaV3a0bqGsKLC2nBL4UrN+MeEc/f4uBiEZsC5nOdHd4XZOTdEBZSOkRPLkHQ== 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 4WxfL30knWzd8M; Sun, 1 Sep 2024 17:40:27 +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 481HeQ4U066808; Sun, 1 Sep 2024 17:40:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 481HeQTx066804; Sun, 1 Sep 2024 17:40:26 GMT (envelope-from git) Date: Sun, 1 Sep 2024 17:40:26 GMT Message-Id: <202409011740.481HeQTx066804@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: 19d61ead82a8 - main - misc/koboldcpp: update 1.73.1 =?utf-8?Q?=E2=86=92?= 1.74 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@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: 19d61ead82a840d5ac28f749ad91a4d7166e63b7 Auto-Submitted: auto-generated The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=19d61ead82a840d5ac28f749ad91a4d7166e63b7 commit 19d61ead82a840d5ac28f749ad91a4d7166e63b7 Author: Yuri Victorovich AuthorDate: 2024-09-01 17:04:34 +0000 Commit: Yuri Victorovich CommitDate: 2024-09-01 17:40:20 +0000 misc/koboldcpp: update 1.73.1 → 1.74 Reported by: portscout --- misc/koboldcpp/Makefile | 2 +- misc/koboldcpp/distinfo | 6 +++--- misc/koboldcpp/files/patch-koboldcpp.py | 31 +++++++++++++++++++++++++++++++ 3 files changed, 35 insertions(+), 4 deletions(-) diff --git a/misc/koboldcpp/Makefile b/misc/koboldcpp/Makefile index 929dfeb19efd..37b29180bfb3 100644 --- a/misc/koboldcpp/Makefile +++ b/misc/koboldcpp/Makefile @@ -1,6 +1,6 @@ PORTNAME= koboldcpp DISTVERSIONPREFIX= v -DISTVERSION= 1.73.1 +DISTVERSION= 1.74 CATEGORIES= misc # machine-learning MAINTAINER= yuri@FreeBSD.org diff --git a/misc/koboldcpp/distinfo b/misc/koboldcpp/distinfo index 3aed07f1298a..1e81634075cc 100644 --- a/misc/koboldcpp/distinfo +++ b/misc/koboldcpp/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1724387078 -SHA256 (LostRuins-koboldcpp-v1.73.1_GH0.tar.gz) = 22e98fa6cff973ddb0d464bc1d35fba20cad5e300e81bb43051718d1973d2682 -SIZE (LostRuins-koboldcpp-v1.73.1_GH0.tar.gz) = 28503444 +TIMESTAMP = 1725179865 +SHA256 (LostRuins-koboldcpp-v1.74_GH0.tar.gz) = 10f99515eec5a34659d4f0b1d160404a6ca0cbf3054e77663c3f038ff4c7c08c +SIZE (LostRuins-koboldcpp-v1.74_GH0.tar.gz) = 28510760 diff --git a/misc/koboldcpp/files/patch-koboldcpp.py b/misc/koboldcpp/files/patch-koboldcpp.py new file mode 100644 index 000000000000..bad178aa0cc6 --- /dev/null +++ b/misc/koboldcpp/files/patch-koboldcpp.py @@ -0,0 +1,31 @@ +- 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: