diff --git a/audio/whisper.cpp/Makefile b/audio/whisper.cpp/Makefile index 757869e17f2a..559df13ddfb2 100644 --- a/audio/whisper.cpp/Makefile +++ b/audio/whisper.cpp/Makefile @@ -1,43 +1,44 @@ PORTNAME= whisper.cpp DISTVERSIONPREFIX= v DISTVERSION= 1.7.6 +PORTREVISION= 1 CATEGORIES= audio # machine-learning MAINTAINER= yuri@FreeBSD.org COMMENT= Port of OpenAI's Whisper model in C/C++ WWW= https://github.com/ggerganov/whisper.cpp LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libggml.so:misc/ggml USES= cmake:testing USE_LDCONFIG= yes USE_GITHUB= yes GH_ACCOUNT= ggerganov LDFLAGS+= -pthread CMAKE_ON= WHISPER_USE_SYSTEM_GGML CMAKE_OFF= WHISPER_BUILD_TESTS CMAKE_TESTING_ON= WHISPER_BUILD_TESTS \ WHISPER_BUILD_EXAMPLES OPTIONS_DEFINE= EXAMPLES OPTIONS_DEFAULT= EXAMPLES # examples contain important user level programs OPTIONS_SUB= yes EXAMPLES_CMAKE_BOOL= WHISPER_BUILD_EXAMPLES MAKE_JOBS_UNSAFE= yes # for tests to suceed on smaller Vulkan devices: they fail to allocate memory otherwise post-install: ${INSTALL_SCRIPT} \ ${WRKSRC}/models/download-ggml-model.sh \ ${STAGEDIR}${PREFIX}/bin/${PORTNAME}-download-ggml-model.sh # tests as of 1.7.6: 73% tests passed, 3 tests failed out of 11, see https://github.com/ggml-org/whisper.cpp/issues/3404 .include diff --git a/misc/ggml/Makefile b/misc/ggml/Makefile index db050b78c558..fafdab54bec2 100644 --- a/misc/ggml/Makefile +++ b/misc/ggml/Makefile @@ -1,38 +1,40 @@ PORTNAME= ggml -DISTVERSION= g20250828 +DISTVERSION= g20250916 CATEGORIES= misc # machine-learning MAINTAINER= yuri@FreeBSD.org COMMENT= Tensor library for machine learning WWW= https://github.com/ggerganov/ggml LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE USES= cmake:testing compiler:c++17-lang python:run shebangfix USE_LDCONFIG= yes BROKEN_i386= compilation fails: LLVM ERROR: out of memory USE_GITHUB= yes GH_ACCOUNT= ggerganov -GH_TAGNAME= 83835ff +GH_TAGNAME= 978f6e1 CMAKE_ON= BUILD_SHARED_LIBS -CMAKE_OFF= GGML_BUILD_TESTS GGML_BUILD_EXAMPLES +CMAKE_OFF= GGML_BUILD_TESTS \ + GGML_BUILD_EXAMPLES \ + GGML_NATIVE CMAKE_TESTING_ON= GGML_BUILD_TESTS BINARY_ALIAS= git=false OPTIONS_DEFINE= VULKAN OPTIONS_DEFAULT= VULKAN OPTIONS_SUB= yes VULKAN_CMAKE_BOOL= GGML_VULKAN VULKAN_BUILD_DEPENDS= glslc:graphics/shaderc \ vulkan-headers>0:graphics/vulkan-headers VULKAN_LIB_DEPENDS= libvulkan.so:graphics/vulkan-loader # tests as of g20250828: 100% tests passed, 0 tests failed out of 21 .include diff --git a/misc/ggml/distinfo b/misc/ggml/distinfo index a17e9ebaeb14..d8983992a40c 100644 --- a/misc/ggml/distinfo +++ b/misc/ggml/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1756957568 -SHA256 (ggerganov-ggml-g20250828-83835ff_GH0.tar.gz) = 42e76df96d99c86e9fe15a87dfe5eab6c0a117497d5bb6c4ef154dbf7b5e805c -SIZE (ggerganov-ggml-g20250828-83835ff_GH0.tar.gz) = 2072055 +TIMESTAMP = 1758234399 +SHA256 (ggerganov-ggml-g20250916-978f6e1_GH0.tar.gz) = 6aed1d94900779583ae4c1981d27827a641aa97562421b24150f24b03a28e3f1 +SIZE (ggerganov-ggml-g20250916-978f6e1_GH0.tar.gz) = 2133677 diff --git a/misc/ggml/files/patch-src_ggml-cpu_CMakeLists.txt b/misc/ggml/files/patch-src_ggml-cpu_CMakeLists.txt index fab5880da52b..a44169da8da7 100644 --- a/misc/ggml/files/patch-src_ggml-cpu_CMakeLists.txt +++ b/misc/ggml/files/patch-src_ggml-cpu_CMakeLists.txt @@ -1,19 +1,30 @@ ---- src/ggml-cpu/CMakeLists.txt.orig 2025-09-07 09:13:51 UTC +--- src/ggml-cpu/CMakeLists.txt.orig 2025-09-16 11:42:24 UTC +++ src/ggml-cpu/CMakeLists.txt -@@ -382,13 +382,13 @@ function(ggml_add_cpu_backend_variant_impl tag_name) +@@ -127,10 +127,6 @@ function(ggml_add_cpu_backend_variant_impl tag_name) + if (NOT ARM_MCPU_RESULT) + string(REGEX MATCH "-mcpu=[^ ']+" ARM_MCPU_FLAG "${ARM_MCPU}") + endif() +- if ("${ARM_MCPU_FLAG}" STREQUAL "") +- set(ARM_MCPU_FLAG -mcpu=native) +- message(STATUS "ARM -mcpu not found, -mcpu=native will be used") +- endif() + + include(CheckCXXSourceRuns) + +@@ -382,13 +378,13 @@ function(ggml_add_cpu_backend_variant_impl tag_name) string(REGEX REPLACE "POWER *([0-9]+)" "\\1" EXTRACTED_NUMBER "${MATCHED_STRING}") if (EXTRACTED_NUMBER GREATER_EQUAL 10) - list(APPEND ARCH_FLAGS -mcpu=power10 -mpowerpc64) + list(APPEND ARCH_FLAGS -mcpu=power10) elseif (EXTRACTED_NUMBER EQUAL 9) - list(APPEND ARCH_FLAGS -mcpu=power9 -mpowerpc64) + list(APPEND ARCH_FLAGS -mcpu=power9) elseif (${CMAKE_SYSTEM_PROCESSOR} MATCHES "ppc64le") list(APPEND ARCH_FLAGS -mcpu=powerpc64le -mtune=native) else() - list(APPEND ARCH_FLAGS -mcpu=native -mtune=native -mpowerpc64) + list(APPEND ARCH_FLAGS -mcpu=native -mtune=native) endif() elseif(GGML_CPU_ALL_VARIANTS) # Begin with the lowest baseline