diff --git a/misc/koboldcpp/Makefile b/misc/koboldcpp/Makefile index 10e3f8ad30c0..115911d005a4 100644 --- a/misc/koboldcpp/Makefile +++ b/misc/koboldcpp/Makefile @@ -1,75 +1,80 @@ PORTNAME= koboldcpp DISTVERSIONPREFIX= v -DISTVERSION= 1.86.2 +DISTVERSION= 1.89 CATEGORIES= misc # machine-learning MAINTAINER= yuri@FreeBSD.org COMMENT= Simple way to run GGML and GGUF AI models with a KoboldAI WebUI WWW= https://github.com/lostruins/koboldcpp LICENSE= AGPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE.md #BROKEN_armv7= compilation fails, see https://github.com/LostRuins/koboldcpp/issues/1129 #BROKEN_i386= compilation fails, see https://github.com/LostRuins/koboldcpp/issues/1129 FLAVORS= default portable FLAVOR?= ${FLAVORS:[1]} portable_PKGNAMESUFFIX= -portable +BUILD_DEPENDS= glslc:graphics/shaderc LIB_DEPENDS= libopenblas.so:math/openblas \ libvulkan.so:graphics/vulkan-loader RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}customtkinter>0:x11-toolkits/py-customtkinter@${PY_FLAVOR} USES= compiler:c++11-lang gmake localbase:ldflags python shebangfix USE_GITHUB= yes GH_ACCOUNT= LostRuins SHEBANG_FILES= koboldcpp.py .if ${FLAVOR} == default LIBS= koboldcpp_default.so koboldcpp_vulkan.so MAKE_ARGS= PRESET_CFLAGS="${CFLAGS}" PRESET_CXXFLAGS="${CXXFLAGS}" .endif .if ${FLAVOR} == portable MAKE_ARGS= LLAMA_PORTABLE=1 LIBS= koboldcpp_default.so koboldcpp_failsafe.so koboldcpp_noavx2.so \ koboldcpp_vulkan.so koboldcpp_vulkan_noavx2.so .endif MAKE_ARGS+= LLAMA_OPENBLAS=1 LLAMA_VULKAN=1 LDFLAGS="${LDFLAGS}" ALL_TARGET= PLIST_FILES= ${LIBS:S/^/%%DATADIR%%\//} .if defined(WITH_DEBUG) MAKE_ARGS+= KCPP_DEBUG=1 .endif +post-patch: + @${RM} ${WRKSRC}/glslc-linux + @${LN} -s ${PREFIX}/bin/glslc ${WRKSRC}/glslc-linux + do-install: # dir ${MKDIR} ${STAGEDIR}${DATADIR} # prog ${INSTALL_DATA} ${WRKSRC}/koboldcpp.py ${STAGEDIR}${DATADIR}/koboldcpp.py ${CHMOD} +x ${STAGEDIR}${DATADIR}/koboldcpp.py ${RLN} ${STAGEDIR}${DATADIR}/koboldcpp.py ${STAGEDIR}${PREFIX}/bin/koboldcpp # libraries .for lib in ${LIBS} ${INSTALL_LIB} ${WRKSRC}/${lib} ${STAGEDIR}${DATADIR} .endfor # embd files .for embd in klite.embd kcpp_docs.embd rwkv_vocab.embd rwkv_world_vocab.embd \ kcpp_sdui.embd taesd.embd taesd_xl.embd ${INSTALL_DATA} ${WRKSRC}/${embd} ${STAGEDIR}${DATADIR} .endfor .include .if ${ARCH} != amd64 IGNORE= portable flavor isn't defined on ${ARCH} because it is based on AVX2, etc. (?) .endif .include diff --git a/misc/koboldcpp/distinfo b/misc/koboldcpp/distinfo index 7de3a054672d..76d417f8cf3f 100644 --- a/misc/koboldcpp/distinfo +++ b/misc/koboldcpp/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1742197061 -SHA256 (LostRuins-koboldcpp-v1.86.2_GH0.tar.gz) = 57ba6a2509215697a3fa3e88f1500e9f653f3d2494a848cfc73cdbcc26c3e7be -SIZE (LostRuins-koboldcpp-v1.86.2_GH0.tar.gz) = 37064271 +TIMESTAMP = 1745253387 +SHA256 (LostRuins-koboldcpp-v1.89_GH0.tar.gz) = 5bf0a3b1559330aa4780ff9670ae9dbf3bad2268076853ccb82754068cf7b743 +SIZE (LostRuins-koboldcpp-v1.89_GH0.tar.gz) = 27654876 diff --git a/misc/koboldcpp/files/patch-Makefile b/misc/koboldcpp/files/patch-Makefile index eaf1aaa17486..e991582502a7 100644 --- a/misc/koboldcpp/files/patch-Makefile +++ b/misc/koboldcpp/files/patch-Makefile @@ -1,40 +1,46 @@ ---- Makefile.orig 2025-02-09 08:59:56 UTC +--- Makefile.orig 2025-04-20 12:57:11 UTC +++ Makefile @@ -45,8 +45,8 @@ endif # # keep standard at C11 and C++17 -CFLAGS = -CXXFLAGS = +CFLAGS = $(PRESET_CFLAGS) +CXXFLAGS = $(PRESET_CXXFLAGS) ifdef KCPP_DEBUG CFLAGS = -g -O0 CXXFLAGS = -g -O0 -@@ -151,7 +151,7 @@ else +@@ -151,10 +151,10 @@ else FULLCFLAGS += -mavx2 -msse3 -mssse3 -mfma -mf16c -mavx endif # LLAMA_NOAVX2 else - CFLAGS += -march=native -mtune=native +- SIMPLECFLAGS += -march=native -mtune=native +- SIMPLERCFLAGS += -march=native -mtune=native +- FULLCFLAGS += -march=native -mtune=native + #CFLAGS += -march=native -mtune=native ++ #SIMPLECFLAGS += -march=native -mtune=native ++ #SIMPLERCFLAGS += -march=native -mtune=native ++ #FULLCFLAGS += -march=native -mtune=native endif # LLAMA_PORTABLE endif # if x86 -@@ -289,8 +289,8 @@ else +@@ -297,8 +297,8 @@ else CXXFLAGS += -mcpu=native endif else - CFLAGS += -mcpu=native - CXXFLAGS += -mcpu=native + #CFLAGS += -mcpu=native + #CXXFLAGS += -mcpu=native endif endif endif -@@ -746,4 +746,4 @@ finishedmsg: +@@ -841,4 +841,4 @@ finishedmsg: #phony for printing messages finishedmsg: $(NOTIFY_MSG) - $(DONOTHING) \ No newline at end of file + $(DONOTHING)