From b1fe9815fc32d1c7a52bb24e5adf82a4e9e7dac7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D9=85=D9=87=D8=AF=D9=8A=20=D8=B4=D9=8A=D9=86=D9=88=D9=86?= =?UTF-8?q?=20=28Mehdi=20Chinoune=29?= Date: Thu, 20 Nov 2025 11:10:31 +0100 Subject: [PATCH] update ggml/llama.cpp/whisper.cpp --- mingw-w64-ggml/PKGBUILD | 7 +++---- mingw-w64-llama.cpp/001-fix-link-cpp-httplib.patch | 12 ++++++++++++ mingw-w64-llama.cpp/PKGBUILD | 13 ++++++++++--- mingw-w64-whisper.cpp/PKGBUILD | 6 +++--- 4 files changed, 28 insertions(+), 10 deletions(-) create mode 100644 mingw-w64-llama.cpp/001-fix-link-cpp-httplib.patch diff --git a/mingw-w64-ggml/PKGBUILD b/mingw-w64-ggml/PKGBUILD index b376575a32..8256ef7f7c 100644 --- a/mingw-w64-ggml/PKGBUILD +++ b/mingw-w64-ggml/PKGBUILD @@ -3,7 +3,7 @@ _realname=ggml pkgbase=mingw-w64-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}") -pkgver=0.9.4.r185.g478023fb +pkgver=0.9.4.r235.gc23776f2 pkgrel=1 pkgdesc="Tensor library for machine learning (mingw-w64)" arch=('any') @@ -27,9 +27,9 @@ makedepends=( "${MINGW_PACKAGE_PREFIX}-vulkan-headers" "git" ) -_commit="478023fbefb9f026b7d20a85724b012183488ad1" +_commit="c23776f22d616d8cb635145381cad365bac675e7" source=("git+https://github.com/ggml-org/ggml.git#commit=${_commit}") -sha256sums=('355786d0cc03f2644e7a79e12efd85ba8a098ab1c04cb4b4f6969a6d53607297') +sha256sums=('a6b340f67dc16d73191523d439e94121f5d00ef8f01c3ed9930b7d23776ac227') pkgver() { cd "${_realname}" @@ -54,7 +54,6 @@ build() { -DCMAKE_INSTALL_PREFIX="${MINGW_PREFIX}" \ "${extra_config[@]}" \ -DBUILD_SHARED_LIBS=ON \ - -DCMAKE_DLL_NAME_WITH_SOVERSION=ON \ -DGGML_RPC=ON \ -DGGML_BLAS=ON \ -DGGML_BLAS_VENDOR=OpenBLAS \ diff --git a/mingw-w64-llama.cpp/001-fix-link-cpp-httplib.patch b/mingw-w64-llama.cpp/001-fix-link-cpp-httplib.patch new file mode 100644 index 0000000000..44721ce3a8 --- /dev/null +++ b/mingw-w64-llama.cpp/001-fix-link-cpp-httplib.patch @@ -0,0 +1,12 @@ +--- a/vendor/cpp-httplib/CMakeLists.txt ++++ b/vendor/cpp-httplib/CMakeLists.txt +@@ -46,6 +46,9 @@ + message(STATUS "OpenSSL found: ${OPENSSL_VERSION}") + target_compile_definitions(${TARGET} PUBLIC CPPHTTPLIB_OPENSSL_SUPPORT) + target_link_libraries(${TARGET} PUBLIC OpenSSL::SSL OpenSSL::Crypto) ++ if(WIN32) ++ target_link_libraries(${TARGET} PUBLIC crypt32) ++ endif() + if (APPLE AND CMAKE_SYSTEM_NAME STREQUAL "Darwin") + target_compile_definitions(${TARGET} PUBLIC CPPHTTPLIB_USE_CERTS_FROM_MACOSX_KEYCHAIN) + find_library(CORE_FOUNDATION_FRAMEWORK CoreFoundation REQUIRED) diff --git a/mingw-w64-llama.cpp/PKGBUILD b/mingw-w64-llama.cpp/PKGBUILD index 0316163a78..66eaa3e4a9 100644 --- a/mingw-w64-llama.cpp/PKGBUILD +++ b/mingw-w64-llama.cpp/PKGBUILD @@ -4,7 +4,7 @@ _realname=llama.cpp pkgbase=mingw-w64-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}") epoch=1 -pkgver=b7018 +pkgver=b7109 pkgrel=1 pkgdesc="Library and tools for running inference with Meta's LLaMA model (and derivatives) in C/C++ (mingw-w64)" arch=('any') @@ -22,8 +22,15 @@ makedepends=( "${MINGW_PACKAGE_PREFIX}-cmake" "${MINGW_PACKAGE_PREFIX}-ninja" ) -source=("https://github.com/ggml-org/llama.cpp/archive/${pkgver}/${_realname}-${pkgver}.tar.gz") -sha256sums=('19207340ea8ae1d770553bdd198e3e6943077a68d35ebf240cc1a7338987731f') +source=("https://github.com/ggml-org/llama.cpp/archive/${pkgver}/${_realname}-${pkgver}.tar.gz" + "001-fix-link-cpp-httplib.patch") +sha256sums=('a03783afa8d91d06904a22dcaac76f11b8a1ce348585d3e6460288405cfef7b6' + 'e3f19749b5e410f8ed4822cfd67eeeb1eb4c0e55618b826dcdff75dc00b422d5') + +prepare() { + cd ${_realname}-${pkgver} + patch -p1 -i "${srcdir}"/001-fix-link-cpp-httplib.patch +} build() { mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}" diff --git a/mingw-w64-whisper.cpp/PKGBUILD b/mingw-w64-whisper.cpp/PKGBUILD index 4ddb01bad2..2e18295eb6 100644 --- a/mingw-w64-whisper.cpp/PKGBUILD +++ b/mingw-w64-whisper.cpp/PKGBUILD @@ -4,7 +4,7 @@ _realname=whisper.cpp pkgbase=mingw-w64-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}") epoch=1 -pkgver=1.8.2.r125.ga1867e0d +pkgver=1.8.2.r178.gb12abefa pkgrel=1 pkgdesc="Port of OpenAI's Whisper model in C/C++ (mingw-w64)" arch=('any') @@ -22,10 +22,10 @@ makedepends=( "${MINGW_PACKAGE_PREFIX}-ninja" "git" ) -_commit=a1867e0dad0b21b35afa43fc815dae60c9a139d6 +_commit=b12abefa9be2abae39a73fa903322af135024a36 source=("git+https://github.com/ggml-org/whisper.cpp#commit=${_commit}") #source=("https://github.com/ggml-org/whisper.cpp/archive/v${pkgver}/${_realname}-${pkgver}.tar.gz") -sha256sums=('ba72799ec0af5ff198b2309c1eb853979824a46d63cabfcbae6cefac65824efa') +sha256sums=('28f97045b348ef1c1c2f6ba379f449239f34615dfe291c7186f03446223848c7') pkgver() { cd "${_realname}"